[Orxonox-commit 399] r2146 - in media: levels particle
Aurelian at orxonox.net
Aurelian at orxonox.net
Mon May 18 18:01:40 CEST 2009
Author: Aurelian
Date: 2009-05-18 18:01:40 +0200 (Mon, 18 May 2009)
New Revision: 2146
Modified:
media/levels/gametype_asteroids.oxw
media/levels/presentation_dm.oxw
media/particle/forcefield.particle
Log:
Level file with blinking checkpoints, forcefield has right direction now...
Modified: media/levels/gametype_asteroids.oxw
===================================================================
--- media/levels/gametype_asteroids.oxw 2009-05-18 14:26:49 UTC (rev 2145)
+++ media/levels/gametype_asteroids.oxw 2009-05-18 16:01:40 UTC (rev 2146)
@@ -17,71 +17,105 @@
<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 position="-300,300,0" name="playerstart" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+<SpawnPoint position="-300,300,0" name="playerstart" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
+<!--
<?lua
-for i = 1, 100, 1
-do ?>
- <Model scale="<?lua print(math.random() * 150 + 30) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" position="<?lua print(math.random() * 10000 ) ?>,<?lua print(math.random() * 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>">
+for i = 1, 500, 1
+do
+j = math.random()
+?>
-</Model>
+ <MovableEntity position="<?lua print(math.random()* 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=<?lua print(j * 150 + 30) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() *100) ?>" >
+ <attached>
+ <Model position="0,0,0" scale=<?lua print(j * 10) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="<?lua print(j * 2300 + 450) ?>" />
+ </collisionShapes>
+ </MovableEntity>
<?lua
end
?>
+-->
+<MovableEntity position="0,0,0" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=5 collisiondamage=1 enablecollisiondamage=true>
+ <attached>
+ <Model position="0,0,0" scale=10 mass=100 mesh="ast1.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius=150 />
+ </collisionShapes>
+</MovableEntity>
-<ForceField position="0,-300,0" direction="0,-1,0" diameter=500 velocity=70>
+
+<ForceField position="0,-500,0" direction="0,1,0" diameter=500 velocity=70>
<attached>
- <ParticleEmitter source="Orxonox/forcefield" startdelay=0 />
+ <ParticleEmitter source="Orxonox/ForceFieldPurple" startdelay=0 />
</attached>
</ForceField>
- <!--
- <ForceField position="1000,-100,0" direction="0,1,1" diameter=500 velocity=30>
+
+ <ForceField position="1000,-500,0" direction="0,1,1" diameter=500 velocity=30>
<attached>
- <ParticleEmitter source="Orxonox/forcefield" startdelay=0 />
+ <ParticleEmitter source="Orxonox/ForceFieldGreen" startdelay=0 />
</attached>
</ForceField>
- <ForceField position="1800,300,-300" direction="0,0,1" diameter=800 velocity=100>
+ <ForceField position="1800,-300,-300" direction="0,0,1" diameter=800 velocity=100>
<attached>
- <ParticleEmitter source="Orxonox/forcefield" startdelay=0 />
+ <ParticleEmitter source="Orxonox/ForceFieldBlue" startdelay=0 />
</attached>
</ForceField>
--->
-<CheckPoint name=trigger1 position="-200,300,0" scale=5 isdestination=false isfirst=true stayactive=true distance=50 addtime=20>
- <attached>
- <Billboard position="0,0,0" scale=1 material="Flares/lensflare" colour="1,0,0">
- </Billboard>
- </attached>
-</CheckPoint>
+<CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=20 />
-<CheckPoint name=trigger2 position="1000,300,0" scale=5 isdestination=false stayactive=true distance=100 addtime=5>
+
+<CheckPoint name=trigger2 position="1100,300,0" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
<events>
<activity>
<EventListener event=trigger1 />
</activity>
</events>
<attached>
- <Billboard position="0,0,0" scale=1 material="Flares/lensflare" colour="1,0,0" />
- </attached>
- <attached>
- <BlinkingBillboard frequency=0.2 amplitude=1 position="0,0,1" scale=1 material="Flares/lensflare" colour="1,1,0">
+ <Billboard material="Flares/lensflare" colour="1,0,0">
<events>
<visibility>
- <EventListener event=trigger1 />
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger1 />
+ </trigger>
+ </events>
+ </EventTrigger>
</visibility>
</events>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger1 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger2 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
</BlinkingBillboard>
- </attached>
- <attached>
- <Billboard position="0,0,0" scale=1 material="Flares/lensflare" colour="0,1,0">
+ <Billboard material="Flares/lensflare" colour="0,1,0">
<events>
<visibility>
<EventListener event=trigger2 />
@@ -92,77 +126,263 @@
</CheckPoint>
-<CheckPoint name=trigger3 position="1800,300,800" stayactive=true distance=100 addtime=5>
+<CheckPoint name=trigger3 position="2100,0,200" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
<events>
<activity>
<EventListener event=trigger2 />
</activity>
</events>
<attached>
- <BlinkingBillboard frequency=0.2 amplitude=1 position="0,0,0" scale=1 material="Flares/lensflare" colour="1,1,0">
+ <Billboard material="Flares/lensflare" colour="1,0,0">
<events>
<visibility>
- <EventListener event=trigger2 />
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger2 />
+ </trigger>
+ </events>
+ </EventTrigger>
</visibility>
</events>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger2 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger3 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
</BlinkingBillboard>
+ <Billboard material="Flares/lensflare" colour="0,1,0">
+ <events>
+ <visibility>
+ <EventListener event=trigger3 />
+ </visibility>
+ </events>
+ </Billboard>
</attached>
- <attached>
- <Billboard position="0,0,0" scale=1 material="Flares/lensflare" colour="1,0,0" />
- </attached>
</CheckPoint>
-
-
-
-<!--
-<CheckPoint name=trigger1 position="-300,300,0" scale=5 isdestination=false isfirst=true stayactive=true distance=50 addtime=5 visibillity=false />
-
-
-<CheckPoint name=trigger2 position="1000,300,0" scale=5 isdestination=false stayactive=true distance=100 addtime=5>
+<CheckPoint name=trigger4 position="2800,200,0" scale=3 isdestination=false stayactive=true distance=100 addtime=7>
<events>
<activity>
- <EventListener event=trigger1 />
+ <EventListener event=trigger3 />
</activity>
</events>
+ <attached>
+ <Billboard material="Flares/lensflare" colour="1,0,0">
+ <events>
+ <visibility>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger3 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger3 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger4 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </BlinkingBillboard>
+ <Billboard material="Flares/lensflare" colour="0,1,0">
+ <events>
+ <visibility>
+ <EventListener event=trigger4 />
+ </visibility>
+ </events>
+ </Billboard>
+ </attached>
</CheckPoint>
-<CheckPoint name=trigger3 position="1800,300,800" stayactive=true distance=100 addtime=5>
+<CheckPoint name=trigger5 position="3600,300,-100" scale=3 isdestination=false stayactive=true distance=100 addtime=6>
<events>
<activity>
- <EventListener event=trigger2 />
+ <EventListener event=trigger4 />
</activity>
</events>
+ <attached>
+ <Billboard material="Flares/lensflare" colour="1,0,0">
+ <events>
+ <visibility>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger4 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger4 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger5 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </BlinkingBillboard>
+ <Billboard material="Flares/lensflare" colour="0,1,0">
+ <events>
+ <visibility>
+ <EventListener event=trigger5 />
+ </visibility>
+ </events>
+ </Billboard>
+ </attached>
</CheckPoint>
-
-
-<CheckPoint name=trigger4 position="2600,400,1100" stayactive=true distance=100 addtime=25>
+<CheckPoint name=trigger6 position="4600, 800,-400" scale=3 isdestination=false stayactive=true distance=100 addtime=6>
<events>
<activity>
- <EventListener event=trigger3 />
+ <EventListener event=trigger5 />
</activity>
</events>
+ <attached>
+ <Billboard material="Flares/lensflare" colour="1,0,0">
+ <events>
+ <visibility>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger5 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger5 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger6 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </BlinkingBillboard>
+ <Billboard material="Flares/lensflare" colour="0,1,0">
+ <events>
+ <visibility>
+ <EventListener event=trigger6 />
+ </visibility>
+ </events>
+ </Billboard>
+ </attached>
</CheckPoint>
-
-<Model position="3800,400,1800" scale=10 mesh="Carrier.mesh" pitch=180>
+<Model position="3800,1200,-900" scale=10 mesh="Carrier.mesh" pitch=180>
<attached>
- <CheckPoint position="-10,0,0" name=trigger5 stayactive=true distance=80 isdestination=true scal=1>
+ <CheckPoint position="-10,0,0" name=trigger7 scale=0.1 isdestination=true stayactive=true distance=100>
+ <events>
+ <activity>
+ <EventListener event=trigger6 />
+ </activity>
+ </events>
+ <attached>
+ <Billboard material="Flares/lensflare" colour="1,0,0">
<events>
- <activity>
- <EventListener event=trigger4 />
- </activity>
+ <visibility>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger6 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </visibility>
</events>
- </CheckPoint>
+ </Billboard>
+ <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+ <events>
+ <visibility>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=trigger6 />
+ </trigger>
+ </events>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event=trigger7 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </EventTrigger>
+ </visibility>
+ </events>
+ </BlinkingBillboard>
+ <Billboard material="Flares/lensflare" colour="0,1,0">
+ <events>
+ <visibility>
+ <EventListener event=trigger7 />
+ </visibility>
+ </events>
+ </Billboard>
</attached>
+</CheckPoint>
+ </attached>
</Model>
--->
-
</Scene>
</Level>
Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw 2009-05-18 14:26:49 UTC (rev 2145)
+++ media/levels/presentation_dm.oxw 2009-05-18 16:01:40 UTC (rev 2146)
@@ -44,9 +44,9 @@
j = math.random()
?>
- <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0.8 scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale=<?lua print(j * 10) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
Modified: media/particle/forcefield.particle
===================================================================
--- media/particle/forcefield.particle 2009-05-18 14:26:49 UTC (rev 2145)
+++ media/particle/forcefield.particle 2009-05-18 16:01:40 UTC (rev 2146)
@@ -1,5 +1,4 @@
-
-Orxonox/forcefield
+Orxonox/ForceFieldPurple
{
quota 10000
material PE/smoke
@@ -24,7 +23,8 @@
colour 0.744444 0 1 0.05
colour_range_start 0.744444 0 1 0.05
colour_range_end 0.533333 0 1 0.05
- emission_rate 60
+ emission_rate 60
+ direction 0 0 -1
velocity 87.1
velocity_min 87.1
velocity_max 87.1
@@ -48,7 +48,8 @@
colour 1 0.455556 0 0.05
colour_range_start 1 0.455556 0 0.05
colour_range_end 0 0 1 0.05
- emission_rate 60
+ emission_rate 60
+ direction 0 0 -1
velocity 77.42
velocity_min 77.42
velocity_max 77.42
@@ -65,4 +66,142 @@
width 300
height 300
}
+}
+
+Orxonox/ForceFieldGreen
+{
+ quota 10000
+ material PE/smoke
+ particle_width 20
+ particle_height 250
+ cull_each true
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type oriented_self
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 1 0 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Cylinder
+ {
+ angle 0
+ colour 0 0.744444 1 0.05
+ colour_range_start 0 0.744444 1 0.05
+ colour_range_end 0 0.533333 1 0.05
+ emission_rate 60
+ direction 0 0 -1
+ velocity 87.1
+ velocity_min 87.1
+ velocity_max 87.1
+ time_to_live 30
+ time_to_live_min 20
+ time_to_live_max 20
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ depth 1
+ width 300
+ height 300
+ }
+
+ emitter Cylinder
+ {
+ angle 0
+ colour 0 0.455556 0 0.05
+ colour_range_start 0 0.455556 0 0.05
+ colour_range_end 0 0.8 0 0.05
+ emission_rate 60
+ direction 0 0 -1
+ velocity 77.42
+ velocity_min 77.42
+ velocity_max 77.42
+ time_to_live 30
+ time_to_live_min 20
+ time_to_live_max 20
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ depth 0
+ width 300
+ height 300
+ }
+}
+
+
+Orxonox/ForceFieldBlue
+{
+ quota 10000
+ material PE/smoke
+ particle_width 20
+ particle_height 350
+ cull_each true
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type oriented_self
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 1 0 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Cylinder
+ {
+ angle 0
+ colour 0 0 0.744444 0.05
+ colour_range_start 0 0 0.744444 0.05
+ colour_range_end 0.5 0 0.533333 0.05
+ emission_rate 150
+ direction 0 0 -1
+ velocity 87.1
+ velocity_min 87.1
+ velocity_max 87.1
+ time_to_live 50
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ depth 1
+ width 600
+ height 600
+ }
+
+ emitter Cylinder
+ {
+ angle 0
+ colour 0 0 0.455556 0.05
+ colour_range_start 0 0.3 0.455556 0.05
+ colour_range_end 0 0.5 0.8 0.05
+ emission_rate 150
+ direction 0 0 -1
+ velocity 77.42
+ velocity_min 77.42
+ velocity_max 77.42
+ time_to_live 50
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ depth 0
+ width 500
+ height 500
+ }
}
+
More information about the Orxonox-commit
mailing list