Changeset 11646 for code/branches/AsteroidMining_HS17/src

Timestamp:

Dec 11, 2017, 1:02:41 PM (7 years ago)

Author:

remartin

Message:

Fisch

Location:

code/branches/AsteroidMining_HS17/src/modules/asteroidmining

Files:

• AsteroidMinable.h (modified) (2 diffs)
• SpicedAsteroidField.cc (modified) (3 diffs)

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

@@ -48 +48 @@
 
         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();
@@ -56 +56 @@
             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);

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

@@ -92 +92 @@
         this->foggy = true; 
         this->fogDensity = 0.5;
+        this->count = 0;
 
         // Old from Pawn
@@ -121 +122 @@
             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;
@@ -201 +201 @@
 
         this->create();
+        // orxout() << "SpicedAsteroidField is done. " << endl;
+
         this->bAlive_ = false;
         this->destroyLater();