Changeset 482 for code/branches/FICN

Timestamp:

Dec 12, 2007, 8:19:40 PM (17 years ago)

Author:

nicolape

Message:

Added example implementation of world entity

Location:

code/branches/FICN/src

Files:

• network/CMakeLists.txt (modified) (4 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/test1.cc (modified) (2 diffs)
• orxonox/orxonox.cc (modified) (2 diffs)

code/branches/FICN/src/network/CMakeLists.txt

@@ -43 +43 @@
   network
   core
-  objects
+  #objects
 )
 
@@ -51 +51 @@
   network
   core
-  objects
+  #objects
 )
 
@@ -60 +60 @@
   network
   core
-  objects
+  #objects
 )
 TARGET_LINK_LIBRARIES( server
@@ -66 +66 @@
   network
   core
-  objects
+  #objects
 )
 

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -18 +18 @@
 )
 
+ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
+
 ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES})
 

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -12 +12 @@
 TARGET_LINK_LIBRARIES( objects
   xml
+  orxonox
 )

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

@@ -3 +3 @@
 #include "test3.h"
 #include "../../tinyxml/tinyxml.h"
+#include "../orxonox.h"
+#include <OgreSceneManager.h>
 
 namespace orxonox
@@ -70 +72 @@
     void Test1::loadParams(TiXmlElement* xmlElem)
     {
+        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
+        
+        mgr->setAmbientLight(ColourValue(1,0,0));
+        
+        
+        
         std::cout<< xmlElem->GetText()<<std::endl;
+        
+        
     }
 }

code/branches/FICN/src/orxonox/orxonox.cc

@@ -360 +360 @@
     Viewport *vp = ogre_->getRoot()->getAutoCreatedWindow()->addViewport(cam);
 
-
-    mgr->setAmbientLight(ColourValue(1,1,1));
+    
     Entity* head = mgr->createEntity("head", "razor.mesh");
     SceneNode *node = mgr->getRootSceneNode()->createChildSceneNode("OgreHeadNode", Vector3(0,0,0));
@@ -387 +386 @@
     steering->addNode(node);
 
+
   }