Changeset 11640 for code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc

Timestamp:

Dec 4, 2017, 4:38:17 PM (7 years ago)

Author:

remartin

Message:

Das Aufteilen funktioniert nun gut. AsteroidField fertiggestellt und mit dokumentieren begonnen.

File:

• code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) (21 diffs)

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

@@ -43 +43 @@
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-FRAGEN:
-* Zeilen-Loeschung beim output
-* orxout()-Problem
-* dokumentieren mit @brief? 
-* Warnumg aus Asteroidenzerstoerung
-
 
 KNACKPUNKTE: 
 
-
 OFFEN: 
-
-o Mass distribution -> weird for bigger asteroids
---> more testing
-
-o SpicedAsteroidField fertigstellen, Mineraldichten-Parameter
 
 o Add custom pickup 'resources'. Weird template stuff -> Problems setting 'size' and other properties? setNumber of Resources. 
@@ -65 +53 @@
 ----> im MineralsPickup die isPickedUp()-Methode überschreiben? 
 --> data_extern/images/effects: PNG's für die Pickups und GUI-Dinger. 
-
-o inherit parent velocity
+--> https://www.orxonox.net/jenkins/view/Management/job/orxonox_doxygen_trunk/javadoc/group___pickup.html
+
+o Anfangsgeschwindigkeit fuers Asteroidenfeld
+o Density doesn't add up to 1...
 o set collisionDamage? Just for static entities?
+o AsteroidBelt?
+
 o Dokumentieren mit @brief?
-
+o unregister -empty- asteroids from radar. (or turn them green or whatever)
+o Add sound effect (crunching etc. ) (No sound in space...)
 o Explosion parts
 o custom HUD
+
 
 HANDBUCH:
@@ -85 +79 @@
 o Pawn.h: Attribut acceptsPickups_ inklusive get/set. 
 
-ERLEGT:
+ERLEGTE FEHLER:
 o Rand() geht bis zu riesigen Nummern! 
 o Pickupgenerierung: vgl. Fremdanpassungen. 
@@ -158 +152 @@
     RegisterClass(AsteroidMinable);
 
-
-    // This constructor is for XML access only.
+    // @brief Standard constructor
     AsteroidMinable::AsteroidMinable(Context* context) : Pawn(context){
 
-        // Da auch noetig? Wegen set in XML-Code?
         RegisterObject(AsteroidMinable);
 
         this->context = context;
         this->initialised = false;
+        this->dropStuff = true; // Default
 
         //Noetig, damit nicht sofort zerstoert?
@@ -178 +171 @@
     }
 
-    // Call this one from other C-files. Takes arguments. 
-    AsteroidMinable::AsteroidMinable(Context* c, float size, Vector3 position) : Pawn(c){
+    // @brief Use this constructor with care. Mainly used internally, arguments are passed directly. 
+    AsteroidMinable::AsteroidMinable(Context* c, float size, Vector3 position, Vector3 v, bool dropStuff) : Pawn(c){
 
         RegisterObject(AsteroidMinable);
 
-        // Old stuff from pawn
-        this->setRadarObjectColour(ColourValue(1.0f, 1.0f, 0.0f, 1.0f));
-        this->setRadarObjectShape(RadarViewable::Shape::Dot);
+        // The radar is able to detect whether an asteroid contains resources....
+        if(dropStuff){
+            this->setRadarObjectColour(ColourValue(1.0f, 1.0f, 0.0f, 1.0f));
+            this->setRadarObjectShape(RadarViewable::Shape::Dot);
+        }else{
+            // Somehow remove from radar?
+        }
+
         this->setCollisionType(WorldEntity::CollisionType::Dynamic);
-
         this->enableCollisionCallback();
 
         // Default Values
-        this->generateSmaller = true; 
         this->context = c;
         this->size = size;
         this->health_ = 15*size; 
         this->maxHealth_ = this->health_;
-        this->acceptsPickups_ = false;
+        this->acceptsPickups_ = false; 
+        this->generateSmaller = true; 
+        this->dropStuff = dropStuff; 
 
         this->setPosition(position);
+        this->setVelocity(v); // velocity = v; // The right one? 
         //this->roll = rand()*5; //etwas Drehung. richtige Variable
 
@@ -228 +227 @@
 
     }
-
+    // @brief Helper method. Create a new asteroid to have an appropriate size for the collision shape etc. 
     void AsteroidMinable::putStuff(){
 
         // Just create a new asteroid to avoid Collision shape scale problems etc. 
-        AsteroidMinable* reborn = new AsteroidMinable(this->context, this->size, this->getPosition());
+        AsteroidMinable* reborn = new AsteroidMinable(this->context, this->size, this->getPosition(), this->getVelocity(), this->dropStuff);
         reborn->toggleShattering(true); // mainly here to avoid 'unused' warning. 
-        this->~AsteroidMinable(); // seems dangerous, yields warning.  Necessary for efficiency? 
+        this->bAlive_ = false;
+        this->destroyLater();
+        //this->~AsteroidMinable(); // seems dangerous, yields warning.  Necessary for efficiency? 
 
     }
@@ -276 +277 @@
     }
 
