Revision: 20029
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20029
Author: campbellbarton
Date: 2009-05-02 06:53:01 +0200 (Sat, 02 May 2009)
Log Message:
-----------
BGE Py API patch from Mitchell Stokes, add distance attribute to the radar
sensor, dont use 'continue' because its a python keyword.
removed (ssizeobjargproc) it breaks py2.3
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
trunk/blender/source/gameengine/PyDoc/BL_ActionActuator.py
Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
2009-05-02 04:51:14 UTC (rev 20028)
+++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
2009-05-02 04:53:01 UTC (rev 20029)
@@ -1012,7 +1012,7 @@
KX_PYATTRIBUTE_FLOAT_RW_CHECK("frame", 0, MAXFRAMEF, BL_ActionActuator,
m_localtime, CheckFrame),
KX_PYATTRIBUTE_STRING_RW("property", 0, 31, false, BL_ActionActuator,
m_propname),
KX_PYATTRIBUTE_STRING_RW("frameProperty", 0, 31, false,
BL_ActionActuator, m_framepropname),
- KX_PYATTRIBUTE_BOOL_RW("continue", BL_ActionActuator, m_end_reset),
+ KX_PYATTRIBUTE_BOOL_RW("useContinue", BL_ActionActuator, m_end_reset),
KX_PYATTRIBUTE_FLOAT_RW_CHECK("blendTime", 0, MAXFRAMEF,
BL_ActionActuator, m_blendframe, CheckBlendTime),
KX_PYATTRIBUTE_SHORT_RW_CHECK("type",0,100,false,BL_ActionActuator,m_playtype,CheckType),
{ NULL } //Sentinel
Modified: trunk/blender/source/gameengine/Expressions/ListValue.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/ListValue.cpp 2009-05-02
04:51:14 UTC (rev 20028)
+++ trunk/blender/source/gameengine/Expressions/ListValue.cpp 2009-05-02
04:53:01 UTC (rev 20029)
@@ -218,7 +218,7 @@
NULL,
#else
listvalue_buffer_slice, /*sq_slice*/
- (ssizeobjargproc)NULL, /*sq_ass_item*/
+ NULL, /*sq_ass_item*/
NULL, /*sq_ass_slice*/
#endif
};
Modified: trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp 2009-05-02
04:51:14 UTC (rev 20028)
+++ trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp 2009-05-02
04:53:01 UTC (rev 20029)
@@ -280,6 +280,7 @@
PyAttributeDef KX_RadarSensor::Attributes[] = {
KX_PYATTRIBUTE_FLOAT_ARRAY_RO("coneOrigin", KX_RadarSensor,
m_cone_origin, 3),
KX_PYATTRIBUTE_FLOAT_ARRAY_RO("coneTarget", KX_RadarSensor,
m_cone_target, 3),
+ KX_PYATTRIBUTE_FLOAT_RO("distance", KX_RadarSensor, m_coneheight),
KX_PYATTRIBUTE_FLOAT_RW("angle", 0, 360, KX_RadarSensor, m_coneradius),
KX_PYATTRIBUTE_INT_RW("axis", 0, 5, true, KX_RadarSensor, m_axis),
{NULL} //Sentinel
Modified: trunk/blender/source/gameengine/PyDoc/BL_ActionActuator.py
===================================================================
--- trunk/blender/source/gameengine/PyDoc/BL_ActionActuator.py 2009-05-02
04:51:14 UTC (rev 20028)
+++ trunk/blender/source/gameengine/PyDoc/BL_ActionActuator.py 2009-05-02
04:53:01 UTC (rev 20029)
@@ -29,7 +29,7 @@
@type blendTime: float
@ivar type: The operation mode of the actuator. KX_ACTIONACT_PLAY,
KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP,
KX_ACTIONACT_LOOPEND
@type type: integer
- @ivar continue: The actions continue option, True or False.
+ @ivar useContinue: The actions continue option, True or False.
When True, the action will always play
from where last left off,
otherwise negative events to this
actuator will reset it to its start frame.
@type: boolean
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
