Changeset 2435 for code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc

Timestamp:

Dec 14, 2008, 1:42:17 AM (15 years ago)

Author:

rgrieder

Message:

• updated msvc files
• Fixed build by including util/Integer.h in NetworkPrereqs.h instead of util/Math.h
• Fixed issue with a this pointer used in the base class c'tor initialisation
• Fixed build under windows: INFINITE seems to be a macro, defined in winbase.h. Constant was somewhere in the quest files.
• Fixed build: Only integral types can have header-file value when declared as static const. Float is not supported by the standard.
• Fixed a potential bug in Planet.cc: "if (cond) doOne; doTwo" —> missing brances (indentation was correct, so I assume there have to be brances)
• Corrected lots of indentation problems with tabs/spaces mix.
• Changed all "@file Blubb.h" to "@file": Doxygen then assumes the actual filename. This gives more flexibility.

File:

• code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc (modified) (8 diffs)

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

@@ -27 +27 @@
  */
 
-
 #include "OrxonoxStableHeaders.h"
 #include "Planet.h"
 
-#include "tinyxml/tinyxml.h"
-#include "core/CoreIncludes.h"
-#include "GraphicsEngine.h"
-#include "core/XMLPort.h"
-#include "CameraManager.h"
-#include "objects/Scene.h"
-#include "Camera.h"
 #include <math.h>
 
@@ -45 +37 @@
 #include <OgreMeshManager.h>
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "objects/Scene.h"
+#include "CameraManager.h"
+#include "Camera.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -67 +65 @@
             this->getNode()->detachObject(this->mesh_.getEntity());
     }    
-    
+
     void Planet::tick(float dt)
     {
         if(!this->isVisible())
             return;
-            
+
         Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
-        if(activeCamera)
-        {
+        if(activeCamera)
+        {
             Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
-//             COUT(2) << distance << std::endl;
+            //             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;
-        
+
             this->billboard_.getBillboardSet()->setDefaultDimensions(newScale, newScale);
-        }
-                
+        }
+
         SUPER(Planet, tick, dt);
     }
-  
-    void Planet::init(){
-    
+
+    void Planet::init()
+    {
         Real scaleFactor = this->getScale();
-        
+
         this->distList.push_back(10.0*scaleFactor);
         this->distList.push_back(19.0*scaleFactor);
@@ -104 +102 @@
         this->distList.push_back(54.0*scaleFactor);
         this->distList.push_back(55.0*scaleFactor);
-        
+
         Real reductionValue = 0.2;
-        
+
         this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
         billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
-        
+
         this->getNode()->attachObject(this->billboard_.getBillboardSet());    
         this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
@@ -116 +114 @@
         this->mesh_.setCastShadows(true);
     }
-    
+
     void Planet::changedMesh()
     {
@@ -147 +145 @@
     {
         SUPER(Planet, XMLPort, xmlelement, mode);
-        
+
         XMLPortParam(Planet, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("planet/Atmosphere");
         XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);     
@@ -153 +151 @@
         XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
-        
     }
 
-    void Planet::registerVariables(){
+    void Planet::registerVariables()
+    {
         registerVariable(this->atmosphere_, variableDirection::toclient);
         registerVariable(this->meshSrc_, variableDirection::toclient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
@@ -168 +166 @@
         SUPER(Planet, changedVisibility);
         if (this->isInitialized())
+        {
             this->mesh_.setVisible(this->isVisible());
             this->billboard_.setVisible(this->isVisible());
+        }
     }
 }