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

Timestamp:

Feb 11, 2018, 10:31:46 PM (7 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/SpicedAsteroidField.cc (modified) (7 diffs)

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

@@ -40 +40 @@
 
 
-#include "../../orxonox/worldentities/pawns/Pawn.h"
-#include "../../orxonox/worldentities/WorldEntity.h"
-
 #include "SpicedAsteroidField.h"
 #include "AsteroidMinable.h"
@@ -49 +46 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "core/EventIncludes.h"
-#include "network/NetworkFunction.h"
 #include "util/Math.h"
 
-#include "../../orxonox/graphics/Billboard.h"
+#include "graphics/Billboard.h"
 
 
@@ -62 +56 @@
     RegisterClass(SpicedAsteroidField);
 
-    SpicedAsteroidField::SpicedAsteroidField(Context* context) : Pawn(context) {
+    SpicedAsteroidField::SpicedAsteroidField(Context* context) : BaseObject(context) {
 
         RegisterObject(SpicedAsteroidField);
-        this->context = context;
 
         // Default Values: 
@@ -76 +69 @@
         this->foggy = true; 
         this->fogDensity = 0.5;
-
-        this->registerVariables();
     }
-
-    SpicedAsteroidField::SpicedAsteroidField(Context* c, Vector3 p, int minS, int maxS, int w, int count, bool f, float mD, float fD): Pawn(c){
-
-        this->context = c;
-        this->position = p; 
-        this->minSize = minS; 
-        this->maxSize = maxS; 
-        this->radius = w; 
-        this->count = count; 
-        this->foggy = f; 
-
-        this->mDensity = mD;
-        this->fogDensity = fD; 
-
-    }
-
 
     SpicedAsteroidField::~SpicedAsteroidField(){
@@ -109 +84 @@
         for(int gertrud = 0; gertrud<count; ++gertrud){
 
-            AsteroidMinable* a = new AsteroidMinable(this->context);
+            AsteroidMinable* a = new AsteroidMinable(this->getContext());
 
             size = round(rnd()*(this->maxSize - this->minSize)) + this->minSize;
@@ -121 +96 @@
 
             bool spiced = (rnd() < (this->mDensity)); // Whether the asteroid does drop pickups etc. 
-            a->toggleDropStuff(spiced);
-            
-            a->setVelocity(this->getVelocity()); 
+            a->setDropStuff(spiced);
             
             // Fog is iplemented with billboards (as in asteroidField.lua, that bloke had the idea)
             if(this->foggy && mod(gertrud, 5) == 0){
-                Billboard* bb = new Billboard(this->context);
+                Billboard* bb = new Billboard(this->getContext());
                 bb->setPosition(this->position + relPos);
                 bb->setMaterial("Smoke/Smoke");
@@ -151 +124 @@
     }
 
-
-    void SpicedAsteroidField::XMLEventPort(Element& xmlelement, XMLPort::Mode mode){
-
-    }
-
-    void SpicedAsteroidField::registerVariables(){
-
-        registerVariable(this->count, VariableDirection::ToClient);
-        registerVariable(this->mDensity, VariableDirection::ToClient);
-        registerVariable(this->position, VariableDirection::ToClient);
-        registerVariable(this->maxSize, VariableDirection::ToClient);
-        registerVariable(this->minSize, VariableDirection::ToClient);
-        registerVariable(this->radius, VariableDirection::ToClient);
-        registerVariable(this->foggy, VariableDirection::ToClient);
-        registerVariable(this->fogDensity, VariableDirection::ToClient);
-
-    }
-
     void SpicedAsteroidField::tick(float dt){
 
         this->create();
-        this->bAlive_ = false;
         this->destroyLater();
     }