Changeset 1638 for code/branches/gui/src/orxonox/objects

Timestamp:

Jul 20, 2008, 7:49:26 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch into gui test branch (was about time)
svn save (it's still a mess and CMLs haven't been updated)
I'll have to create a special project to create the tolua_bind files for tolua itself anyway..

Location:

code/branches/gui

Files:

• . (modified) (1 prop)
• src/orxonox/objects/Ambient.cc (modified) (2 diffs)
• src/orxonox/objects/Backlight.cc (modified) (3 diffs)
• src/orxonox/objects/Camera.cc (modified) (2 diffs)
• src/orxonox/objects/CameraHandler.cc (modified) (1 diff)
• src/orxonox/objects/ParticleSpawner.cc (modified) (1 diff)
• src/orxonox/objects/Projectile.cc (modified) (1 diff)
• src/orxonox/objects/Skybox.cc (modified) (2 diffs)
• src/orxonox/objects/Tickable.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (4 diffs)

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

@@ -65 +65 @@
 
     bool Ambient::create(){
-      GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(ambientLight_);
+      GraphicsEngine::getSingleton().getLevelSceneManager()->setAmbientLight(ambientLight_);
       return Synchronisable::create();
     }
@@ -76 +76 @@
     void Ambient::setAmbientLight(const ColourValue& colour)
     {
-            GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
+        GraphicsEngine::getSingleton().getLevelSceneManager()->setAmbientLight(colour);
       ambientLight_=colour;     
     }

code/branches/gui/src/orxonox/objects/Backlight.cc

@@ -58 +58 @@
         this->attachObject(this->billboard_.getBillboardSet());
 
-        this->ribbonTrail_ = GraphicsEngine::getSingleton().getSceneManager()->createRibbonTrail(this->getName() + "RibbonTrail");
-        this->ribbonTrailNode_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName() + "RibbonTrailNode");
+        this->ribbonTrail_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createRibbonTrail(this->getName() + "RibbonTrail");
+        this->ribbonTrailNode_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName() + "RibbonTrailNode");
         this->ribbonTrailNode_->attachObject(this->ribbonTrail_);
         this->ribbonTrail_->addNode(this->getNode());
@@ -68 +68 @@
         this->ribbonTrail_->setMaterialName("Trail/backlighttrail");
 
-        this->setTimeFactor(Orxonox::getSingleton()->getTimeFactor());
+        this->setTimeFactor(Orxonox::getSingleton().getTimeFactor());
     }
 
@@ -76 +76 @@
         {
             this->detachObject(this->billboard_.getBillboardSet());
-            GraphicsEngine::getSingleton().getSceneManager()->destroySceneNode(this->getName() + "RibbonTrailNode");
-            GraphicsEngine::getSingleton().getSceneManager()->destroyRibbonTrail(this->ribbonTrail_);
+            GraphicsEngine::getSingleton().getLevelSceneManager()->destroySceneNode(this->getName() + "RibbonTrailNode");
+            GraphicsEngine::getSingleton().getLevelSceneManager()->destroyRibbonTrail(this->ribbonTrail_);
         }
     }

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

@@ -52 +52 @@
   {
     this->bHasFocus_ = false;
-    this->cameraNode_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(node->getName() + "Camera");
+    this->cameraNode_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(node->getName() + "Camera");
     if( node != NULL )
       this->setPositionNode(node);
@@ -60 +60 @@
   {
     CameraHandler::getInstance()->releaseFocus(this);
-    GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeAndDestroyChild(cameraNode_->getName());
+    GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeAndDestroyChild(cameraNode_->getName());
   }
 

code/branches/gui/src/orxonox/objects/CameraHandler.cc

@@ -44 +44 @@
   CameraHandler::CameraHandler()
   {
-    this->cam_ = GraphicsEngine::getSingleton().getSceneManager()->createCamera("Cam");
-    GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_);
+    this->cam_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createCamera("Cam");
+    GraphicsEngine::getSingleton().getLevelViewport()->setCamera(this->cam_);
+    GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
     /*this->activeCamera_ = *ObjectList<Camera>::begin();
     this->activeCamera_->cam_ = this->cam_;*/

code/branches/gui/src/orxonox/objects/ParticleSpawner.cc

@@ -79 +79 @@
         this->setPosition(this->getNode()->getParent()->getPosition());
         this->getNode()->getParent()->removeChild(this->getNode());
-        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->addChild(this->getNode());
+        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->addChild(this->getNode());
         if (this->particle_)
             this->particle_->setEnabled(false);

code/branches/gui/src/orxonox/objects/Projectile.cc

@@ -75 +75 @@
         SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second");
 
-        if(this->owner_)
+    if(this->owner_)
           this->setVelocity(this->owner_->getInitialDir() * this->speed_);
     }

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

@@ -56 +56 @@
     void Skybox::setSkybox(const std::string& skyboxname)
     {
-        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(true, skyboxname);
+        GraphicsEngine::getSingleton().getLevelSceneManager()->setSkyBox(true, skyboxname);
     }
 
@@ -92 +92 @@
     {
         BaseObject::changedVisibility();
-        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);
+        GraphicsEngine::getSingleton().getLevelSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);
     }
 }

code/branches/gui/src/orxonox/objects/Tickable.h

@@ -29 +29 @@
 /*!
     @file Tickable.h
-    @brief Definition of the Tickable interface.
+    @brief Declaration of the Tickable interface.
 
     The Tickable interface provides a tick(dt) function, that gets called every frame.

code/branches/gui/src/orxonox/objects/WorldEntity.cc

@@ -49 +49 @@
         RegisterObject(WorldEntity);
 
-        if (GraphicsEngine::getSingleton().getSceneManager())
+        if (GraphicsEngine::getSingleton().getLevelSceneManager())
         {
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            this->node_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            this->node_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
 
             registerAllVariables();
@@ -77 +77 @@
         {
             this->getNode()->removeAndDestroyAllChildren();
-            GraphicsEngine::getSingleton().getSceneManager()->destroySceneNode(this->getName());
+            GraphicsEngine::getSingleton().getLevelSceneManager()->destroySceneNode(this->getName());
         }
     }
@@ -178 +178 @@
     void WorldEntity::attachObject(const WorldEntity& obj) const
     {
-        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
+        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
         this->getNode()->addChild(obj.getNode());
     }
@@ -184 +184 @@
     void WorldEntity::attachObject(WorldEntity* obj) const
     {
-        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
+        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
         this->getNode()->addChild(obj->getNode());
     }