diff options
Diffstat (limited to 'source/gameengine/Physics/common')
10 files changed, 14 insertions, 44 deletions
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt index 400e475f8a2..ceb7a8ba548 100644 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ b/source/gameengine/Physics/common/CMakeLists.txt @@ -41,7 +41,6 @@ set(SRC PHY_IVehicle.cpp PHY_DynamicTypes.h - PHY_ICharacter.h PHY_IController.h PHY_IGraphicController.h PHY_IMotionState.h diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h index 0fe2533cf93..6994706ce2d 100644 --- a/source/gameengine/Physics/common/PHY_DynamicTypes.h +++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h @@ -151,4 +151,4 @@ typedef enum PHY_ShapeType { typedef float PHY_Vector3[3]; -#endif /* __PHY_DYNAMICTYPES_H__ */ +#endif //__PHY_DYNAMICTYPES_H__ diff --git a/source/gameengine/Physics/common/PHY_ICharacter.h b/source/gameengine/Physics/common/PHY_ICharacter.h deleted file mode 100644 index e2fc5e45125..00000000000 --- a/source/gameengine/Physics/common/PHY_ICharacter.h +++ /dev/null @@ -1,30 +0,0 @@ - -/** \file PHY_ICharacter.h - * \ingroup phys - */ - -#ifndef __PHY_ICHARACTER_H__ -#define __PHY_ICHARACTER_H__ - -//PHY_ICharacter provides a generic interface for "character" controllers - -#ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" -#endif - -class PHY_ICharacter -{ -public: - - virtual void Jump()= 0; - virtual bool OnGround()= 0; - - virtual float GetGravity()= 0; - virtual void SetGravity(float gravity)= 0; - -#ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_ICharacter") -#endif -}; - -#endif //__PHY_ICHARACTER_H__ diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h index 003c4edf598..729abd8ec04 100644 --- a/source/gameengine/Physics/common/PHY_IController.h +++ b/source/gameengine/Physics/common/PHY_IController.h @@ -60,4 +60,5 @@ class PHY_IController #endif }; -#endif /* __PHY_ICONTROLLER_H__ */ +#endif //__PHY_ICONTROLLER_H__ + diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h index cb13eda4f18..af337188818 100644 --- a/source/gameengine/Physics/common/PHY_IGraphicController.h +++ b/source/gameengine/Physics/common/PHY_IGraphicController.h @@ -58,4 +58,5 @@ class PHY_IGraphicController : public PHY_IController #endif }; -#endif /* __PHY_IGRAPHICCONTROLLER_H__ */ +#endif //__PHY_IGRAPHICCONTROLLER_H__ + diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h index ccf7cf74724..72ff37468ee 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.h +++ b/source/gameengine/Physics/common/PHY_IMotionState.h @@ -65,4 +65,5 @@ class PHY_IMotionState #endif }; -#endif /* __PHY_IMOTIONSTATE_H__ */ +#endif //__PHY_IMOTIONSTATE_H__ + diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h index bc7671abe80..7eea2a183a1 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h @@ -108,4 +108,5 @@ class PHY_IPhysicsController : public PHY_IController #endif }; -#endif /* __PHY_IPHYSICSCONTROLLER_H__ */ +#endif //__PHY_IPHYSICSCONTROLLER_H__ + diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index bfbe570ad0c..77016859c3f 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -40,7 +40,6 @@ #endif class PHY_IVehicle; -class PHY_ICharacter; class RAS_MeshObject; class PHY_IPhysicsController; @@ -143,7 +142,6 @@ class PHY_IPhysicsEnvironment virtual void setUseEpa(bool epa) {} virtual void setGravity(float x,float y,float z)=0; - virtual void getGravity(PHY__Vector3& grav) = 0; virtual int createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type, float pivotX,float pivotY,float pivotZ, @@ -158,9 +156,6 @@ class PHY_IPhysicsEnvironment //complex constraint for vehicles virtual PHY_IVehicle* getVehicleConstraint(int constraintId) =0; - // Character physics wrapper - virtual PHY_ICharacter* getCharacterController(class KX_GameObject* ob) =0; - virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ)=0; //culling based on physical broad phase @@ -190,4 +185,5 @@ class PHY_IPhysicsEnvironment #endif }; -#endif /* __PHY_IPHYSICSENVIRONMENT_H__ */ +#endif //__PHY_IPHYSICSENVIRONMENT_H__ + diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h index ecf7a87c40f..731e22d9f0f 100644 --- a/source/gameengine/Physics/common/PHY_IVehicle.h +++ b/source/gameengine/Physics/common/PHY_IVehicle.h @@ -66,4 +66,4 @@ public: #endif }; -#endif /* __PHY_IVEHICLE_H__ */ +#endif //__PHY_IVEHICLE_H__ diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h index 7c5d9c9638e..b930177d3a8 100644 --- a/source/gameengine/Physics/common/PHY_Pro.h +++ b/source/gameengine/Physics/common/PHY_Pro.h @@ -62,4 +62,5 @@ struct PHY_MaterialProps { bool m_fh_normal; // Should the object slide off slopes? }; -#endif /* __PHY_PRO_H__ */ +#endif //__PHY_PRO_H__ + |