Changeset 6961 for code/branches/presentation3/src/orxonox

Timestamp:

May 21, 2010, 6:50:07 PM (14 years ago)

Author:

scheusso

Message:

fixed to make everything network-compliant again

Location:

code/branches/presentation3/src/orxonox

Files:

• Level.cc (modified) (1 diff)
• Scene.cc (modified) (2 diffs)
• graphics/Model.cc (modified) (1 diff)
• interfaces/RadarViewable.cc (modified) (4 diffs)

code/branches/presentation3/src/orxonox/Level.cc

@@ -127 +127 @@
         this->objects_.push_back(object);
         object->setGametype(this->getGametype());
-    object->setLevel(this);
+        object->setLevel(this);
     }
 

code/branches/presentation3/src/orxonox/Scene.cc

@@ -47 +47 @@
 #include "Radar.h"
 #include "worldentities/WorldEntity.h"
+#include "Level.h"
 
 namespace orxonox
@@ -133 +134 @@
         registerVariable(this->bHasPhysics_,        VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_hasPhysics));
         registerVariable(this->bShadows_,           VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_applyShadows));
+        registerVariable(this->getLevel(),          VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::changedLevel));
     }
 

code/branches/presentation3/src/orxonox/graphics/Model.cc

@@ -115 +115 @@
                     Level* level_ = this->getLevel();
                     
-                    MeshLodInformation* lodInfo = level_->getLodInfo(this->meshSrc_);
-                    
-                    if(lodInfo!=0)
-                        setLodLevel(lodInfo->getLodLevel());
+                    // TODO: make this also working on the client (there is currently no level pointer in the baseobject on the client)
+                    if( level_ != 0 && level_->getLodInfo(this->meshSrc_)!=0 )
+                        setLodLevel(level_->getLodInfo(this->meshSrc_)->getLodLevel());
                     
                     COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and scale: "<< scaleFactor << ":" << std::endl;

code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc

@@ -31 +31 @@
 #include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
 #include "worldentities/WorldEntity.h"
 #include "Radar.h"
@@ -52 +53 @@
 
         this->uniqueId_=getUniqueNumberString();
-        this->radar_ = this->creator_->getScene()->getRadar();
-        this->radar_->addRadarObject(this);
+        if( GameMode::showsGraphics() )
+        {
+            this->radar_ = this->creator_->getScene()->getRadar();
+            this->radar_->addRadarObject(this);
+        }
         this->bInitialized_ = true;
     }
@@ -60 +64 @@
     RadarViewable::~RadarViewable()
     {
+        
         if( this->bInitialized_ )
-            this->radar_->removeRadarObject(this);
+        {
+            if( GameMode::showsGraphics() )
+            {
+                this->radar_->removeRadarObject(this);
+            }
+        }
     }
 
@@ -101 +111 @@
     void RadarViewable::settingsChanged()
     {
-        this->radar_->radarObjectChanged(this);
+        if( GameMode::showsGraphics() )
+        {
+            this->radar_->radarObjectChanged(this);
+        }
     }
 }