Changeset 375 for code/branches/objecthierarchy/src/orxonox/orxonox.cc

Timestamp:

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

Author:

landauf

Message:

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

File:

• code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified) (10 diffs)

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);