Changeset 10836

Timestamp:

Nov 23, 2015, 3:44:31 PM (9 years ago)

Author:

holzerj

Message:

Added Mine, ice particle, rocketfire, psygun

Location:

code/branches/particleEffectsHS15

Files:

• data/levels/emptyLevel.oxw (modified) (1 diff)
• data/levels/includes/weaponSettingsAssff2.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• data/levels/templates/spaceshipEscort.oxt (modified) (1 diff)
• data/particle/ice.particle (modified) (3 diffs)
• data/particle/psygun.particle (added)
• data/particle/rocketfire.particle (modified) (4 diffs)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/MineMunition.cc (added)
• src/modules/weapons/munitions/MineMunition.h (added)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/IceGunProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/IceGunProjectile.h (modified) (2 diffs)
• src/modules/weapons/projectiles/MineProjectile.cc (added)
• src/modules/weapons/projectiles/MineProjectile.h (added)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/MineGun.cc (added)
• src/modules/weapons/weaponmodes/MineGun.h (added)

code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw

@@ -34 +34 @@
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
-    <ParticleEmitter
-        source="Orxonox/engine"
-        position="0,0,0"
-        lifetime=1.0 loop=1 startdelay=2.0
-    />
-        <ParticleEmitter
-        source="Orxonox/ice"
-        position="0,0,100"
-        lifetime=2.0 loop=1 startdelay=3.0
-    />
+        <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <attached>
+            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+        </collisionShapes>
+    </Pawn>
+
+    <Pawn team=1 health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 3">
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <attached>
+           <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+        </collisionShapes>
+    </Pawn>
     
   </Scene>

code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsAssff2.oxi

@@ -1 @@
-    <weaponslots>
+t    <weaponslots>
       <WeaponSlot position="-15.0,-1.5,0" />
       <WeaponSlot position=" 15.0,-1.5,0" />

code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi

@@ -14 +14 @@
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
-          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
+          <MineGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset=" 0.1, 1.4,-3" />
         </Weapon>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
-          <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam2.mesh" /-->
+          <SplitGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset=" 0.1, 1.4,-3" />
         </Weapon>
       </WeaponPack>

code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt

@@ -92 +92 @@
     <EffectContainer condition="idle">
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+       />
+
+           <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
     </EffectContainer>
     <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.09 position="-12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     </EffectContainer>
     <EffectContainer condition="normal or brake">
 
     </EffectContainer>
+
     <EffectContainer condition="normal or boost">
-      <ParticleEmitter
-        source="Orxonox/engine"
-        position="-12,-1.75,13"
-        lifetime=5.0 loop=1 startdelay=0.0
-        scale=0.3
-    />
-        <ParticleEmitter
-        source="Orxonox/engine"
-        position="12,-1.75,13"
-        lifetime=5.0 loop=1 startdelay=0.0
-        scale=0.3
-    />
-      
+        
+        
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     </EffectContainer>
+
     <EffectContainer condition="boost">
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />

code/branches/particleEffectsHS15/data/particle/ice.particle

