[Orxonox-commit 6047] r10706 - in code/branches/particleEffectsHS15/data: levels levels/templates particle

[holzerj at orxonox.net]

Author: holzerj
Date: 2015-10-26 16:03:57 +0100 (Mon, 26 Oct 2015)
New Revision: 10706

Added:
   code/branches/particleEffectsHS15/data/particle/engine.particle
Modified:
   code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw
   code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt
Log:
New engine effect

Modified: code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw	2015-10-26 14:49:14 UTC (rev 10705)
+++ code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw	2015-10-26 15:03:57 UTC (rev 10706)
@@ -34,11 +34,11 @@
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
     <ParticleEmitter
-        source="Orxonox/engineglow"
+        source="Orxonox/engine"
         position="0,0,0"
-        lifetime=5.0 loop=1 startdelay=2.0
+        lifetime=1.0 loop=1 startdelay=2.0
     />
- <ParticleEmitter
+ 	<ParticleEmitter
         source="Orxonox/ice"
         position="0,0,100"
         lifetime=2.0 loop=1 startdelay=3.0

Modified: code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt	2015-10-26 14:49:14 UTC (rev 10705)
+++ code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt	2015-10-26 15:03:57 UTC (rev 10706)
@@ -93,20 +93,24 @@
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
     </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/engineglow"
-        position="0,0,0"
-        lifetime=5.0 loop=1 startdelay=2.0
-        scale=0.033
+        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, 0, 10" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+	<ParticleEmitter
+        source="Orxonox/engine"
+        position="12,-1.75,13"
+        lifetime=5.0 loop=1 startdelay=0.0
+        scale=0.3
+    />
+      
     </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" />

Added: code/branches/particleEffectsHS15/data/particle/engine.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/engine.particle	                        (rev 0)
+++ code/branches/particleEffectsHS15/data/particle/engine.particle	2015-10-26 15:03:57 UTC (rev 10706)
@@ -0,0 +1,70 @@
+particle_system Orxonox/engine
+{
+	material PE/Special.001
+	particle_width 10.0
+	particle_height 10.0
+	quota 2000
+	cull_each false
+	sorted false
+	local_space false
+	iteration_interval 0.0
+	nonvisible_update_timeout 0.0
+	billboard_type point
+	billboard_origin center
+	billboard_rotation_type texcoord
+	point_rendering false
+	accurate_facing false
+
+	
+
+	emitter Ring
+	{
+		position 0.0 0.0 0.0
+		direction 0.0 0.0 1.0
+		angle 0
+		width 0.5
+		height 0.5
+		depth 0
+		inner_width 0.99
+		inner_height 0.99
+		emission_rate 250
+		velocity_min 50
+		velocity_max 55
+		time_to_live_min 0.075
+		time_to_live_max 0.09
+		duration_min 0
+		duration_max 0
+		repeat_delay_min 0
+		repeat_delay_max 0
+		colour_range_start 1 0.333333 0 1
+		colour_range_end 1 0.333333 0 1
+	}
+
+	emitter Ring
+	{
+		position 0.0 0.0 0.0
+		direction 0.0 0.0 1.0
+		angle 0
+		width 0.5
+		height 0.5
+		depth 0
+		inner_width 0.1
+		inner_height 0.25
+		emission_rate 250
+		velocity_min 50
+		velocity_max 55
+		time_to_live_min 0.1
+		time_to_live_max 0.125
+		duration_min 0
+		duration_max 0
+		repeat_delay_min 0
+		repeat_delay_max 0
+		colour_range_start 1 0 0 1
+		colour_range_end 1 0 0 1
+	}
+
+	affector Scaler
+	{
+		rate -40
+	}
+}