Changeset 11646 for code/branches

Timestamp:

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

Author:

remartin

Message:

Fisch

Location:

code/branches/AsteroidMining_HS17

Files:

• data/levels/AsteroidFarming.oxw (modified) (5 diffs)
• src/modules/asteroidmining/AsteroidMinable.h (modified) (2 diffs)
• src/modules/asteroidmining/SpicedAsteroidField.cc (modified) (3 diffs)

code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw

@@ -2 +2 @@
  name = "AsteroidFarming"
  description = "Testing the Asteroid Mining Project, PPS HS 17"
- tags = "test"
+ tags = "test, showcase"
  screenshot = "AsteroidFarming.png"
 />
@@ -15 +15 @@
   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>
@@ -22 +24 @@
     <Template link=lodtemplate_default />
   </templates>
+
   <?lua include("includes/notifications.oxi") ?>
-
 
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
+    hasPhysics = true
   >
 
@@ -35 +38 @@
 
     <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: -->
@@ -104 +106 @@
 
 
+
   </Scene>
 </Level>

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();