Changeset 665

Timestamp:

Dec 21, 2007, 10:59:03 AM (16 years ago)

Author:

nicolasc

Message:

• removed presentation folder - unneeded
• fixed cmakeclearcache for for good

Location:

code/branches/FICN

Files:

• cmakeclearcache (modified) (1 diff)
• presentation (deleted)
• src/audio/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (7 diffs)

code/branches/FICN/cmakeclearcache

@@ -2 +2 @@
 # Clears the cmake cache
 # Author: Nicolas Perrenoud <nicolape@ee.ethz.ch>
+# Co-Author: Nicolas Schlumberger <nico_at_orxonox.net>
 
 find . -name "CMakeCache.txt" -exec rm -f {} \;
-find . -name "cmake_install" -exec rm -f {} \;
+find . -name "cmake_install.camke" -exec rm -f {} \;
 find . -name "CMakeFiles" -exec rm -fr {} \;
-find . -name "Makefile*" -exec rm -fr {} \;
+find . -name "Makefile" -exec rm -fr {} \;
 
 echo "Cmake Cache cleared!"

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

@@ -2 +2 @@
 
 SET(SRC_FILES
-        AudioIncludes.h
-        AudioManager.cc
-        AudioBuffer.cc
-        AudioSource.cc
-        AudioStream.cc
+  AudioIncludes.h
+  AudioManager.cc
+  AudioBuffer.cc
+  AudioSource.cc
+  AudioStream.cc
 )
 

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

@@ -94 +94 @@
         updateAI();
 
-        if(mode_==PRESENTATION)
+        if(mode_ == PRESENTATION)
           server_g->tick(evt.timeSinceLastFrame);
-        else if(mode_==CLIENT)
+        else if(mode_ == CLIENT)
           client_g->tick(evt.timeSinceLastFrame);
 
@@ -277 +277 @@
     createFrameListener();
     try{
-      server_g = new network::Server(); // add port and bindadress
-      server_g->open(); // open server and create listener thread
+      server_g = new network::Server(); //!< add port and bindadress
+      server_g->open(); //!< open server and create listener thread
       if(ogre_ && ogre_->getRoot())
         ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
@@ -301 +301 @@
     ogre_->setConfigPath(path);
     ogre_->setup();
-    server_g = new network::Server(); // add some settings if wanted
+    server_g = new network::Server(); // FIXME add some settings if wanted
     if(!ogre_->load()) die(/* unable to load */);
-    // add network framelistener
+    // FIXME add network framelistener
   }
 
@@ -426 +426 @@
     // fixes auto repeat problem
     #if defined OIS_LINUX_PLATFORM
-    pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+      pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
     #endif
 
@@ -446 +446 @@
   }
 
-  // we actually want to do this differently...
+  // FIXME we actually want to do this differently...
   void Orxonox::createFrameListener()
   {
@@ -455 +455 @@
     ogre_->getRoot()->addFrameListener(TimerFL);
 
-    //if(mode_!=CLIENT) // just a hack ------- remove this in future
+    //if(mode_!=CLIENT) // FIXME just a hack ------- remove this in future
       frameListener_ = new OrxListener(keyboard_, auMan_, mode_);
     ogre_->getRoot()->addFrameListener(frameListener_);
@@ -462 +462 @@
   void Orxonox::startRenderLoop()
   {
+    // FIXME
     // this is a hack!!!
     // the call to reset the mouse clipping size should probably be somewhere