Changeset 2411 for code

Timestamp:

Dec 11, 2008, 9:21:20 PM (16 years ago)

Author:

scheusso

Message:

Client doesn't segfault now anymore, but the atmospheres are all attached to the same planet with the scaling of the
other planet …

File:

• code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) (3 diffs)

code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc

@@ -74 +74 @@
             
         Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
-        Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
-        COUT(2) << distance << std::endl;
-        Real planetRadius = this->getScale();
+        if(activeCamera)
+        {
+            Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
+            COUT(2) << distance << std::endl;
+            Real planetRadius = this->getScale();
         
-        Real newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
-        Real tempTest = newScale*(1+Real(this->atmosphereSize)/Real(this->imageSize));
-        newScale = tempTest;
+            Real newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
+            Real tempTest = newScale*(1+Real(this->atmosphereSize)/Real(this->imageSize));
+            newScale = tempTest;
         
-        this->billboard_.getBillboardSet()->setDefaultDimensions(newScale, newScale);
+            this->billboard_.getBillboardSet()->setDefaultDimensions(newScale, newScale);
+        }
                 
         SUPER(Planet, tick, dt);
@@ -116 +119 @@
     void Planet::changedMesh()
     {
+COUT(0) << "changedMesh callback -===================" << endl;
         if (this->mesh_.getEntity())
             this->getNode()->detachObject(this->mesh_.getEntity());
@@ -154 +158 @@
 
     void Planet::registerVariables(){
-        //REGISTERSTRING(this->meshSrc_,    network::direction::toclient, new network::NetworkCallback<Planet>(this, &Planet::changedMesh));
-        //REGISTERDATA(this->bCastShadows_, network::direction::toclient, new network::NetworkCallback<Planet>(this, &Planet::changedShadows));
+        REGISTERSTRING(this->atmosphere_, direction::toclient);
+        REGISTERSTRING(this->meshSrc_, direction::toclient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
+        REGISTERDATA(this->bCastShadows_, direction::toclient, new NetworkCallback<Planet>(this, &Planet::changedShadows));
     }