diff options
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Expressions/Value.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonSeq.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_VertexProxy.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 9 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageViewport.cpp | 1 |
9 files changed, 12 insertions, 28 deletions
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index 52ad95c71b6..c025d439fc0 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -1207,8 +1207,8 @@ void PyObjectPlus::ClearDeprecationWarning() NullDeprecationWarning(); } -WarnLink* m_base_wlink_first= NULL; -WarnLink* m_base_wlink_last= NULL; +static WarnLink *m_base_wlink_first = NULL; +static WarnLink *m_base_wlink_last = NULL; WarnLink* PyObjectPlus::GetDeprecationWarningLinkFirst(void) {return m_base_wlink_first;} WarnLink* PyObjectPlus::GetDeprecationWarningLinkLast(void) {return m_base_wlink_last;} diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 30a56c9165a..383e83dcd89 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -135,14 +135,14 @@ effect: deletes the object } - - +/* UNUSED */ +#if 0 #define VALUE_SUB(val1, val2) (val1)->Calc(VALUE_SUB_OPERATOR, val2) #define VALUE_MUL(val1, val2) (val1)->Calc(VALUE_MUL_OPERATOR, val2) #define VALUE_DIV(val1, val2) (val1)->Calc(VALUE_DIV_OPERATOR, val2) #define VALUE_NEG(val1) (val1)->Calc(VALUE_NEG_OPERATOR, val1) #define VALUE_POS(val1) (val1)->Calc(VALUE_POS_OPERATOR, val1) - +#endif STR_String CValue::op2str(VALUE_OPERATOR op) { diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index fa40dad21e7..3baa72eb3c8 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -265,7 +265,7 @@ if(WITH_BULLET) list(APPEND INC ../Physics/Bullet ) - list(APPEND INC + list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} ) add_definitions(-DWITH_BULLET) diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index fb3e6c58027..f652158d72c 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -330,7 +330,7 @@ static PyObject *KX_PythonSeq_get(PyObject *self, PyObject *args) return def; } -PySequenceMethods KX_PythonSeq_as_sequence = { +static PySequenceMethods KX_PythonSeq_as_sequence = { NULL, /* Cant set the len otherwise it can evaluate as false */ NULL, /* sq_concat */ NULL, /* sq_repeat */ @@ -349,7 +349,7 @@ static PyMappingMethods KX_PythonSeq_as_mapping = { 0, /* mp_ass_subscript */ }; -PyMethodDef KX_PythonSeq_methods[] = { +static PyMethodDef KX_PythonSeq_methods[] = { // dict style access for props {"get",(PyCFunction) KX_PythonSeq_get, METH_VARARGS}, {NULL,NULL} //Sentinel diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp index ab73ba1902a..cd1c9eed91b 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.cpp +++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp @@ -489,7 +489,7 @@ KX_VertexProxy::~KX_VertexProxy() // stuff for cvalue related things CValue* KX_VertexProxy::Calc(VALUE_OPERATOR, CValue *) { return NULL;} CValue* KX_VertexProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;} -STR_String sVertexName="vertex"; +static STR_String sVertexName = "vertex"; const STR_String & KX_VertexProxy::GetText() {return sVertexName;}; double KX_VertexProxy::GetNumber() { return -1;} STR_String& KX_VertexProxy::GetName() { return sVertexName;} diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index c5b601361d9..89d7f41ab4d 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -59,7 +59,7 @@ set(SRC ) if(WITH_BULLET) - list(APPEND INC + list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} ) add_definitions(-DWITH_BULLET) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 08ea9706eba..111cfdb2c44 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -64,8 +64,6 @@ float gLinearSleepingTreshold; float gAngularSleepingTreshold; -btVector3 startVel(0,0,0);//-10000); - BlenderBulletCharacterController::BlenderBulletCharacterController(btMotionState *motionState, btPairCachingGhostObject *ghost, btConvexShape* shape, float stepHeight) : btKinematicCharacterController(ghost,shape,stepHeight,2), m_motionState(motionState), @@ -144,14 +142,6 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) m_characterController = 0; CreateRigidbody(); - - -///??? -/*#ifdef WIN32 - if (GetRigidBody() && !GetRigidBody()->isStaticObject()) - GetRigidBody()->setLinearVelocity(startVel); -#endif*/ - } btTransform& CcdPhysicsController::GetTransformFromMotionState(PHY_IMotionState* motionState) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 29b526067fd..e92f7bd1268 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -45,14 +45,12 @@ subject to the following restrictions: #define CCD_CONSTRAINT_DISABLE_LINKED_COLLISION 0x80 -bool useIslands = true; - #ifdef NEW_BULLET_VEHICLE_SUPPORT #include "BulletDynamics/Vehicle/btRaycastVehicle.h" #include "BulletDynamics/Vehicle/btVehicleRaycaster.h" #include "BulletDynamics/Vehicle/btWheelInfo.h" #include "PHY_IVehicle.h" -btRaycastVehicle::btVehicleTuning gTuning; +static btRaycastVehicle::btVehicleTuning gTuning; #endif //NEW_BULLET_VEHICLE_SUPPORT #include "LinearMath/btAabbUtil2.h" @@ -2352,11 +2350,6 @@ PHY_ICharacter* CcdPhysicsEnvironment::getCharacterController(KX_GameObject *ob) return NULL; } -int currentController = 0; -int numController = 0; - - - PHY_IPhysicsController* CcdPhysicsEnvironment::CreateSphereController(float radius,const MT_Vector3& position) { diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index 18095ea631d..28fff8b9a6c 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -38,6 +38,7 @@ #include "KX_PythonInit.h" #include "Texture.h" #include "ImageBase.h" +#include "VideoBase.h" #include "FilterSource.h" #include "ImageViewport.h" |