-    void AsteroidMinable::setSize(float s){
-        this->size = s;
-    }
-
-    float AsteroidMinable::getSize(){
-        return this->size;
-    }
-
-    void AsteroidMinable::toggleShattering(bool b){
-        this->generateSmaller = b;
-    }
+
 
 
@@ -304 +295 @@
 
 
-        // Stuff that can be harvested. 
-        PickupSpawner* thingy = new PickupSpawner(this->context);
-        // OFFEN: more precise size relation in custom resource pickup. 
-        char tname[] = ""; // can-t overwrite strings easily in C (strcat etc.)
-        if(this->size <= 5){
-            strcat(tname, "smallmunitionpickup");
-        }else if(this->size <= 20){
-            strcat(tname, "mediummunitionpickup");
-        }else{
-            strcat(tname, "hugemunitionpickup");
-        }
-        thingy->setPickupTemplateName(tname);
-        thingy->setPosition(this->getPosition());
-        thingy->setMaxSpawnedItems(1); // Would be default anyways
-        thingy->setRespawnTime(0.2f);
-
+        // Pickups which can be harvested. 
+        if(dropStuff){
+            PickupSpawner* thingy = new PickupSpawner(this->context);
+            // OFFEN: more precise size relation in custom resource pickup. 
+            char tname[] = ""; // can-t overwrite strings easily in C (strcat etc.)
+            if(this->size <= 5){
+                strcat(tname, "smallmunitionpickup");
+            }else if(this->size <= 20){
+                strcat(tname, "mediummunitionpickup");
+            }else{
+                strcat(tname, "hugemunitionpickup");
+            }
+            thingy->setPickupTemplateName(tname);
+            thingy->setPosition(this->getPosition());
+            thingy->setMaxSpawnedItems(1); // Would be default anyways
+            thingy->setRespawnTime(0.2f);
+        }
         // orxout() << "AsteroidMining::Death(): Passed Pickup stuff!" << endl;
 
@@ -339 +331 @@
     if(num > 10){num = 10;} // no max function in C!
     int masses[num]; // Masses of the asteroids, at least one. 
-    orxout() << "SpawnChildren(): Passed basic stuff. num = " << num << "; massRem(total) = "<< massRem << endl;
+    //orxout() << "SpawnChildren(): Passed basic stuff. num = " << num << "; massRem(total) = "<< massRem << endl;
 
     massRem = massRem-num; // mass is at least one, add again below. 
@@ -346 +338 @@
     float phi[num] = {0.0}; // assuming that it gets initialised to 0. Add (= {0.0})?
     float theta[num] = {0.0};
-    float piG = pi; // ist statisch oder so. 
+    float piG = 3.1415927410125732421875; //pi; // Math.pi ist statisch oder so. 
 
     float d_p = 2*piG/num;
@@ -380 +372 @@
     //orxout() << "SpawnChildren(): Phi: "; printArrayString(phi);
     //orxout() << "SpawnChildren(): Theta: "; printArrayString(theta);
