[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21822] branches/itasc/source/gameengine: iTaSC: external constraint GE part 2: add type to actuator.

Benoit Bolsee benoit.bolsee at online.be
Thu Jul 23 22:38:56 CEST 2009


Revision: 21822
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21822
Author:   ben2610
Date:     2009-07-23 22:38:56 +0200 (Thu, 23 Jul 2009)

Log Message:
-----------
iTaSC: external constraint GE part 2: add type to actuator.

Modified Paths:
--------------
    branches/itasc/source/gameengine/Converter/BL_ActionActuator.h
    branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_IActuator.h
    branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.cpp

Modified: branches/itasc/source/gameengine/Converter/BL_ActionActuator.h
===================================================================
--- branches/itasc/source/gameengine/Converter/BL_ActionActuator.h	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Converter/BL_ActionActuator.h	2009-07-23 20:38:56 UTC (rev 21822)
@@ -50,7 +50,7 @@
 						short	priority,
 						short	end_reset,
 						float	stride) 
-		: SCA_IActuator(gameobj),
+		: SCA_IActuator(gameobj, KX_ACT_ACTION),
 		
 		m_lastpos(0, 0, 0),
 		m_blendframe(0),

Modified: branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h
===================================================================
--- branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h	2009-07-23 20:38:56 UTC (rev 21822)
@@ -51,7 +51,7 @@
 						short	blendin,
 						short	priority,
 						float	stride) 
-		: SCA_IActuator(gameobj),
+		: SCA_IActuator(gameobj, KX_ACT_SHAPEACTION),
 		
 		m_lastpos(0, 0, 0),
 		m_blendframe(0),

Modified: branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -43,7 +43,7 @@
 		int int_arg,
 		RAS_IRasterizer* rasterizer,
 		RAS_IRenderTools* rendertools)
-    : SCA_IActuator(gameobj),
+    : SCA_IActuator(gameobj, KX_ACT_2DFILTER),
      m_type(type),
 	 m_disableMotionBlur(flag),
 	 m_float_arg(float_arg),

Modified: branches/itasc/source/gameengine/GameLogic/SCA_IActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/GameLogic/SCA_IActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/GameLogic/SCA_IActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -34,8 +34,9 @@
 
 using namespace std;
 
-SCA_IActuator::SCA_IActuator(SCA_IObject* gameobj) :
+SCA_IActuator::SCA_IActuator(SCA_IObject* gameobj, KX_ACTUATOR_TYPE type) :
 	SCA_ILogicBrick(gameobj),
+	m_type(type),
 	m_links(0),
 	m_posevent(false),
 	m_negevent(false)

Modified: branches/itasc/source/gameengine/GameLogic/SCA_IActuator.h
===================================================================
--- branches/itasc/source/gameengine/GameLogic/SCA_IActuator.h	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/GameLogic/SCA_IActuator.h	2009-07-23 20:38:56 UTC (rev 21822)
@@ -41,6 +41,7 @@
 {
 	friend class SCA_LogicManager;
 protected:
+	int					 m_type;
 	int					 m_links;	// number of active links to controllers
 									// when 0, the actuator is automatically stopped
 	//std::vector<CValue*> m_events;
@@ -60,8 +61,33 @@
 	/**
 	 * This class also inherits the default copy constructors
 	 */
+	enum KX_ACTUATOR_TYPE {
+		KX_ACT_OBJECT,
+		KX_ACT_IPO,
+		KX_ACT_CAMERA,
+		KX_ACT_SOUND,
+		KX_ACT_PROPERTY,
+		KX_ACT_ADD_OBJECT,
+		KX_ACT_END_OBJECT,
+		KX_ACT_DYNAMIC,
+		KX_ACT_REPLACE_MESH,
+		KX_ACT_TRACKTO,
+		KX_ACT_CONSTRAINT,
+		KX_ACT_SCENE,
+		KX_ACT_RANDOM,
+		KX_ACT_MESSAGE,
+		KX_ACT_ACTION,
+		KX_ACT_CD,
+		KX_ACT_GAME,
+		KX_ACT_VISIBILITY,
+		KX_ACT_2DFILTER,
+		KX_ACT_PARENT,
+		KX_ACT_SHAPEACTION,
+		KX_ACT_STATE,
+		KX_ACT_ARMATURE,
+	};
 
-	SCA_IActuator(SCA_IObject* gameobj); 
+	SCA_IActuator(SCA_IObject* gameobj, KX_ACTUATOR_TYPE type); 
 
 	/**
 	 * UnlinkObject(...)
@@ -127,6 +153,7 @@
 	void IncLink() { m_links++; }
 	void DecLink();
 	bool IsNoLink() const { return !m_links; }
+	bool IsType(KX_ACTUATOR_TYPE type) { return m_type == type; }
 };
 
 #endif //__KX_IACTUATOR

Modified: branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -43,7 +43,7 @@
 /* ------------------------------------------------------------------------- */
 
 SCA_PropertyActuator::SCA_PropertyActuator(SCA_IObject* gameobj,SCA_IObject* sourceObj,const STR_String& propname,const STR_String& expr,int acttype)
-   :	SCA_IActuator(gameobj),
+   :	SCA_IActuator(gameobj, KX_ACT_PROPERTY),
 	m_type(acttype),
 	m_propname(propname),
 	m_exprtxt(expr),

Modified: branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -51,7 +51,7 @@
 									 float para1,
 									 float para2,
 									 const STR_String &propName)
