griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* changed NULL properties into UnknownProperty

Browse Source 
* added rna_property.c and rna_actuator
* enabled access to properties and actuators from object
Note that because we have RNA_Property in the RNA itself, you can find 
properties in gamelogic of and object under the name of RNA_GameProperty
This commit is contained in:
Hamed Zaghaghi
2008-11-30 19:52:21 +00:00
parent 9cb9bf7da3
commit 255bc067ec
8 changed files with 170 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/RNA_access.h
View File

@@ -35,6 +35,7 @@ struct Main;
extern BlenderRNA BLENDER_RNA;
extern StructRNA RNA_Actuator;
extern StructRNA RNA_ActuatorSensor;
extern StructRNA RNA_BooleanProperty;
extern StructRNA RNA_Camera;
@@ -47,6 +48,7 @@ extern StructRNA RNA_DelaySensor;
extern StructRNA RNA_EnumProperty;
extern StructRNA RNA_EnumPropertyItem;
extern StructRNA RNA_FloatProperty;
extern StructRNA RNA_GameProperty;
extern StructRNA RNA_Group;
extern StructRNA RNA_ID;
extern StructRNA RNA_IDProperty;

2
source/blender/makesrna/intern/makesrna.c
View File

@@ -876,9 +876,11 @@ typedef struct RNAProcessItem {
RNAProcessItem PROCESS_ITEMS[]= {
{"rna_ID.c", RNA_def_ID},
{"rna_actuator.c", RNA_def_actuator},
{"rna_camera.c", RNA_def_camera},
{"rna_color.c", RNA_def_color},
{"rna_controller.c", RNA_def_controller},
{"rna_property.c", RNA_def_gameproperty},
{"rna_group.c", RNA_def_group},
{"rna_image.c", RNA_def_image},
{"rna_lamp.c", RNA_def_lamp},

81
source/blender/makesrna/intern/rna_actuator.c Normal file
View File

@@ -0,0 +1,81 @@
/**
* $Id$
*
* ***** 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,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Contributor(s): Blender Foundation (2008).
*
* ***** END GPL LICENSE BLOCK *****
*/
#include <stdlib.h>
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_types.h"
#include "rna_internal.h"
#include "DNA_actuator_types.h"
#ifdef RNA_RUNTIME
#else
void RNA_def_actuator(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem actuator_types_items[] ={
{ACT_OBJECT, "OBJECT", "Object", ""},
{ACT_IPO, "IPO", "IPO", ""},
{ACT_CAMERA, "CAMERA", "Camera", ""},
{ACT_SOUND, "SOUND", "Sound", ""},
{ACT_PROPERTY, "PROPERTY", "Property", ""},
{ACT_CONSTRAINT, "CONSTRAINT", "Constraint", ""},
{ACT_EDIT_OBJECT, "EDITOBJECT", "Edit Object", ""},
{ACT_SCENE, "SCENE", "Scene", ""},
{ACT_RANDOM, "RANDOM", "Random", ""},
{ACT_MESSAGE, "MESSAGE", "Message", ""},
{ACT_CD, "CD", "CD", ""},
{ACT_GAME, "GAME", "Game", ""},
{ACT_VISIBILITY, "VISIBILITY", "Visibility", ""},
{ACT_2DFILTER, "TWODFILTER", "2D Filter", ""},
{ACT_PARENT, "PARENT", "Parent", ""},
{ACT_SHAPEACTION, "SHAPEACTION", "Shape Action", ""},
{ACT_STATE, "STATE", "State", ""},
{0, NULL, NULL, NULL}};
srna= RNA_def_struct(brna, "Actuator", NULL , "Actuator");
RNA_def_struct_sdna(srna, "bActuator");
prop= RNA_def_property(srna, "actuator_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "name");
RNA_def_property_string_maxlength(prop, 31);
RNA_def_property_ui_text(prop, "Name", "Actuator name.");
/* type is not editable, would need to do proper data free/alloc */
prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_enum_items(prop, actuator_types_items);
RNA_def_property_ui_text(prop, "Actuator Types", "Actuator types.");
}
#endif

4
source/blender/makesrna/intern/rna_controller.c
View File

@@ -43,13 +43,13 @@ static struct StructRNA* rna_Controller_data_type(struct PointerRNA *ptr)
case CONT_LOGIC_NOR:
case CONT_LOGIC_XOR:
case CONT_LOGIC_XNOR:
return NULL;
return &RNA_UnknownType;
case CONT_EXPRESSION:
return &RNA_ExpressionCont;
case CONT_PYTHON:
return &RNA_PythonCont;
}
return NULL;
return &RNA_UnknownType;
}
#else

2
source/blender/makesrna/intern/rna_internal.h
View File

@@ -81,9 +81,11 @@ extern BlenderDefRNA DefRNA;
extern BlenderRNA BLENDER_RNA;
void RNA_def_ID(struct BlenderRNA *brna);
void RNA_def_actuator(struct BlenderRNA *brna);
void RNA_def_camera(struct BlenderRNA *brna);
void RNA_def_color(struct BlenderRNA *brna);
void RNA_def_controller(struct BlenderRNA *brna);
void RNA_def_gameproperty(struct BlenderRNA *brna);
void RNA_def_group(struct BlenderRNA *brna);
void RNA_def_image(struct BlenderRNA *brna);
void RNA_def_lamp(struct BlenderRNA *brna);

10
source/blender/makesrna/intern/rna_object.c
View File

@@ -66,6 +66,16 @@ void RNA_def_object(BlenderRNA *brna)
RNA_def_property_struct_type(prop, "Controller");
RNA_def_property_ui_text(prop, "Controller", "Controllers of this object.");
prop= RNA_def_property(srna, "actuators", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "Actuator");
RNA_def_property_ui_text(prop, "Actuators", "Actuators of this object.");
prop= RNA_def_property(srna, "properties", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "prop", NULL);
RNA_def_property_struct_type(prop, "GameProperty");
RNA_def_property_ui_text(prop, "Property", "Properties of this object.");
}
#endif

