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

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/SpicedAsteroidField.h (modified) (4 diffs)

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

@@ -43 +43 @@
 #include "AsteroidMiningPrereqs.h"
 
-#include <string>
-#include <vector>
-
-#include "worldentities/ControllableEntity.h"
-#include "../../orxonox/worldentities/pawns/Pawn.h"
+#include "core/BaseObject.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox // tolua_export
@@ -53 +50 @@
 
     // tolua_export
-    class _AsteroidMiningExport SpicedAsteroidField : public Pawn // need pawn to get tick for clean argument passing
+    class _AsteroidMiningExport SpicedAsteroidField : public BaseObject, public Tickable
     { // tolua_export
 
         public:
-            SpicedAsteroidField(Context* context);// This constructor is for XML access only!
-            SpicedAsteroidField(Context* c, Vector3 p, int minS, int maxS, int w, int count, bool f, float mD, float fD); 
+            SpicedAsteroidField(Context* context);
+            virtual ~SpicedAsteroidField();
 
-            virtual ~SpicedAsteroidField();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void tick(float dt) override;
-
 
             inline void setCount(float s){this->count = s;}
@@ -92 +86 @@
         protected:
 
-            Context* context;
-
             float count; //!< Number of asteroids generated
             float mDensity; //!< Mineral density, between 0 and 1;
@@ -108 +100 @@
 
         private:
-            void registerVariables();
-
             virtual void create();