UPBGE: Remove physics record animation features.

panzergame · panzergame · commit 682f80e9c668 · 2016-03-10T22:19:07.000+01:00
This feature can be replaced by a simulation baking in the viewport.
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
@@ -162,7 +162,6 @@ def draw(self, context):
             col = layout.column()
             col.prop(game, "use_actor")
             col.prop(game, "use_ghost")
-            col.prop(game, "use_record_animation")
             col.prop(ob, "hide_render", text="Invisible")
 
             layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
@@ -229,7 +229,6 @@ def draw(self, context):
         layout.prop(gs, "show_bounding_box")
         layout.prop(gs, "show_armatures")
         layout.prop(gs, "use_deprecation_warnings")
-        layout.prop(gs, "use_animation_record")
         layout.separator()
         layout.prop(gs, "use_auto_start")
 
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
@@ -1562,9 +1562,6 @@ static void game_set_commmandline_options(GameData *gm)
 		test = (gm->flag & GAME_ENABLE_ALL_FRAMES);
 		SYS_WriteCommandLineInt(syshandle, "fixedtime", test);
 
-		test = (gm->flag & GAME_ENABLE_ANIMATION_RECORD);
-		SYS_WriteCommandLineInt(syshandle, "animation_record", test);
-
 		test = (gm->flag & GAME_IGNORE_DEPRECATION_WARNINGS);
 		SYS_WriteCommandLineInt(syshandle, "ignore_deprecation_warnings", test);
 
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
@@ -563,8 +563,6 @@ enum {
 	OB_NAVMESH               = 1 << 20,
 	OB_HASOBSTACLE           = 1 << 21,
 	OB_CHARACTER             = 1 << 22,
-
-	OB_RECORD_ANIMATION      = 1 << 23,
 };
 
 /* ob->gameflag2 */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
@@ -891,7 +891,6 @@ typedef struct GameData {
 #define GAME_GLSL_NO_NODES					(1 << 10)
 #define GAME_GLSL_NO_EXTRA_TEX				(1 << 11)
 #define GAME_IGNORE_DEPRECATION_WARNINGS	(1 << 12)
-#define GAME_ENABLE_ANIMATION_RECORD		(1 << 13)
 #define GAME_SHOW_MOUSE						(1 << 14)
 #define GAME_GLSL_NO_COLOR_MANAGEMENT		(1 << 15)
 #define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 16)
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
@@ -1690,10 +1690,6 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Physics Type", "Select the type of physical representation");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 
-	prop = RNA_def_property(srna, "use_record_animation", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_RECORD_ANIMATION);
-	RNA_def_property_ui_text(prop, "Record Animation", "Record animation objects without physics");
-
 	prop = RNA_def_property(srna, "use_actor", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_ACTOR);
 	RNA_def_property_ui_text(prop, "Actor", "Object is detected by the Near and Radar sensor");
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
@@ -4187,10 +4187,6 @@ static void rna_def_scene_game_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Deprecation Warnings",
 	                         "Print warnings when using deprecated features in the python API");
 
-	prop = RNA_def_property(srna, "use_animation_record", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_ENABLE_ANIMATION_RECORD);
-	RNA_def_property_ui_text(prop, "Record Animation", "Record animation to F-Curves");
-
 	prop = RNA_def_property(srna, "use_auto_start", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_GameSettings_auto_start_get", "rna_GameSettings_auto_start_set");
 	RNA_def_property_ui_text(prop, "Auto Start", "Automatically start game at load time");
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -263,7 +263,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 		bool usefixed = (SYS_GetCommandLineInt(syshandle, "fixedtime", 0) != 0);
 		bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0);
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
-		bool animation_record = (SYS_GetCommandLineInt(syshandle, "animation_record", 0) != 0);
 		bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0) && GPU_display_list_support();
 		bool showBoundingBox = (SYS_GetCommandLineInt(syshandle, "show_bounding_box", 0) != 0);
 		bool showArmatures = (SYS_GetCommandLineInt(syshandle, "show_armatures", 0) != 0);
@@ -294,8 +293,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 			}
 		}
 
-		if (animation_record) usefixed= false; /* override since you don't want to run full-speed for sim recording */
-
 		// create the canvas and rasterizer
 		RAS_ICanvas* canvas = new KX_BlenderCanvas(wm, win, area_rect, ar);
 		