-    orxout() << "SpawnChildren(): Passed angle stuff. " << endl;
-
-    // 'Triangular', discrete probability density with max at the expected value massRem/num at a. a+b = c
+    //orxout() << "SpawnChildren(): Passed angle stuff. " << endl;
+
+    // 'Triangular', discrete probability "density" with max at the expected value massRem/num at a. a+b = c
     if(massRem>0){ // Required to avoid array of size 0 or access problems
         int c = massRem;
@@ -397 +389 @@
         for(z = 0; z<b; ++z){probDensity[c-z] = (z+1)*dProbB;} // falling part
     
-        // Testing
-        for(int globi = 0; globi<c; ++globi){
-            orxout() << "pDensity at [" << globi << "] is: " << probDensity[globi] << endl;
-        }
+        // // Just for testing:
+        // float sum = 0.0;
+        // for(int globi = 0; globi<c; ++globi){
+        //     orxout() << "pDensity at [" << globi << "] is: " << probDensity[globi] << endl;
+        //     sum = sum+ probDensity[globi];
+        // }
+        // orxout() << "Sum of densities should b 1, it is: " << sum << endl;
 
         // Distributing the mass to individual asteroids
@@ -409 +404 @@
             result = 0;// reset
             rVal = rnd();// between 0 and 1
-            orxout() << "Random Value picked: " << rVal << endl;
+            // orxout() << "Random Value picked: " << rVal << endl;
             probSum = probDensity[0]; 
             //orxout() << "Sum at start: " << probSum << endl;
 
             while(rVal>probSum && result<massRem){// Not yet found && there-s smth to distribute (Incrementing once inside!)
-                if(result<(num-2)){probSum = probSum+probDensity[result+1];} // avoid logical/acess error
+                if(result<(massRem-2)){probSum = probSum + probDensity[result+1];} // avoid logical/acess error
                 ++result;
-                //orxout() << "Sum so far: " << probSum << endl;
+                // orxout() << "Sum so far: " << probSum << ". Just added " << probDensity[result+1] <<  endl;
             }
 
             massRem = massRem-result;
             masses[trav] = 1 +result; // at least one 
-            orxout() << "Mass chosen for child " << trav << " is: " << masses[trav] << endl;
+            // orxout() << "Mass chosen for child " << trav << " is: " << masses[trav] << endl;
 
         }
@@ -430 +425 @@
     }
 
-    //orxout() << "SpawnChildren(): Masses: "; printArrayString(masses);
-    orxout() << "SpawnChildren(): Passed mass stuff. " << endl;
+    // orxout() << "SpawnChildren(): Masses: "; printArrayString(masses);
+    // orxout() << "SpawnChildren(): Passed mass stuff. " << endl;
 
     // Creating the 'chlidren':
@@ -442 +437 @@
         }
         
-        //orxout() << "Creating asteroid with mass " << masses[fisch] << " at relative postition " << *pos << endl;
-        AsteroidMinable* child = new AsteroidMinable(this->context, masses[fisch], this->getPosition() + *pos);
+        // orxout() << "Creating asteroid with mass " << masses[fisch] << " at relative postition " << *pos << endl;
+        AsteroidMinable* child = new AsteroidMinable(this->context, masses[fisch], this->getPosition() + *pos, this->getVelocity(), this->dropStuff);
 
         if(child == nullptr){
@@ -450 +445 @@
 
     }
-    orxout() << "Leaving spawnChildren() method. " << endl;
+    // orxout() << "Leaving spawnChildren() method. " << endl;
 }
 
@@ -458 +453 @@
         orxout() << "AsteroidMining::Hit(Variante 1) Dings aufgerufen. " << endl;
 
-        // Kollision mit anderem Asteroid oder Pickup (OFFEN: evtl. Spawner oder irgendwas?) verhindern. In diesem Fall einfach nichts tun. 
+        // Kollision mit anderem Asteroid oder Pickup verhindern. In diesem Fall einfach nichts tun. 
         // Wird staending aufgerufen -> Rechenleistung?
         if(orxonox_cast<AsteroidMinable*>(originator) || orxonox_cast<Pickup*>(originator)){return;}
