mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-25 04:02:30 +01:00
Code Issues Projects Releases Wiki Activity

3rd person camera improved/fixed ( still not done )

Browse Source
This commit is contained in:
Titus Tscharntke 2012-09-26 19:25:35 +00:00
parent 1db56463fd
commit 784ccb7e56
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/game/game.cpp
View File

@ -1506,15 +1506,17 @@ void Game::update() {
if(currentCameraFollowUnit!=NULL){ if(currentCameraFollowUnit!=NULL){
Vec3f c=currentCameraFollowUnit->getCurrVector(); Vec3f c=currentCameraFollowUnit->getCurrVector();
c.y=c.y+currentCameraFollowUnit->getType()->getHeight()/2.f+2.f; c.y=c.y+currentCameraFollowUnit->getType()->getHeight()/2.f+2.0f;
getGameCameraPtr()->setPos(c); getGameCameraPtr()->setPos(c);
int rotation=currentCameraFollowUnit->getRotation(); int rotation=currentCameraFollowUnit->getRotation();
getGameCameraPtr()->rotateToVH(0.0f,(180-rotation)%360); getGameCameraPtr()->rotateToVH(18.0f,(540-rotation)%360);
if(currentCameraFollowUnit->isAlive()==false){ if(currentCameraFollowUnit->isAlive()==false){
currentCameraFollowUnit==NULL; currentCameraFollowUnit=NULL;
gameCamera.resetPosition(); gameCamera.resetPosition();
getGameCameraPtr()->setClampDisabled(false);
getGameCameraPtr()->setGameState();
} }
} }
@ -3173,8 +3175,8 @@ void Game::startCameraFollowUnit() {
int rotation=currentCameraFollowUnit->getRotation(); int rotation=currentCameraFollowUnit->getRotation();
getGameCameraPtr()->stop(); getGameCameraPtr()->stop();
getGameCameraPtr()->rotateToVH(0.0f,(180-rotation)%360); getGameCameraPtr()->rotateToVH(0.0f,(540-rotation)%360);
getGameCameraPtr()->setHAng((180-rotation)%360); getGameCameraPtr()->setHAng((540-rotation)%360);
getGameCameraPtr()->setVAng(0.0f); getGameCameraPtr()->setVAng(0.0f);
} }
} }
@ -3313,6 +3315,7 @@ void Game::keyDown(SDL_KeyboardEvent key) {
} }
gameCamera.resetPosition(); gameCamera.resetPosition();
gameCamera.setClampDisabled(false);
} }
//pause //pause
//else if(key == configKeys.getCharKey("PauseGame")) { //else if(key == configKeys.getCharKey("PauseGame")) {

2
source/glest_game/game/game_camera.cpp
View File

@ -396,7 +396,7 @@ void GameCamera::rotateHV(float h, float v){
} }
void GameCamera::clampAng() { void GameCamera::clampAng() {
if(clampDisable == true) { if(clampDisable == true && state != sUnit ) {
return; return;
} }