Changeset 11615 for code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc

Timestamp:

Dec 1, 2017, 8:40:42 PM (6 years ago)

Author:

remartin

Message:

Gebastel in spawnChildren, hat immer noch Fehler drin.

File:

• code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) (5 diffs)

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

@@ -42 +42 @@
 
 #include "SpicedAsteroidField.h"
+#include "AsteroidMinable.h"
 
 #include <algorithm>
@@ -50 +51 @@
 #include "core/EventIncludes.h"
 #include "network/NetworkFunction.h"
+#include "util/Math.h"
 
 // #include "infos/PlayerInfo.h"
@@ -61 +63 @@
 // #include "controllers/FormationController.h"
 
-#include "../pickup/items/HealthPickup.h"
-#include "../pickup/PickupSpawner.h"
-#include "../pickup/Pickup.h"
+
 //#include "../pickup/pickup ..... pickupable
 #include "../objects/collisionshapes/SphereCollisionShape.h"
@@ -110 +110 @@
         SUPER(SpicedAsteroidField, XMLPort, xmlelement, mode);
         //        XMLPortParam(PickupSpawner, "pickup", setPickupTemplateName, getPickupTemplateName, xmlelement, mode);
-        XMLPortParam(SpicedAsteroidField, "size", setSize, getSize, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "count", setCount, getCount, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "mDensity", setMineralDensity, getMineralDensity, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "position", setPosition, getPosition, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "maxSize", setMaxSize, getMaxSize, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "minSize", setMinSize, getMinSize, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "radius", setRadius, getRadius, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidField, "foggy", setFog, isFoggy, xmlelement, mode);
+
 
     }
+
+
+
 
     void SpicedAsteroidField::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
@@ -151 +161 @@
     }
 
-    void SpicedAsteroidField::setSize(float s){
-        this->size = s;
-    }
 
-    float SpicedAsteroidField::getSize(){
-        return this->size;
-    }