Changeset 5730 for code/branches/libraries2/src/modules/objects/Planet.cc

Timestamp:

Aug 31, 2009, 10:38:48 PM (16 years ago)

Author:

landauf

Message:

Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport
Changed Paths in the files of the objects module
Compiles now again

Btw, I had to link the objects module into the weaponsystem module because the projectile is hardcoded at the moment and therefore needs a collision shape. This will be changed somewhen in the future.

File:

• code/branches/libraries2/src/modules/objects/Planet.cc (modified) (4 diffs)

code/branches/libraries2/src/modules/objects/Planet.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
-#include "Camera.h"
+#include "objects/worldentities/Camera.h"
 #include "CameraManager.h"
 
 namespace orxonox
 {
-    CreateFactory(Planet);    
+    CreateFactory(Planet);
 
     /**
@@ -60 +60 @@
         if (this->isInitialized() && this->mesh_.getEntity())
             this->detachOgreObject(this->mesh_.getEntity());
-    }    
+    }
 
     void Planet::tick(float dt)
@@ -107 +107 @@
         billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
 
-        this->attachOgreObject(this->billboard_.getBillboardSet());    
+        this->attachOgreObject(this->billboard_.getBillboardSet());
         this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
         this->setCastShadows(true);
@@ -148 +148 @@
         {
             XMLPortParam(Planet, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("planet/Atmosphere");
-            XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);     
-            XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);         
+            XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
+            XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
             XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
             XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);