Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 21, 2010, 6:50:07 PM (15 years ago)
Author:
scheusso
Message:

fixed to make everything network-compliant again

Location:
code/branches/presentation3/src/orxonox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/src/orxonox/Level.cc

    r6926 r6961  
    127127        this->objects_.push_back(object);
    128128        object->setGametype(this->getGametype());
    129     object->setLevel(this);
     129        object->setLevel(this);
    130130    }
    131131
  • code/branches/presentation3/src/orxonox/Scene.cc

    r6417 r6961  
    4747#include "Radar.h"
    4848#include "worldentities/WorldEntity.h"
     49#include "Level.h"
    4950
    5051namespace orxonox
     
    133134        registerVariable(this->bHasPhysics_,        VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_hasPhysics));
    134135        registerVariable(this->bShadows_,           VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::networkcallback_applyShadows));
     136        registerVariable(this->getLevel(),          VariableDirection::ToClient, new NetworkCallback<Scene>(this, &Scene::changedLevel));
    135137    }
    136138
  • code/branches/presentation3/src/orxonox/graphics/Model.cc

    r6942 r6961  
    115115                    Level* level_ = this->getLevel();
    116116                   
    117                     MeshLodInformation* lodInfo = level_->getLodInfo(this->meshSrc_);
    118                    
    119                     if(lodInfo!=0)
    120                         setLodLevel(lodInfo->getLodLevel());
     117                    // TODO: make this also working on the client (there is currently no level pointer in the baseobject on the client)
     118                    if( level_ != 0 && level_->getLodInfo(this->meshSrc_)!=0 )
     119                        setLodLevel(level_->getLodInfo(this->meshSrc_)->getLodLevel());
    121120                   
    122121                    COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and scale: "<< scaleFactor << ":" << std::endl;
  • code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc

    r6942 r6961  
    3131#include "util/StringUtils.h"
    3232#include "core/CoreIncludes.h"
     33#include "core/GameMode.h"
    3334#include "worldentities/WorldEntity.h"
    3435#include "Radar.h"
     
    5253
    5354        this->uniqueId_=getUniqueNumberString();
    54         this->radar_ = this->creator_->getScene()->getRadar();
    55         this->radar_->addRadarObject(this);
     55        if( GameMode::showsGraphics() )
     56        {
     57            this->radar_ = this->creator_->getScene()->getRadar();
     58            this->radar_->addRadarObject(this);
     59        }
    5660        this->bInitialized_ = true;
    5761    }
     
    6064    RadarViewable::~RadarViewable()
    6165    {
     66       
    6267        if( this->bInitialized_ )
    63             this->radar_->removeRadarObject(this);
     68        {
     69            if( GameMode::showsGraphics() )
     70            {
     71                this->radar_->removeRadarObject(this);
     72            }
     73        }
    6474    }
    6575
     
    101111    void RadarViewable::settingsChanged()
    102112    {
    103         this->radar_->radarObjectChanged(this);
     113        if( GameMode::showsGraphics() )
     114        {
     115            this->radar_->radarObjectChanged(this);
     116        }
    104117    }
    105118}
Note: See TracChangeset for help on using the changeset viewer.