Changeset 11664 for code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h

Timestamp:

Dec 11, 2017, 6:05:17 PM (6 years ago)

Author:

remartin

Message:

SpicedAsteroidBelt erstellt, kosmetische Veränderungen. Offener Punkt um velocity, ansonsten fehlt nur noch das dokumentieren.

File:

• code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) (4 diffs)

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

@@ -27 +27 @@
  */
 
+/**
+
+    @file SpicedAsteroidField.h
+    @brief Asteroid field with lots of parameters. Derived from asteroidField.lua
+
+
+*/
+
 #ifndef _SpicedAsteroidField_H__
 #define _SpicedAsteroidField_H__
@@ -34 +42 @@
 #include <string>
 #include <vector>
-#include "interfaces/PickupCarrier.h"
-#include "interfaces/RadarViewable.h"
+
 #include "worldentities/ControllableEntity.h"
-#include "worldentities/ExplosionPart.h"
-
 #include "../../orxonox/worldentities/pawns/Pawn.h"
 
 namespace orxonox // tolua_export
 {
-
 
     // tolua_export
@@ -51 +55 @@
         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); 
 
             virtual ~SpicedAsteroidField();
@@ -83 +88 @@
 
         protected:
-            // Da neue Argumente reinstellen
-            //float asteroidVersion; // Bodenstrich-Konvention?, 
-            // Wert zwischen 1 und 6 (Spezialdinger?), die Mesh-Form
+
+            Context* context;
+
             float count;
             float mDensity; // Mineral density, between 0 and 1;
 
             Vector3 position;
-            Context* context;
             
             int maxSize;