Changeset 560 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 17, 2007, 3:20:46 AM (17 years ago)

Author:

landauf

Message:

• changed output from std::cout to COUT(level)
• added SoftDebugLevel config-variable (its a hack, but it works fine)

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Ambient.cc (modified) (2 diffs)
• Camera.cc (modified) (3 diffs)
• Entity.cc (modified) (4 diffs)
• SceneNode.cc (modified) (3 diffs)
• Skybox.cc (modified) (2 diffs)
• SpaceshipSteeringObject.cc (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Ambient.h"
@@ -64 +65 @@
                 mgr->setAmbientLight(ColourValue(r,g,b));
 
-                std::cout << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
+                COUT(4) << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
         }
    }

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

@@ -11 +11 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Camera.h"
@@ -30 +31 @@
     {
         Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-        
+
         if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
         {
                 //              <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
-                
+
                 std::string name = xmlElem->Attribute("name");
                 std::string pos = xmlElem->Attribute("pos");
@@ -57 +58 @@
 
                 std::string node = xmlElem->Attribute("node");
-                
+
                     Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(node);
                     sceneNode->attachObject((Ogre::MovableObject*)cam);
-            
-                
+
+
                     Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
-                            
 
-                std::cout << "Loader: Created camera "<< name  << std::endl << std::endl;
-        }       
+
+                COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
+        }
    }
 }

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

@@ -6 +6 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Entity.h"
@@ -25 +26 @@
     {
         Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-        
+
         if (xmlElem->Attribute("name") && xmlElem->Attribute("src") && xmlElem->Attribute("node"))
         {
@@ -31 +32 @@
                 std::string src = xmlElem->Attribute("src");
                 std::string node = xmlElem->Attribute("node");
-                        
+
                         Ogre::Entity* entity = mgr->createEntity(name, src);
 
@@ -37 +38 @@
                     sceneNode->attachObject((Ogre::MovableObject*)entity);
 
-                std::cout << "Loader: Created entity "<< name <<" with source " << src  << " at node " << node  << std::endl << std::endl;
-        }       
+                COUT(4) << "Loader: Created entity "<< name <<" with source " << src  << " at node " << node  << std::endl << std::endl;
+        }
    }
-   
+
 }

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

@@ -6 +6 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "SceneNode.h"
@@ -25 +26 @@
     {
         Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-        
+
         if (xmlElem->Attribute("name") && xmlElem->Attribute("pos"))
         {
@@ -36 +37 @@
                 String2Number<float>(z, pos[2]);
 
-                
+
                 mgr->getRootSceneNode()->createChildSceneNode(name, Vector3(x,y,z));
-                
-                std::cout << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;
-        }       
+
+                COUT(4) << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;
+        }
    }
 }

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

@@ -33 +33 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Skybox.h"
@@ -58 +59 @@
                 mgr->setSkyBox(true, skyboxSrc);
 
-                std::cout << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
+                COUT(4) << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
         }
    }

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

@@ -11 +11 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "SpaceshipSteeringObject.h"
@@ -32 +33 @@
     {
         SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
-        
+
         if (xmlElem->Attribute("node") && xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
         {
@@ -46 +47 @@
                 String2Number<float>(rotaterightleft, rotaterightleftStr);
                 String2Number<float>(looprightleft, looprightleftStr);
-            
+
                 steering = new SpaceshipSteering(forward, rotateupdown, rotaterightleft, looprightleft);
-                
+
                 Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
                     Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(nodeStr);
-                                        
+
                 steering->addNode(sceneNode);
-    
-    
-    
-    
-                std::cout << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
-        }       
+
+
+
+
+                COUT(4) << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
+        }
    }
 }