Changeset 10962 for code/branches/presentationHS15/src/modules/dodgerace

Timestamp:

Dec 9, 2015, 4:03:59 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and exlposionChunks branches. Works fine. Added explosion parts to hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/dodgerace/DodgeRace.cc (modified) (1 diff)
• src/modules/dodgerace/DodgeRace.h (modified) (1 diff)

code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.cc

@@ -71 +71 @@
             for (int i = 0; i < 7; i++)
             {
-                BigExplosion* chunk = new BigExplosion(this->center_->getContext());
-                chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
-                chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
-                chunk->setScale(20);
+                WeakPtr<ExplosionPart> chunk5 = new ExplosionPart(this->center_->getContext());
+                chunk5->setPosition(Vector3(600, 0, 100.f * i - 300));
+                chunk5->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
+                chunk5->setScale(10);
+                chunk5->setEffect1("Orxonox/explosion2b");
+                chunk5->setEffect2("Orxonox/smoke6");
+                chunk5->Explode();
+
             }
         }

code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.h

@@ -56 +56 @@
 
 #include "core/command/ConsoleCommand.h"
-#include "worldentities/BigExplosion.h"
 
 #include "gametypes/Deathmatch.h"