Changeset 1024 for code/trunk/src/orxonox/core

Timestamp:

Apr 10, 2008, 5:35:49 PM (17 years ago)

Author:

rgrieder

Message:

merged input back into trunk
note: I have created an asylum with obsolete code, please check the files

Location:

code/trunk/src/orxonox/core

Files:

• ArgReader.cc (deleted)
• ArgReader.h (deleted)
• CMakeLists.txt (modified) (1 diff)
• CorePrereqs.h (modified) (5 diffs)
• Factory.h (modified) (1 diff)
• Identifier.h (modified) (2 diffs)
• InputEvent.h (copied) (copied from code/branches/input/src/orxonox/core/InputEvent.h)
• InputEventListener.cc (copied) (copied from code/branches/input/src/orxonox/core/InputEventListener.cc)
• InputEventListener.h (copied) (copied from code/branches/input/src/orxonox/core/InputEventListener.h)
• InputHandler.cc (copied) (copied from code/branches/input/src/orxonox/core/InputHandler.cc)
• InputHandler.h (copied) (copied from code/branches/input/src/orxonox/core/InputHandler.h)
• InputManager.cc (copied) (copied from code/branches/input/src/orxonox/core/InputManager.cc)
• InputManager.h (copied) (copied from code/branches/input/src/orxonox/core/InputManager.h)
• MetaObjectList.h (modified) (1 diff)
• Script.cc (modified) (4 diffs)
• Tickable.h (modified) (1 diff)

code/trunk/src/orxonox/core/CMakeLists.txt

@@ -5 +5 @@
   Identifier.cc
   IdentifierDistributor.cc
+  InputHandler.cc
+  InputManager.cc
   MetaObjectList.cc
   ConfigValueContainer.cc
   Error.cc
   SignalHandler.cc
-  ArgReader.cc
   DebugLevel.cc
   OutputHandler.cc

code/trunk/src/orxonox/core/CorePrereqs.h

@@ -27 +27 @@
 
 /**
-    @file  CorePrereq.h
-    @brief Contains all the necessary forward declarations for all classes, structs and enums.
+  @file
+  @brief Contains all the necessary forward declarations for all classes and structs.
 */
 
@@ -36 +36 @@
 #include <string>
 
-#include "orxonox/OrxonoxPlatform.h"
+#include "OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------
@@ -67 +67 @@
   typedef std::string LanguageEntryLabel;
 
-  class ArgReader;
   class BaseFactory;
   class BaseMetaObjectListElement;
+  class BaseObject;
   template <class T>
   class ClassFactory;
@@ -86 +86 @@
   class Identifier;
   class IdentifierDistributor;
+  class InputHandlerGame;
+  class InputHandlerGUI;
+  class InputManager;
   template <class T>
   class Iterator;
@@ -103 +106 @@
   template <class T>
   class SubclassIdentifier;
+  class Tickable;
   template <class T, class O>
   class XMLPortClassObjectContainer;

code/trunk/src/orxonox/core/Factory.h

@@ -51 +51 @@
 namespace orxonox
 {
-    class BaseObject; // Forward declaration
-
     // ###############################
     // ###         Factory         ###

code/trunk/src/orxonox/core/Identifier.h

@@ -33 +33 @@
      - the name
      - a list with all objects
-     - parents and childs
+     - parents and children
      - the factory (if available)
      - the networkID that can be synchronised with the server
@@ -65 +65 @@
 namespace orxonox
 {
-    class BaseFactory; // Forward declaration
-    class BaseObject;  // Forward declaration
-
     // ###############################
     // ###       Identifier        ###

code/trunk/src/orxonox/core/MetaObjectList.h

@@ -113 +113 @@
         This allows much faster deletion of objects because no iteration is needed.
     */
-    class MetaObjectList
+    class _CoreExport MetaObjectList
     {
         public:

code/trunk/src/orxonox/core/Script.cc

@@ -38 +38 @@
 }
 
-#include "tolua++.h"
-#include "../../util/tolua/tolua_bind.h"
+#include "util/tolua/tolua++.h"
+#include "util/tolua/tolua_bind.h"
 
 namespace orxonox
@@ -57 +57 @@
   {
     output_ += str;
-    COUT(0) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
+    COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
   }
 
@@ -89 +89 @@
 
     if (luaTags) luaSource_ = replaceLuaTags(levelString);
-    COUT(0) << "ParsedSourceCode: " << luaSource_ << std::endl;
+    COUT(4) << "ParsedSourceCode: " << luaSource_ << std::endl;
   }
 
@@ -100 +100 @@
     if (error == 0)
       error = lua_pcall(luaState_, 0, 0, 0);
-    if (error != 0) COUT(0) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
+    if (error != 0) COUT(2) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
   }
 

code/trunk/src/orxonox/core/Tickable.h

@@ -46 +46 @@
 namespace orxonox
 {
-    //class TickFrameListener; // Forward declaration
-
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
     class _CoreExport Tickable : virtual public OrxonoxClass