Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/camera.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/camera.cc (modified) (4 diffs)

orxonox/branches/levelloader/src/camera.cc

@@ -51 +51 @@
 Camera::~Camera ()
 {
+  this->bound = NULL;
+  this->world = NULL;
+
 }
 
@@ -60 +63 @@
    as smooth camera movement or swaying).
 */
-void Camera::timeSlice (Uint32 deltaT)
+void Camera::tick (Uint32 deltaT)
 {
   if( this->t <= deltaTime)
@@ -198 +201 @@
   // TO DO: implement options for frustum generation
   //glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
-  gluPerspective(60, 1.2f, 0.1, 250);
+  gluPerspective(60, 1.2f, 0.1, 2000);
   
   //Vector up(0,0,1);
@@ -276 +279 @@
 
 
-/**
-   \brief destroy, reset the camera so that it doesn't perform anything anymore
-
-*/
-void Camera::destroy()
-{
-  this->bound = NULL;
-  this->world = NULL;
-}