@@ -1 +1 @@
 particle_system Orxonox/ice
 {
-        material PE/Hidden.001
-        particle_width 66.6699981689453
-        particle_height 38.0999984741211
+        material PE/iceCrystal
+        particle_width 5
+        particle_height 5
         quota 7000
         cull_each false
@@ -18 +18 @@
         emitter Box
         {
-                position 0.0 500.0 0.0
-                direction 0.0 0.0 1.0
-                angle 0
-                width 200
-                height 200
-                depth 200
-                emission_rate 20
+                position 0.0 0.0 0.0
+                direction 1.0 1.0 1.0
+                angle 45
+                width 20
+                height 20
+                depth 20
+                emission_rate 200
                 velocity_min 1
                 velocity_max 1
-                time_to_live_min 10
-                time_to_live_max 20
+                time_to_live_min 3
+                time_to_live_max 6
                 duration_min 0
                 duration_max 0
@@ -34 +34 @@
                 repeat_delay_max 0
                 colour_range_start 1 1 1 1
-                colour_range_end 0.835294 0.956863 1 1
+                colour_range_end 0.9 1 1 1
         }
 

code/branches/particleEffectsHS15/data/particle/rocketfire.particle

@@ -1 +1 @@
 particle_system Orxonox/rocketfire
 {
-        material PE/Special.001
-        particle_width 6.67000007629395
-        particle_height 3.80999994277954
-        quota 300
-        cull_each false
-        sorted false
-        local_space false
+        material PE/glowEffect
+        particle_width 2
+        particle_height 2
+        quota 10000
+        cull_each true
+        sorted true
+        local_space true
         iteration_interval 0.0
         nonvisible_update_timeout 0.0
@@ -18 +18 @@
         emitter Ellipsoid
         {
-                position 0.0 0.0 3.0
+                position 0.05 0.0 2.0
                 direction 0.0 0.0 1.0
                 angle 0
@@ -26 +26 @@
                 emission_rate 1200
                 velocity_min 10
-                velocity_max 48
+                velocity_max 20
                 time_to_live_min 0.1
-                time_to_live_max 0.19
+                time_to_live_max 0.1
                 duration_min 0
                 duration_max 0
@@ -36 +36 @@
                 colour_range_end 1 0 0 1
         }
+        emitter Ellipsoid
+        {
+                position 0.05 0.0 2.0
+                direction 0.0 0.0 1.0
+                angle 0
+                width 0
+                height 0
+                depth 0
+                emission_rate 100
+                velocity_min 5
+                velocity_max 10
+                time_to_live_min 0.1
+                time_to_live_max 0.1
+                duration_min 0
+                duration_max 0
+                repeat_delay_min 0
+                repeat_delay_max 0
+                colour_range_start 0.2 0.5 0.65
+                colour_range_end 0.25 0.55 0.7
+        }
 
         affector Scaler

code/branches/particleEffectsHS15/src/modules/weapons/munitions/CMakeLists.txt

@@ -7 +7 @@
   IceMunition.cc
   SplitMunition.cc
+  MineMunition.cc
 )

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/CMakeLists.txt

@@ -12 +12 @@
   GravityBomb.cc
   GravityBombField.cc
+  MineProjectile.cc
 )

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.cc

@@ -34 +34 @@
 #include "IceGunProjectile.h"
 
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
 #include "core/CoreIncludes.h"
 #include "graphics/Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "Scene.h"
+#include "core/command/Executor.h"
+#include "tools/ParticleInterface.h"
 
 namespace orxonox
@@ -55 +62 @@
         this->attach(model);
         model->setPosition(Vector3(0,0,0));
+
+        // Add effect.
+        emitter_ = new ParticleEmitter(this->getContext());
+        this->attach(emitter_);
+        emitter_->setOrientation(this->getOrientation());
+        emitter_->setSource("Orxonox/ice");        
+    }
+
+    IceGunProjectile::~IceGunProjectile()
+    {
+        if (this->isInitialized())
+        {
+            const Vector3& pos = emitter_->getWorldPosition();
+            const Quaternion& rot = emitter_->getWorldOrientation();
+            this->detach(emitter_);
+            emitter_->setPosition(pos);
+            emitter_->setOrientation(rot);
+            emitter_->getParticleInterface()->setEnabled(false);
+            this->getScene()->getRootSceneNode()->addChild(const_cast<Ogre::SceneNode*>(emitter_->getNode()));
+
+            const ExecutorPtr& executor = createExecutor(createFunctor(&ParticleEmitter::destroy, emitter_));
+            new Timer(15, false, executor, true);
+        }
     }
 

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -56 +56 @@
         public:
             IceGunProjectile(Context* context);
-            virtual ~IceGunProjectile() {}
+            virtual ~IceGunProjectile();
 
             virtual void setFreezeTime(float freezeTime);
@@ -63 +63 @@
         protected:
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-        private:         
+        private:
+            ParticleEmitter* emitter_;
             float freezeTime_; //The duration of the freezing effect on a target
             float freezeFactor_; //The strength of the freezing effect

code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -11 +11 @@
   SimpleRocketFire.cc
   GravityBombFire.cc
+  MineGun.cc
 )