From 3869720decd1d338510d3d52ba0f88508314543d Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Tue, 28 Jun 2016 04:57:14 +0200 Subject: [PATCH] LVL loads _col too --- Weave/Scene/Level.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Weave/Scene/Level.cpp b/Weave/Scene/Level.cpp index e98b97f..a438aad 100644 --- 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); } -- 2.47.3