Selaa lähdekoodia

see previous commit

mikymod 12 vuotta sitten
vanhempi
sitoutus
348a908800
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 3 2
      engine/physics/PhysicsWorld.cpp
  2. 2 1
      engine/physics/PhysicsWorld.h

+ 3 - 2
engine/physics/PhysicsWorld.cpp

@@ -37,6 +37,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "ProxyAllocator.h"
 #include "Hash.h"
 #include "StringUtils.h"
+#include "Actor.h"
 
 #include "PxPhysicsAPI.h"
 
@@ -290,9 +291,9 @@ void PhysicsWorld::destroy_trigger(TriggerId id)
 }
 
 //-----------------------------------------------------------------------------
-JointId	PhysicsWorld::create_joint(const PhysicsResource* pr, const uint32_t index, const Actor& a1, const Actor& a2)
+JointId	PhysicsWorld::create_joint(const PhysicsResource* pr, const uint32_t index, const Actor& actor_0, const Actor& actor_1)
 {
-	Joint* joint = CE_NEW(m_joints_pool, Joint)(physics_system::s_physics, pr, index, a1, a2);
+	Joint* joint = CE_NEW(m_joints_pool, Joint)(physics_system::s_physics, pr, index, actor_0, actor_1);
 	return m_joints.create(joint);
 }
 

+ 2 - 1
engine/physics/PhysicsWorld.h

@@ -72,6 +72,7 @@ struct Trigger;
 struct Joint;
 struct Quaternion;
 class SceneGraph;
+struct Actor;
 
 //-----------------------------------------------------------------------------
 class PhysicsWorld
@@ -90,7 +91,7 @@ public:
 	TriggerId					create_trigger(const Vector3& half_extents, const Vector3& pos, const Quaternion& rot);
 	void						destroy_trigger(TriggerId id);
 
-	JointId						create_joint(const PhysicsResource* pr, const uint32_t index, const Actor& a1, const Actor& a2);
+	JointId						create_joint(const PhysicsResource* pr, const uint32_t index, const Actor& actor_0, const Actor& actor_1);
 	void						destroy_joint(JointId id);
 
 	Actor*						lookup_actor(StringId32 name);