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

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.h (modified) (2 diffs)

orxonox/branches/levelloader/src/camera.h

@@ -7 +7 @@
 #define _CAMERA_H
 
-#include "stdincl.h"
 #include "world_entity.h"
-
 
 class World;
@@ -56 +54 @@
  public:
   Camera (World* world);
-  ~Camera ();
+  virtual ~Camera ();
   
-  void timeSlice (Uint32 deltaT);
+  void tick (Uint32 deltaT);
   void apply ();
   void bind (WorldEntity* entity);
-  void destroy();
 
   void setWorld(World* world);