Changeset 2104 in orxonox.OLD for orxonox/branches/chris/src

Timestamp:

Jul 10, 2004, 3:07:42 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: This code compiles and links but is still missing the SDL libraries.

Location:

orxonox/branches/chris/src

Files:

• orxonox.cc (modified) (1 diff)
• orxonox.h (modified) (2 diffs)
• world.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

orxonox/branches/chris/src/orxonox.cc

@@ -51 +51 @@
 /* this is a singleton class to prevent duplicates */
 Orxonox* Orxonox::singleton_ref = 0;
-World* Orxonox::world = 0;
-bool Orxonox::pause = false;
-
 
 Orxonox* Orxonox::getInstance (void)

orxonox/branches/chris/src/orxonox.h

@@ -20 +20 @@
   ~Orxonox ();
   
-  static char configfilename[256];
-  static World* world;
-  static DataTank* resources;
-  static CommandNode* localinput;
-  static Camera* localcamera;
-  static SDL_Surface* screen;
+  char configfilename[256];
+  World* world;
+  DataTank* resources;
+  CommandNode* localinput;
+  Camera* localcamera;
+  SDL_Surface* screen;
   
-  static bool bQuitOrxonox;
-  static bool pause;
-        static Uint32 lastframe;
+  bool bQuitOrxonox;
+  bool pause;
+        Uint32 lastframe;
 
-        static void get_config_file (int argc, char** argv);
+        void get_config_file (int argc, char** argv);
         
                 // main loop functions
-  static void synchronize ();
-  static void handle_input ();
-  static void time_slice ();
-  static void collision ();
-  static void display ();
+  void synchronize ();
+  void handle_input ();
+  void time_slice ();
+  void collision ();
+  void display ();
   
         // subsystem initialization
@@ -50 +50 @@
  public:
   static Orxonox* getInstance ();
-  static void quitGame();
+  void quitGame();
 
-  static void event_handler (SDL_Event* event);
+  void event_handler (SDL_Event* event);
 
   int init (int argc, char** argv);

orxonox/branches/chris/src/world.cc

@@ -196 +196 @@
         orx->get_camera()->bind (myPlayer);
 }
+
+void World::calc_camera_pos (Location* loc, Placement* plc)
+{
+  track[loc->part].map_camera (loc, plc);
+}

orxonox/branches/chris/src/world_entity.cc

@@ -122 +122 @@
 }
 
+void WorldEntity::post_spawn ()
+{
+}
+
+void WorldEntity::command (Command* cmd)
+{
+}
+
+void WorldEntity::get_lookat (Location* locbuf)
+{
+}
+
+void WorldEntity::left_world ()
+{
+}