[Orxonox-commit 7027] r11646 - in code/branches/AsteroidMining_HS17: data/levels src/modules/asteroidmining

[remartin at orxonox.net]

Author: remartin
Date: 2017-12-11 13:02:41 +0100 (Mon, 11 Dec 2017)
New Revision: 11646

Modified:
   code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw
   code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h
   code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc
Log:
Fisch

Modified: code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw
===================================================================
--- code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw	2017-12-09 12:29:44 UTC (rev 11645)
+++ code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw	2017-12-11 12:02:41 UTC (rev 11646)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "AsteroidFarming"
  description = "Testing the Asteroid Mining Project, PPS HS 17"
- tags = "test"
+ tags = "test, showcase"
  screenshot = "AsteroidFarming.png"
 />
 
@@ -14,19 +14,22 @@
 <?lua
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
-    include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
 ?>
 
+<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
+
 <Level>
   <templates>
     <Template link=lodtemplate_default />
   </templates>
+
   <?lua include("includes/notifications.oxi") ?>
 
-
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
+    hasPhysics = true
   >
 
   <?lua
@@ -34,11 +37,10 @@
   ?>
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+
     <SpawnPoint team=0 position="0,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     
 
-
-
      <!-- Asteroid Display: -->
       <Model position="0,  0,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast1.mesh" />
       <Model position="0, 20,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast2.mesh" />
@@ -103,5 +105,6 @@
     <SpicedAsteroidField count=30 mDensity= 0.5 maxSize=40 minSize=1 position="5000, 0, 0" radius=1000/>
 
 
+
   </Scene>
 </Level>

Modified: code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h
===================================================================
--- code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h	2017-12-09 12:29:44 UTC (rev 11645)
+++ code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h	2017-12-11 12:02:41 UTC (rev 11646)
@@ -47,8 +47,8 @@
     class _OrxonoxExport AsteroidMinable : public Pawn{ 
 
         public:
-            AsteroidMinable(Context* context);// This constructor is for XML access only!
-            AsteroidMinable(Context* c, float size, Vector3 position, Vector3 velocity, bool dS);// Call this Constructor from other C-files.
+            AsteroidMinable(Context* context);// @brief This constructor is for XML access only!
+            AsteroidMinable(Context* c, float size, Vector3 position, Vector3 velocity, bool dS);// @brief Call this Constructor from other C-files.
 
             virtual ~AsteroidMinable();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -55,7 +55,7 @@
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void tick(float dt) override;
 
-            // Overwrite to prevet 'self-collision' of generated stuff
+            // @brief Overwrite to prevet 'self-collision' of generated stuff
             virtual void hit(Pawn* originator, const Vector3& force, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
 

Modified: code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc
===================================================================
--- code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc	2017-12-09 12:29:44 UTC (rev 11645)
+++ code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc	2017-12-11 12:02:41 UTC (rev 11646)
@@ -91,6 +91,7 @@
         this->context = context;
         this->foggy = true; 
         this->fogDensity = 0.5;
+        this->count = 0;
 
         // Old from Pawn
         this->registerVariables();
@@ -120,7 +121,6 @@
 
             size = round(rnd()*(this->maxSize - this->minSize)) + this->minSize;
             a->setSize(size);
-
             pX = round(rnd()*2*this->radius) - radius;
             pY = round(rnd()*2*this->radius) - radius;
             pZ = round(rnd()*2*this->radius) - radius;
@@ -200,6 +200,8 @@
     void SpicedAsteroidField::tick(float dt){
 
         this->create();
+        // orxout() << "SpicedAsteroidField is done. " << endl;
+
         this->bAlive_ = false;
         this->destroyLater();
     }