-	: SCA_IActuator(gameobj),
+	: SCA_IActuator(gameobj, KX_ACT_RANDOM),
 	  m_propname(propName),
 	  m_parameter1(para1),
 	  m_parameter2(para2),

Modified: branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -42,7 +42,7 @@
 	const STR_String &subject,
 	int bodyType,
 	const STR_String &body) :
-	SCA_IActuator(gameobj),
+	SCA_IActuator(gameobj, KX_ACT_MESSAGE),
 	m_networkscene(networkscene),
 	m_toPropName(toPropName),
 	m_subject(subject),

Modified: branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -49,7 +49,7 @@
 							 int track,
 							 short start,
 							 short end)
-							 : SCA_IActuator(gameobject)
+							 : SCA_IActuator(gameobject, KX_ACT_CD)
 {
 	m_soundscene = soundscene;
 	m_type = type;

Modified: branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -58,7 +58,7 @@
 	float maxhght,
 	bool  xytog
 ): 
-	SCA_IActuator(gameobj),
+	SCA_IActuator(gameobj, KX_ACT_CAMERA),
 	m_ob (obj),
 	m_height (hght),
 	m_minHeight (minhght),

Modified: branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -55,7 +55,7 @@
 											 int time,
 											 int option,
 											 char *property) :
-	SCA_IActuator(gameobj),
+	SCA_IActuator(gameobj, KX_ACT_CONSTRAINT),
 	m_refDirVector(refDir),
 	m_currentTime(0)
 {

Modified: branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -50,7 +50,7 @@
 								   const STR_String& loadinganimationname,
 								   KX_Scene* scene,
 								   KX_KetsjiEngine* ketsjiengine)
-								   : SCA_IActuator(gameobj)
+								   : SCA_IActuator(gameobj, KX_ACT_GAME)
 {
 	m_mode = mode;
 	m_filename = filename;

Modified: branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -71,7 +71,7 @@
 							   bool ipo_as_force,
 							   bool ipo_add,
 							   bool ipo_local)
-	: SCA_IActuator(gameobj),
+	: SCA_IActuator(gameobj, KX_ACT_IPO),
 	m_bNegativeEvent(false),
 	m_startframe (starttime),
 	m_endframe(endtime),

Modified: branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -55,7 +55,7 @@
 	const short damping,
 	const KX_LocalFlags& flag
 ) : 
-	SCA_IActuator(gameobj),
+	SCA_IActuator(gameobj, KX_ACT_OBJECT),
 	m_force(force),
 	m_torque(torque),
 	m_dloc(dloc),

Modified: branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -51,7 +51,7 @@
 									 bool addToCompound,
 									 bool ghost,
 									 SCA_IObject *ob)
-	: SCA_IActuator(gameobj),
+	: SCA_IActuator(gameobj, KX_ACT_PARENT),
 	  m_mode(mode),
 	  m_addToCompound(addToCompound),
 	  m_ghost(ghost),

Modified: branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
===================================================================
--- branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp	2009-07-23 15:57:30 UTC (rev 21821)
+++ branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp	2009-07-23 20:38:56 UTC (rev 21822)
@@ -57,7 +57,7 @@
 												   const float *angvel,
 												   bool angv_local)
 	: 
-	SCA_IActuator(gameobj),
+	SCA_IActuator(gameobj, KX_ACT_ADD_OBJECT),
 	m_OriginalObject(original),
 	m_scene(scene),
 	

Modified: branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list