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

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.cc (modified) (7 diffs)

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

@@ -27 +27 @@
  */
 
-/*
+/**
 
-*
-*
-*<OFFEN Describe 
-Math from asteroidField.lua used. 
-*
-*
-
-
-DESCRIPTION
-o Andere: Simpel wie in asteroidField.lua, oder einfach Asteroiden, die nichts abwerfen?
---> Letzteres scheint passender, simpler. 
+    @file SpicedAsteroidField.cc
+    @brief Asteroid field with lots of parameters. Derived from asteroidField.lua
 
 
@@ -60 +51 @@
 #include "util/Math.h"
 
-// #include "infos/PlayerInfo.h"
-// #include "controllers/Controller.h"
-// #include "gametypes/Gametype.h"
-// #include "graphics/ParticleSpawner.h"
-// #include "worldentities/ExplosionChunk.h"
-// #include "worldentities/ExplosionPart.h"
-
-// #include "core/object/ObjectListIterator.h"
-// #include "controllers/FormationController.h"
+#include "../../orxonox/graphics/Billboard.h"
 
 
-//#include "../pickup/pickup ..... pickupable
-#include "../objects/collisionshapes/SphereCollisionShape.h"
-#include "../../orxonox/graphics/Model.h"
+namespace orxonox{
 
-
-
-
-
-
-namespace orxonox
-{
     RegisterClass(SpicedAsteroidField);
 
     SpicedAsteroidField::SpicedAsteroidField(Context* context) : Pawn(context) {
 
-        // Da auch noetig? Wegen set in XML-Code?
         RegisterObject(SpicedAsteroidField);
+        this->context = context;
 
-        this->context = context;
+        // Default Values: 
+        this->count = 30; 
+        this->mDensity = 0.5;
+        this->position = Vector3(0,0,0);
+        this->maxSize = 40; 
+        this->minSize = 1; 
+        this->radius = 1000;
         this->foggy = true; 
         this->fogDensity = 0.5;
-        this->count = 0;
 
-        // Old from Pawn
         this->registerVariables();
+    }
 
+    SpicedAsteroidField::SpicedAsteroidField(Context* c, Vector3 p, int minS, int maxS, int w, int count, bool f, float mD, float fD): Pawn(c){
 
-        // this->create();
-        this->bAlive_ = false;
-        this->destroyLater();
+        this->context = c;
+        this->position = p; 
+        this->minSize = minS; 
+        this->maxSize = maxS; 
+        this->radius = w; 
+        this->count = count; 
+        this->foggy = f; 
+
+        this->mDensity = mD;
+        this->fogDensity = fD; 
+
     }
+
 
     SpicedAsteroidField::~SpicedAsteroidField(){
@@ -115 +104 @@
 
         Vector3* relPos; 
+
 
         for(int gertrud = 0; gertrud<count; ++gertrud){
@@ -131 +121 @@
             a->toggleDropStuff(spiced);
 
-            // @TODO: Fox Fog stuff, error due to billbord
-
-//             Billboard* bb;
-//             if(this->foggy && mod(gertrud, 5) == 0){
-//                 bb = new Billboard(this->context);
-//                 bb->setPosition(this-position + *relPos);
-//                 bb->setMaterial("Smoke/Smoke");
-//                 bb->setScale(size); // tricky?
-
-//                 bb->setColour(ColourValue(this-fogDensity, this->fogDensity, this->fogDensity)); // 4rd argument = transparency?
-                
-// //     print("<Billboard ")
-// //         print("position = \"")
-// //             print(posX) print(",")
-// //             print(posY) print(",")
-// //             print(posZ) print("\" ")
-// //         print("colour=\"")
-// //             print(brightness) print(",")
-// //             print(brightness) print(",")
-// //             print(brightness) print("\" ")
-// //         print("material=\"Smoke/Smoke\" scale=")
-// //         print(size)
-// //     print(" />")
-//             }
+            // A problem
+            a->setVelocity(this->getVelocity());
+            
+            // Fog is iplemented with billboards.
+            Billboard* bb;
+            if(this->foggy && mod(gertrud, 5) == 0){
+                bb = new Billboard(this->context);
+                bb->setPosition(this->position + *relPos);
+                bb->setMaterial("Smoke/Smoke");
+                bb->setScale(size);
+                bb->setColour(ColourValue(this->fogDensity, this->fogDensity, this->fogDensity));    
+            }
         }
     }
 
-    void SpicedAsteroidField::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        // SUPER(SpicedAsteroidField, XMLPort, xmlelement, mode);
-        //        XMLPortParam(PickupSpawner, "pickup", setPickupTemplateName, getPickupTemplateName, xmlelement, mode);
+    void SpicedAsteroidField::XMLPort(Element& xmlelement, XMLPort::Mode mode){
+
+        SUPER(SpicedAsteroidField, XMLPort, xmlelement, mode); 
+
         XMLPortParam(SpicedAsteroidField, "count", setCount, getCount, xmlelement, mode);
         XMLPortParam(SpicedAsteroidField, "mDensity", setMineralDensity, getMineralDensity, xmlelement, mode);
@@ -174 +152 @@
 
 
+    void SpicedAsteroidField::XMLEventPort(Element& xmlelement, XMLPort::Mode mode){
 
-
-    void SpicedAsteroidField::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        // SUPER(SpicedAsteroidField, XMLEventPort, xmlelement, mode);
-
-        XMLPortEventState(SpicedAsteroidField, BaseObject, "vulnerability", setVulnerable, xmlelement, mode);
     }
 
-    void SpicedAsteroidField::registerVariables()
-    {
+    void SpicedAsteroidField::registerVariables(){
 
         registerVariable(this->count, VariableDirection::ToClient);
@@ -195 +167 @@
         registerVariable(this->fogDensity, VariableDirection::ToClient);
 
-
     }
 
@@ -201 +172 @@
 
         this->create();
-        // orxout() << "SpicedAsteroidField is done. " << endl;
-
         this->bAlive_ = false;
         this->destroyLater();
     }
 
-
-
-
-
 }
-
-// --[[ fog generator
-// generates fog
-//     posX, posY, posZ - position in space
-//     size - size of billboard
-//     brightness - [0,1] fog brightness
-// --]]
-// function generateFog(posX, posY, posZ, size, brightness)
-//     print("<Billboard ")
-//         print("position = \"")
-//             print(posX) print(",")
-//             print(posY) print(",")
-//             print(posZ) print("\" ")
-//         print("colour=\"")
-//             print(brightness) print(",")
-//             print(brightness) print(",")
-//             print(brightness) print("\" ")
-//         print("material=\"Smoke/Smoke\" scale=")
-//         print(size)
-//     print(" />")
-// end
-
-// --[[ asteroid field generator
-// generates asteroid field
-//     posX, posY, posZ - position in space
-//     minSize, maxSize - size boundaries of each asteroid
-//     radius - size of the cube around position in space
-//     count - number of asteroids
-//     fog - enable fog 0/1
-// --]]
-// function asteroidField(posX, posY, posZ, minSize, maxSize, radius, count, fog)
-//     for i = 1, count, 1 do
-//         size = (math.random() * (maxSize - minSize)) + minSize
-//         pX = (2 * math.random() * radius) - radius + posX
-//         pY = (2 * math.random() * radius) - radius + posY
-//         pZ = (2 * math.random() * radius) - radius + posZ
-//         print("<StaticEntity ")
-
-//         print("position = \"")
-//         print(pX) print(",")
-//         print(pY) print(",")
-//         print(pZ) print("\" ")
-
-//         print("scale = \"") print(size) print("\" ")
-
-//         print("collisionType = static linearDamping = 0.8 angularDamping = 1 ")
-//         print("collisiondamage = 1000 enablecollisiondamage = true>")
-
-//         print("<attached>")
-//             print("<Model mass=\"") print(size * 10) print("\" ")
-//             print("mesh=\"ast") print(math.mod(i,6) + 1) print(".mesh\" />")
-//         print("</attached>")
-
-//         print("<collisionShapes> ")
-//             print("<SphereCollisionShape radius=\"")
-//             print(size * 2.5) print("\" />")
-//         print("</collisionShapes>")
-
-//         print("</StaticEntity>")
-
-//         if fog == 1 and i % 5 == 0 then
-//             generateFog(pX, pY, pZ, radius*0.04, 0.2)
-//         end
-//     end
-// end
-
-
-// --[[ asteroid belt generator
-// generates asteroid belt
-//     posX, posY, posZ - position in space
-//     yaw, pitch - rotation
-//     minSize, maxSize - size boundaries of each asteroid
-//     radius0, radius1 - inner/outer radius
-//     count - number of asteroids
-//     fog - enable fog 0/1
-// --]]
-// function asteroidBelt(centerX, centerY, centerZ, yaw, pitch, segments, minSize, maxSize, radius0, radius1, count, fog)
-//     dPhi = (2 * math.pi) / segments
-//     width = math.abs(radius1 - radius0)
-//     radius = (radius1 + radius0) / 2
-//     segmentCount = count / segments
-
-//     print("<StaticEntity collisionType=static yaw=") print(yaw)
-//     print(" pitch=") print(pitch)
-
-//     print(" position = \"")
-//         print(centerX) print(",")
-//         print(centerY) print(",")
-//         print(centerZ) print("\"")
-//     print(">")
-
-//     print("<attached>")
-
-//     for i = 0, segments - 1, 1 do
-//         asteroidField((radius * math.cos(i * dPhi)),
-//                     (radius * math.sin(i * dPhi)),
-//                     0, minSize, maxSize, width, segmentCount, fog)
-//     end
-
-//     print("</attached>")
-//     print("</StaticEntity>")
-// end