Changeset 258 for code/trunk/src/orxonox

Timestamp:

Nov 26, 2007, 4:26:17 PM (17 years ago)

Author:

landauf

Message:

merged object-hierarchy back to trunk

Location:

code/trunk/src/orxonox

Files:

• . (copied) (copied from code/branches/objecthierarchie/src/orxonox)
• core (copied) (copied from code/branches/objecthierarchie/src/orxonox/core)
• core/ClassFactory.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/ClassFactory.h)
• core/Factory.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/Factory.cc)
• core/Factory.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/Factory.h)
• core/Identifier.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/Identifier.cc)
• core/Identifier.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/Identifier.h)
• core/IdentifierIncludes.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/IdentifierIncludes.h)
• core/IdentifierList.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/IdentifierList.cc)
• core/IdentifierList.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/IdentifierList.h)
• core/Iterator.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/Iterator.h)
• core/MetaObjectList.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/MetaObjectList.cc)
• core/MetaObjectList.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/MetaObjectList.h)
• core/ObjectList.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/ObjectList.h)
• core/OrxonoxClass.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/OrxonoxClass.cc)
• core/OrxonoxClass.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/core/OrxonoxClass.h)
• objects (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects)
• objects/BaseObject.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/BaseObject.cc)
• objects/BaseObject.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/BaseObject.h)
• objects/Test.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/Test.h)
• objects/test1.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test1.cc)
• objects/test1.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test1.h)
• objects/test2.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test2.cc)
• objects/test2.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test2.h)
• objects/test3.cc (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test3.cc)
• objects/test3.h (copied) (copied from code/branches/objecthierarchie/src/orxonox/objects/test3.h)
• orxonox.cc (moved) (moved from code/trunk/src/orxonox.cc) (2 diffs)

code/trunk/src/orxonox/orxonox.cc

@@ -39 +39 @@
 #include <iostream>
 
-#include "xml/xmlParser.h"
-#include "loader/LevelLoader.h"
+#include "../xml/xmlParser.h"
+#include "../loader/LevelLoader.h"
 
 
@@ -194 +194 @@
       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }
-    
+
     void setupScene()
     {