Przeglądaj źródła

update PhysicsWorld according to Actor changes

mikymod 12 lat temu
rodzic
commit
3d384f7215
2 zmienionych plików z 3 dodań i 9 usunięć
  1. 2 8
      engine/physics/PhysicsWorld.cpp
  2. 1 1
      engine/physics/PhysicsWorld.h

+ 2 - 8
engine/physics/PhysicsWorld.cpp

@@ -85,12 +85,6 @@ PhysicsWorld::PhysicsWorld()
 	m_controller_manager = PxCreateControllerManager(device()->physx()->getFoundation());
 	CE_ASSERT(m_controller_manager != NULL, "Failed to create PhysX controller manager");
 
-	PxTransform pose = PxTransform(PxVec3(0.0f, -3.75, 0.0f), PxQuat(PxHalfPi, PxVec3(0.0f, 0.0f, 1.0f)));
-	PxMaterial* mat = device()->physx()->createMaterial(0.5f, 0.5f, 1.0f);
-	PxRigidStatic* plane = device()->physx()->createRigidStatic(pose);
-	PxShape* shape = plane->createShape(PxPlaneGeometry(), *mat);
-	m_scene->addActor(*plane);
-
 	// FIXME FIXME FIXME
 	create_trigger(Vector3(.5, .5, .5), Vector3(5.0, -3.0, 3), Quaternion::IDENTITY);
 }
@@ -104,9 +98,9 @@ PhysicsWorld::~PhysicsWorld()
 }
 
 //-----------------------------------------------------------------------------
-ActorId	PhysicsWorld::create_actor(const PhysicsActor& resource, SceneGraph& sg, int32_t node)
+ActorId	PhysicsWorld::create_actor(const PhysicsResource* res, const uint32_t index, SceneGraph& sg, int32_t node)
 {
-	Actor* actor = CE_NEW(m_actors_pool, Actor)(resource, m_scene, sg, node, Vector3::ZERO, Quaternion::IDENTITY);
+	Actor* actor = CE_NEW(m_actors_pool, Actor)(res, index, m_scene, sg, node, Vector3::ZERO, Quaternion::IDENTITY);
 	return m_actors.create(actor);
 }
 

+ 1 - 1
engine/physics/PhysicsWorld.h

@@ -62,7 +62,7 @@ public:
 								PhysicsWorld();
 								~PhysicsWorld();
 
-	ActorId						create_actor(const PhysicsActor& resource, SceneGraph& sg, int32_t node);
+	ActorId						create_actor(const PhysicsResource* res, const uint32_t index, SceneGraph& sg, int32_t node);
 	void						destroy_actor(ActorId id);
 
 	ControllerId				create_controller(const PhysicsResource* pr, SceneGraph& sg, int32_t node);