@@ -496 +491 @@
     }
 
+    // @brief Just for testing. Don-t work anyways. 
     void AsteroidMinable::printArrayString(float thingy[]){ // Don-t work!
 
@@ -509 +505 @@
     }
 
+    // @brief Just for testing. Don-t work anyways. 
     void AsteroidMinable::printArrayString(int thingy[]){
 
@@ -524 +521 @@
     }
 
-
     // void AsteroidMinable::printArrayString(int thingy[]){
-
     //     char res[] = "[";
     //     //strcat(res, "[");
@@ -547 +542 @@
     // }
 
-
-
-//Pawn:
-    // void Pawn::hit(Pawn* originator, const Vector3& force, const btCollisionShape* cs, float damage, float healthdamage, float shielddamage)
-    // {
-    //     if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
-    //     {
-    //         this->damage(damage, healthdamage, shielddamage, originator, cs);
-    //         this->setVelocity(this->getVelocity() + force);
-    //     }
-    // }
-
-    // void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage, float shielddamage)
-    // {
-    //     if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
-    //     {
-    //         this->damage(damage, healthdamage, shielddamage, originator, cs);
-
-    //         if ( this->getController() )
-    //             this->getController()->hit(originator, contactpoint, damage); // changed to damage, why shielddamage?
-    //     }
-    // }
-
-
-
-
-            // /**
-            // @brief
-            //     Virtual function that gets called when this object collides with another.
-            // @param otherObject
-            //     The object this one has collided into.
-            // @param ownCollisionShape
-            //     The collision shape of the other object
-            // @param contactPoint
-            //     Contact point provided by Bullet. Holds more information and can me modified. See return value.
-            // @return
-            //     Returning false means that no modification to the contactPoint has been made. Return true otherwise!
-            // @note
-            //     Condition is that enableCollisionCallback() was called.
-            // */
-            // virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
-            //     { return false; } /* With false, Bullet assumes no modification to the collision objects. */
-
-            // //! Enables the collidesAgainst(.) function. The object doesn't respond to collision otherwise!
-            // inline void enableCollisionCallback()
-            //     { this->bCollisionCallbackActive_ = true; this->collisionCallbackActivityChanged(); }
-
-
-
-            // //! Disables the collidesAgainst(.) function. @see enableCollisionCallback()
-            // inline void disableCollisionCallback()
-            //     { this->bCollisionCallbackActive_ = false; this->collisionCallbackActivityChanged(); }
-
-
-            // //! Tells whether there could be a collision callback via collidesAgainst(.)
-            // inline bool isCollisionCallbackActive() const
-            //     { return this->bCollisionCallbackActive_; }
-
-            // //! Enables or disables collision response (default is of course on)
-            // inline void setCollisionResponse(bool value)
-            //     { this->bCollisionResponseActive_ = value; this->collisionResponseActivityChanged(); }
-
-
-            // //! Tells whether there could be a collision response
-            // inline bool hasCollisionResponse()
-            //     { return this->bCollisionResponseActive_; }
-
-
 }
-
-
-
-
-
-/*
-    void DronePickup::changedUsed(void)
-    {
-        SUPER(DronePickup, changedUsed);
-
-        // If the pickup has transited to used.
-        if(this->isUsed())
-        {
-
-                Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
-                    this->Pickupable::destroy();
-
-                //Attach to pawn
-                Drone* drone = new Drone(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
-                drone->addTemplate(this->getDroneTemplate());
-
-                Controller* controller = drone->getController();
-                DroneController* droneController = orxonox_cast<DroneController*>(controller);
-                if(droneController != nullptr)
-                {
-                    droneController->setOwner(pawn);
-                }
-
-                Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(30,0,-30);
-                drone->setPosition(spawnPosition);
-
-                // The pickup has been used up.
-                this->setUsed(false);
-        }
-        else
-        {
-            // If either the pickup can only be used once or it is continuous and used up, it is destroyed upon setting it to unused.
-            if(this->isOnce() || (this->isContinuous() ))
-            {
-                this->Pickupable::destroy();
-            }
-        }
-    }
-*/