LVL loads _col too

diff --git a/Weave/Scene/Level.cpp b/Weave/Scene/Level.cpp
index e98b97f71c97cd952ad7b5119ad3bd26f0674438..a438aadbf26e0550815a1b297f6e57137c656f43 100644 (file)
--- a/Weave/Scene/Level.cpp
+++ b/Weave/Scene/Level.cpp
@@ -32,7 +32,7 @@ Level::Level(std::string _modelpath, std::string _texturepath) : SceneObject(mat
 }
 
 Level::Level(const mat4& _modelMat, const vec4& _material, std::string _modelpath, std::string _texturepath) :
-       SceneObject(_modelMat, _material, Model::newIMetaModel(_modelpath + ".dae"), _texturepath)
+       SceneObject(_modelMat, _material, _modelpath, _texturepath)
 {
        collide_group = COL_LEVEL;
        collide_with = COL_MARVIN | COL_ENEMY;
@@ -40,20 +40,20 @@ Level::Level(const mat4& _modelMat, const vec4& _material, std::string _modelpat
        //model->bindModel();
        //model->bindShader(shader);
 
-       collision = model;
-       collision->bt_init();
-       bt_collision_object->setCollisionShape(*collision);
-       bt_collision_object->setUserPointer(this);
+       //collision = model;
+       //collision->bt_init();
+       //bt_collision_object->setCollisionShape(*collision);
+       //bt_collision_object->setUserPointer(this);
 
 
-       btTransform btModelMat;
-       btModelMat.setFromOpenGLMatrix(value_ptr(modelMat));
+       //btTransform btModelMat;
+       //btModelMat.setFromOpenGLMatrix(value_ptr(modelMat));
 
-       btDefaultMotionState* MotionState =
-               new btDefaultMotionState(btModelMat);
-       btRigidBody::btRigidBodyConstructionInfo RigidBodyCI(0, MotionState, *model, btVector3(0, 0, 0));
+       //btDefaultMotionState* MotionState =
+       //      new btDefaultMotionState(btModelMat);
+       //btRigidBody::btRigidBodyConstructionInfo RigidBodyCI(0, MotionState, *model, btVector3(0, 0, 0));
 
-       bt_rigid_body = new btRigidBody(RigidBodyCI);
+       //bt_rigid_body = new btRigidBody(RigidBodyCI);
 }