Changeset 11667 for code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc

Timestamp:

Dec 12, 2017, 8:29:52 PM (7 years ago)

Author:

remartin

Message:

Added tilting for the spicedAsteroidBelt. Finished commenting, polish up. Done.

File:

• code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) (8 diffs)

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

@@ -29 +29 @@
 /**
 
-    @file SpicedAsteroidBelt.cc
+    @file 
+    @author remartin
     @brief Asteroid belt with lots of parameters. Derived from asteroidField.lua
 
+    Generates a ring of asteroids by calling SpicedAsteroidField multiple times. 
+    It's in the xy-plane at default, orientation can be changed with tiltAt 
+    (angle where it gets elevated/lowered the most) and TiltBy (angle at z-axis). 
+    This doesn't work very well and could probably implemented differently with 
+    relative coordinates (attach etc, stuff in WorldEntity). 
 
+    It is required to wait until all XML-arguments are set. That's why the actual 
+    generation happens when tick() gets called for the first time. 
+    
 */
 
@@ -64 +73 @@
         this->count = 250; 
         this->position = Vector3(0,0,0);
-        // this->yaw = 0; 
-        // this->pitch = 0; 
         this->segments = 30;
         this->minSize = 1;
@@ -75 +82 @@
         this->fogDensity = 0.5;
 
-        // Old from Pawn
+        this->tiltAt = 0.0; 
+        this->tiltBy = 0.0;  
+
         this->registerVariables();
 
@@ -87 +96 @@
 
         float myPi = 3.1415927410125732421875; //pi; // Math.pi ist statisch oder so. 
-        float dPhi = (2 * myPi) / segments;
-        float width = radius1 - radius0; if(width<0){width = -width;} // predefined abs?
-        float radius = (radius1 + radius0) / 2.0;
-        int segmentCount = round(count / segments);
+        float width = this->radius1 - this->radius0; if(width<0){width = -width;} // predefined abs?
+        float radius = (this->radius1 + this->radius0) / 2.0;
+        int segmentCount = round(this->count / this->segments);
 
-        SpicedAsteroidField* af[segments]; 
+        SpicedAsteroidField* af[this->segments]; 
         (void)af[0]; // avoid nasty compiler warning
 
+        float dPhi = (2 * myPi) / this->segments;
+        float dTheta = 4.0*this->tiltBy/this->segments; 
+        float sepp = -this->tiltAt;
+        float globi = (myPi/2.0) + this->tiltBy;
+
         for(int s = 0; s<segments; ++s){
-            Vector3* pos = new Vector3(radius*cos(s*dPhi), radius*sin(s*dPhi),0); 
+            sepp = sepp + dPhi;
+            if(s<segments/2){            
+                globi = globi - dTheta; 
+            }else{
+                globi = globi + dTheta; 
+            }
+            
+            Vector3* pos = new Vector3(radius*cos(sepp)*sin(globi), radius*sin(sepp)*sin(globi), radius*cos(globi)); 
             af[s] = new SpicedAsteroidField(this->context, this->position + *pos, this->minSize, this->maxSize, width, segmentCount, this->foggy, this->mDensity, this->fogDensity);
+            
         }
         
@@ -109 +130 @@
         XMLPortParam(SpicedAsteroidBelt, "mDensity", setMineralDensity, getMineralDensity, xmlelement, mode);
         XMLPortParam(SpicedAsteroidBelt, "position", setPosition, getPosition, xmlelement, mode);
-        // XMLPortParam(SpicedAsteroidBelt, "yaw", setYaw, getYaw, xmlelement, mode);
-        // XMLPortParam(SpicedAsteroidBelt, "pitch", setPitch, getPitch, xmlelement, mode);
         XMLPortParam(SpicedAsteroidBelt, "segments", setSegments, getSegments, xmlelement, mode);
 
@@ -119 +138 @@
         XMLPortParam(SpicedAsteroidBelt, "foggy", setFog, isFoggy, xmlelement, mode);
         XMLPortParam(SpicedAsteroidBelt, "fogDensity", setFogDensity, getFogDensity, xmlelement, mode);
+
+        XMLPortParam(SpicedAsteroidBelt, "tiltAt", setTiltAt, getTiltAt, xmlelement, mode);
+        XMLPortParam(SpicedAsteroidBelt, "tiltBy", setTiltBy, getTiltBy, xmlelement, mode); 
 
     }
@@ -131 +153 @@
         registerVariable(this->mDensity, VariableDirection::ToClient);
         registerVariable(this->position, VariableDirection::ToClient);
-        // registerVariable(this->yaw, VariableDirection::ToClient);
-        // registerVariable(this->pitch, VariableDirection::ToClient);
         registerVariable(this->segments, VariableDirection::ToClient);
 
@@ -141 +161 @@
         registerVariable(this->foggy, VariableDirection::ToClient);
         registerVariable(this->fogDensity, VariableDirection::ToClient);
+
+        registerVariable(this->tiltAt, VariableDirection::ToClient);
+        registerVariable(this->tiltBy, VariableDirection::ToClient);
 
     }