Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2014-04-24 05:39:33 +0400
committerMitchell Stokes <mogurijin@gmail.com>2014-04-24 05:39:33 +0400
commit8cee587bcb44b24cc17a9d6527a63d19dade4e5d (patch)
treebae00bdf6ac197296c9ea9cdacfb5918f8c3ebf3 /source/gameengine/Physics/Dummy
parent89c61b20f019766fa57835b3548c4f84d36f6214 (diff)
BGE Cleanup: Physics conversion is now handled by PHY_IPhysicsEnvironment
The current physics conversion code was moved from KX_ConvertPhysicsObjects to CcdPhysicsEnvironment.
Diffstat (limited to 'source/gameengine/Physics/Dummy')
-rw-r--r--source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index c06a8d904b2..a645af1e471 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -33,6 +33,7 @@
#define __DUMMYPHYSICSENVIRONMENT_H__
#include "PHY_IPhysicsEnvironment.h"
+#include "PHY_IMotionState.h"
/**
* DummyPhysicsEnvironment is an empty placeholder
@@ -108,6 +109,20 @@ public:
// Dummy, nothing to do here
}
+ virtual void ConvertObject(KX_GameObject* gameobj,
+ RAS_MeshObject* meshobj,
+ DerivedMesh* dm,
+ KX_Scene* kxscene,
+ PHY_ShapeProps* shapeprops,
+ PHY_MaterialProps* smmaterial,
+ PHY_IMotionState *motionstate,
+ int activeLayerBitInfo,
+ bool isCompoundChild,
+ bool hasCompoundChildren)
+ {
+ // All we need to do is handle the motionstate (we're supposed to own it)
+ delete motionstate;
+ }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("GE:DummyPhysicsEnvironment")