Changeset 11736 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc

Timestamp:

Feb 11, 2018, 10:31:46 PM (6 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] some cleanup - Field and Belt should not depend on Pawn, should not be synchronized either (server-side logic). also removed additional constructors and replaced with regular setters.

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) (6 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc

@@ -45 +45 @@
 
 
-#include "../../orxonox/worldentities/pawns/Pawn.h"
-#include "../../orxonox/worldentities/WorldEntity.h"
-
 #include "SpicedAsteroidBelt.h"
 #include "SpicedAsteroidField.h"
@@ -54 +51 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "core/EventIncludes.h"
-#include "network/NetworkFunction.h"
 #include "util/Math.h"
 
@@ -64 +58 @@
     RegisterClass(SpicedAsteroidBelt);
 
-    SpicedAsteroidBelt::SpicedAsteroidBelt(Context* context) : Pawn(context) {
+    SpicedAsteroidBelt::SpicedAsteroidBelt(Context* context) : BaseObject(context) {
 
         RegisterObject(SpicedAsteroidBelt);
-
-        this->context = context; 
 
         // Default Values:
@@ -85 +77 @@
         this->tiltAt = 0.0; 
         this->tiltBy = 0.0;  
-
-        this->registerVariables();
 
     }
@@ -115 +105 @@
             
             Vector3 pos(radius*cos(sepp)*sin(globi), radius*sin(sepp)*sin(globi), radius*cos(globi));
-            new SpicedAsteroidField(this->context, this->position + pos, this->minSize, this->maxSize, width, segmentCount, this->foggy, this->mDensity, this->fogDensity);
-            
+
+            SpicedAsteroidField* field = new SpicedAsteroidField(this->getContext());
+            field->setPosition(this->position + pos);
+            field->setMinSize(this->minSize);
+            field->setMaxSize(this->maxSize);
+            field->setRadius(width);
+            field->setCount(segmentCount);
+            field->setFog(this->foggy);
+            field->setMineralDensity(this->mDensity);
+            field->setFogDensity(this->fogDensity);
         }
-        
     }
 
@@ -142 +139 @@
     }
 
-    void SpicedAsteroidBelt::XMLEventPort(Element& xmlelement, XMLPort::Mode mode){
-
-    }
-
-    void SpicedAsteroidBelt::registerVariables(){
-
-        registerVariable(this->count, VariableDirection::ToClient);
-        registerVariable(this->mDensity, VariableDirection::ToClient);
-        registerVariable(this->position, VariableDirection::ToClient);
-        registerVariable(this->segments, VariableDirection::ToClient);
-
-        registerVariable(this->maxSize, VariableDirection::ToClient);
-        registerVariable(this->minSize, VariableDirection::ToClient);
-        registerVariable(this->radius0, VariableDirection::ToClient);
-        registerVariable(this->radius1, VariableDirection::ToClient);
-        registerVariable(this->foggy, VariableDirection::ToClient);
-        registerVariable(this->fogDensity, VariableDirection::ToClient);
-
-        registerVariable(this->tiltAt, VariableDirection::ToClient);
-        registerVariable(this->tiltBy, VariableDirection::ToClient);
-
-    }
-
     void SpicedAsteroidBelt::tick(float dt){
 
         this->create();
-        this->bAlive_ = false;
         this->destroyLater();