Changeset 1524 for code/branches/input/src/orxonox

Timestamp:

Jun 3, 2008, 12:20:36 AM (17 years ago)

Author:

rgrieder

Message:

• moved Tickable to objects again
• network, audio and core now have their own tick routine
• Sequence is defined in Orxonox.cc

Location:

code/branches/input/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (5 diffs)
• OrxonoxStableHeaders.h (modified) (2 diffs)
• console/InGameConsole.h (modified) (1 diff)
• hud/HUD.h (modified) (1 diff)
• hud/RadarOverlayElement.cc (modified) (1 diff)
• objects/Tickable.cc (moved) (moved from code/branches/input/src/core/Tickable.cc) (1 diff)
• objects/Tickable.h (moved) (moved from code/branches/input/src/core/Tickable.h) (2 diffs)
• objects/WorldEntity.h (modified) (1 diff)
• tools/Timer.h (modified) (1 diff)

code/branches/input/src/orxonox/CMakeLists.txt

@@ -29 +29 @@
   objects/SpaceShip.cc
   objects/SpaceShipAI.cc
+  objects/Tickable.cc
   objects/WorldEntity.cc
 

code/branches/input/src/orxonox/Orxonox.cc

@@ -57 +57 @@
 #include "core/Debug.h"
 #include "core/Loader.h"
-#include "core/Tickable.h"
 #include "core/input/InputManager.h"
 #include "core/TclBind.h"
+#include "core/Core.h"
 
 // audio
@@ -70 +70 @@
 // objects and tools
 #include "hud/HUD.h"
-#include <Ogre.h>
+#include "objects/Tickable.h"
 
 #include "GraphicsEngine.h"
@@ -76 +76 @@
 // FIXME: is this really file scope?
 // globals for the server or client
-network::Client *client_g;
-network::Server *server_g;
+network::Client *client_g = 0;
+network::Server *server_g = 0;
 
 namespace orxonox
@@ -430 +430 @@
       }
 
+      // tick the core
+      Core::tick((float)evt.timeSinceLastFrame);
       // Call those objects that need the real time
       for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
@@ -436 +438 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      //AudioManager::tick();
+      if (client_g)
+        client_g->tick((float)evt.timeSinceLastFrame);
+      if (server_g)
+        server_g->tick((float)evt.timeSinceLastFrame);
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/branches/input/src/orxonox/OrxonoxStableHeaders.h

@@ -104 +104 @@
 #include "core/Debug.h"
 //#include "core/Executor.h"
-#include "core/Tickable.h"
 //#include "core/XMLPort.h"
 
@@ -111 +110 @@
 #include "OrxonoxPrereqs.h"
 #include "tools/Timer.h"
+#include "objects/Tickable.h"
 #include "objects/Model.h"
 #include "objects/WorldEntity.h"

code/branches/input/src/orxonox/console/InGameConsole.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 
-#include "core/Tickable.h"
 #include "core/Shell.h"
+#include "objects/Tickable.h"
 
 

code/branches/input/src/orxonox/hud/HUD.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgreSceneNode.h>
-#include "core/Tickable.h"
+#include "objects/Tickable.h"
 #include "util/Math.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport HUD : public Tickable
+    class _OrxonoxExport HUD : public TickableReal
     {
       private:

code/branches/input/src/orxonox/hud/RadarOverlayElement.cc

@@ -35 +35 @@
 
 #include "GraphicsEngine.h"
-#include "core/Tickable.h"
 #include "core/ConsoleCommand.h"
+#include "objects/Tickable.h"
 #include "objects/SpaceShip.h"
 #include "RadarObject.h"

code/branches/input/src/orxonox/objects/Tickable.cc

@@ -27 +27 @@
  */
 
+#include "OrxonoxStableHeaders.h"
 #include "Tickable.h"
-#include "CoreIncludes.h"
-#include "ConsoleCommand.h"
+#include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
 
 namespace orxonox

code/branches/input/src/orxonox/objects/Tickable.h

@@ -42 +42 @@
 #define _Tickable_H__
 
-#include "CorePrereqs.h"
+#include "OrxonoxPrereqs.h"
 
-#include "OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _CoreExport Tickable : virtual public OrxonoxClass
+    class _OrxonoxExport Tickable : virtual public OrxonoxClass
     {
         public:
@@ -63 +63 @@
 
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _CoreExport TickableReal : virtual public OrxonoxClass
+    class _OrxonoxExport TickableReal : virtual public OrxonoxClass
     {
         public:

code/branches/input/src/orxonox/objects/WorldEntity.h

@@ -39 +39 @@
 #include "network/Synchronisable.h"
 #include "core/BaseObject.h"
-#include "core/Tickable.h"
+#include "Tickable.h"
 #include "../tools/Mesh.h"
 

code/branches/input/src/orxonox/tools/Timer.h

@@ -62 +62 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/CorePrereqs.h"
-#include "core/Tickable.h"
+#include "objects/Tickable.h"
 
 namespace orxonox