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

modified the update in level.cc. Now the ball no longer goes bouncy.

Browse Source
This commit is contained in:
Jasper 2015-03-04 15:04:46 +01:00
parent b7718d73e8
commit ef9c089d91
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
level.cc
View File

@ -57,7 +57,6 @@ void Level::render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
} }
void Level::update(float runTimeSinceLastUpdate, float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPressed, bool sPressed, bool dPressed,bool kPressed, bool lPressed) { void Level::update(float runTimeSinceLastUpdate, float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPressed, bool sPressed, bool dPressed,bool kPressed, bool lPressed) {
physics.takeUpdateStep(runTimeSinceLastUpdate);
// Ignore first two mouse updates, because they are incorrect // Ignore first two mouse updates, because they are incorrect
// DON'T try to move this functionallity elsewhere // DON'T try to move this functionallity elsewhere
@ -65,49 +64,56 @@ void Level::update(float runTimeSinceLastUpdate, float runTime, glm::vec2 mouseD
if (i <2) { if (i <2) {
i++; i++;
} }
else {
mouseDelta.x = -mouseDelta.x;
camera.updateRotation(mouseDelta/100.0f);
physics.updateCameraPos(mouseDelta, 50, camera.getDistance());
camera.setPosition(physics.getCameraPosition());
camera.setDirection(physics.getCameraToPlayer());
}
if(wPressed){
physics.rollForward(camera.getVector(),strength);
}
if(aPressed) {
physics.rollLeft(camera.getVector(),strength);
}
if(sPressed) {
physics.rollBack(camera.getVector(),strength);
}
if(dPressed){
physics.rollRight(camera.getVector(),strength);
}
if(kPressed) int runs = 2;
camera.setIsPhysicsCamera(true); for(int j = runs; j > 0; j--)
if(lPressed)
camera.setIsPhysicsCamera(false);
cameraCenter->setPosition(physics.getPos(0));
cameraCenter->setRotation(physics.getRotation(0));
for(unsigned i = 0; i < physicsObjects.size();i++)
{ {
physicsObjects[i]->setPosition(physics.getPos(i)); physics.takeUpdateStep(runTimeSinceLastUpdate/runs);
physicsObjects[i]->setRotation(physics.getRotation(i)); if(i>=2)
} {
mouseDelta.x = -mouseDelta.x;
skydome->setPosition(glm::vec3(cameraCenter->getPosition().x, camera.updateRotation(mouseDelta/100.0f/(float)runs);
0.0f, cameraCenter->getPosition().z)); physics.updateCameraPos(mouseDelta, 50/runs, camera.getDistance());
if (runTime > 2.0f) { camera.setPosition(physics.getCameraPosition());
for(unsigned int i = 0; i<triggers.size(); i++) { camera.setDirection(physics.getCameraToPlayer());
triggers.at(i).triggerUpdate(); }
if(wPressed){
physics.rollForward(camera.getVector(),strength/runs);
}
if(aPressed) {
physics.rollLeft(camera.getVector(),strength/runs);
}
if(sPressed) {
physics.rollBack(camera.getVector(),strength/runs);
}
if(dPressed){
physics.rollRight(camera.getVector(),strength/runs);
}
}
if(kPressed)
camera.setIsPhysicsCamera(true);
if(lPressed)
camera.setIsPhysicsCamera(false);
cameraCenter->setPosition(physics.getPos(0));
cameraCenter->setRotation(physics.getRotation(0));
for(unsigned i = 0; i < physicsObjects.size();i++)
{
physicsObjects[i]->setPosition(physics.getPos(i));
physicsObjects[i]->setRotation(physics.getRotation(i));
}
skydome->setPosition(glm::vec3(cameraCenter->getPosition().x,
0.0f, cameraCenter->getPosition().z));
if (runTime > 2.0f) {
for(unsigned int i = 0; i<triggers.size(); i++) {
triggers.at(i).triggerUpdate();
}
} }
}
} }
glm::vec3 Level::getAmbientLight() { glm::vec3 Level::getAmbientLight() {