Changeset 1414 for code/branches/network/src/core

Timestamp:

May 24, 2008, 10:08:42 PM (17 years ago)

Author:

rgrieder

Message:

• moved OrxonoxPlatform.h to util (didn't even notice util recently)
• therefore was able to define uint32_t, etc. for all our libs in OrxonoxPlatform.h
• made use of OgreRenderWindow::getAverageFPS() in HUD

Location:

code/branches/network/src/core

Files:

• CorePrereqs.h (modified) (1 diff)
• InputManager.cc (modified) (1 diff)
• KeyBinder.cc (modified) (3 diffs)
• KeyBinder.h (modified) (2 diffs)

code/branches/network/src/core/CorePrereqs.h

@@ -35 +35 @@
 #define _CorePrereqs_H__
 
-#include "OrxonoxPlatform.h"
+#include "util/OrxonoxPlatform.h"
 
 #include <string>

code/branches/network/src/core/InputManager.cc

@@ -421 +421 @@
 
         case IS_GUI:
-          // TODO: do stuff
           break;
 

code/branches/network/src/core/KeyBinder.cc

@@ -188 +188 @@
         // check for param command
         int paramIndex = eval.getEvaluatedExecutor()->getAxisParamIndex();
-        // TODO: check in Executor for correct paramIndex
         if (paramIndex >= 0)
         {
@@ -231 +230 @@
           cmd->evaluation_ = eval;
 
-          //TODO: check CommandEvaluation for correct KeybindMode
           if (mode == KeybindMode::None)
             mode = eval.getEvaluatedExecutor()->getKeybindMode();
@@ -757 +755 @@
   void KeyBinder::joyStickAxisMoved(int joyStickID, int axis, int value)
   {
-    // TODO: check whether 16 bit integer as general axis value is a good idea (works under windows)
+    // TODO: Use proper calibration values instead of generally 16-bit integer
     int i = 8 + axis * 2;
     if (value >= 0)

code/branches/network/src/core/KeyBinder.h

@@ -48 +48 @@
 namespace orxonox
 {
-  class _CoreExport BaseCommand
-  {
-  public:
-    virtual ~BaseCommand() { }
-    virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
-  };
-
   class _CoreExport BufferedParamCommand
   {
@@ -65 +58 @@
     int paramIndex_;
     CommandEvaluation evaluation_;
+  };
+
+  class _CoreExport BaseCommand
+  {
+  public:
+    virtual ~BaseCommand() { }
+    virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
   };