[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54722] trunk/blender/source/gameengine: BGE cleanup: Removing the PHY__Vector classes and replacing them with MT_Vectors.
Mitchell Stokes
mogurijin at gmail.com
Thu Feb 21 19:30:12 CET 2013
Revision: 54722
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54722
Author: moguri
Date: 2013-02-21 18:30:11 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
BGE cleanup: Removing the PHY__Vector classes and replacing them with MT_Vectors. The PHY__Vectors didn't offer anything (not even any real abstraction) and they required annoying MT_Vector <-> PHY_Vector conversions all over the place. No functional changes.
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/CMakeLists.txt
trunk/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
trunk/blender/source/gameengine/Physics/common/PHY_ICharacter.h
trunk/blender/source/gameengine/Physics/common/PHY_IGraphicController.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsController.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IVehicle.h
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -260,14 +260,9 @@
// this sumoObject is not deleted by a gameobj, so delete it ourself
// later (memleaks)!
float radius = blendernearsensor->dist;
- PHY__Vector3 pos;
const MT_Vector3& wpos = gameobj->NodeGetWorldPosition();
- pos[0] = (float)wpos[0];
- pos[1] = (float)wpos[1];
- pos[2] = (float)wpos[2];
- pos[3] = 0.f;
bool bFindMaterial = false;
- PHY_IPhysicsController* physCtrl = kxscene->GetPhysicsEnvironment()->CreateSphereController(radius,pos);
+ PHY_IPhysicsController* physCtrl = kxscene->GetPhysicsEnvironment()->CreateSphereController(radius,wpos);
//will be done in KX_TouchEventManager::RegisterSensor()
//if (isInActiveLayer)
Modified: trunk/blender/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_CharacterWrapper.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Ketsji/KX_CharacterWrapper.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -113,10 +113,8 @@
PyObject *KX_CharacterWrapper::pyattr_get_walk_dir(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
{
KX_CharacterWrapper* self = static_cast<KX_CharacterWrapper*>(self_v);
- PHY__Vector3 vec = self->m_character->GetWalkDirection();
- MT_Vector3 retval = MT_Vector3(vec[0], vec[1], vec[2]);
- return PyObjectFrom(retval);
+ return PyObjectFrom(self->m_character->GetWalkDirection());
}
int KX_CharacterWrapper::pyattr_set_walk_dir(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
@@ -128,12 +126,7 @@
return PY_SET_ATTR_FAIL;
}
- PHY__Vector3 vec;
- vec[0] = dir[0];
- vec[1] = dir[1];
- vec[2] = dir[2];
-
- self->m_character->SetWalkDirection(vec);
+ self->m_character->SetWalkDirection(dir);
return PY_SET_ATTR_SUCCESS;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -51,10 +51,10 @@
void KX_RayCast::reportHit(PHY_RayCastResult* result)
{
m_hitFound = true;
- m_hitPoint.setValue((const float*)result->m_hitPoint);
- m_hitNormal.setValue((const float*)result->m_hitNormal);
+ m_hitPoint = MT_Vector3(result->m_hitPoint);
+ m_hitNormal = MT_Vector3(result->m_hitNormal);
m_hitUVOK = result->m_hitUVOK;
- m_hitUV.setValue((const float*)result->m_hitUV);
+ m_hitUV = MT_Vector2(result->m_hitUV);
m_hitMesh = result->m_meshObject;
m_hitPolygon = result->m_polygon;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -1490,7 +1490,7 @@
if (m_dbvt_culling)
{
// test culling through Bullet
- PHY__Vector4 planes[6];
+ MT_Vector4 planes[6];
// get the clip planes
MT_Vector4* cplanes = cam->GetNormalizedClipPlanes();
// and convert
@@ -1711,13 +1711,11 @@
MT_Vector3 KX_Scene::GetGravity()
{
- PHY__Vector3 gravity;
- MT_Vector3 vec;
+ MT_Vector3 gravity;
GetPhysicsEnvironment()->getGravity(gravity);
- vec = gravity.m_vec;
- return vec;
+ return gravity;
}
void KX_Scene::SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter)
Modified: trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -59,19 +59,12 @@
PyVecTo(pylistPos,attachPos);
PyVecTo(pylistDir,attachDir);
PyVecTo(pylistAxleDir,attachAxle);
- PHY__Vector3 aPos,aDir,aAxle;
- aPos[0] = attachPos[0];
- aPos[1] = attachPos[1];
- aPos[2] = attachPos[2];
- aDir[0] = attachDir[0];
- aDir[1] = attachDir[1];
- aDir[2] = attachDir[2];
- aAxle[0] = -attachAxle[0];//someone reverse some conventions inside Bullet (axle winding)
- aAxle[1] = -attachAxle[1];
- aAxle[2] = -attachAxle[2];
+
+ //someone reverse some conventions inside Bullet (axle winding)
+ attachAxle = -attachAxle;
printf("attempt for addWheel: suspensionRestLength%f wheelRadius %f, hasSteering:%d\n",suspensionRestLength,wheelRadius,hasSteering);
- m_vehicle->AddWheel(motionState,aPos,aDir,aAxle,suspensionRestLength,wheelRadius,hasSteering);
+ m_vehicle->AddWheel(motionState,attachPos,attachDir,attachAxle,suspensionRestLength,wheelRadius,hasSteering);
}
} else {
Modified: trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h 2013-02-21 18:30:11 UTC (rev 54722)
@@ -7,7 +7,6 @@
#define __KX_VEHICLEWRAPPER_H__
#include "Value.h"
-#include "PHY_DynamicTypes.h"
class PHY_IVehicle;
class PHY_IMotionState;
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -55,7 +55,7 @@
SetGraphicTransform();
}
-void CcdGraphicController::setLocalAabb(const PHY__Vector3& aabbMin,const PHY__Vector3& aabbMax)
+void CcdGraphicController::setLocalAabb(const MT_Vector3& aabbMin,const MT_Vector3& aabbMax)
{
m_localAabbMin.setValue(aabbMin[0],aabbMin[1],aabbMin[2]);
m_localAabbMax.setValue(aabbMax[0],aabbMax[1],aabbMax[2]);
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h 2013-02-21 18:30:11 UTC (rev 54722)
@@ -42,7 +42,7 @@
void setLocalAabb(const btVector3& aabbMin,const btVector3& aabbMax);
void setLocalAabb(const MT_Point3& aabbMin,const MT_Point3& aabbMax);
- virtual void setLocalAabb(const PHY__Vector3& aabbMin,const PHY__Vector3& aabbMax);
+ virtual void setLocalAabb(const MT_Vector3& aabbMin,const MT_Vector3& aabbMax);
virtual void setLocalAabb(const float aabbMin[3],const float aabbMax[3]);
PHY_IMotionState* GetMotionState() { return m_motionState; }
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -1092,7 +1092,7 @@
{
}
-void CcdPhysicsController::getPosition(PHY__Vector3& pos) const
+void CcdPhysicsController::getPosition(MT_Vector3& pos) const
{
const btTransform& xform = m_object->getWorldTransform();
pos[0] = xform.getOrigin().x();
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h 2013-02-21 18:30:11 UTC (rev 54722)
@@ -524,7 +524,7 @@
virtual void getOrientation(float &quatImag0,float &quatImag1,float &quatImag2,float &quatReal);
virtual void setOrientation(float quatImag0,float quatImag1,float quatImag2,float quatReal);
virtual void setPosition(float posX,float posY,float posZ);
- virtual void getPosition(PHY__Vector3& pos) const;
+ virtual void getPosition(MT_Vector3& pos) const;
virtual void setScaling(float scaleX,float scaleY,float scaleZ);
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2013-02-21 18:08:07 UTC (rev 54721)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2013-02-21 18:30:11 UTC (rev 54722)
@@ -97,9 +97,9 @@
virtual void AddWheel(
PHY_IMotionState* motionState,
- PHY__Vector3 connectionPoint,
- PHY__Vector3 downDirection,
- PHY__Vector3 axleDirection,
+ MT_Vector3 connectionPoint,
+ MT_Vector3 downDirection,
+ MT_Vector3 axleDirection,
float suspensionRestLength,
float wheelRadius,
bool hasSteering
@@ -311,20 +311,16 @@
return m_controller->getJumpCount();
}
- virtual void SetWalkDirection(PHY__Vector3 dir)
+ virtual void SetWalkDirection(const MT_Vector3& dir)
{
btVector3 vec = btVector3(dir[0], dir[1], dir[2]);
m_controller->setWalkDirection(vec);
}
- virtual PHY__Vector3 GetWalkDirection()
+ virtual MT_Vector3 GetWalkDirection()
{
btVector3 vec = m_controller->getWalkDirection();
- PHY__Vector3 retval;
- retval[0] = vec[0];
- retval[1] = vec[1];
- retval[2] = vec[2];
- return retval;
+ return MT_Vector3(vec[0], vec[1], vec[2]);
}
};
@@ -951,7 +947,7 @@
-void CcdPhysicsEnvironment::getGravity(PHY__Vector3& grav)
+void CcdPhysicsEnvironment::getGravity(MT_Vector3& grav)
{
const btVector3& gravity = m_dynamicsWorld->getGravity();
grav[0] = gravity.getX();
@@ -1851,7 +1847,7 @@
};
static OcclusionBuffer gOcb;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list