Changeset 1001 for code/branches/core2/src/orxonox

Timestamp:

Apr 8, 2008, 1:51:25 AM (17 years ago)

Author:

landauf

Message:

ok, be aware, here comes a big one. people with weak nerves should probably better look away or take some serious drugs.
this update includes partial and explicit class template specialization, partial and explicit specialized template function overloading, template meta programming and a simple typecast.
yeah right, a typecast. but let me explain the whole story from the beginning.

it all started with a simple problem: i had a double in a MultiType and wanted a float, but i always got 0. what was the problem? the conversion 'MultiType to anyting' was handled by the Converter class in util/Convert.h and the Converter was specialized for strings, multitypes, vectors and so on, but not for int, float, bool, …
so i've first wanted to implement a typecast as default, but this was a bad idea because it doesn't work for almost every generic type.
implementing an explicit specialization for every possible pair of primitives (did you ever happened to use an unsigned short? or a long double? no? ignorants ) would have been a simple but ugly solution.
but there were other problems: if there's a rule to convert a string into anything and another rule to convert anything into an int - what happens if you want to convert a string into an int? compiler error! …ambiguous partial template specialization.
so i've spent days and nights to find a solution. this is my 5th try or so and i'm still really unsure if it works, but it's the first version i want to commit to have at least a backup.
if you're interested in looking at the code you better wait until i've cleaned up the whole thing, it's a real mess. and i want to do further tests, but now i'm tired. good night

Location:

code/branches/core2/src/orxonox

Files:

• OrxonoxStableHeaders.h (modified) (1 diff)
• core/CommandExecutor.cc (modified) (1 diff)
• core/CommandExecutor.h (modified) (1 diff)
• core/ConsoleCommand.h (modified) (1 diff)
• core/Functor.h (modified) (1 diff)
• objects/Tickable.cc (modified) (1 diff)
• objects/Tickable.h (modified) (2 diffs)
• tools/Timer.h (modified) (3 diffs)

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

@@ -83 +83 @@
 
 #include "util/Math.h"
-#include "util/Convert.h"
 #include "util/Sleep.h"
 #include "util/String2Number.h"

code/branches/core2/src/orxonox/core/CommandExecutor.cc

@@ -297 +297 @@
     }
 
-    bool CommandExecutor::addConsoleCommandShortcut(ExecutorStatic* executor)
+    Executor& CommandExecutor::addConsoleCommandShortcut(ExecutorStatic* executor)
     {
         CommandExecutor::getInstance().consoleCommandShortcuts_[executor->getName()] = executor;
         CommandExecutor::getInstance().consoleCommandShortcuts_LC_[getLowercase(executor->getName())] = executor;
-        return true;
+        return (*executor);
     }
 

code/branches/core2/src/orxonox/core/CommandExecutor.h

@@ -139 +139 @@
             static CommandEvaluation evaluate(const std::string& command);
 
-            static bool addConsoleCommandShortcut(ExecutorStatic* executor);
+            static Executor& addConsoleCommandShortcut(ExecutorStatic* executor);
             static ExecutorStatic* getConsoleCommandShortcut(const std::string& name);
             static ExecutorStatic* getLowercaseConsoleCommandShortcut(const std::string& name);

code/branches/core2/src/orxonox/core/ConsoleCommand.h

@@ -50 +50 @@
 
 #define ConsoleCommandShortcutGeneric(fakevariable, executor) \
-    bool fakevariable = CommandExecutor::addConsoleCommandShortcut((ExecutorStatic*)executor)
+    Executor& fakevariable = CommandExecutor::addConsoleCommandShortcut((ExecutorStatic*)executor)
 
 

code/branches/core2/src/orxonox/core/Functor.h

@@ -325 +325 @@
             void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
             { \
+                std::cout << "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" << std::endl; \
+                std::cout << param1 << std::endl; \
+                std::cout << this->getTypenameParam(0) << std::endl; \
                 FUNCTOR_STORE_RETURNVALUE(returnvalue, (*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \
+                std::cout << "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" << std::endl; \
             } \
     \

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

@@ -1 +1 @@
 #include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
 #include "Tickable.h"
 
 namespace orxonox
 {
+    ConsoleCommandShortcutExtern(slomo, AccessLevel::Offline).setDefaultValue(0, 1.0);
+    ConsoleCommandShortcutExtern(setTimeFactor, AccessLevel::Offline).setDefaultValue(0, 1.0);
+
+    static float timefactor = 1.0;
+    void slomo(float factor)
+    {
+        setTimeFactor(factor);
+    }
+    void setTimeFactor(float factor)
+    {
+        timefactor = factor;
+    }
+    float getTimeFactor()
+    {
+        return timefactor;
+    }
+
     /**
         @brief Constructor: Registers the object in the Tickable-list

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

@@ -50 +50 @@
     class TickFrameListener; // Forward declaration
 
+    void slomo(float factor);
+    void setTimeFactor(float factor = 1.0);
+    float getTimeFactor();
+
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
     class _OrxonoxExport Tickable : virtual public OrxonoxClass
@@ -71 +75 @@
             bool frameStarted(const Ogre::FrameEvent &evt)
             {
+                float dt = evt.timeSinceLastFrame * getTimeFactor();
                 // Iterate through all Tickables and call their tick(dt) function
                 for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
-                    (it++)->tick(evt.timeSinceLastFrame);
+                    (it++)->tick(dt);
 
                 return FrameListener::frameStarted(evt);

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

@@ -63 +63 @@
 #include "OrxonoxPrereqs.h"
 #include "core/CorePrereqs.h"
+#include "../objects/Tickable.h"
 
 namespace orxonox
@@ -200 +201 @@
             bool frameStarted(const Ogre::FrameEvent &evt)
             {
+                float dt = evt.timeSinceLastFrame * getTimeFactor();
                 // Iterate through all Timers
                 for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; )
@@ -206 +208 @@
                     {
                         // If active: Decrease the timer by the duration of the last frame
-                        it->time_ -= evt.timeSinceLastFrame;
+                        it->time_ -= dt;
 
                         if (it->time_ <= 0)