diff options
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/BL_Action.cpp | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/BL_Shader.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_ConstraintWrapper.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Dome.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.h | 20 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.h | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.h | 14 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SteeringActuator.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SteeringActuator.h | 4 |
12 files changed, 31 insertions, 30 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp index 1d5a3dd461a..c187199c8d0 100644 --- a/source/gameengine/Ketsji/BL_Action.cpp +++ b/source/gameengine/Ketsji/BL_Action.cpp @@ -25,6 +25,7 @@ */ #include <cstdlib> +#include <stdio.h> #include "BL_Action.h" #include "BL_ArmatureObject.h" diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h index 32872592cc5..3015dd204c8 100644 --- a/source/gameengine/Ketsji/BL_Shader.h +++ b/source/gameengine/Ketsji/BL_Shader.h @@ -194,7 +194,7 @@ public: bool Ok()const; unsigned int GetProg(); void SetProg(bool enable); - int GetAttribute(){return mAttr;}; + int GetAttribute() { return mAttr; } // -- // Apply methods : sets colected uniforms diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index bd27bc5b333..a92ae83e7f0 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -41,7 +41,7 @@ class KX_ConstraintWrapper : public PyObjectPlus public: KX_ConstraintWrapper(PHY_ConstraintType ctype,int constraintId,class PHY_IPhysicsEnvironment* physenv); virtual ~KX_ConstraintWrapper (); - int getConstraintId() { return m_constraintId;}; + int getConstraintId() { return m_constraintId; } #ifdef WITH_PYTHON KX_PYMETHOD_NOARGS(KX_ConstraintWrapper,GetConstraintId); diff --git a/source/gameengine/Ketsji/KX_Dome.h b/source/gameengine/Ketsji/KX_Dome.h index 0436e910469..922e2d4efb3 100644 --- a/source/gameengine/Ketsji/KX_Dome.h +++ b/source/gameengine/Ketsji/KX_Dome.h @@ -112,7 +112,7 @@ public: int nfacestop, nfacesbottom, nfacesleft, nfacesright, nfacesfront, nfacesback; int nfacesleftback, nfacesrightback; - int GetNumberRenders(){return m_numfaces;}; + int GetNumberRenders() { return m_numfaces; } void RenderDome(void); void RenderDomeFrame(KX_Scene* scene, KX_Camera* cam, int i); diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h index 7a29e2a2731..b37ebd250a5 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.h +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h @@ -72,12 +72,12 @@ class KX_KetsjiEngine { private: - class RAS_ICanvas* m_canvas; // 2D Canvas (2D Rendering Device Context) + class RAS_ICanvas* m_canvas; // 2D Canvas (2D Rendering Device Context) class RAS_IRasterizer* m_rasterizer; // 3D Rasterizer (3D Rendering) - class KX_ISystem* m_kxsystem; + class KX_ISystem* m_kxsystem; class RAS_IRenderTools* m_rendertools; class KX_ISceneConverter* m_sceneconverter; - class NG_NetworkDeviceInterface* m_networkdevice; + class NG_NetworkDeviceInterface* m_networkdevice; #ifdef WITH_PYTHON /* borrowed from sys.modules["__main__"], dont manage ref's */ PyObject* m_pythondictionary; @@ -222,16 +222,16 @@ public: void SetRasterizer(RAS_IRasterizer* rasterizer); #ifdef WITH_PYTHON void SetPyNamespace(PyObject* pythondictionary); - PyObject* GetPyNamespace(){return m_pythondictionary;}; + PyObject* GetPyNamespace() { return m_pythondictionary; } #endif void SetSceneConverter(KX_ISceneConverter* sceneconverter); void SetAnimRecordMode(bool animation_record, int startFrame); - RAS_IRasterizer* GetRasterizer(){return m_rasterizer;}; - RAS_ICanvas* GetCanvas(){return m_canvas;}; - RAS_IRenderTools* GetRenderTools(){return m_rendertools;}; - SCA_IInputDevice* GetKeyboardDevice(){return m_keyboarddevice;}; - SCA_IInputDevice* GetMouseDevice(){return m_mousedevice;}; + RAS_IRasterizer* GetRasterizer() { return m_rasterizer; } + RAS_ICanvas* GetCanvas() { return m_canvas; } + RAS_IRenderTools* GetRenderTools() { return m_rendertools; } + SCA_IInputDevice* GetKeyboardDevice() { return m_keyboarddevice; } + SCA_IInputDevice* GetMouseDevice() { return m_mousedevice; } /// Dome functions void InitDome(short res, short mode, short angle, float resbuf, short tilt, struct Text* text); @@ -265,7 +265,7 @@ public: void GetSceneViewport(KX_Scene* scene, KX_Camera* cam, RAS_Rect& area, RAS_Rect& viewport); void SetDrawType(int drawingtype); - int GetDrawType(){return m_drawingmode;}; + int GetDrawType() { return m_drawingmode; } void SetCameraZoom(float camzoom); diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index c8e9dc6b6b7..f8f5426dc8d 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -61,7 +61,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor KX_KetsjiEngine* kxengine, SCA_IObject* gameobj); - virtual ~KX_MouseFocusSensor() { ; }; + virtual ~KX_MouseFocusSensor() { } virtual CValue* GetReplica() { CValue* replica = new KX_MouseFocusSensor(*this); // this will copy properties and so on... diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index e6f8d7175dc..79e9c28a81c 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -620,7 +620,7 @@ void KX_NavMeshObject::DrawPath(const float *path, int pathLen, const MT_Vector3 } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON //---------------------------------------------------------------------------- //Python @@ -718,4 +718,4 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_NavMeshObject, rebuild, Py_RETURN_NONE; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h index b9c1fcc66db..db35a011c16 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.h +++ b/source/gameengine/Ketsji/KX_NavMeshObject.h @@ -65,7 +65,7 @@ public: MT_Point3 TransformToLocalCoords(const MT_Point3& wpos); MT_Point3 TransformToWorldCoords(const MT_Point3& lpos); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ @@ -74,7 +74,7 @@ public: KX_PYMETHOD_DOC(KX_NavMeshObject, raycast); KX_PYMETHOD_DOC(KX_NavMeshObject, draw); KX_PYMETHOD_DOC_NOARGS(KX_NavMeshObject, rebuild); -#endif +#endif // WITH_PYTHON }; #endif //__KX_NAVMESHOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index ffe077b9738..1327f0aea37 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -76,7 +76,7 @@ public: virtual bool NewHandleCollision(void* obj1,void* obj2, const PHY_CollData * coll_data); virtual bool BroadPhaseFilterCollision(void*obj1,void*obj2); - virtual bool BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; }; + virtual bool BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; } virtual sensortype GetSensorType() { return ST_NEAR; } #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index e89f1ed83a9..9f12d9473bc 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -558,10 +558,10 @@ public: bool IsClearingZBuffer(); void EnableZBufferClearing(bool isclearingZbuffer); // use of DBVT tree for camera culling - void SetDbvtCulling(bool b) { m_dbvt_culling = b; }; - bool GetDbvtCulling() { return m_dbvt_culling; }; - void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; }; - int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; }; + void SetDbvtCulling(bool b) { m_dbvt_culling = b; } + bool GetDbvtCulling() { return m_dbvt_culling; } + void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; } + int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; } void SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter); @@ -587,7 +587,7 @@ public: void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text); void Render2DFilters(RAS_ICanvas* canvas); - KX_ObstacleSimulation* GetObstacleSimulation() {return m_obstacleSimulation;}; + KX_ObstacleSimulation* GetObstacleSimulation() { return m_obstacleSimulation; } #ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ @@ -628,8 +628,8 @@ public: */ void RunDrawingCallbacks(PyObject* cb_list); - PyObject* GetPreDrawCB() { return m_draw_call_pre; }; - PyObject* GetPostDrawCB() { return m_draw_call_post; }; + PyObject* GetPreDrawCB() { return m_draw_call_pre; } + PyObject* GetPostDrawCB() { return m_draw_call_post; } #endif /** diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp index f9af9fc3b8e..c4688af687b 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp +++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp @@ -502,7 +502,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity) } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -620,7 +620,7 @@ PyObject* KX_SteeringActuator::pyattr_get_steeringVec(void *self, const struct K return PyObjectFrom(steeringVec); } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h index f0c3e73ddec..cd55f574e8e 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.h +++ b/source/gameengine/Ketsji/KX_SteeringActuator.h @@ -99,7 +99,7 @@ public: virtual bool UnlinkObject(SCA_IObject* clientobj); const MT_Vector3& GetSteeringVec(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ @@ -113,7 +113,7 @@ public: static PyObject* pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; /* end of class KX_SteeringActuator : public SCA_PropertyActuator */ |