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

Timestamp:

May 22, 2010, 8:43:39 PM (14 years ago)

Author:

scheusso

Message:

fix in ClassID (thanks reto)
fix in Rocket
small improvements in model
weakptr synchronisable

File:

• code/branches/presentation3/src/orxonox/graphics/Model.cc (modified) (1 diff)

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

@@ -113 +113 @@
                     }
                     
-                    Level* level_ = this->getLevel();
+                    Level* level = this->getLevel();
                     
-                    // 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());
+                    assert( level != 0 );
+                    if( 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;