Changeset 11520

Timestamp:

Oct 30, 2017, 4:12:04 PM (6 years ago)

Author:

remartin

Message:

Added spawning of pickup and smaller asteroids, doesn't work yet.

Location:

code/branches/AsteroidMining_HS17

Files:

• data/levels/AsteroidFarming.oxw (modified) (2 diffs)
• src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified) (6 diffs)
• src/orxonox/worldentities/pawns/AsteroidMinable.h (modified) (2 diffs)

code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw

@@ -76 +76 @@
           <visibility>
             <EventListener event="flying4" />
+
           </visibility>
         </events>
@@ -84 +85 @@
             <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
         </collisionShapes>
+    </Pawn>
 
-    </Pawn>
+
+    <!-----AsteroidMinable --->
+
+    <AsteroidMinable size=5 position="0,-500,0" />
 
     

code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc

@@ -66 +66 @@
 
 #include "controllers/FormationController.h"
+#include "pickup/items/HealthPickup.h"
+#include "pickup/PickupSpawner.h"
+#include "pickup/Pickup.h"
 
 namespace orxonox
@@ -74 +77 @@
     {
         RegisterObject(AsteroidMinable);
-
-        this->bAlive_ = true;
-        this->bVulnerable_ = true;
-
-        this->health_ = 0;
-        this->maxHealth_ = 0;
-        this->initialHealth_ = 0;
-
-        this->damageMultiplier_ = 1;
-
-        this->spawnparticleduration_ = 3.0f;
-
-        this->aimPosition_ = Vector3::ZERO;
-
-        this->setRadarObjectColour(ColourValue::Yellow);
+        this->setRadarObjectColour(ColourValue(1.0f, 1.0f, 0.0f, 1.0f));
         this->setRadarObjectShape(RadarViewable::Shape::Dot);
+
+        this->size = 5;
+        this->context = context;
+
+
+
+        //      <Model position="0,-40,40" yaw="90" pitch="-90" roll="0" scale="4" mesh="ast6.mesh" />
+
  
     }
@@ -101 +98 @@
     {
         SUPER(AsteroidMinable, XMLPort, xmlelement, mode);
+        //        XMLPortParam(PickupSpawner, "pickup", setPickupTemplateName, getPickupTemplateName, xmlelement, mode);
+        XMLPortParam(AsteroidMinable, "size", setSize,getSize, xmlelement, mode);
+
     }
 
@@ -107 +107 @@
         SUPER(AsteroidMinable, XMLEventPort, xmlelement, mode);
 
-        XMLPortEventState(AsteroidMinable, BaseObject, "vulnerability", setVulnerable, xmlelement, mode);
+        //XMLPortEventState(AsteroidMinable, BaseObject, "vulnerability", setVulnerable, xmlelement, mode);
     }
 
@@ -124 +124 @@
     }
 
+    void AsteroidMinable::setSize(float s){
+        this->size = s;
+        this->health_ = 200*s;
+    }
+
+    float AsteroidMinable::getSize(){
+        return this->size;
+    }
+
     void AsteroidMinable::death() //ueberschreiben
     {
         this->setHealth(1);
+
+
+
+        // Spawn Pickup
+        HealthPickup* hP = new HealthPickup(context);
+        //OFFEN: Add custom pickup 'resources' 
+        PickupSpawner* thingy = new PickupSpawner(context);
+        thingy->createDroppedPickup(context, hP, nullptr, 10);
+//    /*static*/ PickupSpawner* PickupSpawner::createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance)
+   
+
+
+
+        this->spawnChildren();
+
+
+
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
@@ -138 +164 @@
     }
 
+
+void AsteroidMinable::spawnChildren(){
+    // Spawn smaller Children
+    int massRem = this->size-1; //some mass is lost
+    int num = round(massRem*rand()); // random number of children
+    massRem = massRem-num;
+    int extra = 0;
+    for(int fisch=num; fisch>=1; fisch++){
+        // to distribute remaining mass
+        if(fisch==1){ 
+            extra = massRem;
+        }else{
+            extra = round(massRem*rand());
+            massRem = massRem-extra;
+        }
+        //Spawn this child
+        AsteroidMinable* child = new AsteroidMinable(context);
+        child->setSize(extra + 1);
+            
+        //OFFEN:Kollision der Kinder verhindern
+        //Relativ zu Elternteil automatisch?
+        //Typ position:rand()*Vektoriwas?
+        child->setPosition(this->getCarrierPosition());
+    }
 }
+
+
+
+
+}
+
+
 
 

code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h

@@ -53 +53 @@
             virtual ~AsteroidMinable();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+
+            virtual void setSize(float f);
+            virtual float getSize();
+
 
         protected:
@@ -58 +64 @@
             float asteroidVersion; // Bodenstrich-Konvention?, 
             // Wert zwischen 1 und 6 (Spezialdinger?), die Mesh-Form
-            float asteroidSize;
+            float size;
             bool generateSmaller;
+            virtual void death();
+
+
 
         private:
+            void registerVariables();
+            virtual void spawnChildren();
+
+            Context* context;