@@ -448,9 +445,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 
 		if (scene)
 		{
-			int startFrame = scene->r.cfra;
-			ketsjiengine->SetAnimRecordMode(animation_record, startFrame);
-			
 			// Quad buffered needs a special window.
 			if (scene->gm.stereoflag == STEREO_ENABLED) {
 				if (scene->gm.stereomode != RAS_IRasterizer::RAS_STEREO_QUADBUFFERED)
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1215,10 +1215,6 @@ static void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 		(isSensor) ? ((isActor) ? KX_ClientObjectInfo::OBACTORSENSOR : KX_ClientObjectInfo::OBSENSOR) :
 		(isActor) ? KX_ClientObjectInfo::ACTOR : KX_ClientObjectInfo::STATIC;
 
-	// should we record animation for this object?
-	if ((blenderobject->gameflag & OB_RECORD_ANIMATION) != 0)
-		gameobj->SetRecordAnimation(true);
-
 	delete shapeprops;
 	delete smmaterial;
 	if (dm) {
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -484,225 +484,6 @@ void KX_BlenderSceneConverter::RegisterWorldInfo(KX_WorldInfo *worldinfo)
 	m_worldinfos.push_back(pair<KX_Scene *, KX_WorldInfo *> (m_currentScene, worldinfo));
 }
 
-void KX_BlenderSceneConverter::ResetPhysicsObjectsAnimationIpo(bool clearIpo)
-{
-	//TODO this entire function is deprecated, written for 2.4x
-	//the functionality should be rewritten, currently it does nothing
-
-	CListValue *scenes = m_ketsjiEngine->CurrentScenes();
-	for (CListValue::iterator sceit = scenes->GetBegin(); sceit != scenes->GetEnd(); ++sceit) {
-		KX_Scene *scene = (KX_Scene *)*sceit;
-		//PHY_IPhysicsEnvironment* physEnv = scene->GetPhysicsEnvironment();
-		CListValue* parentList = scene->GetRootParentList();
-		int numObjects = parentList->GetCount();
-		int g;
-		for (g = 0; g < numObjects; g++) {
-			KX_GameObject *gameObj = (KX_GameObject *)parentList->GetValue(g);
-			if (gameObj->IsRecordAnimation()) {
-				Object *blenderObject = gameObj->GetBlenderObject();
-				if (blenderObject) {
-#if 0
-					//erase existing ipo's
-					Ipo* ipo = blenderObject->ipo;//findIpoForName(blenderObject->id.name+2);
-					if (ipo) { 	//clear the curve data
-						if (clearIpo) {//rcruiz
-							IpoCurve *icu1;
-
-							int numCurves = 0;
-							for ( icu1 = (IpoCurve*)ipo->curve.first; icu1;  ) {
-
-								IpoCurve* tmpicu = icu1;
-
-								/*int i;
-								BezTriple *bezt;
-								for ( bezt = tmpicu->bezt, i = 0;	i < tmpicu->totvert; i++, bezt++) {
-									printf("(%f,%f,%f),(%f,%f,%f),(%f,%f,%f)\n",bezt->vec[0][0],bezt->vec[0][1],bezt->vec[0][2],bezt->vec[1][0],bezt->vec[1][1],bezt->vec[1][2],bezt->vec[2][0],bezt->vec[2][1],bezt->vec[2][2]);
-								}*/
-
-								icu1 = icu1->next;
-								numCurves++;
-
-								BLI_remlink( &( blenderObject->ipo->curve ), tmpicu );
-								if ( tmpicu->bezt )
-									MEM_freeN( tmpicu->bezt );
-								MEM_freeN( tmpicu );
-								localDel_ipoCurve( tmpicu );
-							}
-						}
-					} 
-					else {
-						ipo = NULL; // XXX add_ipo(blenderObject->id.name+2, ID_OB);
-						blenderObject->ipo = ipo;
-					}
-#endif
-				}
-			}
-		}
-	}
-}
-
-void KX_BlenderSceneConverter::resetNoneDynamicObjectToIpo()
-{
-	//TODO the functionality should be rewritten
-}
-
-// this generates ipo curves for position, rotation, allowing to use game physics in animation
-void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
-{
-	CListValue *scenes = m_ketsjiEngine->CurrentScenes();
-	for (CListValue::iterator sceit = scenes->GetBegin(); sceit != scenes->GetEnd(); ++sceit) {
-		KX_Scene *scene = (KX_Scene *)*sceit;
-		//PHY_IPhysicsEnvironment* physEnv = scene->GetPhysicsEnvironment();
-		CListValue *parentList = scene->GetObjectList();
-		int numObjects = parentList->GetCount();
-		int g;
-		for (g = 0; g < numObjects; g++) {
-			KX_GameObject *gameObj = (KX_GameObject *)parentList->GetValue(g);
-			Object *blenderObject = gameObj->GetBlenderObject();
-			if (blenderObject && blenderObject->parent == NULL && gameObj->IsRecordAnimation()) {
-				if (blenderObject->adt == NULL)
-					BKE_animdata_add_id(&blenderObject->id);
-
-				if (blenderObject->adt) {
-					const MT_Vector3 &position = gameObj->NodeGetWorldPosition();
-					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
-					const MT_Matrix3x3 &orn = gameObj->NodeGetWorldOrientation();
-
-					position.getValue(blenderObject->loc);
-
-					float tmat[3][3];
-					for (int r = 0; r < 3; r++)
-						for (int c = 0; c < 3; c++)
-							tmat[r][c] = (float)orn[c][r];
-
-					mat3_to_compatible_eul(blenderObject->rot, blenderObject->rot, tmat);
-
-					insert_keyframe(NULL, &blenderObject->id, NULL, NULL, "location", -1, (float)frameNumber, INSERTKEY_FAST);
-					insert_keyframe(NULL, &blenderObject->id, NULL, NULL, "rotation_euler", -1, (float)frameNumber, INSERTKEY_FAST);
-
-#if 0
-					const MT_Vector3& position = gameObj->NodeGetWorldPosition();
-					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
-					const MT_Matrix3x3& orn = gameObj->NodeGetWorldOrientation();
-					
-					float eulerAngles[3];
-					float eulerAnglesOld[3] = {0.0f, 0.0f, 0.0f};
-					float tmat[3][3];
-					
-					// XXX animato
-					Ipo* ipo = blenderObject->ipo;
-
-					//create the curves, if not existing, set linear if new
-
-					IpoCurve *icu_lx = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
-					if (!icu_lx) {
-						icu_lx = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X, 1);
-						if (icu_lx) icu_lx->ipo = IPO_LIN;
-					}
-					IpoCurve *icu_ly = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
-					if (!icu_ly) {
-						icu_ly = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y, 1);
-						if (icu_ly) icu_ly->ipo = IPO_LIN;
-					}
-					IpoCurve *icu_lz = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
-					if (!icu_lz) {
-						icu_lz = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z, 1);
-						if (icu_lz) icu_lz->ipo = IPO_LIN;
-					}
-					IpoCurve *icu_rx = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
-					if (!icu_rx) {
-						icu_rx = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X, 1);
-						if (icu_rx) icu_rx->ipo = IPO_LIN;
-					}
-					IpoCurve *icu_ry = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
-					if (!icu_ry) {
-						icu_ry = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y, 1);
-						if (icu_ry) icu_ry->ipo = IPO_LIN;
-					}
-					IpoCurve *icu_rz = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
-					if (!icu_rz) {
-						icu_rz = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z, 1);
-						if (icu_rz) icu_rz->ipo = IPO_LIN;
-					}
-					
-					if (icu_rx) eulerAnglesOld[0] = eval_icu( icu_rx, frameNumber - 1 ) / ((180 / 3.14159265f) / 10);
-					if (icu_ry) eulerAnglesOld[1] = eval_icu( icu_ry, frameNumber - 1 ) / ((180 / 3.14159265f) / 10);
-					if (icu_rz) eulerAnglesOld[2] = eval_icu( icu_rz, frameNumber - 1 ) / ((180 / 3.14159265f) / 10);
-					
-					// orn.getValue((float *)tmat); // uses the wrong ordering, cant use this
-					for (int r = 0; r < 3; r++)
-						for (int c = 0; c < 3; c++)
-							tmat[r][c] = orn[c][r];
-					
-					// mat3_to_eul( eulerAngles,tmat); // better to use Mat3ToCompatibleEul
-					mat3_to_compatible_eul( eulerAngles, eulerAnglesOld,tmat);
-					
-					//eval_icu
-					for (int x = 0; x < 3; x++)
-						eulerAngles[x] *= (float) ((180 / 3.14159265f) / 10.0);
-					
-					//fill the curves with data
-					if (icu_lx) insert_vert_icu(icu_lx, frameNumber, position.x(), 1);
-					if (icu_ly) insert_vert_icu(icu_ly, frameNumber, position.y(), 1);
-					if (icu_lz) insert_vert_icu(icu_lz, frameNumber, position.z(), 1);
-					if (icu_rx) insert_vert_icu(icu_rx, frameNumber, eulerAngles[0], 1);
-					if (icu_ry) insert_vert_icu(icu_ry, frameNumber, eulerAngles[1], 1);
-					if (icu_rz) insert_vert_icu(icu_rz, frameNumber, eulerAngles[2], 1);
-					
-					// Handles are corrected at the end, testhandles_ipocurve isn't needed yet
-#endif
-				}
-			}
-		}
-	}
-}
-
-void KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
-{
-	CListValue *scenes = m_ketsjiEngine->CurrentScenes();
-	for (CListValue::iterator sceit = scenes->GetBegin(); sceit != scenes->GetEnd(); ++sceit) {
-		KX_Scene *scene = (KX_Scene *)*sceit;
-		//PHY_IPhysicsEnvironment* physEnv = scene->GetPhysicsEnvironment();
-		CListValue *parentList = scene->GetRootParentList();
-		int numObjects = parentList->GetCount();
-		int g;
-		for (g = 0; g < numObjects; g++) {
-			KX_GameObject *gameObj = (KX_GameObject *)parentList->GetValue(g);
-			if (gameObj->IsRecordAnimation()) {
-				Object *blenderObject = gameObj->GetBlenderObject();
-				if (blenderObject && blenderObject->adt) {
-					bAction *act = verify_adt_action(&blenderObject->id, false);
-					FCurve *fcu;
-
-					if (!act) {
-						continue;
-					}
-
-					/* for now, not much choice but to run this on all curves... */
-					for (fcu = (FCurve *)act->curves.first; fcu; fcu = fcu->next) {
-						/* Note: calling `sort_time_fcurve()` here is not needed, since
-						 *       all keys have been added in 'right' order. */
-						calchandles_fcurve(fcu);
-					}
-#if 0
-					// XXX animato
-					Ipo* ipo = blenderObject->ipo;
-
-					//create the curves, if not existing
-					//testhandles_ipocurve checks for NULL
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"LocX"));
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"LocY"));
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ"));
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"RotX"));
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"RotY"));
-					testhandles_ipocurve(findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ"));
-#endif
-				}
-			}
-		}
-	}
-}
-
 #ifdef WITH_PYTHON
 PyObject *KX_BlenderSceneConverter::GetPyNamespace()
 {
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -148,15 +148,6 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
 
 	void RegisterWorldInfo(KX_WorldInfo *worldinfo);
 
-	virtual void	ResetPhysicsObjectsAnimationIpo(bool clearIpo);
-
-	///this is for reseting the position,rotation and scale of the gameobjet that is not dynamic
-	virtual	void	resetNoneDynamicObjectToIpo();
-	
-	///this generates ipo curves for position, rotation, allowing to use game physics in animation
-	virtual void	WritePhysicsObjectToAnimationIpo(int frameNumber);
-	virtual void	TestHandlesPhysicsObjectToAnimationIpo();
-
 	struct Scene* GetBlenderSceneForName(const STR_String& name);
 
 //	struct Main* GetMain() { return m_maggie; }
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -114,9 +114,7 @@ KX_GameObject::KX_GameObject(
       m_pGraphicController(NULL),
       m_pInstanceObjects(NULL),
       m_pDupliGroupObject(NULL),
-      m_actionManager(NULL),
-      m_bRecordAnimation(false)
-
+      m_actionManager(NULL)
 #ifdef WITH_PYTHON
     , m_attr_dict(NULL),
     m_collisionCallbacks(NULL)
@@ -1954,7 +1952,6 @@ PyAttributeDef KX_GameObject::Attributes[] = {
 	KX_PYATTRIBUTE_RW_FUNCTION("angularVelocityMin", KX_GameObject, pyattr_get_ang_vel_min, pyattr_set_ang_vel_min),
 	KX_PYATTRIBUTE_RW_FUNCTION("angularVelocityMax", KX_GameObject, pyattr_get_ang_vel_max, pyattr_set_ang_vel_max),
 	KX_PYATTRIBUTE_RW_FUNCTION("visible",	KX_GameObject, pyattr_get_visible,	pyattr_set_visible),
-	KX_PYATTRIBUTE_RW_FUNCTION("record_animation",	KX_GameObject, pyattr_get_record_animation,	pyattr_set_record_animation),
 	KX_PYATTRIBUTE_BOOL_RW    ("occlusion", KX_GameObject, m_bOccluder),
 	KX_PYATTRIBUTE_RW_FUNCTION("position",	KX_GameObject, pyattr_get_worldPosition,	pyattr_set_localPosition),
 	KX_PYATTRIBUTE_RO_FUNCTION("localInertia",	KX_GameObject, pyattr_get_localInertia),
@@ -2543,28 +2540,6 @@ int KX_GameObject::pyattr_set_visible(void *self_v, const KX_PYATTRIBUTE_DEF *at
 	return PY_SET_ATTR_SUCCESS;
 }
 
-PyObject *KX_GameObject::pyattr_get_record_animation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
-{
-	KX_GameObject* self = static_cast<KX_GameObject*>(self_v);
-	return PyBool_FromLong(self->IsRecordAnimation());
-}
-
-int KX_GameObject::pyattr_set_record_animation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
-{
-	KX_GameObject* self = static_cast<KX_GameObject*>(self_v);
-	int param = PyObject_IsTrue(value);
-	if (param == -1) {
-		PyErr_SetString(PyExc_AttributeError, "gameOb.record_animation = bool: KX_GameObject, expected boolean");
-		return PY_SET_ATTR_FAIL;
-	}
-
-	self->SetRecordAnimation(param);
-
-	return PY_SET_ATTR_SUCCESS;
-}
-
-
-
 PyObject *KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 #ifdef USE_MATHUTILS
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
