faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

getting the sizes juuuuuuuust right

Browse Source
This commit is contained in:
Jasper 2014-11-17 16:28:31 +01:00
parent 362b4f0230
commit 6c32a0c35a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
level.cc
View File

@ -25,14 +25,14 @@ void Level::load(ACGL::OpenGL::SharedShaderProgram shader) {
// load a texture: // load a texture:
Material material = Material("marbleTexture.png", 0.1f, 0.5f, 0.5f, 3.0f); Material material = Material("marbleTexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
//Create object //Create object
Object object = Object(model, material, glm::vec3(0.0f, 5.0f, 0.0f), Object object = Object(model, material, glm::vec3(0.0f, 10.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f), shader); glm::vec3(0.0f, 0.0f, 0.0f), shader);
//add player to phy //add player to phy
this->physics.addPlayer(0.75f,0.0f,5.0f,0.0f,1.0f,0); this->physics.addPlayer(1.25f,0.0f,10.0f,0.0f,1.0f,0);
objects.push_back(object); objects.push_back(object);
physics.addStaticGroundPlane(); //physics.addStaticGroundPlane();
Model torchModel = Model("torch.obj", 0.75f); Model torchModel = Model("torch.obj", 0.75f);
Material torchMaterial = Material("torchTexture.png", 0.1f, 0.3f, 0.7f, 10.0f); Material torchMaterial = Material("torchTexture.png", 0.1f, 0.3f, 0.7f, 10.0f);
@ -98,6 +98,7 @@ void Level::update(float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPre
i++; i++;
} }
else { else {
mouseDelta.x = -mouseDelta.x;
camera.updateRotation(mouseDelta/100.0f); camera.updateRotation(mouseDelta/100.0f);
} }

2
physics.cc
View File

@ -61,7 +61,7 @@ void Physics::addTerrain(int width, int length, float** heightData)
btRigidBody* tBody = new btRigidBody(0,new btDefaultMotionState(),terrianShape); btRigidBody* tBody = new btRigidBody(0,new btDefaultMotionState(),terrianShape);
tBody->getWorldTransform().setOrigin(btVector3(0,5*highest/10,0)); tBody->getWorldTransform().setOrigin(btVector3(0,highest/2,0));
//tBody->getWoorldTransform().setRotation(btQuaternion(0,0,0,1)); //tBody->getWoorldTransform().setRotation(btQuaternion(0,0,0,1));