69
source/blender/makesrna/intern/rna_property.c Normal file
View File

@@ -0,0 +1,69 @@
/**
* $Id$
*
* ***** 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,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Contributor(s): Blender Foundation (2008).
*
* ***** END GPL LICENSE BLOCK *****
*/
#include <stdlib.h>
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_types.h"
#include "rna_internal.h"
#include "DNA_property_types.h"
#ifdef RNA_RUNTIME
#else
void RNA_def_gameproperty(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem gameproperty_types_items[] ={
{PROP_BOOL, "BOOL", "Boolean", ""},
{PROP_INT, "INT", "Integer", ""},
{PROP_FLOAT, "FLOAT", "Float", ""},
{PROP_STRING, "STRING", "String", ""},
{PROP_TIME, "TIME", "Time", ""},
{0, NULL, NULL, NULL}};
srna= RNA_def_struct(brna, "GameProperty", NULL , "GameProperty");
RNA_def_struct_sdna(srna, "bProperty");
prop= RNA_def_property(srna, "gameproperty_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "name");
RNA_def_property_string_maxlength(prop, 31);
RNA_def_property_ui_text(prop, "Name", "Game Property name.");
/* type is not editable, would need to do proper data free/alloc */
prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_enum_items(prop, gameproperty_types_items);
RNA_def_property_ui_text(prop, "Game Property Types", "Game Property types.");
}
#endif

4
source/blender/makesrna/intern/rna_sensor.c
View File

@@ -40,7 +40,7 @@ static struct StructRNA* rna_Sensor_data_type(struct PointerRNA *ptr)
switch(sensor->type) {
case SENS_ALWAYS:
return NULL;
return &RNA_UnknownType;
case SENS_TOUCH:
return &RNA_TouchSensor;
case SENS_NEAR:
@@ -71,7 +71,7 @@ static struct StructRNA* rna_Sensor_data_type(struct PointerRNA *ptr)
return &RNA_UnknownType;
}
return NULL;
return &RNA_UnknownType;
}
#else