archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
dbde62d12416b75cc8dc0ce71bd101d8d8f42ef5
blender-archive/source/blender/editors/space_logic/logic_window.c

2526 lines
74 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
*
* The Original Code is Copyright (C) 2009 Blender Foundation.
* All rights reserved.
*
*
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
*/
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
/** \file blender/editors/space_logic/logic_window.c
* \ingroup splogic
*/
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include <string.h>
#include <stdio.h>
needed for win32's msvc.
2009-12-29 18:57:59 +00:00
#include <stddef.h>
2.5 Sound: Bugfixes.
2009-08-29 23:13:27 +00:00
#include <float.h>
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include "DNA_actuator_types.h"
#include "DNA_controller_types.h"
#include "DNA_property_types.h"
#include "DNA_space_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_sensor_types.h"
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
#include "DNA_constraint_types.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include "DNA_windowmanager_types.h"
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
#include "DNA_object_types.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
#include "BLI_utildefines.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
minor edits, no functional changes. - BGE was getting MCol array and not using it. - use list lookup functions for getting constraint from pose bone. - use const char * in more places.
2011-02-07 22:48:23 +00:00
#include "BKE_action.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_sca.h"
#include "ED_util.h"
#include "WM_types.h"
#include "BIF_gl.h"
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
#include "BLF_translation.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
#include "UI_interface.h"
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
#include "RNA_access.h"
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
/* XXX BAD BAD */
#include "../interface/interface_intern.h"
#include "logic_intern.h"
#define B_REDR 1
#define B_ADD_SENS 2703
#define B_CHANGE_SENS 2704
#define B_DEL_SENS 2705
#define B_ADD_CONT 2706
#define B_CHANGE_CONT 2707
#define B_DEL_CONT 2708
#define B_ADD_ACT 2709
#define B_CHANGE_ACT 2710
#define B_DEL_ACT 2711
#define B_SOUNDACT_BROWSE 2712
#define B_SETPROP 2714
#define B_SETACTOR 2715
#define B_SETMAINACTOR 2716
#define B_SETDYNA 2717
#define B_SET_STATE_BIT 2718
#define B_INIT_STATE_BIT 2719
/* proto */
static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisflag);
static int vergname(const void *v1, const void *v2)
{
char **x1, **x2;
style cleanup
2012-10-26 04:14:10 +00:00
x1 = (char **)v1;
x2 = (char **)v2;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
bugfix for [32368] Added controllers don't count over 10 Blender original code (NaN likely) was relying on strcmp to sort the list of controllers. As it happens, in strcmp 10 < 2, thus the list was never in the right order. The curious thing is that in 2.49 it worked, but I think it did because the make_unique_prop_names function was called twice. Strange ;) The solution is to use blender BLI_natstrcmp to do natural sorting
2012-08-23 17:37:04 +00:00
return BLI_natstrcmp(*x1, *x2);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
void make_unique_prop_names(bContext *C, char *str)
{
Object *ob;
bProperty *prop;
bSensor *sens;
bController *cont;
bActuator *act;
ID **idar;
short a, obcount, propcount=0, nr;
char **names;
/* this function is called by a Button, and gives the current
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* stringpointer as an argument, this is the one that can change
*/
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
idar= get_selected_and_linked_obs(C, &obcount, BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_CONT_SEL|BUTS_CONT_ACT);
/* for each object, make properties and sca names unique */
/* count total names */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<obcount; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
propcount+= BLI_countlist(&ob->prop);
propcount+= BLI_countlist(&ob->sensors);
propcount+= BLI_countlist(&ob->controllers);
propcount+= BLI_countlist(&ob->actuators);
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (propcount==0) {
if (idar) MEM_freeN(idar);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
return;
}
/* make names array for sorting */
names= MEM_callocN(propcount*sizeof(void *), "names");
/* count total names */
nr= 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<obcount; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
prop= ob->prop.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (prop) {
style cleanup
2012-10-22 08:15:51 +00:00
names[nr++] = prop->name;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
prop= prop->next;
}
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
style cleanup
2012-10-22 08:15:51 +00:00
names[nr++] = sens->name;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= sens->next;
}
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
style cleanup
2012-10-22 08:15:51 +00:00
names[nr++] = cont->name;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= cont->next;
}
act= ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
style cleanup
2012-10-22 08:15:51 +00:00
names[nr++] = act->name;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act= act->next;
}
}
qsort(names, propcount, sizeof(void *), vergname);
/* now we check for double names, and change them */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (nr=0; nr<propcount; nr++) {
if (names[nr]!=str && strcmp( names[nr], str )==0 ) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
BLI_newname(str, +1);
}
}
MEM_freeN(idar);
MEM_freeN(names);
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void do_logic_buts(bContext *C, void *UNUSED(arg), int event)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
2.5: code changes to reduce the usage of G.main and pass it along or get it from the context instead.
2010-08-01 12:47:49 +00:00
Main *bmain= CTX_data_main(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
bSensor *sens;
bController *cont;
bActuator *act;
Object *ob;
int didit, bit;
ob= CTX_data_active_object(C);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob==NULL) return;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (event) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case B_SETPROP:
am learning bad spelling from blender. grr
2010-01-26 14:00:13 +00:00
/* check for inconsistent types */
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->gameflag &= ~(OB_SECTOR|OB_MAINACTOR|OB_DYNAMIC|OB_ACTOR);
break;
case B_SETACTOR:
case B_SETDYNA:
case B_SETMAINACTOR:
ob->gameflag &= ~(OB_SECTOR|OB_PROP);
break;
* KX_PythonSeq - comparisons work again. eg. act1.sensors == act2.sensors, had to copy Py_CmpToRich inline grr!, mailed python-dev about this. * Shift-Click on states in the logic UI works again. * New Logic Space has all the view options pressed.
2009-09-02 20:46:28 +00:00
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case B_ADD_SENS:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
if (ob->scaflag & OB_ADDSENS) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scaflag &= ~OB_ADDSENS;
sens= new_sensor(SENS_ALWAYS);
BLI_addtail(&(ob->sensors), sens);
make_unique_prop_names(C, sens->name);
ob->scaflag |= OB_SHOWSENS;
}
}
ED_undo_push(C, "Add sensor");
break;
case B_CHANGE_SENS:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (sens->type != sens->otype) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
init_sensor(sens);
sens->otype= sens->type;
break;
}
sens= sens->next;
}
}
break;
case B_DEL_SENS:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (sens->flag & SENS_DEL) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
BLI_remlink(&(ob->sensors), sens);
free_sensor(sens);
break;
}
sens= sens->next;
}
}
ED_undo_push(C, "Delete sensor");
break;
case B_ADD_CONT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
if (ob->scaflag & OB_ADDCONT) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scaflag &= ~OB_ADDCONT;
cont= new_controller(CONT_LOGIC_AND);
make_unique_prop_names(C, cont->name);
ob->scaflag |= OB_SHOWCONT;
BLI_addtail(&(ob->controllers), cont);
/* set the controller state mask from the current object state.
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* A controller is always in a single state, so select the lowest bit set
* from the object state */
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
for (bit=0; bit<32; bit++) {
if (ob->state & (1<<bit))
break;
}
cont->state_mask = (1<<bit);
if (cont->state_mask == 0) {
/* shouldn't happen, object state is never 0 */
cont->state_mask = 1;
}
}
}
ED_undo_push(C, "Add controller");
break;
case B_SET_STATE_BIT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
if (ob->scaflag & OB_ALLSTATE) {
Logic UI: Controller State http://www.pasteall.org/pic/show.php?id=3255 New design, with an option to hide/unhide it. Matt: 1) the way I managed to have the I selected is kind of nasty :) but I think it will have to wait for proper icons. 2) the ALL is so far only working visually, It's still have to change the code to make all sensors and actuators visible when ALL is on. I think this is better than actually marking all states as before (2.49). Maybe it's even nicer nice to have not only have the states disactivated (in gray as they are now), but also to show them as temporary marked. Is that interesting/possible? 3) Can't centralize it :( 4) I think you are right, the icons are nice, but uninformative ... for someone else curious: http://www.pasteall.org/pic/show.php?id=3254
2010-05-12 08:34:15 +00:00
ob->scaflag &= ~OB_ALLSTATE;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->state = 0x3FFFFFFF;
}
}
break;
case B_INIT_STATE_BIT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
if (ob->scaflag & OB_INITSTBIT) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scaflag &= ~OB_INITSTBIT;
ob->state = ob->init_state;
if (!ob->state)
ob->state = 1;
}
}
break;
case B_CHANGE_CONT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cont->type != cont->otype) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
init_controller(cont);
cont->otype= cont->type;
break;
}
cont= cont->next;
}
}
break;
case B_DEL_CONT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cont->flag & CONT_DEL) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
BLI_remlink(&(ob->controllers), cont);
unlink_controller(cont);
free_controller(cont);
break;
}
cont= cont->next;
}
}
ED_undo_push(C, "Delete controller");
break;
case B_ADD_ACT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
if (ob->scaflag & OB_ADDACT) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scaflag &= ~OB_ADDACT;
act= new_actuator(ACT_OBJECT);
make_unique_prop_names(C, act->name);
BLI_addtail(&(ob->actuators), act);
ob->scaflag |= OB_SHOWACT;
}
}
ED_undo_push(C, "Add actuator");
break;
case B_CHANGE_ACT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act= ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (act->type != act->otype) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
init_actuator(act);
act->otype= act->type;
break;
}
act= act->next;
}
}
break;
case B_DEL_ACT:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act= ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (act->flag & ACT_DEL) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
BLI_remlink(&(ob->actuators), act);
unlink_actuator(act);
free_actuator(act);
break;
}
act= act->next;
}
}
ED_undo_push(C, "Delete actuator");
break;
case B_SOUNDACT_BROWSE:
/* since we don't know which... */
didit= 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (ob=bmain->object.first; ob; ob=ob->id.next) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act= ob->actuators.first;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
while (act) {
if (act->type==ACT_SOUND) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
bSoundActuator *sa= act->data;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
if (sa->sndnr) {
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
ID *sound= bmain->sound.first;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
int nr= 1;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (sa->sndnr == -2) {
2.5: code changes to reduce the usage of G.main and pass it along or get it from the context instead.
2010-08-01 12:47:49 +00:00
// XXX activate_databrowse((ID *)bmain->sound.first, ID_SO, 0, B_SOUNDACT_BROWSE,
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
// &sa->sndnr, do_logic_buts);
break;
}
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
while (sound) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (nr==sa->sndnr)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
break;
nr++;
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
sound= sound->next;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (sa->sound)
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
((ID *)sa->sound)->us--;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
sa->sound= (struct bSound *)sound;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (sound)
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
sound->us++;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sa->sndnr= 0;
didit= 1;
}
}
act= act->next;
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (didit)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
break;
}
break;
}
}
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
2010-12-03 17:05:21 +00:00
static const char *sensor_name(int type)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
switch (type) {
case SENS_ALWAYS:
return "Always";
case SENS_TOUCH:
return "Touch";
case SENS_NEAR:
return "Near";
case SENS_KEYBOARD:
return "Keyboard";
case SENS_PROPERTY:
return "Property";
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
case SENS_ARMATURE:
return "Armature";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case SENS_ACTUATOR:
return "Actuator";
case SENS_DELAY:
return "Delay";
case SENS_MOUSE:
return "Mouse";
case SENS_COLLISION:
return "Collision";
case SENS_RADAR:
return "Radar";
case SENS_RANDOM:
return "Random";
case SENS_RAY:
return "Ray";
case SENS_MESSAGE:
return "Message";
case SENS_JOYSTICK:
return "Joystick";
}
return "unknown";
}
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
2010-12-03 17:05:21 +00:00
static const char *controller_name(int type)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
switch (type) {
case CONT_LOGIC_AND:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "And";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_LOGIC_OR:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "Or";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_LOGIC_NAND:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "Nand";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_LOGIC_NOR:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "Nor";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_LOGIC_XOR:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "Xor";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_LOGIC_XNOR:
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
return "Xnor";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case CONT_EXPRESSION:
return "Expression";
case CONT_PYTHON:
return "Python";
}
return "unknown";
}
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
2010-12-03 17:05:21 +00:00
static const char *actuator_name(int type)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
switch (type) {
case ACT_SHAPEACTION:
return "Shape Action";
case ACT_ACTION:
return "Action";
case ACT_OBJECT:
return "Motion";
case ACT_IPO:
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
return "F-Curve";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case ACT_LAMP:
return "Lamp";
case ACT_CAMERA:
return "Camera";
case ACT_MATERIAL:
return "Material";
case ACT_SOUND:
return "Sound";
case ACT_PROPERTY:
return "Property";
case ACT_EDIT_OBJECT:
return "Edit Object";
case ACT_CONSTRAINT:
return "Constraint";
case ACT_SCENE:
return "Scene";
case ACT_GROUP:
return "Group";
case ACT_RANDOM:
return "Random";
case ACT_MESSAGE:
return "Message";
case ACT_GAME:
return "Game";
case ACT_VISIBILITY:
return "Visibility";
case ACT_2DFILTER:
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
return "Filter 2D";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
case ACT_PARENT:
return "Parent";
case ACT_STATE:
return "State";
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
case ACT_ARMATURE:
return "Armature";
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
case ACT_STEERING:
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
return "Steering";
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
return "unknown";
}
static void set_sca_ob(Object *ob)
{
bController *cont;
bActuator *act;
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont->mynew= (bController *)ob;
cont= cont->next;
}
act= ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act->mynew= (bActuator *)ob;
act= act->next;
}
}
static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisflag)
{
Base *base;
2.5: code changes to reduce the usage of G.main and pass it along or get it from the context instead.
2010-08-01 12:47:49 +00:00
Main *bmain= CTX_data_main(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
Scene *scene= CTX_data_scene(C);
Object *ob, *obt, *obact= CTX_data_active_object(C);
ID **idar;
bSensor *sens;
bController *cont;
unsigned int lay;
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
int a, nr, do_it;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
/* we need a sorted object list */
/* set scavisflags flags in Objects to indicate these should be evaluated */
/* also hide ob pointers in ->new entries of controllerss/actuators */
*count= 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (scene==NULL) return NULL;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
2.5: code changes to reduce the usage of G.main and pass it along or get it from the context instead.
2010-08-01 12:47:49 +00:00
ob= bmain->object.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (ob) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scavisflag= 0;
set_sca_ob(ob);
ob= ob->id.next;
}
/* XXX here it checked 3d lay */
lay= scene->lay;
base= FIRSTBASE;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (base) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (base->lay & lay) {
if (base->flag & SELECT) {
if (scavisflag & BUTS_SENS_SEL) base->object->scavisflag |= OB_VIS_SENS;
if (scavisflag & BUTS_CONT_SEL) base->object->scavisflag |= OB_VIS_CONT;
if (scavisflag & BUTS_ACT_SEL) base->object->scavisflag |= OB_VIS_ACT;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
}
base= base->next;
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (obact) {
if (scavisflag & BUTS_SENS_ACT) obact->scavisflag |= OB_VIS_SENS;
if (scavisflag & BUTS_CONT_ACT) obact->scavisflag |= OB_VIS_CONT;
if (scavisflag & BUTS_ACT_ACT) obact->scavisflag |= OB_VIS_ACT;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
/* BUTS_XXX_STATE are similar to BUTS_XXX_LINK for selecting the object */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (scavisflag & (BUTS_SENS_LINK|BUTS_CONT_LINK|BUTS_ACT_LINK|BUTS_SENS_STATE|BUTS_ACT_STATE)) {
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
do_it = TRUE;
while (do_it) {
do_it = FALSE;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
2.5: code changes to reduce the usage of G.main and pass it along or get it from the context instead.
2010-08-01 12:47:49 +00:00
ob= bmain->object.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (ob) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
/* 1st case: select sensor when controller selected */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((scavisflag & (BUTS_SENS_LINK|BUTS_SENS_STATE)) && (ob->scavisflag & OB_VIS_SENS)==0) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<sens->totlinks; a++) {
if (sens->links[a]) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
obt= (Object *)sens->links[a]->mynew;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (obt && (obt->scavisflag & OB_VIS_CONT)) {
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
do_it = TRUE;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scavisflag |= OB_VIS_SENS;
break;
}
}
}
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
if (do_it) break;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= sens->next;
}
}
/* 2nd case: select cont when act selected */
code cleanup: - style - multi-line ifs move braces onto new lines. - iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
if ((scavisflag & BUTS_CONT_LINK) && (ob->scavisflag & OB_VIS_CONT)==0) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<cont->totlinks; a++) {
if (cont->links[a]) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
obt= (Object *)cont->links[a]->mynew;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (obt && (obt->scavisflag & OB_VIS_ACT)) {
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
do_it = TRUE;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob->scavisflag |= OB_VIS_CONT;
break;
}
}
}
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
if (do_it) break;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= cont->next;
}
}
/* 3rd case: select controller when sensor selected */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((scavisflag & BUTS_CONT_LINK) && (ob->scavisflag & OB_VIS_SENS)) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
for (a=0; a<sens->totlinks; a++) {
if (sens->links[a]) {
obt= (Object *)sens->links[a]->mynew;
if (obt && (obt->scavisflag & OB_VIS_CONT)==0) {
do_it = TRUE;
obt->scavisflag |= OB_VIS_CONT;
}
}
}
sens= sens->next;
}
}
/* 4th case: select actuator when controller selected */
if ((scavisflag & (BUTS_ACT_LINK|BUTS_ACT_STATE)) && (ob->scavisflag & OB_VIS_CONT)) {
cont= ob->controllers.first;
while (cont) {
for (a=0; a<cont->totlinks; a++) {
if (cont->links[a]) {
obt= (Object *)cont->links[a]->mynew;
if (obt && (obt->scavisflag & OB_VIS_ACT)==0) {
do_it = TRUE;
obt->scavisflag |= OB_VIS_ACT;
}
}
style cleanup: (indentation)
2012-06-06 14:48:39 +00:00
}
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
cont= cont->next;
}
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
}
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
ob= ob->id.next;
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
}
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
}
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
}
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
/* now we count */
ob= bmain->object.first;
while (ob) {
if ( ob->scavisflag ) (*count)++;
ob= ob->id.next;
}
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
style cleanup: also rename bmesh_decimate.c --> bmesh_decimate_collapse.c
2012-10-23 03:38:26 +00:00
if (*count == 0) return NULL;
if (*count > 24) *count = 24; /* temporal */
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
idar= MEM_callocN((*count)*sizeof(void *), "idar");
ob= bmain->object.first;
nr= 0;
style cleanup: (indentation)
2012-06-06 14:48:39 +00:00
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
/* make the active object always the first one of the list */
if (obact) {
style cleanup
2012-10-22 08:15:51 +00:00
idar[0] = (ID *)obact;
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
nr++;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
while (ob) {
if ((ob->scavisflag) && (ob != obact)) {
style cleanup
2012-10-22 08:15:51 +00:00
idar[nr] = (ID *)ob;
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
nr++;
}
style cleanup: also rename bmesh_decimate.c --> bmesh_decimate_collapse.c
2012-10-23 03:38:26 +00:00
if (nr >= 24) break;
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
ob= ob->id.next;
}
/* just to be sure... these were set in set_sca_done_ob() */
clear_sca_new_poins();
return idar;
}
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
static void get_armature_bone_constraint(Object *ob, const char *posechannel, const char *constraint_name, bConstraint **constraint)
{
/* check that bone exist in the active object */
if (ob->type == OB_ARMATURE && ob->pose) {
bPoseChannel *pchan= BKE_pose_channel_find_name(ob->pose, posechannel);
if (pchan) {
bConstraint *con= BLI_findstring(&pchan->constraints, constraint_name, offsetof(bConstraint, name));
if (con) {
*constraint= con;
}
}
}
/* didn't find any */
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static void do_sensor_menu(bContext *C, void *UNUSED(arg), int event)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
2.5: code cleanup, added CTX_wm_space_* for each space type, instead of casting everywhere.
2009-07-28 16:33:02 +00:00
SpaceLogic *slogic= CTX_wm_space_logic(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ID **idar;
Object *ob;
bSensor *sens;
short count, a;
idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==0 || event==2) ob->scaflag |= OB_SHOWSENS;
else if (event==1) ob->scaflag &= ~OB_SHOWSENS;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==2) sens->flag |= SENS_SHOW;
else if (event==3) sens->flag &= ~SENS_SHOW;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens= sens->next;
}
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (idar) MEM_freeN(idar);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static uiBlock *sensor_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
uiBlock *block;
int yco=0;
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
block= uiBeginBlock(C, ar, __func__, UI_EMBOSSP);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetButmFunc(block, do_sensor_menu, NULL);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Objects"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Objects"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiDefBut(block, SEPR, 0, "", 0, (short)(yco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Sensors"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 2, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Sensors"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 3, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetDirection(block, UI_TOP);
uiEndBlock(C, block);
return block;
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static void do_controller_menu(bContext *C, void *UNUSED(arg), int event)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
2.5: code cleanup, added CTX_wm_space_* for each space type, instead of casting everywhere.
2009-07-28 16:33:02 +00:00
SpaceLogic *slogic= CTX_wm_space_logic(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ID **idar;
Object *ob;
bController *cont;
short count, a;
idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==0 || event==2) ob->scaflag |= OB_SHOWCONT;
else if (event==1) ob->scaflag &= ~OB_SHOWCONT;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==2) cont->flag |= CONT_SHOW;
else if (event==3) cont->flag &= ~CONT_SHOW;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont= cont->next;
}
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (idar) MEM_freeN(idar);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static uiBlock *controller_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
uiBlock *block;
int yco=0;
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
block= uiBeginBlock(C, ar, __func__, UI_EMBOSSP);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetButmFunc(block, do_controller_menu, NULL);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Objects"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Objects"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiDefBut(block, SEPR, 0, "", 0, (short)(yco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Controllers"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 2, 2, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Controllers"), 0, (short)(yco-=20), 160, 19, NULL, 0.0, 0.0, 3, 3, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetDirection(block, UI_TOP);
uiEndBlock(C, block);
return block;
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static void do_actuator_menu(bContext *C, void *UNUSED(arg), int event)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
2.5: code cleanup, added CTX_wm_space_* for each space type, instead of casting everywhere.
2009-07-28 16:33:02 +00:00
SpaceLogic *slogic= CTX_wm_space_logic(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ID **idar;
Object *ob;
bActuator *act;
short count, a;
idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==0 || event==2) ob->scaflag |= OB_SHOWACT;
else if (event==1) ob->scaflag &= ~OB_SHOWACT;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
act= ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (event==2) act->flag |= ACT_SHOW;
else if (event==3) act->flag &= ~ACT_SHOW;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act= act->next;
}
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (idar) MEM_freeN(idar);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static uiBlock *actuator_menu(bContext *C, ARegion *ar, void *UNUSED(arg))
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
uiBlock *block;
int xco=0;
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
block= uiBeginBlock(C, ar, __func__, UI_EMBOSSP);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetButmFunc(block, do_actuator_menu, NULL);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Objects"), 0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Objects"), 0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiDefBut(block, SEPR, 0, "", 0, (short)(xco-=6), 160, 6, NULL, 0.0, 0.0, 0, 0, "");
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBut(block, BUTM, 1, IFACE_("Show Actuators"), 0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 2, "");
uiDefBut(block, BUTM, 1, IFACE_("Hide Actuators"), 0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 3, "");
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetDirection(block, UI_TOP);
uiEndBlock(C, block);
return block;
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static void check_controller_state_mask(bContext *UNUSED(C), void *arg1_but, void *arg2_mask)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
unsigned int *cont_mask = arg2_mask;
uiBut *but = arg1_but;
/* a controller is always in a single state */
*cont_mask = (1<<but->retval);
but->retval = B_REDR;
}
static uiBlock *controller_state_mask_menu(bContext *C, ARegion *ar, void *arg_cont)
{
uiBlock *block;
uiBut *but;
bController *cont = arg_cont;
short yco = 12, xco = 0, stbit, offset;
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
block= uiBeginBlock(C, ar, __func__, UI_EMBOSS);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
/* use this for a fake extra empy space around the buttons */
uiDefBut(block, LABEL, 0, "", -5, -5, 200, 34, NULL, 0, 0, 0, 0, "");
style cleanup
2012-10-26 04:14:10 +00:00
for (offset=0; offset<15; offset += 5) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockBeginAlign(block);
for (stbit=0; stbit<5; stbit++) {
but = uiDefButBitI(block, TOG, (1<<(stbit+offset)), (stbit+offset), "", (short)(xco+12*stbit+13*offset), yco, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
uiButSetFunc(but, check_controller_state_mask, but, &(cont->state_mask));
}
for (stbit=0; stbit<5; stbit++) {
but = uiDefButBitI(block, TOG, (1<<(stbit+offset+15)), (stbit+offset+15), "", (short)(xco+12*stbit+13*offset), yco-12, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
uiButSetFunc(but, check_controller_state_mask, but, &(cont->state_mask));
}
}
uiBlockEndAlign(block);
uiBlockSetDirection(block, UI_TOP);
uiEndBlock(C, block);
return block;
}
static int is_sensor_linked(uiBlock *block, bSensor *sens)
{
bController *cont;
remove unused vars.
2011-02-28 03:17:53 +00:00
int i;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
remove unused vars.
2011-02-28 03:17:53 +00:00
for (i=0; i<sens->totlinks; i++) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
cont = sens->links[i];
if (uiFindInlink(block, cont) != NULL)
return 1;
}
return 0;
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
/* Sensors code */
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr)
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *box, *row, *sub;
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
bSensor *sens= (bSensor *)ptr->data;
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
box = uiLayoutBox(layout);
row = uiLayoutRow(box, FALSE);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "type", 0, "", ICON_NONE);
uiItemR(row, ptr, "name", 0, "", ICON_NONE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemL(row, sensor_name(sens->type), ICON_NONE);
uiItemL(row, sens->name, ICON_NONE);
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
}
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, FALSE);
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states") &&
RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE);
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")==0) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemEnumO(sub, "LOGIC_OT_sensor_move", "", ICON_TRIA_UP, "direction", 1); // up
uiItemEnumO(sub, "LOGIC_OT_sensor_move", "", ICON_TRIA_DOWN, "direction", 2); // down
Logic Editor UI: move s/c/a operators and interface buttons Tchatcharantcharan ... Three new operators: bpy.ops.logic.sensor_move bpy.ops.logic.controller_move bpy.ops.logic.actuator_move direction is a parameter (UP,DOWN) Moved some interface code to sca.c instead of logic_window.c. (and changed accordingly). One note: as in 2.49, the move up/down button is only available in non-expanded mode. However instead of one button with two options we have 2 buttons (as we had originally in 2.50). That also means the s/c/a header is getting more clunky. Design, thoughts, ideas are appreciated. For the time been functionality back is still the priority (mine at least ;)
2010-07-09 00:14:46 +00:00
}
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
uiItemO(row, "", ICON_X, "LOGIC_OT_sensor_remove");
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr)
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *box, *split, *sub, *row;
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
box = uiLayoutBox(layout);
split = uiLayoutSplit(box, 0.45f, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP);
uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN);
Logic Editor UI: sensor frequency active only when one of the triggers is on. Removing text "Action" from Action and Shape Action Actuators. I still would love to see a change in the action actuators (Action, Shape and FCurve) even if only a rename or unifying them in a single actuator (I do have some patch for that). Anyways
2011-03-24 21:07:54 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, FALSE);
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
uiLayoutSetActive(sub, (RNA_boolean_get(ptr, "use_pulse_true_level") ||
RNA_boolean_get(ptr, "use_pulse_false_level")));
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemR(sub, ptr, "frequency", 0, IFACE_("Freq"), ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(row, ptr, "use_tap", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemR(split, ptr, "invert", UI_ITEM_R_TOGGLE, IFACE_("Invert"), ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
/* sensors in alphabetical order */
static void draw_sensor_actuator(uiLayout *layout, PointerRNA *ptr)
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
Added search list widget for 'actuator sensor' too.
2010-05-10 04:59:44 +00:00
uiItemPointerR(layout, ptr, "actuator", &settings_ptr, "actuators", NULL, ICON_LOGIC);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
{
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
bSensor *sens = (bSensor*)ptr->data;
bArmatureSensor *as = (bArmatureSensor *) sens->data;
Object *ob = (Object *)ptr->id.data;
PointerRNA pose_ptr, pchan_ptr;
possible un-initialized value
2010-05-19 17:06:36 +00:00
PropertyRNA *bones_prop= NULL;
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
uiLayout *row;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type != OB_ARMATURE) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Sensor only available for armatures"), ICON_NONE);
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
return;
}
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
if (ob->pose) {
RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
}
if (&pose_ptr.data) {
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, as->posechannel, &pchan_ptr))
uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
}
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "test_type", 0, NULL, ICON_NONE);
Logic UI + missing listener in Outliner - changes on Armature Sensor and Visibility Actuator * fix for armature sensor (Status Changed doesn't use any value to evaluate itself) + renamed "Test Type" to "Test" * visibility tooltip was wrong - now we can change visibility from the physic buttons instead of the outliner * bonus * when you change the visibility from the physics panel the icon in the outliner wasn't changing
2011-01-21 08:59:08 +00:00
if (RNA_enum_get(ptr, "test_type") != SENS_ARM_STATE_CHANGED)
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "value", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
uiLayout *row, *split;
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
PointerRNA main_ptr;
RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.3f, FALSE);
row = uiLayoutRow(split, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
incorrect rna type for the BGE ui.
2011-03-25 14:32:47 +00:00
switch (RNA_boolean_get(ptr, "use_material")) {
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case SENS_COLLISION_PROPERTY:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
case SENS_COLLISION_MATERIAL:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
}
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
}
static void draw_sensor_delay(uiLayout *layout, PointerRNA *ptr)
{
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiLayout *row;
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "delay", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "duration", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "use_repeat", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_joystick(uiLayout *layout, PointerRNA *ptr)
{
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
uiLayout *col, *row;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "joystick_index", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "event_type", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
switch (RNA_enum_get(ptr, "event_type")) {
case SENS_JOY_BUTTON:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "button_number", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case SENS_JOY_AXIS:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "axis_number", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "axis_direction", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case SENS_JOY_HAT:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "hat_number", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events") == FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "hat_direction", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case SENS_JOY_AXIS_SINGLE:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "single_axis_number", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_keyboard(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
uiLayout *row, *col;
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(row, IFACE_("Key:"), ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys") == FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "use_all_keys", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys") == FALSE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(row, IFACE_("First Modifier:"), ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "modifier_key_1", UI_ITEM_R_EVENT, "", ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(row, IFACE_("Second Modifier:"), ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "modifier_key_2", UI_ITEM_R_EVENT, "", ICON_NONE);
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(layout, ptr, "log", &settings_ptr, "properties", NULL, ICON_NONE);
uiItemPointerR(layout, ptr, "target", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_message(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "subject", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_mouse(uiLayout *layout, PointerRNA *ptr)
{
bugfix [#32538] 'Mouse Over Any' sensor 'Pulse' button missing since 2.5x [Patch] - based on the patch from HG1
2012-09-11 22:55:14 +00:00
uiLayout *split;
split = uiLayoutSplit(layout, 0.8f, FALSE);
uiItemR(split, ptr, "mouse_event", 0, NULL, ICON_NONE);
if (RNA_enum_get(ptr, "mouse_event") == BL_SENS_MOUSE_MOUSEOVER_ANY)
uiItemR(split, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_near(uiLayout *layout, PointerRNA *ptr)
{
uiLayout *row;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "property", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "reset_distance", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_property(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiLayout *row;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "evaluation_type", 0, NULL, ICON_NONE);
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
switch (RNA_enum_get(ptr, "evaluation_type")) {
case SENS_PROP_INTERVAL:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "value_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "value_max", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
case SENS_PROP_EQUAL:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
case SENS_PROP_NEQUAL:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
case SENS_PROP_CHANGED:
break;
}
}
static void draw_sensor_radar(uiLayout *layout, PointerRNA *ptr)
{
uiLayout *row;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "property", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "axis", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "angle", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_random(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "seed", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
static void draw_sensor_ray(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
uiLayout *split, *row;
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
PointerRNA main_ptr;
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.3f, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "ray_type", 0, "", ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
switch (RNA_enum_get(ptr, "ray_type")) {
case SENS_RAY_PROPERTY:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "property", 0, "", ICON_NONE);
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
break;
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
case SENS_RAY_MATERIAL:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
uiItemPointerR(split, ptr, "material", &main_ptr, "materials", "", ICON_MATERIAL_DATA);
break;
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.3, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "axis", 0, "", ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "range", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_sensor_touch(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "material", 0, NULL, ICON_NONE);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void draw_brick_sensor(uiLayout *layout, PointerRNA *ptr, bContext *C)
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
{
uiLayout *box;
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
if (!RNA_boolean_get(ptr, "show_expanded"))
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
return;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
draw_sensor_internal_header(layout, ptr);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
box = uiLayoutBox(layout);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
switch (RNA_enum_get(ptr, "type")) {
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case SENS_ACTUATOR:
draw_sensor_actuator(box, ptr);
break;
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
case SENS_ALWAYS:
break;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case SENS_ARMATURE:
draw_sensor_armature(box, ptr);
break;
case SENS_COLLISION:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
draw_sensor_collision(box, ptr, C);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
break;
case SENS_DELAY:
draw_sensor_delay(box, ptr);
break;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case SENS_JOYSTICK:
draw_sensor_joystick(box, ptr);
break;
case SENS_KEYBOARD:
draw_sensor_keyboard(box, ptr);
break;
case SENS_MESSAGE:
draw_sensor_message(box, ptr);
break;
case SENS_MOUSE:
draw_sensor_mouse(box, ptr);
break;
case SENS_NEAR:
draw_sensor_near(box, ptr);
break;
case SENS_PROPERTY:
draw_sensor_property(box, ptr);
break;
case SENS_RADAR:
draw_sensor_radar(box, ptr);
break;
case SENS_RANDOM:
draw_sensor_random(box, ptr);
break;
case SENS_RAY:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
draw_sensor_ray(box, ptr, C);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
break;
case SENS_TOUCH:
draw_sensor_touch(box, ptr);
break;
}
}
/* Controller code */
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
static void draw_controller_header(uiLayout *layout, PointerRNA *ptr, int xco, int width, int yco)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *box, *row, *sub;
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
bController *cont= (bController *)ptr->data;
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
char state[3];
use BLI_strncpy and BLI_snprintf when the size of the string is known. fix for sequencer unique naming which was missed with string length update.
2012-01-11 12:33:51 +00:00
BLI_snprintf(state, sizeof(state), "%d", RNA_int_get(ptr, "states"));
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
box = uiLayoutBox(layout);
row = uiLayoutRow(box, FALSE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "type", 0, "", ICON_NONE);
uiItemR(row, ptr, "name", 0, "", ICON_NONE);
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise). Cosmetic commit, no structural/big code changes (patch by dfelinto).
2010-07-14 23:51:21 +00:00
/* XXX provisory for Blender 2.50Beta */
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, IFACE_("Set controller state index (from 1 to 30)"));
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemL(row, controller_name(cont->type), ICON_NONE);
uiItemL(row, cont->name, ICON_NONE);
uiItemL(row, state, ICON_NONE);
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
}
Logic UI: partial implementation of state per controller Adding two rna properties: state and state_number For scripting "state_number" (integer) makes more sense while "state" (boolean/array) may be needed for the UI. So far the UI is only showing the state number (using Label). Still have to decide how is the better way to "change the state". If we don't need "state" (as boolean) for the UI, we can have only the integer one and rename it to "state". + some cosmetic changes (renamed ob "states" to "visible states") ps.: 2 goals == 2 commits... let's see if I can keep that ratio until the middle of July ...
2010-06-16 08:29:40 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_priority", 0, "", ICON_NONE);
Logic Editor UI: move s/c/a operators and interface buttons Tchatcharantcharan ... Three new operators: bpy.ops.logic.sensor_move bpy.ops.logic.controller_move bpy.ops.logic.actuator_move direction is a parameter (UP,DOWN) Moved some interface code to sca.c instead of logic_window.c. (and changed accordingly). One note: as in 2.49, the move up/down button is only available in non-expanded mode. However instead of one button with two options we have 2 buttons (as we had originally in 2.50). That also means the s/c/a header is getting more clunky. Design, thoughts, ideas are appreciated. For the time been functionality back is still the priority (mine at least ;)
2010-07-09 00:14:46 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")==0) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemEnumO(sub, "LOGIC_OT_controller_move", "", ICON_TRIA_UP, "direction", 1); // up
uiItemEnumO(sub, "LOGIC_OT_controller_move", "", ICON_TRIA_DOWN, "direction", 2); // down
Logic Editor UI: move s/c/a operators and interface buttons Tchatcharantcharan ... Three new operators: bpy.ops.logic.sensor_move bpy.ops.logic.controller_move bpy.ops.logic.actuator_move direction is a parameter (UP,DOWN) Moved some interface code to sca.c instead of logic_window.c. (and changed accordingly). One note: as in 2.49, the move up/down button is only available in non-expanded mode. However instead of one button with two options we have 2 buttons (as we had originally in 2.50). That also means the s/c/a header is getting more clunky. Design, thoughts, ideas are appreciated. For the time been functionality back is still the priority (mine at least ;)
2010-07-09 00:14:46 +00:00
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiItemO(row, "", ICON_X, "LOGIC_OT_controller_remove");
}
static void draw_controller_expression(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "expression", 0, "", ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
static void draw_controller_python(uiLayout *layout, PointerRNA *ptr)
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *split, *sub;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.3, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "mode", 0, "", ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
if (RNA_enum_get(ptr, "mode") == CONT_PY_SCRIPT) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "text", 0, "", ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
else {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutSplit(split, 0.8f, FALSE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "module", 0, "", ICON_NONE);
uiItemR(sub, ptr, "use_debug", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
}
editors/space_* build without unused args warnings
2010-10-16 08:03:28 +00:00
static void draw_controller_state(uiLayout *UNUSED(layout), PointerRNA *UNUSED(ptr))
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void draw_brick_controller(uiLayout *layout, PointerRNA *ptr)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
uiLayout *box;
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
if (!RNA_boolean_get(ptr, "show_expanded"))
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
return;
box = uiLayoutBox(layout);
draw_controller_state(box, ptr);
switch (RNA_enum_get(ptr, "type")) {
case CONT_LOGIC_AND:
break;
case CONT_LOGIC_OR:
break;
case CONT_EXPRESSION:
draw_controller_expression(box, ptr);
break;
case CONT_PYTHON:
draw_controller_python(box, ptr);
break;
case CONT_LOGIC_NAND:
break;
case CONT_LOGIC_NOR:
break;
case CONT_LOGIC_XOR:
break;
case CONT_LOGIC_XNOR:
break;
}
}
/* Actuator code */
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *logic_ptr)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *box, *row, *sub;
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
bActuator *act= (bActuator *)ptr->data;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
box = uiLayoutBox(layout);
row = uiLayoutRow(box, FALSE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NONE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "type", 0, "", ICON_NONE);
uiItemR(row, ptr, "name", 0, "", ICON_NONE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemL(row, actuator_name(act->type), ICON_NONE);
uiItemL(row, act->name, ICON_NONE);
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
}
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, FALSE);
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
uiLayoutSetActive(sub, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states") &&
RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NONE);
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_boolean_get(ptr, "show_expanded")==0) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemEnumO(sub, "LOGIC_OT_actuator_move", "", ICON_TRIA_UP, "direction", 1); // up
uiItemEnumO(sub, "LOGIC_OT_actuator_move", "", ICON_TRIA_DOWN, "direction", 2); // down
Logic Editor UI: move s/c/a operators and interface buttons Tchatcharantcharan ... Three new operators: bpy.ops.logic.sensor_move bpy.ops.logic.controller_move bpy.ops.logic.actuator_move direction is a parameter (UP,DOWN) Moved some interface code to sca.c instead of logic_window.c. (and changed accordingly). One note: as in 2.49, the move up/down button is only available in non-expanded mode. However instead of one button with two options we have 2 buttons (as we had originally in 2.50). That also means the s/c/a header is getting more clunky. Design, thoughts, ideas are appreciated. For the time been functionality back is still the priority (mine at least ;)
2010-07-09 00:14:46 +00:00
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiItemO(row, "", ICON_X, "LOGIC_OT_actuator_remove");
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
patch: [#29382] Arbitrary Length Array Function Additions and Modifications from Andrew Hale (trumanblending), with some edits to use these in mathutils.Vector added. Added Functions: - dot_vn_vn - Dot product of two arrays - normalize_vn_vn - Normalize an array and store the result in a second array - normalize_vn - Normalize an array inplace Renamed Functions: Some functions have been renamed to make them consistent with the naming conventions used by fixed length array functions. - fill_vni to fill_vn_i - fill_vn to fill_vn_fl
2011-11-24 04:12:16 +00:00
uiLayout *row, *sub;
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "play_mode", 0, "", ICON_NONE);
BGE Animations: Adding the ipo flag options to the action actuator. This still needs more testing.
2011-06-16 01:18:52 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "use_force", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(sub, ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Animations: Adding the ipo flag options to the action actuator. This still needs more testing.
2011-06-16 01:18:52 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutColumn(sub, FALSE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayoutSetActive(row, (RNA_boolean_get(ptr, "use_additive") || RNA_boolean_get(ptr, "use_force")));
uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Animations: Adding the ipo flag options to the action actuator. This still needs more testing.
2011-06-16 01:18:52 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
Logic Editor UI: sensor frequency active only when one of the triggers is on. Removing text "Action" from Action and Shape Action Actuators. I still would love to see a change in the action actuators (Action, Shape and FCurve) even if only a rename or unifying them in a single actuator (I do have some patch for that). Anyways
2011-03-24 21:07:54 +00:00
uiItemR(row, ptr, "action", 0, "", ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((RNA_enum_get(ptr, "play_mode") == ACT_ACTION_FROM_PROP))
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
else {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
}
BGE Animations: Adding the ipo flag options to the action actuator. This still needs more testing.
2011-06-16 01:18:52 +00:00
uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "priority", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
BGE Animations: Adding a layer option to Action actuators.
2011-06-11 01:03:03 +00:00
uiItemR(row, ptr, "layer", 0, NULL, ICON_NONE);
BGE Animations: Adding in layer weights to allow for layer blending.
2011-07-03 01:59:17 +00:00
uiItemR(row, ptr, "layer_weight", 0, NULL, ICON_NONE);
BGE Animations: Adding a layer option to Action actuators.
2011-06-11 01:03:03 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(layout, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
#ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(layout, "stride_length", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
#endif
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
{
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
bActuator *act = (bActuator*)ptr->data;
bArmatureActuator *aa = (bArmatureActuator *) act->data;
Object *ob = (Object *)ptr->id.data;
Logic UI: Armature Actuator + general Captalizing 1st letter of UI text - Armature Actuator now only shows the "Secondary Target" option when the Bone Constraint supports it (IK only now). -- that may be overkill I don't know. It shouldn't slow down the UI considerably, so it should be fine. Easy to revert if needed though. - renaming things such as "Start frame" to "Start Frame"
2011-02-07 18:24:15 +00:00
bConstraint *constraint = NULL;
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
PointerRNA pose_ptr, pchan_ptr;
Silence more compiler warnings.
2010-12-31 20:01:38 +00:00
PropertyRNA *bones_prop = NULL;
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type != OB_ARMATURE) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Actuator only available for armatures"), ICON_NONE);
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
return;
}
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
if (ob->pose) {
RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
}
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (RNA_enum_get(ptr, "mode")) {
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
case ACT_ARM_RUN:
break;
case ACT_ARM_ENABLE:
case ACT_ARM_DISABLE:
misc fixes found with clang's static checker.
2010-10-07 10:04:07 +00:00
if (ob->pose) {
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
}
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
case ACT_ARM_SETTARGET:
misc fixes found with clang's static checker.
2010-10-07 10:04:07 +00:00
if (ob->pose) {
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
}
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "target", 0, NULL, ICON_NONE);
Logic UI: Armature Actuator + general Captalizing 1st letter of UI text - Armature Actuator now only shows the "Secondary Target" option when the Bone Constraint supports it (IK only now). -- that may be overkill I don't know. It shouldn't slow down the UI considerably, so it should be fine. Easy to revert if needed though. - renaming things such as "Start frame" to "Start Frame"
2011-02-07 18:24:15 +00:00
/* show second target only if the constraint supports it */
get_armature_bone_constraint(ob, aa->posechannel, aa->constraint, &constraint);
if (constraint && constraint->type == CONSTRAINT_TYPE_KINEMATIC) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "secondary_target", 0, NULL, ICON_NONE);
Logic UI: Armature Actuator + general Captalizing 1st letter of UI text - Armature Actuator now only shows the "Secondary Target" option when the Bone Constraint supports it (IK only now). -- that may be overkill I don't know. It shouldn't slow down the UI considerably, so it should be fine. Easy to revert if needed though. - renaming things such as "Start frame" to "Start Frame"
2011-02-07 18:24:15 +00:00
}
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
case ACT_ARM_SETWEIGHT:
misc fixes found with clang's static checker.
2010-10-07 10:04:07 +00:00
if (ob->pose) {
Update Armature actuator UI to use pointer list widgets, rather than text entry fields
2010-05-10 04:49:09 +00:00
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
}
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "weight", 0, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
option for the Armature Actuator to change the influence of a bone constraint. Also adds DampedTrackTo to the list of supported constraints in the BGE Test file: http://www.pasteall.org/blend/11715 Patch developed as part of a project to NF-UBC Nereus Program. Development time 'sponsored' by the project. www.nereusprogram.org
2012-03-03 02:47:01 +00:00
case ACT_ARM_SETINFLUENCE:
if (ob->pose) {
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, aa->posechannel, &pchan_ptr))
uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
}
uiItemR(layout, ptr, "influence", 0, NULL, ICON_NONE);
break;
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_camera(uiLayout *layout, PointerRNA *ptr)
{
uiLayout *row;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "height", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "axis", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "max", 0, NULL, ICON_NONE);
merge from trunk #37722
2011-06-24 03:30:50 +00:00
uiItemR(layout, ptr, "damping", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *row, *col, *sub, *split;
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
PointerRNA main_ptr;
RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (RNA_enum_get(ptr, "mode")) {
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
case ACT_CONST_TYPE_LOC:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "limit", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "limit_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "limit_max", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
break;
case ACT_CONST_TYPE_DIST:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.8, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "direction", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(row, ptr, "use_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
col = uiLayoutColumn(row, TRUE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(col, IFACE_("Range:"), ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "range", 0, "", ICON_NONE);
adjusment to constraint actuator layout (forgot to expose normal and before)
2010-05-07 23:56:26 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "use_force_distance", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutColumn(col, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_force_distance") == TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "distance", 0, "", ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.15f, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
if (RNA_boolean_get(ptr, "use_material_detect"))
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
else
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.15, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
break;
case ACT_CONST_TYPE_ORI:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "direction_axis_pos", 0, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row=uiLayoutRow(layout, TRUE);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
uiItemR(row, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row=uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "rotation_max", 0, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row=uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "angle_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "angle_max", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
break;
case ACT_CONST_TYPE_FH:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.75, FALSE);
row = uiLayoutRow(split, FALSE);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
uiItemR(row, ptr, "fh_damping", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "fh_height", 0, NULL, ICON_NONE);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
uiItemR(split, ptr, "use_fh_paralel_axis", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: All Sensors, Controllers and Actuators are ported now... (let's the tests begin) * get/set funcs * unifying rna_props for Constraint Actuator * Collision sensor * Ray sensor * State Actuator * We need icons! at least one for Sensor, one for Controller and one for Actuator * Layout artists: Keyboard sensor really need some help :) The other as well. I mainly copied the layout from 2.49 with some adjustments here and there. * some get/set functions in rna_actuator.c are exactly the same (e.g. rna_ConstraintActuator_range_get, rna_ConstraintActuator_spring_get) and other could be easily distributed. maybe something for later.
2010-05-07 07:31:39 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "direction_axis", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(row, 0.9f, FALSE);
BGE: Material Force Field renaming + reorganization the old FH setting was blended with the other physics settings (friction and elastic) Also in the Physics panel it was saying "Use Material Physics" but the button is only for Force Field. Since I was here I decided to change the Constraint FH ui name from Fh to Force. I don't think users really understand what FH is (I for once don't). Thanks to Carsten Wartmann for pointing that out.
2011-03-03 01:47:17 +00:00
uiItemR(split, ptr, "fh_force", 0, NULL, ICON_NONE);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
uiItemR(split, ptr, "use_fh_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.15, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
if (RNA_boolean_get(ptr, "use_material_detect"))
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
else
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.15, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: constraint actuator+rna 100% (finally !!!) + other fixes/improvements: - s/c/a type enum update function replaced by set function - rna_Sensor_type_itemf and rna_Actuators_type_itemf implemented (but not working ... it was working yesterday before I updated the set func, so need further investigation). Matt, if you have any clue on that ... Roadmap: i) I definitively gotta unify the maxloc, minloc rna properties. the way it's right now (based on 2.49 makes the layout code really clunky ii) - actuator missing - State Actuator (I'll probably need help on that). iii) - sensor missing - collision and ray (they are partly implemented, but the enums are a mess there). iv) - get/set funcs missing (not many) and default values (not many) v) - have more lookup functions for properties and material (I'll definitively need help on that). Eventually will fix (iii, iv and v) changing bge and dna code and doing a subversion/do_version.
2010-05-06 19:12:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
break;
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_edit_object(uiLayout *layout, PointerRNA *ptr)
{
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
Object *ob = (Object *)ptr->id.data;
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *row, *split, *sub;
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (RNA_enum_get(ptr, "mode")) {
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
case ACT_EDOB_ADD_OBJECT:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "object", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "time", 0, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
case ACT_EDOB_END_OBJECT:
break;
case ACT_EDOB_REPLACE_MESH:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type != OB_MESH) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Mode only available for mesh objects"), ICON_NONE);
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
break;
}
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.6, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "mesh", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_replace_display_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(row, ptr, "use_replace_physics_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
case ACT_EDOB_TRACK_TO:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.5, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "track_object", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutSplit(split, 0.7f, FALSE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "time", 0, NULL, ICON_NONE);
uiItemR(sub, ptr, "use_3d_tracking", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
case ACT_EDOB_DYNAMICS:
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type != OB_MESH) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Mode only available for mesh objects"), ICON_NONE);
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
break;
}
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "dynamic_operation", 0, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
if (RNA_enum_get(ptr, "dynamic_operation") == ACT_EDOB_SET_MASS)
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mass", 0, NULL, ICON_NONE);
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
break;
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_filter_2d(uiLayout *layout, PointerRNA *ptr)
{
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
uiLayout *row, *split;
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (RNA_enum_get(ptr, "mode")) {
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
case ACT_2DFILTER_CUSTOMFILTER:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "glsl_shader", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
break;
case ACT_2DFILTER_MOTIONBLUR:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split=uiLayoutSplit(layout, 0.75f, TRUE);
row = uiLayoutRow(split, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(row, RNA_boolean_get(ptr, "use_motion_blur") == TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "motion_blur_factor", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_motion_blur", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
break;
default: // all other 2D Filters
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
break;
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_game(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
if (RNA_enum_get(ptr, "mode") == ACT_GAME_LOAD)
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
static void draw_actuator_message(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob;
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
PointerRNA main_ptr, settings_ptr;
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
uiLayout *row;
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
ob = (Object *)ptr->id.data;
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
uiItemPointerR(layout, ptr, "to_property", &main_ptr, "objects", NULL, ICON_OBJECT_DATA);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "subject", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "body_type", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (RNA_enum_get(ptr, "body_type") == ACT_MESG_MESG)
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "body_message", 0, "", ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
else // mode == ACT_MESG_PROP
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "body_property", &settings_ptr, "properties", "", ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_motion(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob;
Tweak for dfelinto, logic ui
2010-05-06 01:38:17 +00:00
PointerRNA settings_ptr;
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *split, *row, *col, *sub;
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
int physics_type;
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
ob = (Object *)ptr->id.data;
Tweak for dfelinto, logic ui
2010-05-06 01:38:17 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
physics_type = RNA_enum_get(&settings_ptr, "physics_type");
Tweak for dfelinto, logic ui
2010-05-06 01:38:17 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
Tweak for dfelinto, logic ui
2010-05-06 01:38:17 +00:00
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
switch (RNA_enum_get(ptr, "mode")) {
case ACT_OBJECT_NORMAL:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "offset_location", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_location", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "offset_rotation", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_rotation", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Tweak for dfelinto, logic ui
2010-05-06 01:38:17 +00:00
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
if (ELEM3(physics_type, OB_BODY_TYPE_DYNAMIC, OB_BODY_TYPE_RIGID, OB_BODY_TYPE_SOFT)) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Dynamic Object Settings:"), ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "force", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_force", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "torque", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_torque", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(row, ptr, "use_add_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "damping", 0, NULL, ICON_NONE);
Logic UI: fix for #Motion Actuator Dynamic options not showing for Soft Body and Rigid Body (reported by Mal Duffin (malCanDo) over email) Originally (2.49) we were testing for ob->game_flag to see if the object is dynamic. That could work here (it would require a new rna prop for the object (a read-only is_dynamic) or similar. However using ob.game.physics_type is more explicit, therefore may be more interesting. I have no strong opinions on that...
2010-07-08 06:49:08 +00:00
}
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
break;
case ACT_OBJECT_SERVO:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "reference_object", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.9, FALSE);
row = uiLayoutRow(split, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NONE);
uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
col = uiLayoutColumn(row, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "use_servo_limit_x", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutColumn(col, TRUE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_x") == TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "force_max_x", 0, NULL, ICON_NONE);
uiItemR(sub, ptr, "force_min_x", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "use_servo_limit_y", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutColumn(col, TRUE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_y") == TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "force_max_y", 0, NULL, ICON_NONE);
uiItemR(sub, ptr, "force_min_y", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "use_servo_limit_z", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutColumn(col, TRUE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_servo_limit_z") == TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "force_max_z", 0, NULL, ICON_NONE);
uiItemR(sub, ptr, "force_min_z", 0, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
//XXXACTUATOR missing labels from original 2.49 ui (e.g. Servo, Min, Max, Fast)
Logic UI - fixing missing rna default values there are some cases (i.e. Constraint Actuator) where the same DNA property is being used by different RNAs with different ranges. It's easy to change (reset the values to their default in the set func of the constrant type rna). Not sure it's necessary though.
2010-05-07 18:53:28 +00:00
//Layout designers willing to help on that, please compare with 2.49 ui
// (since the old code is going to be deleted ... soon)
Logic UI: more actuators: armature, motion, edit object (ui) and 2dfilter (layout fix)
2010-05-06 03:26:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, TRUE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, ptr, "proportional_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(col, ptr, "integral_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(col, ptr, "derivate_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
BGE Logic UI: 2dfilter actuator + object (motino) actuator + commenting out buggy sensors
2010-05-05 21:25:34 +00:00
break;
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_parent(uiLayout *layout, PointerRNA *ptr)
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *row, *sub;
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
Logic UI: ParentActuator fix + PropertyActuator tooltip improvement ParentActuator: sub options only available when mode==setParent + deactive ghost option when compound is true (isntead of saying that in the tooltip) PropertyActuator: I never knew that you could pass a property name to the Add and Assign options of the Property Actuator. Where it's by design or a side effect is cool. And a tooltip explaining that does help.
2011-01-23 04:54:23 +00:00
if (RNA_enum_get(ptr, "mode") == ACT_PARENT_SET) {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE);
Logic UI: ParentActuator fix + PropertyActuator tooltip improvement ParentActuator: sub options only available when mode==setParent + deactive ghost option when compound is true (isntead of saying that in the tooltip) PropertyActuator: I never knew that you could pass a property name to the Add and Assign options of the Property Actuator. Where it's by design or a side effect is cool. And a tooltip explaining that does help.
2011-01-23 04:54:23 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_compound", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_compound") == TRUE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "use_ghost", 0, NULL, ICON_NONE);
Logic UI: ParentActuator fix + PropertyActuator tooltip improvement ParentActuator: sub options only available when mode==setParent + deactive ghost option when compound is true (isntead of saying that in the tooltip) PropertyActuator: I never knew that you could pass a property name to the Add and Assign options of the Property Actuator. Where it's by design or a side effect is cool. And a tooltip explaining that does help.
2011-01-23 04:54:23 +00:00
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_property(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
bActuator *act = (bActuator *)ptr->data;
bPropertyActuator *pa = (bPropertyActuator *) act->data;
Object *ob_from= pa->ob;
PointerRNA settings_ptr, obj_settings_ptr;
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *row, *sub;
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (RNA_enum_get(ptr, "mode")) {
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
case ACT_PROP_TOGGLE:
break;
case ACT_PROP_ADD:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_PROP_ASSIGN:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "value", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_PROP_COPY:
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "object", 0, NULL, ICON_NONE);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
if (ob_from) {
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
RNA_pointer_create((ID *)ob_from, &RNA_GameObjectSettings, ob_from, &obj_settings_ptr);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "object_property", &obj_settings_ptr, "properties", NULL, ICON_NONE);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
}
else {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
sub = uiLayoutRow(row, FALSE);
uiLayoutSetActive(sub, FALSE);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, ptr, "object_property", 0, NULL, ICON_NONE);
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here) Also: extra set funcs, layout adjustments The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments. So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
2010-05-11 06:56:59 +00:00
}
break;
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_random(uiLayout *layout, PointerRNA *ptr)
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob;
PointerRNA settings_ptr;
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
uiLayout *row;
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
ob = (Object *)ptr->id.data;
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "seed", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "distribution", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
switch (RNA_enum_get(ptr, "distribution")) {
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
case ACT_RANDOM_BOOL_CONST:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_always_true", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_BOOL_UNIFORM:
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(row, IFACE_("Choose between true and false, 50% chance each"), ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_BOOL_BERNOUILLI:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "chance", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_INT_CONST:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "int_value", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_INT_UNIFORM:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "int_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "int_max", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_INT_POISSON:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "int_mean", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_FLOAT_CONST:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "float_value", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_FLOAT_UNIFORM:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "float_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "float_max", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_FLOAT_NORMAL:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "float_mean", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "standard_derivation", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
case ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "half_life_time", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
break;
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
static void draw_actuator_scene(uiLayout *layout, PointerRNA *ptr)
{
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
BGE Logic UI: fix for scene actuator Any volunteer for this? //XXX to do: an operator that calls file_browse with relative_path on and blender filtering active
2010-05-04 22:05:41 +00:00
switch (RNA_enum_get(ptr, "mode")) {
case ACT_SCENE_CAMERA:
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "camera", 0, NULL, ICON_NONE);
BGE Logic UI: fix for scene actuator Any volunteer for this? //XXX to do: an operator that calls file_browse with relative_path on and blender filtering active
2010-05-04 22:05:41 +00:00
break;
case ACT_SCENE_RESTART:
break;
default: // ACT_SCENE_SET|ACT_SCENE_ADD_FRONT|ACT_SCENE_ADD_BACK|ACT_SCENE_REMOVE|ACT_SCENE_SUSPEND|ACT_SCENE_RESUME
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "scene", 0, NULL, ICON_NONE);
BGE Logic UI: fix for scene actuator Any volunteer for this? //XXX to do: an operator that calls file_browse with relative_path on and blender filtering active
2010-05-04 22:05:41 +00:00
break;
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
static void draw_actuator_shape_action(uiLayout *layout, PointerRNA *ptr)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
uiLayout *row;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type != OB_MESH) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Actuator only available for mesh objects"), ICON_NONE);
Logic UI and Operators: adjusts on Layout + copy properties operator + fix on copy logic bricks operator (and moved to OBJECT_OT) * adjusts on Layout: - in order to avoid much changes when copying Logics, it's nice to have the logic s/c/a always displaying even though it's not valid (e.g. edit mesh used from a camera object). Now a message shows in the s/c/a alerting to the problem. * logic operators under OBJECT_OT - copy properties and logics Matt, is it possible to have the object game properties listed as a submenu from "Copy Properties" ? So from the "Copy Game Property" menu we would have three options: "Copy a property" -> (submenu) prop1, prop2, prop3 "Replace all Properties" "Merge all Properties" For the current task list in Logic Editor: http://www.pasteall.org/13245
2010-05-19 09:40:45 +00:00
return;
}
Logic UI - lookup for properties (matt need your help to finish it) I based this code on drawnode, so I hope this is the right way of doing this. Working Sensors: - keyboard - property Working Actuators: - property (partly) - ipo - action - shape action - message - random Need help with: - actuator sensor - property actuator (for the second object) - touch/ray/collision sensors + constraint actuator (for the material lookup, not the property one) maybe a doversion + changing the type to material work better here (as we have in touch sensor) + added notifier for the game property.
2010-05-08 22:11:00 +00:00
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "mode", 0, "", ICON_NONE);
Logic Editor UI: sensor frequency active only when one of the triggers is on. Removing text "Action" from Action and Shape Action Actuators. I still would love to see a change in the action actuators (Action, Shape and FCurve) even if only a rename or unifying them in a single actuator (I do have some patch for that). Anyways
2011-03-24 21:07:54 +00:00
uiItemR(row, ptr, "action", 0, "", ICON_NONE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((RNA_enum_get(ptr, "mode") == ACT_ACTION_FROM_PROP))
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
else {
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
}
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "priority", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
#ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, "stride_length", 0, NULL, ICON_NONE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
#endif
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
{
Fix Open Sound operator, bring it in line with Open Image: * Add relative paths option * Set the pointer used in the ID template properly * Tweaked the Sound actuator ui
2010-05-28 23:12:45 +00:00
uiLayout *row, *col;
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
if (!RNA_pointer_get(ptr, "sound").data) {
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(layout, IFACE_("Select a sound from the list or load a new one"), ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
return;
}
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "volume", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "pitch", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, ptr, "use_sound_3d", 0, NULL, ICON_NONE);
Fix Open Sound operator, bring it in line with Open Image: * Add relative paths option * Set the pointer used in the ID template properly * Tweaked the Sound actuator ui
2010-05-28 23:12:45 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(layout, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_sound_3d") == TRUE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "gain_3d_min", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "gain_3d_max", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "distance_3d_reference", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "distance_3d_max", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, ICON_NONE);
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, ICON_NONE);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
{
Logic UI: State Actuator done :) all actuators are there now. [and stubs update] (it's a small commit, but couldn't help not doing it ;)
2010-05-07 01:30:12 +00:00
uiLayout *split;
Logic UI: small fixes: order of sensor type enum + state actuator showing used states now
2010-05-07 02:37:05 +00:00
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.35, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(split, ptr, "operation", 0, NULL, ICON_NONE);
Logic UI: State Actuator done :) all actuators are there now. [and stubs update] (it's a small commit, but couldn't help not doing it ;)
2010-05-07 01:30:12 +00:00
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
uiTemplateLayers(split, ptr, "states", &settings_ptr, "used_states", 0);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
}
static void draw_actuator_visibility(uiLayout *layout, PointerRNA *ptr)
{
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
uiLayout *row;
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
BGE Logic UI: more actuators + almost all sensors * Matt, I'm marking some "property" rna properties that will need some speacial lookup. Talking with Campbell we thought that it will be nice to have the lookup with autocomplete for the properties, but giving you the freedom to type whatever prop_name you want (so you can use python created properties). That way we would still store it as a string. Whenever the property doesn't exist (or was renamed, therefore can't be found) the property name tints in red ... Is that possible? * Matt: in draw_actuator_random I used a uiItemL for one of the modes. Is there another way to do that (having the label in the rna file?). I noticed draw_nodes has some cases of that as well. * Andrea, the actuator_game property filename (in rna_actuator) is the one that needs to open the filebrowser but saving the result as relative path (or to have relative path as the default in this case)
2010-05-04 21:31:46 +00:00
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(row, ptr, "use_visible", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "use_occlusion", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
}
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
static void draw_actuator_steering(uiLayout *layout, PointerRNA *ptr)
{
uiLayout *row;
- set valid default value for facingaxis parameter of steering actuator (for earlier versions) - disable instead hiding UI checkbox for facing_axis and normal_up parameters of steering actuator - fit rna names to the name convention for steering actuator and recast data structures
2010-09-03 19:56:22 +00:00
uiLayout *col;
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "target", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "navmesh", 0, NULL, ICON_NONE);
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(row, ptr, "distance", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "velocity", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(row, ptr, "acceleration", 0, NULL, ICON_NONE);
uiItemR(row, ptr, "turn_speed", 0, NULL, ICON_NONE);
synched with trunk at revision 34793
2011-02-16 17:07:18 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
col = uiLayoutColumn(row, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(col, ptr, "facing", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(col, ptr, "facing_axis", 0, NULL, ICON_NONE);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
if (!RNA_boolean_get(ptr, "facing")) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
uiLayoutSetActive(col, FALSE);
added option to set "up" vector of the actor orientation using navmesh normal (steering actuator)
2010-08-15 17:40:57 +00:00
}
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(row, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(col, ptr, "normal_up", 0, NULL, ICON_NONE);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
if (!RNA_pointer_get(ptr, "navmesh").data) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
uiLayoutSetActive(col, FALSE);
added option for automatic facing in steering actuator
2010-08-15 12:58:13 +00:00
}
- set valid default value for facingaxis parameter of steering actuator (for earlier versions) - disable instead hiding UI checkbox for facing_axis and normal_up parameters of steering actuator - fit rna names to the name convention for steering actuator and recast data structures
2010-09-03 19:56:22 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(row, ptr, "self_terminated", 0, NULL, ICON_NONE);
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
if (RNA_enum_get(ptr, "mode")==ACT_STEERING_PATHFOLLOWING) {
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(row, ptr, "update_period", 0, NULL, ICON_NONE);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, FALSE);
- added options to enable visualization for obstacle simulation and steering actuator - added python attributes for parameters of steering actuator
2010-07-15 18:41:29 +00:00
}
stule cleanup
2012-09-04 18:47:08 +00:00
uiItemR(row, ptr, "show_visualization", 0, NULL, ICON_NONE);
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
{
uiLayout *box;
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
if (!RNA_boolean_get(ptr, "show_expanded"))
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
return;
box = uiLayoutBox(layout);
switch (RNA_enum_get(ptr, "type")) {
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
case ACT_ACTION:
draw_actuator_action(box, ptr);
break;
case ACT_ARMATURE:
draw_actuator_armature(box, ptr);
break;
case ACT_CAMERA:
draw_actuator_camera(box, ptr);
break;
case ACT_CONSTRAINT:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
draw_actuator_constraint(box, ptr, C);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case ACT_EDIT_OBJECT:
draw_actuator_edit_object(box, ptr);
break;
case ACT_2DFILTER:
draw_actuator_filter_2d(box, ptr);
break;
case ACT_GAME:
draw_actuator_game(box, ptr);
break;
case ACT_MESSAGE:
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
draw_actuator_message(box, ptr, C);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case ACT_OBJECT:
draw_actuator_motion(box, ptr);
break;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case ACT_PARENT:
draw_actuator_parent(box, ptr);
break;
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
case ACT_PROPERTY:
draw_actuator_property(box, ptr);
break;
case ACT_RANDOM:
draw_actuator_random(box, ptr);
break;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
case ACT_SCENE:
draw_actuator_scene(box, ptr);
break;
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
case ACT_SHAPEACTION:
draw_actuator_shape_action(box, ptr);
break;
case ACT_SOUND:
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
draw_actuator_sound(box, ptr, C);
BGE Logic UI: more sensors + rna fixes + actuator empty draw functions (+ camera actuator)
2010-05-04 07:34:46 +00:00
break;
case ACT_STATE:
draw_actuator_state(box, ptr);
break;
case ACT_VISIBILITY:
draw_actuator_visibility(box, ptr);
break;
Added new actuator type for following steering behaviors: seek, flee, path following; renamed KX_Pathfinder to KX_NavMeshObject
2010-05-31 22:35:22 +00:00
case ACT_STEERING:
draw_actuator_steering(box, ptr);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
}
}
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
Logic Editor code cleanup > 2500 lines removed - old 2.49 UI code since last two commits the UI has all the features we had in 2.49, time to remove the old code :)
2012-09-21 05:19:06 +00:00
void logic_buttons(bContext *C, ARegion *ar)
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
{
2.5: code cleanup, added CTX_wm_space_* for each space type, instead of casting everywhere.
2009-07-28 16:33:02 +00:00
SpaceLogic *slogic= CTX_wm_space_logic(C);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
Object *ob= CTX_data_active_object(C);
ID **idar;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
2.49 Logic Editor functionality - Add Sensor/Controller/Actuator now possible for all selected objects (not only the active one)
2012-09-21 04:12:55 +00:00
PointerRNA logic_ptr, settings_ptr, object_ptr;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
sequencer swap data operator. needed for durian so we can swap out preview AVI's for EXR sequences.
2010-06-21 17:37:50 +00:00
uiLayout *layout, *row, *box;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlock *block;
uiBut *but;
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
char uiblockstr[32];
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
short a, count;
int xco, yco, width;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob==NULL) return;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
RNA_pointer_create(NULL, &RNA_SpaceLogicEditor, slogic, &logic_ptr);
idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
use BLI_strncpy and BLI_snprintf when the size of the string is known. fix for sequencer unique naming which was missed with string length update.
2012-01-11 12:33:51 +00:00
BLI_snprintf(uiblockstr, sizeof(uiblockstr), "buttonswin %p", (void *)ar);
minor cleanup for string use - no functional changes - use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
block= uiBeginBlock(C, ar, uiblockstr, UI_EMBOSS);
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
uiBlockSetHandleFunc(block, do_logic_buts, NULL);
Rewrite of Logic editor UI to use layout engine This commit puts the ground work in place, swapping out the crusty old Logic Editor UI code for the new RNA-based layout engine. It's disabled with ifdefs at the moment because it's incomplete, but Dalai can now do the grunt work to fill it all out and get it running. Also includes a bug fix to LINK buttons, and two new logic operators to add and delete sensors. Dalai, just switch the #if 0 and #if 1 in logic_window.c:3412 and 3469
2010-04-29 07:01:48 +00:00
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
/* loop over all objects and set visible/linked flags for the logic bricks */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
bActuator *act;
bSensor *sens;
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
bController *cont;
int iact;
short flag;
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
ob= (Object *)idar[a];
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
/* clean ACT_LINKED and ACT_VISIBLE of all potentially visible actuators so that we can determine which is actually linked/visible */
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
act = ob->actuators.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (act) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
act->flag &= ~(ACT_LINKED|ACT_VISIBLE);
act = act->next;
}
/* same for sensors */
sens= ob->sensors.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (sens) {
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
sens->flag &= ~(SENS_VISIBLE);
sens = sens->next;
}
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
/* mark the linked and visible actuators */
cont= ob->controllers.first;
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
while (cont) {
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
flag = ACT_LINKED;
/* this controller is visible, mark all its actuator */
if ((ob->scaflag & OB_ALLSTATE) || (ob->state & cont->state_mask))
flag |= ACT_VISIBLE;
for (iact=0; iact<cont->totlinks; iact++) {
act = cont->links[iact];
if (act)
act->flag |= flag;
}
cont = cont->next;
}
2.5 Logic editing back! Test screenie: http://download.blender.org/institute/rt9.jpg I gave the buttons a bit more width, added nicer linkline draw. Not working yet: - theme colors for sensor/actuator types (was old button colors) - moving sensors up/down (used bad pupmenu... better is icons like used for modifiers) - Linkline mouse-over select. Currently deleting a link goes by drawing the same line again. Needs to be fully tested for functionality too, leave that to the GE department. :) I noted there's bad button hacking with reading button values, like check_state_mask(). uiBut structure was not meant to be exported outside of interface module.
2009-06-17 11:01:05 +00:00
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* ****************** Controllers ****************** */
xco= 420; yco= 170; width= 300;
select uiStyle according to UserDef and update lang-packs
2011-07-16 18:28:24 +00:00
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, UI_GetStyle());
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBlockBut(block, controller_menu, NULL, IFACE_("Controllers"), xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemR(row, &logic_ptr, "show_controllers_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_controllers_active_object", 0, IFACE_("Act"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_controllers_linked_controller", 0, IFACE_("Link"), ICON_NONE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
bController *cont;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
PointerRNA ptr;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiLayout *split, *subsplit, *col;
remove some warnings
2010-06-27 21:03:39 +00:00
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
ob= (Object *)idar[a];
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
/* only draw the controller common header if "use_visible" */
style cleanup: also remove some redundant conversions int -> short -> int
2012-09-09 00:00:21 +00:00
if ( (ob->scavisflag & OB_VIS_CONT) == 0) {
continue;
}
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
/* Drawing the Controller Header common to all Selected Objects */
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.05f, FALSE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
uiItemR(split, &settings_ptr, "show_state_panel", UI_ITEM_R_NO_BG, "", ICON_DISCLOSURE_TRI_RIGHT);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(split, TRUE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide controllers"));
2.49 Logic Editor functionality - Add Sensor/Controller/Actuator now possible for all selected objects (not only the active one)
2012-09-21 04:12:55 +00:00
RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
uiLayoutSetContextPointer(row, "object", &object_ptr);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemMenuEnumO(row, "LOGIC_OT_controller_add", "type", IFACE_("Add Controller"), ICON_NONE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
if (RNA_boolean_get(&settings_ptr, "show_state_panel")) {
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
box = uiLayoutBox(layout);
split = uiLayoutSplit(box, 0.2f, FALSE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(split, FALSE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemL(col, IFACE_("Visible"), ICON_NONE);
uiItemL(col, IFACE_("Initial"), ICON_NONE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
subsplit = uiLayoutSplit(split, 0.85f, FALSE);
col = uiLayoutColumn(subsplit, FALSE);
row = uiLayoutRow(col, FALSE);
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00
uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "use_all_states") == FALSE);
2.49 feature: Game Controller State name shows up when mouse over them (the name of a state is the name of the top controller of this state) review and small tweaks by Campbell Barton
2012-09-21 04:09:09 +00:00
uiTemplateGameStates(row, &settings_ptr, "states_visible", &settings_ptr, "used_states", 0);
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(col, FALSE);
2.49 feature: Game Controller State name shows up when mouse over them (the name of a state is the name of the top controller of this state) review and small tweaks by Campbell Barton
2012-09-21 04:09:09 +00:00
uiTemplateGameStates(row, &settings_ptr, "states_initial", &settings_ptr, "used_states", 0);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(subsplit, FALSE);
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
uiItemR(col, &settings_ptr, "show_debug_state", 0, "", ICON_NONE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
}
/* End of Drawing the Controller Header common to all Selected Objects */
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
if ((ob->scaflag & OB_SHOWCONT) == 0) continue;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiItemS(layout);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (cont= ob->controllers.first; cont; cont=cont->next) {
Added dynamic enum itemf for add sensor/actuator operators
2010-05-07 02:01:50 +00:00
RNA_pointer_create((ID *)ob, &RNA_Controller, cont, &ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Logic UI: add name option for add operators + ALL button in controller states is working now + fix for actuator STATES filtering option. Extra comments related bugs: 1)"actuators_show_active_states" doesn't seem to produce any effect (maybe because PIN is not implemented yet? therefore it's always on? 2)If you set the name to be bigger than 32 it will crashes blender (somehow for s/c/a the get function instead of using the defined 32 maxlen it's using 160 (from UserPrerencesFilePaths_python_scriptsdirectory_get ), 3)properties currently can have the same name as s/c/a and they shouldn't. 4)we need an option to show and/or set the STATE of a given controller (in 2.49 it's the number by the controller name)
2010-05-14 10:45:50 +00:00
if (!(ob->scaflag & OB_ALLSTATE) && !(ob->state & cont->state_mask))
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
continue;
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* use two nested splits to align inlinks/links properly */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.05f, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* put inlink button to the left */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(split, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_LEFT);
uiDefIconBut(block, INLINK, 0, ICON_INLINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, cont, LINK_CONTROLLER, 0, 0, 0, "");
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
//col = uiLayoutColumn(split, TRUE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* nested split for middle and right columns */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
subsplit = uiLayoutSplit(split, 0.95f, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(subsplit, TRUE);
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiLayoutSetContextPointer(col, "controller", &ptr);
/* should make UI template for controller header.. function will do for now */
Logic UI: HEADERS changes: adding option to change state + showing the name, type as label when not-expanded + renaming rna prop "states" (from state_number) + small UI changes + capitalizing Controller Type names (as we had in 2.49). Why? I'm not sure. Therefore let's stick to 2.49 way of doing it for a bit longer. * It would be really nice to have a drag&drop system for logic (instead of the move up/down button) * The controller header is so messy :/ definitively should find a better way to handle that (for one the "change state" operator doesn't need this up/down arrow. I'm (temporarly) using the old code for that, so this will wait for when we use proper rna ui here. * I wonder if it's possible to get the name of the logic type straight from the rna prop (instead of using sensor_name(sens->type) )
2010-07-13 11:06:19 +00:00
// draw_controller_header(col, &ptr);
draw_controller_header(col, &ptr, xco, width, yco); //provisory for 2.50 beta
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
/* draw the brick contents */
draw_brick_controller(col, &ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
/* put link button to the right */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(subsplit, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_LEFT);
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
but = uiDefIconBut(block, LINK, 0, ICON_LINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
uiSetButLink(but, NULL, (void ***)&(cont->links), &cont->totlinks, LINK_CONTROLLER, LINK_ACTUATOR);
}
}
uiBlockLayoutResolve(block, NULL, &yco); /* stores final height in yco */
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* ****************** Sensors ****************** */
xco= 10; yco= 170; width= 340;
select uiStyle according to UserDef and update lang-packs
2011-07-16 18:28:24 +00:00
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, UI_GetStyle());
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBlockBut(block, sensor_menu, NULL, IFACE_("Sensors"), xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemR(row, &logic_ptr, "show_sensors_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_sensors_active_object", 0, IFACE_("Act"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_sensors_linked_controller", 0, IFACE_("Link"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_sensors_active_states", 0, IFACE_("State"), ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
bSensor *sens;
PointerRNA ptr;
ob= (Object *)idar[a];
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
/* only draw the sensor common header if "use_visible" */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((ob->scavisflag & OB_VIS_SENS) == 0) continue;
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefButBitS(block, TOG, OB_SHOWSENS, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide sensors"));
2.49 Logic Editor functionality - Add Sensor/Controller/Actuator now possible for all selected objects (not only the active one)
2012-09-21 04:12:55 +00:00
RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
uiLayoutSetContextPointer(row, "object", &object_ptr);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemMenuEnumO(row, "LOGIC_OT_sensor_add", "type", IFACE_("Add Sensor"), ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
if ((ob->scaflag & OB_SHOWSENS) == 0) continue;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiItemS(layout);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (sens= ob->sensors.first; sens; sens=sens->next) {
Added dynamic enum itemf for add sensor/actuator operators
2010-05-07 02:01:50 +00:00
RNA_pointer_create((ID *)ob, &RNA_Sensor, sens, &ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Logic UI: add name option for add operators + ALL button in controller states is working now + fix for actuator STATES filtering option. Extra comments related bugs: 1)"actuators_show_active_states" doesn't seem to produce any effect (maybe because PIN is not implemented yet? therefore it's always on? 2)If you set the name to be bigger than 32 it will crashes blender (somehow for s/c/a the get function instead of using the defined 32 maxlen it's using 160 (from UserPrerencesFilePaths_python_scriptsdirectory_get ), 3)properties currently can have the same name as s/c/a and they shouldn't. 4)we need an option to show and/or set the STATE of a given controller (in 2.49 it's the number by the controller name)
2010-05-14 10:45:50 +00:00
if ((ob->scaflag & OB_ALLSTATE) ||
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
!(slogic->scaflag & BUTS_SENS_STATE) ||
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
(sens->totlinks == 0) || /* always display sensor without links so that is can be edited */
(sens->flag & SENS_PIN && slogic->scaflag & BUTS_SENS_STATE) || /* states can hide some sensors, pinned sensors ignore the visible state */
(is_sensor_linked(block, sens))
)
{ // gotta check if the current state is visible or not
uiLayout *split, *col;
Logic UI: small commit - set visible flag for sensor and actuator (so it works with the move logic bricks operator to be committed)
2010-07-08 09:25:18 +00:00
/* make as visible, for move operator */
sens->flag |= SENS_VISIBLE;
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.95f, FALSE);
col = uiLayoutColumn(split, TRUE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiLayoutSetContextPointer(col, "sensor", &ptr);
/* should make UI template for sensor header.. function will do for now */
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
draw_sensor_header(col, &ptr, &logic_ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* draw the brick contents */
Logic Editor: more datablock lookups :) Now all the material properties have the nice Datablock Lookup menu (thanks a lot Matt !). They still store the property as a string, therefore if you change a material name the logic bricks using it don't get updated. it would be nice if we had a way to communicate that in the interface. The only "datablock" field that doesn't have lookup is "property" in collision and ray sensors and Constraint Actuator. The reason being is that there is no global ListBase to gather the properties of all the objects in the scene. And it may be too overkill to create a list with all the properties on-the-fly only for that (it would be cool though)
2010-06-03 08:26:47 +00:00
draw_brick_sensor(col, &ptr, C);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* put link button to the right */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(split, FALSE);
style cleanup - comment spelling + translate some dutch.
2012-03-04 04:35:12 +00:00
/* use old-school uiButtons for links for now */
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
but = uiDefIconBut(block, LINK, 0, ICON_LINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiSetButLink(but, NULL, (void ***)&(sens->links), &sens->totlinks, LINK_SENSOR, LINK_CONTROLLER);
}
}
}
uiBlockLayoutResolve(block, NULL, &yco); /* stores final height in yco */
/* ****************** Actuators ****************** */
xco= 800; yco= 170; width= 340;
select uiStyle according to UserDef and update lang-packs
2011-07-16 18:28:24 +00:00
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, xco, yco, width, 20, UI_GetStyle());
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefBlockBut(block, actuator_menu, NULL, IFACE_("Actuators"), xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemR(row, &logic_ptr, "show_actuators_selected_objects", 0, IFACE_("Sel"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_actuators_active_object", 0, IFACE_("Act"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_actuators_linked_controller", 0, IFACE_("Link"), ICON_NONE);
uiItemR(row, &logic_ptr, "show_actuators_active_states", 0, IFACE_("State"), ICON_NONE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (a=0; a<count; a++) {
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
bActuator *act;
PointerRNA ptr;
ob= (Object *)idar[a];
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
apply logic brick rna renaming
2010-08-17 16:27:10 +00:00
/* only draw the actuator common header if "use_visible" */
style cleanup: also remove some redundant conversions int -> short -> int
2012-09-09 00:00:21 +00:00
if ((ob->scavisflag & OB_VIS_ACT) == 0) {
continue;
}
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
row = uiLayoutRow(layout, TRUE);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide actuators"));
2.49 Logic Editor functionality - Add Sensor/Controller/Actuator now possible for all selected objects (not only the active one)
2012-09-21 04:12:55 +00:00
RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
uiLayoutSetContextPointer(row, "object", &object_ptr);
adding logic editor strings to .po for the records I was chasing the strings using: /\"\u[^\".]*\"/IFACE_(\0)/cg
2012-10-25 18:28:12 +00:00
uiItemMenuEnumO(row, "LOGIC_OT_actuator_add", "type", IFACE_("Add Actuator"), ICON_NONE);
Partial fix for [#22574] Logic Panel missing buttons (when selecting multiple objects) This commit allows you to see the Logic Bricks for multiple objects at once. It still will only add s/c/a for the active object. @Matt, currently "LOGIC_OT_controller_add" uses the active object. That's good for the operator to work in scripts, however for the UI we need something different. Ideally I would like to pass the object as an (optional) parameter to the operator. Not sure if it's possible. The solution in 2.49 looks too "2.50 incompatible". In there ob->scaflag is set to be retrieve later by "do_logic_buts". Smart but too hacky imho.
2010-06-16 06:20:56 +00:00
Logic UI: small fixes 1) "Actuators" menu wasn't working (it was showing the sensors one) 2) s/c/a top menus (the one showing options to hide/show objects and logics) with a big space. - To have those options like this sounds a bit like a legacy, but for the time being at least, let's make it better :) 3) not show the s/c/a common header when object not visible
2010-06-24 04:52:28 +00:00
if ((ob->scaflag & OB_SHOWACT) == 0) continue;
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiItemS(layout);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (act= ob->actuators.first; act; act=act->next) {
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Added dynamic enum itemf for add sensor/actuator operators
2010-05-07 02:01:50 +00:00
RNA_pointer_create((ID *)ob, &RNA_Actuator, act, &ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
Logic UI: add name option for add operators + ALL button in controller states is working now + fix for actuator STATES filtering option. Extra comments related bugs: 1)"actuators_show_active_states" doesn't seem to produce any effect (maybe because PIN is not implemented yet? therefore it's always on? 2)If you set the name to be bigger than 32 it will crashes blender (somehow for s/c/a the get function instead of using the defined 32 maxlen it's using 160 (from UserPrerencesFilePaths_python_scriptsdirectory_get ), 3)properties currently can have the same name as s/c/a and they shouldn't. 4)we need an option to show and/or set the STATE of a given controller (in 2.49 it's the number by the controller name)
2010-05-14 10:45:50 +00:00
if ((ob->scaflag & OB_ALLSTATE) ||
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
!(slogic->scaflag & BUTS_ACT_STATE) ||
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
!(act->flag & ACT_LINKED) || /* always display actuators without links so that is can be edited */
(act->flag & ACT_VISIBLE) || /* this actuator has visible connection, display it */
(act->flag & ACT_PIN && slogic->scaflag & BUTS_ACT_STATE) /* states can hide some sensors, pinned sensors ignore the visible state */
)
{ // gotta check if the current state is visible or not
uiLayout *split, *col;
Logic UI: small commit - set visible flag for sensor and actuator (so it works with the move logic bricks operator to be committed)
2010-07-08 09:25:18 +00:00
/* make as visible, for move operator */
act->flag |= ACT_VISIBLE;
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
split = uiLayoutSplit(layout, 0.05f, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* put inlink button to the left */
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(split, FALSE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiDefIconBut(block, INLINK, 0, ICON_INLINK, 0, 0, UI_UNIT_X, UI_UNIT_Y, act, LINK_ACTUATOR, 0, 0, 0, "");
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
col = uiLayoutColumn(split, TRUE);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
uiLayoutSetContextPointer(col, "actuator", &ptr);
/* should make UI template for actuator header.. function will do for now */
Logic UI: Pin option for sensor and actuators (from 2.49) - implemented the old functionality of pin a sensor or actuator when "show state" is on. - fixed code for setting/resetting VISIBLE and LINKED flags for sensors and actuators (so states buttons is working for actuators and sensors) - move the flag setting code (^^^) to a pre-processing part of the logic ui code.
2010-06-21 07:51:40 +00:00
draw_actuator_header(col, &ptr, &logic_ptr);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
/* draw the brick contents */
Logic UI: actuators - action+rna 100%, sound 100%, constraint+rna 50% Notes: 1) I had to pass Context to the draw_actuator_sound in order to access the open_sound_operator uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL); According to Campbell they are better ways to do that (mdef bind for reference). but for now it works. 2) for the record: action actuator is equal to shape actuator (but runs in armature) 3) in Constraint Actuator I think I should unify all the limit_loc_max_, loc_min, ... properties. I was thinking about replacing it with a single limit_loc_max, limit_loc_min, range, distance, and use get/set funcs to find the correct one.
2010-05-06 12:01:44 +00:00
draw_brick_actuator(col, &ptr, C);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
}
}
}
uiBlockLayoutResolve(block, NULL, &yco); /* stores final height in yco */
uiComposeLinks(block);
uiEndBlock(C, block);
uiDrawBlock(C, block);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (idar) MEM_freeN(idar);
Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks)
2010-05-05 00:12:31 +00:00
}
BGE Logics UI: commit to receive some feedback from Matt To test use debug mode > 0 (Ctrl+Alt+D) * primarly the goal is to put all the bricks there, and then to worry about the proper layout * sensor header added (need to be more compressed). Also checkbox will not work that well here in my opinion. we need to see what can be used instead (icons?) * sensors, and actuators in alphabetical order * a lot of sensors using the rna (//XXXSENSOR in the ones not using it) * the logic_window.c code for controller and actuator is there only to display the draw functions for controller and actuators. But the code it's a really bad copy of the sensor code, so it will be fixed later (Matt? :) * I would love if the non-expanded mode were more compact, more like in 2.49 (the name non-editable). but this is the kind of think we can worry in the end. Also instead of "move up/move down" it would be nice to drag/drop the sensors/controllers/actuators * to do: rna_actuators: to rename type to mode for the enum
2010-05-04 00:06:13 +00:00
Copy Permalink