Changeset 375

Timestamp:

Dec 3, 2007, 10:02:06 PM (17 years ago)

Author:

landauf

Message:

added a "Tickable"-interface
added a "Timer"-class

Location:

code/branches/objecthierarchy/src

Files:

• CMakeLists.txt (modified) (1 diff)
• orxonox/objects/Tickable.h (added)
• orxonox/objects/Timer.h (added)
• orxonox/objects/test1.cc (modified) (1 diff)
• orxonox/objects/test1.h (modified) (1 diff)
• orxonox/objects/test2.cc (modified) (1 diff)
• orxonox/objects/test2.h (modified) (3 diffs)
• orxonox/orxonox.cc (modified) (10 diffs)

code/branches/objecthierarchy/src/CMakeLists.txt

@@ -3 +3 @@
 # create a few variables to simplify life
 SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h)
+SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h orxonox/objects/Tickable.h orxonox/objects/Timer.h)
 
 #Creates an executable

code/branches/objecthierarchy/src/orxonox/objects/test1.cc

@@ -18 +18 @@
     Test1::~Test1()
     {
+    }
+
+    void Test1::tick(float dt)
+    {
+        std::cout << "Test1: " << this << "\n";
     }
 

code/branches/objecthierarchy/src/orxonox/objects/test1.h

@@ -3 +3 @@
 
 #include "BaseObject.h"
+#include "Tickable.h"
 #include "test3.h"
 
 namespace orxonox
 {
-    class Test1 : public BaseObject
+    class Test1 : public BaseObject, public Tickable
     {
         public:
             Test1();
             virtual ~Test1();
+
+            virtual void tick(float dt);
 
             bool usefullClass1isA(Identifier* identifier);

code/branches/objecthierarchy/src/orxonox/objects/test2.cc

@@ -14 +14 @@
         this->usefullClass2_ = Class(Test2);
         this->usefullClass3_ = Class(Test3);
+
+        timer1.setTimer(1, true, this, &Test2::timerFunction1);
+        timer2.setTimer(5, true, this, &Test2::timerFunction2);
+        timer3.setTimer(10, false, this, &Test2::timerFunction3);
     }
 
     Test2::~Test2()
     {
+    }
+
+    void Test2::timerFunction1()
+    {
+        std::cout << "Test2: 1 Sekunde\n";
+    }
+
+    void Test2::timerFunction2()
+    {
+        std::cout << "Test2: 5 Sekunden\n";
+    }
+
+    void Test2::timerFunction3()
+    {
+        std::cout << "Test2: 10 Sekunden sind um!\n";
     }
 

code/branches/objecthierarchy/src/orxonox/objects/test2.h

@@ -3 +3 @@
 
 #include "BaseObject.h"
+#include "Timer.h"
 
 namespace orxonox
@@ -21 +22 @@
             void setUsefullClassOfTypeTest3(Identifier* identifier);
 
+            void timerFunction1();
+            void timerFunction2();
+            void timerFunction3();
+
         private:
             Identifier* usefullClass1_;
@@ -26 +31 @@
             SubclassIdentifier<Test3> usefullClass3_;
 
+            Timer<Test2> timer1;
+            Timer<Test2> timer2;
+            Timer<Test2> timer3;
     };
 }

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -39 +39 @@
 #include <iostream>
 
-#include "../xml/xmlParser.h"
-#include "../loader/LevelLoader.h"
+//#include "../xml/xmlParser.h"
+//#include "../loader/LevelLoader.h"
 
 #include "core/IdentifierIncludes.h"
+#include "objects/Tickable.h"
+#include "objects/Timer.h"
+
 #include "objects/BaseObject.h"
 #include "objects/Test.h"
@@ -48 +51 @@
 #include "objects/test2.h"
 #include "objects/test3.h"
-
 
 // some tests to see if enet works without includsion
@@ -106 +108 @@
       void go()
       {
-/*
         createRoot();
         defineResources();
@@ -117 +118 @@
         setupCEGUI();
         createFrameListener();
-        startRenderLoop();
-*/
+
 
         #define testandcout(code) \
@@ -148 +148 @@
         test4 = new A3();
 */
-
+/*
         std::cout << "Test 5\n";
         A1* test5_01 = new A1();
@@ -218 +218 @@
         std::cout << "ID of BaseObject: " << Class(BaseObject)->getNetworkID() << "\n";
         std::cout << "ID of Test1: " << Class(Test1)->getNetworkID() << "\n";
-
+*/
 /*
         std::cout << "\n";
@@ -474 +474 @@
         delete test9_06;
 */
-
+/*
         std::cout << "Test 10\n";
         Identifier* test10_01 = Class(A1B2);
@@ -605 +605 @@
 
         std::cout << "13\n";
-
+*/
+        std::cout << "Test 11\n";
+/*
+        std::cout << "1\n";
+        count = 0; for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it) { count++; }
+        std::cout << "AnzahlTickable: " << count << "\n";
+
+        Test1* test11_1;
+        for (int i = 0; i < 3; i++)
+            test11_1 = new Test1;
+
+        count = 0; for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it) { count++; }
+        std::cout << "AnzahlTickable: " << count << "\n";
+
+        for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
+            it->tick(0);
+
+        std::cout << "2\n";
+*/
+
+        Test2* test11_2 = new Test2;
+        std::cout << "3\n";
+
+        startRenderLoop();
       }
 
@@ -687 +710 @@
       {
 
-        string levelFile = "sp_level_moonstation.oxw";
-        loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+//        string levelFile = "sp_level_moonstation.oxw";
+//        loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
       }
 
@@ -735 +758 @@
       void createFrameListener()
       {
+        TickFrameListener* TickFL = new TickFrameListener();
+        mRoot->addFrameListener(TickFL);
+
+        TimerFrameListener* TimerFL = new TimerFrameListener();
+        mRoot->addFrameListener(TimerFL);
+
         mListener = new OrxExitListener(mKeyboard);
         mRoot->addFrameListener(mListener);