[Orxonox-commit 1401] r6119 - in code/branches/presentation2: bin data/levels data/levels/includes data/levels/templates data/particle doc/api src/modules/weapons/projectiles src/orxonox src/orxonox/controllers
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Nov 22 16:10:07 CET 2009
Author: rgrieder
Date: 2009-11-22 16:10:06 +0100 (Sun, 22 Nov 2009)
New Revision: 6119
Modified:
code/branches/presentation2/bin/dedicatedClient.bat.in
code/branches/presentation2/bin/dedicatedClient.in
code/branches/presentation2/data/levels/events.oxw
code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi
code/branches/presentation2/data/levels/questsystem2.oxw
code/branches/presentation2/data/levels/sound.oxw
code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt
code/branches/presentation2/data/levels/test_ghost.oxw
code/branches/presentation2/data/particle/bigexplosion.particle
code/branches/presentation2/data/particle/explosion4.particle
code/branches/presentation2/data/particle/laser.particle
code/branches/presentation2/data/particle/load.particle
code/branches/presentation2/data/particle/particlecanon.particle
code/branches/presentation2/data/particle/rocketfire.particle
code/branches/presentation2/data/particle/smoke.particle
code/branches/presentation2/data/particle/tes3.particle
code/branches/presentation2/doc/api/main.dox
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
code/branches/presentation2/src/orxonox/MoodManager.cc
code/branches/presentation2/src/orxonox/MoodManager.h
code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
Log:
svn:eol-style "native" should be set for all text files.
Property changes on: code/branches/presentation2/bin/dedicatedClient.bat.in
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/bin/dedicatedClient.in
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/levels/events.oxw
===================================================================
--- code/branches/presentation2/data/levels/events.oxw 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/levels/events.oxw 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,223 +1,223 @@
-<?lua
- include("hudtemplates3.oxo")
- include("stats.oxo")
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_H2.oxt")
-?>
-
-<Level
- name = "Event testing"
- description = "A simple level to test the event-system (with comments)"
->
- <Scene
- ambientlight = "0.5, 0.5, 0.5"
- skybox = "Orxonox/skypanoramagen1"
- >
- <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="0,-100,0" lookat="0,0,0" roll=180 spawnclass=SpaceShip pawndesign=spaceshipassff />
-
- <Billboard position=" 300,100, 0" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
- <Billboard position=" 200,100, 0" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
- <Billboard position=" 200,100,100" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
- <Billboard position=" 100,100, 0" material="Examples/Flare" colour="1.0, 1.0, 0.0" />
- <Billboard position=" 0,100, 0" material="Examples/Flare" colour="0.0, 1.0, 0.0" />
- <Billboard position="-100,100, 0" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
- <Billboard position="-100,100,100" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
- <Billboard position="-200,100, 0" material="Examples/Flare" colour="0.0, 0.0, 1.0" />
- <Billboard position="-300,100, 0" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
-
-
-
- <!--
- Begin of the tutorial section.
- -->
-
-
-
- <!--
- Note:
- All following examples use only one subobject (in nested layouts). But of course you can add more
- objects. They will all follow the same rules (depending on the example receive, send or pipe events).
-
- Some examples address objects by name. Those methods always address ALL objects with this name, no
- matter where they are in the XML-file (before or after the addressing object). Of course this also
- works with all amounts of objects from zero to infinity. In the examples I used two objects each.
- -->
-
-
- <!-- red -->
- <!--
- Standard:
- Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
- Every fired event of the source is mapped to the "visibility" state of the listener.
-
- This is a 1:1 mapping between event-listener and event-source.
- -->
- <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
- <events>
- <visibility>
- <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
- </visibility>
- </events>
- </Billboard>
-
-
- <!-- orange -->
- <!--
- EventListener:
- The EventListener object forwards all events from objects, whose names equal the "event" attribute
- of the EventListener, to the enclosing object (Billboard).
- In this case, both triggers have the name "trigger2" and thus both triggers send events to the Billboard.
-
- The EventListener provides an 1:n mapping between one listener and multiple event-sources.
- -->
- <Billboard position="200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
- <events>
- <visibility>
- <EventListener event="trigger2" />
- </visibility>
- </events>
- </Billboard>
- <DistanceTrigger name="trigger2" position="200,100,0" distance=25 target="ControllableEntity" />
- <DistanceTrigger name="trigger2" position="200,100,100" distance=25 target="ControllableEntity" />
-
-
- <!-- yellow -->
- <!--
- EventTarget:
- The EventTarget object forwards the events, received from objects whithin the "events" subsection,
- to all objects whose names equal the "name" attribute.
- In this case, the EventTarget forwards the event from the DistanceTrigger to all listeners with
- name "bb3".
-
- The EventTarget provides an n:1 mapping between several listeners and one event-source.
- -->
- <Billboard name="bb3" position="100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
- <Billboard name="bb3" position="100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
- <EventTarget target="bb3">
- <events>
- <visibility>
- <DistanceTrigger position="100,100,0" distance=25 target="ControllableEntity" />
- </visibility>
- </events>
- </EventTarget>
-
-
- <!-- green -->
- <!--
- EventDispatcher:
- The EventDispatcher catches events from objects in its "events" subsection. Those events are forwared
- to all objects in the "targets" subsection. The EventDispatcher resembles the EventTarget, but
- doesn't address objects with the "name" attribute. It rather places them directly inside the "targets"
- subsection.
- In this case, the EventDispatcher receives events from the DistanceTrigger and forwards those events
- to the Billboard object.
-
- The EventDispatcher provides an n:1 mapping between several targets (listeners) and one event source.
- -->
- <EventDispatcher>
- <targets>
- <Billboard position="0,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
- </targets>
- <events>
- <visibility>
- <DistanceTrigger position="0,100,0" distance=25 target="ControllableEntity" />
- </visibility>
- </events>
- </EventDispatcher>
-
-
- <!-- turquoise -->
- <!--
- Combination:
- By combinding the above three classes, namely EventDispatcher, EventTarget and EventListener, you can
- extract the event logic completely from the actual objects (Billboards and DistanceTriggers).
- In this case, both triggers (whith names "trigger5") send events to both Billboards (with names "bb5").
-
- This combination allows an n:n mapping between event-listeners and event-sources.
- -->
- <Billboard name="bb5" position="-100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
- <Billboard name="bb5" position="-100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
- <DistanceTrigger name="trigger5" position="-100,100,0" distance=25 target="ControllableEntity" />
- <DistanceTrigger name="trigger5" position="-100,100,100" distance=25 target="ControllableEntity" />
- <EventDispatcher>
- <targets>
- <EventTarget target="bb5" />
- </targets>
- <events>
- <visibility>
- <EventListener event="trigger5" />
- </visibility>
- </events>
- </EventDispatcher>
-
-
- <!-- blue -->
- <!--
- Mainstate:
- Apart from the standard states (like activity and visibility), each object can have a mainstate.
- You can define the mainstate with an xml-attribute: mainstate="state". "state" must be one of the
- supported states of the object (except states which need the originator as a second argument). If
- the mainstate is set (by default that's not the case), you can send events to the "mainstate" state.
- This allows you to hide the actually affected state in the event-listener, while the event-source
- just sends events.
- Note that this example is exactly like the standard case, but the event is sent to the main-state,
- which in turn is set to "visibility".
- -->
- <Billboard position="-200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility">
- <events>
- <mainstate>
- <DistanceTrigger position="-200,100,0" distance=25 target="ControllableEntity" />
- </mainstate>
- </events>
- </Billboard>
-
-
- <!-- violet -->
- <!--
- Event forwarding:
- As a consequence of the mainstate, events can also be sent without any explicit declaration of
- the targets state. This allows us to forward events from an event-source directly to a bunch of
- event-listeners. The events are automatically piped into the mainstate. Therefore the listeners
- have to declare their main-state.
- In this example, the DistanceTrigger forwards the events to the Billboards main-state (visibility).
- This does the same like the example above, but instead of piping events backwards from the source
- into the mainstate of the listener, we're forwarding the event implicitly to the mainstate.
- -->
- <DistanceTrigger position="-300,100,0" distance=25 target="ControllableEntity">
- <eventlisteners>
- <Billboard position="-300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility" />
- </eventlisteners>
- </DistanceTrigger>
-
-
-
- <!--
- End of the tutorial section.
- -->
-
-
-
- <!--
- The following example shows again the red (standard layout) and the violet (event forwarding) example,
- but this time with a memoryless state (spawn) from the ParticleSpawner instead of the boolean state
- (visibility) in the other examples.
- -->
- <Billboard position=" 300,100,300" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
- <Billboard position="-300,100,300" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
- <ParticleSpawner position="300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0>
- <events>
- <spawn>
- <DistanceTrigger position="300,100,300" distance=25 target="ControllableEntity" />
- </spawn>
- </events>
- </ParticleSpawner>
- <DistanceTrigger position="-300,100,300" distance=25 target="ControllableEntity">
- <eventlisteners>
- <ParticleSpawner position="-300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 mainstate="spawn" />
- </eventlisteners>
- </DistanceTrigger>
-
- </Scene>
-</Level>
+<?lua
+ include("hudtemplates3.oxo")
+ include("stats.oxo")
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_H2.oxt")
+?>
+
+<Level
+ name = "Event testing"
+ description = "A simple level to test the event-system (with comments)"
+>
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ skybox = "Orxonox/skypanoramagen1"
+ >
+ <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="0,-100,0" lookat="0,0,0" roll=180 spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+ <Billboard position=" 300,100, 0" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
+ <Billboard position=" 200,100, 0" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
+ <Billboard position=" 200,100,100" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
+ <Billboard position=" 100,100, 0" material="Examples/Flare" colour="1.0, 1.0, 0.0" />
+ <Billboard position=" 0,100, 0" material="Examples/Flare" colour="0.0, 1.0, 0.0" />
+ <Billboard position="-100,100, 0" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
+ <Billboard position="-100,100,100" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
+ <Billboard position="-200,100, 0" material="Examples/Flare" colour="0.0, 0.0, 1.0" />
+ <Billboard position="-300,100, 0" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
+
+
+
+ <!--
+ Begin of the tutorial section.
+ -->
+
+
+
+ <!--
+ Note:
+ All following examples use only one subobject (in nested layouts). But of course you can add more
+ objects. They will all follow the same rules (depending on the example receive, send or pipe events).
+
+ Some examples address objects by name. Those methods always address ALL objects with this name, no
+ matter where they are in the XML-file (before or after the addressing object). Of course this also
+ works with all amounts of objects from zero to infinity. In the examples I used two objects each.
+ -->
+
+
+ <!-- red -->
+ <!--
+ Standard:
+ Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
+ Every fired event of the source is mapped to the "visibility" state of the listener.
+
+ This is a 1:1 mapping between event-listener and event-source.
+ -->
+ <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
+ <events>
+ <visibility>
+ <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
+ </visibility>
+ </events>
+ </Billboard>
+
+
+ <!-- orange -->
+ <!--
+ EventListener:
+ The EventListener object forwards all events from objects, whose names equal the "event" attribute
+ of the EventListener, to the enclosing object (Billboard).
+ In this case, both triggers have the name "trigger2" and thus both triggers send events to the Billboard.
+
+ The EventListener provides an 1:n mapping between one listener and multiple event-sources.
+ -->
+ <Billboard position="200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
+ <events>
+ <visibility>
+ <EventListener event="trigger2" />
+ </visibility>
+ </events>
+ </Billboard>
+ <DistanceTrigger name="trigger2" position="200,100,0" distance=25 target="ControllableEntity" />
+ <DistanceTrigger name="trigger2" position="200,100,100" distance=25 target="ControllableEntity" />
+
+
+ <!-- yellow -->
+ <!--
+ EventTarget:
+ The EventTarget object forwards the events, received from objects whithin the "events" subsection,
+ to all objects whose names equal the "name" attribute.
+ In this case, the EventTarget forwards the event from the DistanceTrigger to all listeners with
+ name "bb3".
+
+ The EventTarget provides an n:1 mapping between several listeners and one event-source.
+ -->
+ <Billboard name="bb3" position="100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
+ <Billboard name="bb3" position="100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
+ <EventTarget target="bb3">
+ <events>
+ <visibility>
+ <DistanceTrigger position="100,100,0" distance=25 target="ControllableEntity" />
+ </visibility>
+ </events>
+ </EventTarget>
+
+
+ <!-- green -->
+ <!--
+ EventDispatcher:
+ The EventDispatcher catches events from objects in its "events" subsection. Those events are forwared
+ to all objects in the "targets" subsection. The EventDispatcher resembles the EventTarget, but
+ doesn't address objects with the "name" attribute. It rather places them directly inside the "targets"
+ subsection.
+ In this case, the EventDispatcher receives events from the DistanceTrigger and forwards those events
+ to the Billboard object.
+
+ The EventDispatcher provides an n:1 mapping between several targets (listeners) and one event source.
+ -->
+ <EventDispatcher>
+ <targets>
+ <Billboard position="0,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
+ </targets>
+ <events>
+ <visibility>
+ <DistanceTrigger position="0,100,0" distance=25 target="ControllableEntity" />
+ </visibility>
+ </events>
+ </EventDispatcher>
+
+
+ <!-- turquoise -->
+ <!--
+ Combination:
+ By combinding the above three classes, namely EventDispatcher, EventTarget and EventListener, you can
+ extract the event logic completely from the actual objects (Billboards and DistanceTriggers).
+ In this case, both triggers (whith names "trigger5") send events to both Billboards (with names "bb5").
+
+ This combination allows an n:n mapping between event-listeners and event-sources.
+ -->
+ <Billboard name="bb5" position="-100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
+ <Billboard name="bb5" position="-100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
+ <DistanceTrigger name="trigger5" position="-100,100,0" distance=25 target="ControllableEntity" />
+ <DistanceTrigger name="trigger5" position="-100,100,100" distance=25 target="ControllableEntity" />
+ <EventDispatcher>
+ <targets>
+ <EventTarget target="bb5" />
+ </targets>
+ <events>
+ <visibility>
+ <EventListener event="trigger5" />
+ </visibility>
+ </events>
+ </EventDispatcher>
+
+
+ <!-- blue -->
+ <!--
+ Mainstate:
+ Apart from the standard states (like activity and visibility), each object can have a mainstate.
+ You can define the mainstate with an xml-attribute: mainstate="state". "state" must be one of the
+ supported states of the object (except states which need the originator as a second argument). If
+ the mainstate is set (by default that's not the case), you can send events to the "mainstate" state.
+ This allows you to hide the actually affected state in the event-listener, while the event-source
+ just sends events.
+ Note that this example is exactly like the standard case, but the event is sent to the main-state,
+ which in turn is set to "visibility".
+ -->
+ <Billboard position="-200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility">
+ <events>
+ <mainstate>
+ <DistanceTrigger position="-200,100,0" distance=25 target="ControllableEntity" />
+ </mainstate>
+ </events>
+ </Billboard>
+
+
+ <!-- violet -->
+ <!--
+ Event forwarding:
+ As a consequence of the mainstate, events can also be sent without any explicit declaration of
+ the targets state. This allows us to forward events from an event-source directly to a bunch of
+ event-listeners. The events are automatically piped into the mainstate. Therefore the listeners
+ have to declare their main-state.
+ In this example, the DistanceTrigger forwards the events to the Billboards main-state (visibility).
+ This does the same like the example above, but instead of piping events backwards from the source
+ into the mainstate of the listener, we're forwarding the event implicitly to the mainstate.
+ -->
+ <DistanceTrigger position="-300,100,0" distance=25 target="ControllableEntity">
+ <eventlisteners>
+ <Billboard position="-300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility" />
+ </eventlisteners>
+ </DistanceTrigger>
+
+
+
+ <!--
+ End of the tutorial section.
+ -->
+
+
+
+ <!--
+ The following example shows again the red (standard layout) and the violet (event forwarding) example,
+ but this time with a memoryless state (spawn) from the ParticleSpawner instead of the boolean state
+ (visibility) in the other examples.
+ -->
+ <Billboard position=" 300,100,300" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
+ <Billboard position="-300,100,300" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
+ <ParticleSpawner position="300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0>
+ <events>
+ <spawn>
+ <DistanceTrigger position="300,100,300" distance=25 target="ControllableEntity" />
+ </spawn>
+ </events>
+ </ParticleSpawner>
+ <DistanceTrigger position="-300,100,300" distance=25 target="ControllableEntity">
+ <eventlisteners>
+ <ParticleSpawner position="-300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 mainstate="spawn" />
+ </eventlisteners>
+ </DistanceTrigger>
+
+ </Scene>
+</Level>
Property changes on: code/branches/presentation2/data/levels/events.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/data/levels/questsystem2.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/levels/sound.oxw
===================================================================
--- code/branches/presentation2/data/levels/sound.oxw 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/levels/sound.oxw 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,36 +1,36 @@
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
-?>
-
-<?lua
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name = "Sample"
- description = "Just a few tests"
->
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
- <AmbientSound ambientSource="Mars.ogg" loop="true" play="true" />
- <AmbientSound ambientSource="Asteroid_rocks.ogg" loop="true" play="false">
- <events>
- <activity>
- <DistanceTrigger position="300,100,0" distance=200 target="ControllableEntity">
- <attached>
- <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
- </attached>
- </DistanceTrigger>
- </activity>
- </events>
- </AmbientSound>
-
- <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="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- </Scene>
-</Level>
+<?lua
+ include("stats.oxo")
+ include("hudtemplates3.oxo")
+?>
+
+<?lua
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_pirate.oxt")
+?>
+
+<Level
+ name = "Sample"
+ description = "Just a few tests"
+>
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+
+ <AmbientSound ambientSource="Mars.ogg" loop="true" play="true" />
+ <AmbientSound ambientSource="Asteroid_rocks.ogg" loop="true" play="false">
+ <events>
+ <activity>
+ <DistanceTrigger position="300,100,0" distance=200 target="ControllableEntity">
+ <attached>
+ <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
+ </attached>
+ </DistanceTrigger>
+ </activity>
+ </events>
+ </AmbientSound>
+
+ <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="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ </Scene>
+</Level>
Property changes on: code/branches/presentation2/data/levels/sound.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/data/levels/test_ghost.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/bigexplosion.particle
===================================================================
--- code/branches/presentation2/data/particle/bigexplosion.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/bigexplosion.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,72 +1,72 @@
-particle_system Orxonox/bigexplosion
-{
- quota 3000
- material PE/explosion
- particle_width 100
- particle_height 100
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type vertex
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- angle 180
- colour 0 0 0 0
- colour_range_start 0 0 0 0
- colour_range_end 0 0 0 0
- direction 0 1 0
- emission_rate 2000
- position 0 0 0
- velocity 300
- velocity_min 300
- velocity_max 300
- time_to_live 1.4
- time_to_live_min 1.4
- time_to_live_max 1.8
- duration 0.3
- duration_min 0.3
- duration_max 0.3
- repeat_delay 5
- repeat_delay_min 5
- repeat_delay_max 5
- }
-
- affector Scaler
- {
- rate 20
- }
-
- affector Rotator
- {
- rotation_speed_range_start 0
- rotation_speed_range_end -7.2
- rotation_range_start 0
- rotation_range_end 360
- }
-
- affector ColourInterpolator
- {
- colour0 0.5 0.5 0.5 0
- time0 0
- colour1 0.4 0.4 0.4 0
- time1 0.1
- colour2 0.2 0.2 0.2 0
- time2 0.3
- colour3 0 0 0 0
- time3 1.4
- colour4 0.5 0.5 0.5 0
- time4 1
- colour5 0.5 0.5 0.5 0
- time5 1.5
- }
-}
-
+particle_system Orxonox/bigexplosion
+{
+ quota 3000
+ material PE/explosion
+ particle_width 100
+ particle_height 100
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type vertex
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ angle 180
+ colour 0 0 0 0
+ colour_range_start 0 0 0 0
+ colour_range_end 0 0 0 0
+ direction 0 1 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 300
+ velocity_min 300
+ velocity_max 300
+ time_to_live 1.4
+ time_to_live_min 1.4
+ time_to_live_max 1.8
+ duration 0.3
+ duration_min 0.3
+ duration_max 0.3
+ repeat_delay 5
+ repeat_delay_min 5
+ repeat_delay_max 5
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end -7.2
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector ColourInterpolator
+ {
+ colour0 0.5 0.5 0.5 0
+ time0 0
+ colour1 0.4 0.4 0.4 0
+ time1 0.1
+ colour2 0.2 0.2 0.2 0
+ time2 0.3
+ colour3 0 0 0 0
+ time3 1.4
+ colour4 0.5 0.5 0.5 0
+ time4 1
+ colour5 0.5 0.5 0.5 0
+ time5 1.5
+ }
+}
+
Property changes on: code/branches/presentation2/data/particle/bigexplosion.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/explosion4.particle
===================================================================
--- code/branches/presentation2/data/particle/explosion4.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/explosion4.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,71 +1,71 @@
-particle_system Orxonox/explosion4
-{
- quota 1000
- material PE/explosion3
- particle_width 10
- particle_height 10
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type vertex
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- angle 180
- colour 0 0 0 0
- colour_range_start 0 0 0 0
- colour_range_end 0 0 0 0
- direction 0 1 0
- emission_rate 2000
- position 0 0 0
- velocity 15
- velocity_min 15
- velocity_max 15
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1.4
- duration 0.05
- duration_min 0.05
- duration_max 0.05
- repeat_delay 5
- repeat_delay_min 5
- repeat_delay_max 5
- }
-
- affector Scaler
- {
- rate 20
- }
-
- affector Rotator
- {
- rotation_speed_range_start 0
- rotation_speed_range_end -7.2
- rotation_range_start 0
- rotation_range_end 360
- }
-
- affector ColourInterpolator
- {
- colour0 0.5 0.5 0.5 0
- time0 0
- colour1 0.4 0.4 0.4 0
- time1 0.2
- colour2 0.2 0.2 0.2 0
- time2 0.5
- colour3 0 0 0 0
- time3 1
- colour4 0.5 0.5 0.5 0
- time4 1
- colour5 0.5 0.5 0.5 0
- time5 1
- }
-}
+particle_system Orxonox/explosion4
+{
+ quota 1000
+ material PE/explosion3
+ particle_width 10
+ particle_height 10
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type vertex
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ angle 180
+ colour 0 0 0 0
+ colour_range_start 0 0 0 0
+ colour_range_end 0 0 0 0
+ direction 0 1 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 15
+ velocity_min 15
+ velocity_max 15
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1.4
+ duration 0.05
+ duration_min 0.05
+ duration_max 0.05
+ repeat_delay 5
+ repeat_delay_min 5
+ repeat_delay_max 5
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end -7.2
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector ColourInterpolator
+ {
+ colour0 0.5 0.5 0.5 0
+ time0 0
+ colour1 0.4 0.4 0.4 0
+ time1 0.2
+ colour2 0.2 0.2 0.2 0
+ time2 0.5
+ colour3 0 0 0 0
+ time3 1
+ colour4 0.5 0.5 0.5 0
+ time4 1
+ colour5 0.5 0.5 0.5 0
+ time5 1
+ }
+}
Property changes on: code/branches/presentation2/data/particle/explosion4.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/laser.particle
===================================================================
--- code/branches/presentation2/data/particle/laser.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/laser.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,47 +1,47 @@
-particle_system Orxonox/laser
-{
- quota 200
- material PE/point_lensflare
- particle_width 7.08
- particle_height 7.08
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- angle 180
- colour 0 1 0.275862 1
- colour_range_start 0 1 0.275862 1
- colour_range_end 0 1 0.275862 1
- direction 0 1 0
- emission_rate 80
- position 0 0 0
- velocity 11
- velocity_min 11
- velocity_max 11
- time_to_live 0.7
- time_to_live_min 0.7
- time_to_live_max 1
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 1.6
- repeat_delay_min 1.6
- repeat_delay_max 1.6
- }
-
- affector Scaler
- {
- rate -8.8
- }
-}
+particle_system Orxonox/laser
+{
+ quota 200
+ material PE/point_lensflare
+ particle_width 7.08
+ particle_height 7.08
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ angle 180
+ colour 0 1 0.275862 1
+ colour_range_start 0 1 0.275862 1
+ colour_range_end 0 1 0.275862 1
+ direction 0 1 0
+ emission_rate 80
+ position 0 0 0
+ velocity 11
+ velocity_min 11
+ velocity_max 11
+ time_to_live 0.7
+ time_to_live_min 0.7
+ time_to_live_max 1
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 1.6
+ repeat_delay_min 1.6
+ repeat_delay_max 1.6
+ }
+
+ affector Scaler
+ {
+ rate -8.8
+ }
+}
Property changes on: code/branches/presentation2/data/particle/laser.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/load.particle
===================================================================
--- code/branches/presentation2/data/particle/load.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/load.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,141 +1,141 @@
-particle_system Orxonox/load
-{
- quota 50
- material PE/ringflare
- particle_width 1
- particle_height 1.3
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- angle 5
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 0 1 0
- emission_rate 4
- position 0 -5 0
- velocity 5
- velocity_min 5
- velocity_max 5
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- }
-
- emitter Point
- {
- angle 5
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 1 0 0
- emission_rate 3
- position -5 0 0
- velocity 5
- velocity_min 5
- velocity_max 5
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- }
-
- emitter Point
- {
- angle 5
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction -1 0 0
- emission_rate 3
- position 5 0 0
- velocity 5
- velocity_min 5
- velocity_max 5
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- }
-
- emitter Point
- {
- angle 5
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 0 -1 0
- emission_rate 4
- position 0 5 0
- velocity 5
- velocity_min 5
- velocity_max 5
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- }
-
- affector Scaler
- {
- rate 14.4
- }
-
- affector ColourInterpolator
- {
- colour0 1 1 0.5 0
- time0 1
- colour1 0.5 0.5 0.5 0
- time1 1
- colour2 0.5 0.5 0.5 0
- time2 1
- colour3 0.5 0.5 0.5 0
- time3 1
- colour4 0.5 0.5 0.5 0
- time4 1
- colour5 0.5 0.5 0.5 0
- time5 1
- }
-
- affector DirectionRandomiser
- {
- randomness 15
- scope 0.8
- keep_velocity false
- }
-
-
-}
+particle_system Orxonox/load
+{
+ quota 50
+ material PE/ringflare
+ particle_width 1
+ particle_height 1.3
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ angle 5
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 1 0
+ emission_rate 4
+ position 0 -5 0
+ velocity 5
+ velocity_min 5
+ velocity_max 5
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ }
+
+ emitter Point
+ {
+ angle 5
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 1 0 0
+ emission_rate 3
+ position -5 0 0
+ velocity 5
+ velocity_min 5
+ velocity_max 5
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ }
+
+ emitter Point
+ {
+ angle 5
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction -1 0 0
+ emission_rate 3
+ position 5 0 0
+ velocity 5
+ velocity_min 5
+ velocity_max 5
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ }
+
+ emitter Point
+ {
+ angle 5
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 -1 0
+ emission_rate 4
+ position 0 5 0
+ velocity 5
+ velocity_min 5
+ velocity_max 5
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ }
+
+ affector Scaler
+ {
+ rate 14.4
+ }
+
+ affector ColourInterpolator
+ {
+ colour0 1 1 0.5 0
+ time0 1
+ colour1 0.5 0.5 0.5 0
+ time1 1
+ colour2 0.5 0.5 0.5 0
+ time2 1
+ colour3 0.5 0.5 0.5 0
+ time3 1
+ colour4 0.5 0.5 0.5 0
+ time4 1
+ colour5 0.5 0.5 0.5 0
+ time5 1
+ }
+
+ affector DirectionRandomiser
+ {
+ randomness 15
+ scope 0.8
+ keep_velocity false
+ }
+
+
+}
Property changes on: code/branches/presentation2/data/particle/load.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/particlecanon.particle
===================================================================
--- code/branches/presentation2/data/particle/particlecanon.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/particlecanon.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,43 +1,43 @@
-particle_system Orxonox/particlecanon
-{
- quota 1000
- material PE/point_lensflare
- particle_width 6
- particle_height 6
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- angle 1
- colour 0.965517 0.544828 0 1
- colour_range_start 0.965517 0.544828 0 1
- colour_range_end 0.965517 0.544828 0 1
- direction 0 1 0
- emission_rate 1220
- position 0 0 0
- velocity 300
- velocity_min 300
- velocity_max 300
- time_to_live 0.05
- time_to_live_min 0.05
- time_to_live_max 0.05
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- }
-
-}
+particle_system Orxonox/particlecanon
+{
+ quota 1000
+ material PE/point_lensflare
+ particle_width 6
+ particle_height 6
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ angle 1
+ colour 0.965517 0.544828 0 1
+ colour_range_start 0.965517 0.544828 0 1
+ colour_range_end 0.965517 0.544828 0 1
+ direction 0 1 0
+ emission_rate 1220
+ position 0 0 0
+ velocity 300
+ velocity_min 300
+ velocity_max 300
+ time_to_live 0.05
+ time_to_live_min 0.05
+ time_to_live_max 0.05
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ }
+
+}
Property changes on: code/branches/presentation2/data/particle/particlecanon.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/rocketfire.particle
===================================================================
--- code/branches/presentation2/data/particle/rocketfire.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/rocketfire.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,50 +1,50 @@
-particle_system Orxonox/rocketfire
-{
- quota 5000
- material PE/explosion
- particle_width 9
- particle_height 5
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Ellipsoid
- {
- angle 2
- colour 1 0.682759 1 1
- colour_range_start 1 0.682759 1 1
- colour_range_end 1 0.682759 1 1
- direction 0 1 0
- emission_rate 600
- position 0 0 0
- velocity 10
- velocity_min 10
- velocity_max 48
- time_to_live 0.3
- time_to_live_min 0.3
- time_to_live_max 0.5
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- width 1.5
- height 1.5
- depth 0
- }
-
- affector Scaler
- {
- rate -13.2
- }
-}
+particle_system Orxonox/rocketfire
+{
+ quota 5000
+ material PE/explosion
+ particle_width 9
+ particle_height 5
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Ellipsoid
+ {
+ angle 2
+ colour 1 0.682759 1 1
+ colour_range_start 1 0.682759 1 1
+ colour_range_end 1 0.682759 1 1
+ direction 0 1 0
+ emission_rate 600
+ position 0 0 0
+ velocity 10
+ velocity_min 10
+ velocity_max 48
+ time_to_live 0.3
+ time_to_live_min 0.3
+ time_to_live_max 0.5
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ width 1.5
+ height 1.5
+ depth 0
+ }
+
+ affector Scaler
+ {
+ rate -13.2
+ }
+}
Property changes on: code/branches/presentation2/data/particle/rocketfire.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/smoke.particle
===================================================================
--- code/branches/presentation2/data/particle/smoke.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/smoke.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,45 +1,45 @@
-particle_system Orxonox/smoke
-{
- quota 300
- material PE/explosion
- particle_width 6.94
- particle_height 7.93
- cull_each false
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Ellipsoid
- {
- angle 13
- colour 0.156897 0.326207 1 1
- colour_range_start 0.156897 0.326207 1 1
- colour_range_end 0.156897 0.326207 1 1
- direction 0 1 0
- emission_rate 65
- position 0 0 0
- velocity 25
- velocity_min 25
- velocity_max 25
- time_to_live 2.2
- time_to_live_min 2.2
- time_to_live_max 2.2
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- width 3
- height 3
- depth 0
- }
-}
+particle_system Orxonox/smoke
+{
+ quota 300
+ material PE/explosion
+ particle_width 6.94
+ particle_height 7.93
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Ellipsoid
+ {
+ angle 13
+ colour 0.156897 0.326207 1 1
+ colour_range_start 0.156897 0.326207 1 1
+ colour_range_end 0.156897 0.326207 1 1
+ direction 0 1 0
+ emission_rate 65
+ position 0 0 0
+ velocity 25
+ velocity_min 25
+ velocity_max 25
+ time_to_live 2.2
+ time_to_live_min 2.2
+ time_to_live_max 2.2
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ width 3
+ height 3
+ depth 0
+ }
+}
Property changes on: code/branches/presentation2/data/particle/smoke.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/data/particle/tes3.particle
===================================================================
--- code/branches/presentation2/data/particle/tes3.particle 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/data/particle/tes3.particle 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,59 +1,59 @@
-particle_system Orxonox/tes3
-{
- quota 500
- material PE/lensflare
- particle_width 10
- particle_height 10
- cull_each true
- renderer billboard
- sorted false
- local_space false
- iteration_interval 0
- nonvisible_update_timeout 0
- billboard_type perpendicular_self
- billboard_origin center
- billboard_rotation_type texcoord
- common_up_vector 0 1 0
- point_rendering false
- accurate_facing false
-
- emitter Cylinder
- {
- angle 180
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 0 -1 0
- emission_rate 100
- position 0 100 0
- velocity 26
- velocity_min 26
- velocity_max 26
- time_to_live 9.6
- time_to_live_min 9.6
- time_to_live_max 9.6
- duration 0
- duration_min 0
- duration_max 0
- repeat_delay 0
- repeat_delay_min 0
- repeat_delay_max 0
- width 200
- height 200
- depth 1
- }
-
- affector DeflectorPlane
- {
- plane_point 0 0 0
- plane_normal 0 1 0
- bounce 2
- }
-
- affector DirectionRandomiser
- {
- randomness 7
- scope 1
- keep_velocity true
- }
-}
+particle_system Orxonox/tes3
+{
+ quota 500
+ material PE/lensflare
+ particle_width 10
+ particle_height 10
+ cull_each true
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type perpendicular_self
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Cylinder
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 -1 0
+ emission_rate 100
+ position 0 100 0
+ velocity 26
+ velocity_min 26
+ velocity_max 26
+ time_to_live 9.6
+ time_to_live_min 9.6
+ time_to_live_max 9.6
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ width 200
+ height 200
+ depth 1
+ }
+
+ affector DeflectorPlane
+ {
+ plane_point 0 0 0
+ plane_normal 0 1 0
+ bounce 2
+ }
+
+ affector DirectionRandomiser
+ {
+ randomness 7
+ scope 1
+ keep_velocity true
+ }
+}
Property changes on: code/branches/presentation2/data/particle/tes3.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/doc/api/main.dox
===================================================================
--- code/branches/presentation2/doc/api/main.dox 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/doc/api/main.dox 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,4 +1,4 @@
-/**
- at mainpage
- Orxonox Doxygen Reference
-*/
+/**
+ at mainpage
+ Orxonox Doxygen Reference
+*/
Property changes on: code/branches/presentation2/doc/api/main.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,263 +1,263 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Oliver Scheuss
- * Co-authors:
- * ...
- *
- */
-
-#include "Rocket.h"
-
-#include "core/XMLPort.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "worldentities/pawns/Pawn.h"
-#include "graphics/ParticleSpawner.h"
-#include "graphics/Model.h"
-#include "objects/collisionshapes/ConeCollisionShape.h"
-#include "infos/PlayerInfo.h"
-#include "controllers/Controller.h"
-#include "worldentities/CameraPosition.h"
-
-namespace orxonox
-{
- CreateFactory(Rocket);
- // create the factory for the Rocket
-
- /**
- @brief
- Constructor. Registers the object and initializes some default values.
- */
- Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator)
- {
- RegisterObject(Rocket);// - register the Rocket class to the core
-
- this->localAngularVelocity_ = 0;
-
- if (GameMode::isMaster())
- {
- this->setCollisionType(WorldEntity::Kinematic);
- this->setVelocity(0,0,-100);
- this->lifetime_ = 100;
- this->bDestroy_ = false;
-
- this->model_ = new Model(this);
- this->model_->setMeshSource("rocket.mesh");
- this->attach(this->model_);
- ParticleSpawner* fire = new ParticleSpawner(this);
- this->attach(fire);
- fire->setOrientation(this->getOrientation());
- fire->setSource("Orxonox/rocketfire");
-
- this->enableCollisionCallback();
- this->setCollisionResponse(false);
- this->setCollisionType(Kinematic);
-
- this->collisionShape_ = new ConeCollisionShape(this);
- this->collisionShape_->setRadius(3);
- this->collisionShape_->setHeight(500);
- this->attachCollisionShape(this->collisionShape_);
-
- this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
- }
-
- this->camPosition_ = new CameraPosition(this);
- this->camPosition_->setPosition(0,10,40);
- this->camPosition_->setSyncMode(0x0);
- this->camPosition_->setAllowMouseLook(true);
- this->attach( this->camPosition_ );
- this->addCameraPosition( this->camPosition_ );
- }
-
- /**
- @brief
- Destructor. Destroys controller, if present.
- */
- Rocket::~Rocket()
- {
- if(this->isInitialized())
- {
- if (GameMode::isMaster() && this->player_.get())
- {
- this->model_->destroy();
- this->collisionShape_->destroy();
- this->player_->stopTemporaryControl();
- }
- this->camPosition_->destroy();
- }
- }
-
- /**
- @brief
- Method for creating a Rocket through XML.
- */
- void Rocket::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- // this calls the XMLPort function of the parent class
- SUPER(Rocket, XMLPort, xmlelement, mode);
- }
-
- void Rocket::setOwner(Pawn* owner)
- {
- this->owner_ = owner;
- this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
- this->player_ = this->owner_->getPlayer();
- this->owner_->getPlayer()->startTemporaryControl(this);
- }
-
- /**
- @brief
- Defines which actions the Rocket has to take in each tick.
- @param dt
- The length of the tick.
- */
- void Rocket::tick(float dt)
- {
- SUPER(Rocket, tick, dt);
-
- if( this->hasLocalController() )
- {
- this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
- this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
- this->localAngularVelocity_ = 0;
-
- if( this->bDestroy_ )
- this->destroy();
- }
- }
-
- bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
- {
- if (!this->bDestroy_ && GameMode::isMaster())
- {
- if (otherObject == this->owner_)
- return false;
-
- this->bDestroy_ = true;
-
- if (this->owner_)
- {
- {
- ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/explosion4");
- effect->setLifetime(2.0f);
- }
-
- {
- ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/smoke4");
- effect->setLifetime(3.0f);
- }
- }
-
- float dmg = this->damage_;
- if (this->owner_)
- dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
-
- Pawn* victim = orxonox_cast<Pawn*>(otherObject);
- if (victim)
- victim->damage(dmg, this->owner_);
-// this->destroy();
- }
- return false;
- }
-
- void Rocket::destroyObject()
- {
- if (GameMode::isMaster())
- this->destroy();
- }
-
- void Rocket::fired(unsigned int firemode)
- {
- if (this->owner_)
- {
- {
- ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/explosion4");
- effect->setLifetime(2.0f);
- }
-
- {
- ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/smoke4");
- effect->setLifetime(3.0f);
- }
- this->destroy();
- }
- }
-
- /**
- @brief
- Rotates the Rocket around the y-axis by the amount specified by the first component of the input 2-dim vector.
- @param value
- The vector determining the amount of the angular movement.
- */
- void Rocket::rotateYaw(const Vector2& value)
- {
- ControllableEntity::rotateYaw(value);
-
- if( !this->isInMouseLook() )
- this->localAngularVelocity_.y += value.x;
- }
-
- /**
- @brief
- Rotates the Rocket around the x-axis by the amount specified by the first component of the input 2-dim vector.
- @param value
- The vector determining the amount of the angular movement.
- */
- void Rocket::rotatePitch(const Vector2& value)
- {
- ControllableEntity::rotatePitch(value);
-
- if( !this->isInMouseLook() )
- this->localAngularVelocity_.x += value.x;
- }
-
- /**
- @brief
- Rotates the Rocket around the z-axis by the amount specified by the first component of the input 2-dim vector.
- @param value
- The vector determining the amount of the angular movement.
- */
- void Rocket::rotateRoll(const Vector2& value)
- {
- ControllableEntity::rotateRoll(value);
-
- if( !this->isInMouseLook() )
- this->localAngularVelocity_.z += value.x;
- }
-
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "Rocket.h"
+
+#include "core/XMLPort.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/pawns/Pawn.h"
+#include "graphics/ParticleSpawner.h"
+#include "graphics/Model.h"
+#include "objects/collisionshapes/ConeCollisionShape.h"
+#include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
+#include "worldentities/CameraPosition.h"
+
+namespace orxonox
+{
+ CreateFactory(Rocket);
+ // create the factory for the Rocket
+
+ /**
+ @brief
+ Constructor. Registers the object and initializes some default values.
+ */
+ Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator)
+ {
+ RegisterObject(Rocket);// - register the Rocket class to the core
+
+ this->localAngularVelocity_ = 0;
+
+ if (GameMode::isMaster())
+ {
+ this->setCollisionType(WorldEntity::Kinematic);
+ this->setVelocity(0,0,-100);
+ this->lifetime_ = 100;
+ this->bDestroy_ = false;
+
+ this->model_ = new Model(this);
+ this->model_->setMeshSource("rocket.mesh");
+ this->attach(this->model_);
+ ParticleSpawner* fire = new ParticleSpawner(this);
+ this->attach(fire);
+ fire->setOrientation(this->getOrientation());
+ fire->setSource("Orxonox/rocketfire");
+
+ this->enableCollisionCallback();
+ this->setCollisionResponse(false);
+ this->setCollisionType(Kinematic);
+
+ this->collisionShape_ = new ConeCollisionShape(this);
+ this->collisionShape_->setRadius(3);
+ this->collisionShape_->setHeight(500);
+ this->attachCollisionShape(this->collisionShape_);
+
+ this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
+ }
+
+ this->camPosition_ = new CameraPosition(this);
+ this->camPosition_->setPosition(0,10,40);
+ this->camPosition_->setSyncMode(0x0);
+ this->camPosition_->setAllowMouseLook(true);
+ this->attach( this->camPosition_ );
+ this->addCameraPosition( this->camPosition_ );
+ }
+
+ /**
+ @brief
+ Destructor. Destroys controller, if present.
+ */
+ Rocket::~Rocket()
+ {
+ if(this->isInitialized())
+ {
+ if (GameMode::isMaster() && this->player_.get())
+ {
+ this->model_->destroy();
+ this->collisionShape_->destroy();
+ this->player_->stopTemporaryControl();
+ }
+ this->camPosition_->destroy();
+ }
+ }
+
+ /**
+ @brief
+ Method for creating a Rocket through XML.
+ */
+ void Rocket::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ // this calls the XMLPort function of the parent class
+ SUPER(Rocket, XMLPort, xmlelement, mode);
+ }
+
+ void Rocket::setOwner(Pawn* owner)
+ {
+ this->owner_ = owner;
+ this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
+ this->player_ = this->owner_->getPlayer();
+ this->owner_->getPlayer()->startTemporaryControl(this);
+ }
+
+ /**
+ @brief
+ Defines which actions the Rocket has to take in each tick.
+ @param dt
+ The length of the tick.
+ */
+ void Rocket::tick(float dt)
+ {
+ SUPER(Rocket, tick, dt);
+
+ if( this->hasLocalController() )
+ {
+ this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
+ this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
+ this->localAngularVelocity_ = 0;
+
+ if( this->bDestroy_ )
+ this->destroy();
+ }
+ }
+
+ bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ {
+ if (!this->bDestroy_ && GameMode::isMaster())
+ {
+ if (otherObject == this->owner_)
+ return false;
+
+ this->bDestroy_ = true;
+
+ if (this->owner_)
+ {
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/explosion4");
+ effect->setLifetime(2.0f);
+ }
+
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/smoke4");
+ effect->setLifetime(3.0f);
+ }
+ }
+
+ float dmg = this->damage_;
+ if (this->owner_)
+ dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
+ Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+ if (victim)
+ victim->damage(dmg, this->owner_);
+// this->destroy();
+ }
+ return false;
+ }
+
+ void Rocket::destroyObject()
+ {
+ if (GameMode::isMaster())
+ this->destroy();
+ }
+
+ void Rocket::fired(unsigned int firemode)
+ {
+ if (this->owner_)
+ {
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/explosion4");
+ effect->setLifetime(2.0f);
+ }
+
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/smoke4");
+ effect->setLifetime(3.0f);
+ }
+ this->destroy();
+ }
+ }
+
+ /**
+ @brief
+ Rotates the Rocket around the y-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Rocket::rotateYaw(const Vector2& value)
+ {
+ ControllableEntity::rotateYaw(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.y += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the Rocket around the x-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Rocket::rotatePitch(const Vector2& value)
+ {
+ ControllableEntity::rotatePitch(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.x += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the Rocket around the z-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Rocket::rotateRoll(const Vector2& value)
+ {
+ ControllableEntity::rotateRoll(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.z += value.x;
+ }
+
+}
Property changes on: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,131 +1,131 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Oliver Scheuss
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _Rocket_H__
-#define _Rocket_H__
-
-#include "weapons/WeaponsPrereqs.h"
-#include "worldentities/ControllableEntity.h"
-
-namespace orxonox
-{
- class ConeCollisionShape;
-
- /**
- @brief
- Rocket, that is made to move upon a specified pattern.
- This class was constructed for the PPS tutorial.
- @author
- Oli Scheuss
- */
- class _WeaponsExport Rocket : public ControllableEntity
- {
- public:
- Rocket(BaseObject* creator);
- virtual ~Rocket();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Rocket through XML.
- virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
-
- virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
- void destroyObject();
-
- virtual void moveFrontBack(const Vector2& value){}
- virtual void moveRightLeft(const Vector2& value){}
- virtual void moveUpDown(const Vector2& value){}
-
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
-
- /**
- @brief Moves the Rocket in the Front/Back-direction by the specifed amount.
- @param value The amount by which the Rocket is to be moved.
- */
- inline void moveFrontBack(float value)
- { this->moveFrontBack(Vector2(value, 0)); }
- /**
- @brief Moves the Rocket in the Right/Left-direction by the specifed amount.
- @param value The amount by which the Rocket is to be moved.
- */
- inline void moveRightLeft(float value)
- { this->moveRightLeft(Vector2(value, 0)); }
- /**
- @brief Moves the Rocket in the Up/Down-direction by the specifed amount.
- @param value The amount by which the Rocket is to be moved.
- */
- inline void moveUpDown(float value)
- { this->moveUpDown(Vector2(value, 0)); }
-
- /**
- @brief Rotates the Rocket around the y-axis by the specifed amount.
- @param value The amount by which the Rocket is to be rotated.
- */
- inline void rotateYaw(float value)
- { this->rotateYaw(Vector2(value, 0)); }
- /**
- @brief Rotates the Rocket around the x-axis by the specifed amount.
- @param value The amount by which the Rocket is to be rotated.
- */
- inline void rotatePitch(float value)
- { this->rotatePitch(Vector2(value, 0)); }
- /**
- @brief Rotates the Rocket around the z-axis by the specifed amount.
- @param value The amount by which the Rocket is to be rotated.
- */
- inline void rotateRoll(float value)
- { this->rotateRoll(Vector2(value, 0)); }
-
- void setOwner(Pawn* owner);
- inline Pawn* getOwner() const
- { return this->owner_; }
-
- inline void setDamage(float damage)
- { this->damage_ = damage; }
- inline float getDamage() const
- { return this->damage_; }
- virtual void fired(unsigned int firemode);
-
- private:
- WeakPtr<Pawn> owner_;
- Vector3 localAngularVelocity_;
- float damage_;
- bool bDestroy_;
- ControllableEntity* originalControllableEntity_;
-
- Model* model_;
- CameraPosition* camPosition_;
- ConeCollisionShape* collisionShape_;
- WeakPtr<PlayerInfo> player_;
- Timer destroyTimer_;
- float lifetime_;
- };
-
-}
-
-#endif /* _Rocket_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Rocket_H__
+#define _Rocket_H__
+
+#include "weapons/WeaponsPrereqs.h"
+#include "worldentities/ControllableEntity.h"
+
+namespace orxonox
+{
+ class ConeCollisionShape;
+
+ /**
+ @brief
+ Rocket, that is made to move upon a specified pattern.
+ This class was constructed for the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _WeaponsExport Rocket : public ControllableEntity
+ {
+ public:
+ Rocket(BaseObject* creator);
+ virtual ~Rocket();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Rocket through XML.
+ virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
+
+ virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ void destroyObject();
+
+ virtual void moveFrontBack(const Vector2& value){}
+ virtual void moveRightLeft(const Vector2& value){}
+ virtual void moveUpDown(const Vector2& value){}
+
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
+ /**
+ @brief Moves the Rocket in the Front/Back-direction by the specifed amount.
+ @param value The amount by which the Rocket is to be moved.
+ */
+ inline void moveFrontBack(float value)
+ { this->moveFrontBack(Vector2(value, 0)); }
+ /**
+ @brief Moves the Rocket in the Right/Left-direction by the specifed amount.
+ @param value The amount by which the Rocket is to be moved.
+ */
+ inline void moveRightLeft(float value)
+ { this->moveRightLeft(Vector2(value, 0)); }
+ /**
+ @brief Moves the Rocket in the Up/Down-direction by the specifed amount.
+ @param value The amount by which the Rocket is to be moved.
+ */
+ inline void moveUpDown(float value)
+ { this->moveUpDown(Vector2(value, 0)); }
+
+ /**
+ @brief Rotates the Rocket around the y-axis by the specifed amount.
+ @param value The amount by which the Rocket is to be rotated.
+ */
+ inline void rotateYaw(float value)
+ { this->rotateYaw(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Rocket around the x-axis by the specifed amount.
+ @param value The amount by which the Rocket is to be rotated.
+ */
+ inline void rotatePitch(float value)
+ { this->rotatePitch(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Rocket around the z-axis by the specifed amount.
+ @param value The amount by which the Rocket is to be rotated.
+ */
+ inline void rotateRoll(float value)
+ { this->rotateRoll(Vector2(value, 0)); }
+
+ void setOwner(Pawn* owner);
+ inline Pawn* getOwner() const
+ { return this->owner_; }
+
+ inline void setDamage(float damage)
+ { this->damage_ = damage; }
+ inline float getDamage() const
+ { return this->damage_; }
+ virtual void fired(unsigned int firemode);
+
+ private:
+ WeakPtr<Pawn> owner_;
+ Vector3 localAngularVelocity_;
+ float damage_;
+ bool bDestroy_;
+ ControllableEntity* originalControllableEntity_;
+
+ Model* model_;
+ CameraPosition* camPosition_;
+ ConeCollisionShape* collisionShape_;
+ WeakPtr<PlayerInfo> player_;
+ Timer destroyTimer_;
+ float lifetime_;
+ };
+
+}
+
+#endif /* _Rocket_H__ */
Property changes on: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/MoodManager.cc 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/src/orxonox/MoodManager.cc 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,84 +1,84 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Kevin 'youngk' Young
- * Co-authors:
- * ...
- *
- */
-
-#include "MoodManager.h"
-
-#include "core/ConsoleCommand.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
-
-namespace orxonox
-{
- MoodManager* MoodManager::singletonPtr_s = 0;
- ManageScopedSingleton(MoodManager, ScopeID::Root, false);
-
- MoodManager::MoodManager()
- {
- RegisterRootObject(MoodManager);
- moodOld_ = "default";
- this->setConfigValues();
- CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
- }
-
- MoodManager::~MoodManager()
- {
- }
-
- void MoodManager::setConfigValues()
- {
- SetConfigValue(mood_, "default")
- .description("Sets the mood for the current level.")
- .callback(this, &MoodManager::checkMoodValidity);
- }
-
- /**
- * Sets the mood
- * @note TODO: Inform dependent classes of mood change
- */
- void MoodManager::setMood(const std::string& mood)
- {
- ModifyConfigValue(mood_, set, mood);
- }
-
- // gets the current mood
- const std::string& MoodManager::getMood()
- {
- return mood_;
- }
-
- void MoodManager::checkMoodValidity()
- {
- if(mood_ != "default" && mood_ != "dnb") // Insert new moods here
- {
- ResetConfigValue(mood_);
- }
- COUT(0) << "MoodManager: Mood now set to " << mood_ << std::endl;
- return;
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Kevin 'youngk' Young
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "MoodManager.h"
+
+#include "core/ConsoleCommand.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
+#include "core/ScopedSingletonManager.h"
+
+namespace orxonox
+{
+ MoodManager* MoodManager::singletonPtr_s = 0;
+ ManageScopedSingleton(MoodManager, ScopeID::Root, false);
+
+ MoodManager::MoodManager()
+ {
+ RegisterRootObject(MoodManager);
+ moodOld_ = "default";
+ this->setConfigValues();
+ CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
+ }
+
+ MoodManager::~MoodManager()
+ {
+ }
+
+ void MoodManager::setConfigValues()
+ {
+ SetConfigValue(mood_, "default")
+ .description("Sets the mood for the current level.")
+ .callback(this, &MoodManager::checkMoodValidity);
+ }
+
+ /**
+ * Sets the mood
+ * @note TODO: Inform dependent classes of mood change
+ */
+ void MoodManager::setMood(const std::string& mood)
+ {
+ ModifyConfigValue(mood_, set, mood);
+ }
+
+ // gets the current mood
+ const std::string& MoodManager::getMood()
+ {
+ return mood_;
+ }
+
+ void MoodManager::checkMoodValidity()
+ {
+ if(mood_ != "default" && mood_ != "dnb") // Insert new moods here
+ {
+ ResetConfigValue(mood_);
+ }
+ COUT(0) << "MoodManager: Mood now set to " << mood_ << std::endl;
+ return;
+ }
+}
Property changes on: code/branches/presentation2/src/orxonox/MoodManager.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2/src/orxonox/MoodManager.h
===================================================================
--- code/branches/presentation2/src/orxonox/MoodManager.h 2009-11-22 15:08:32 UTC (rev 6118)
+++ code/branches/presentation2/src/orxonox/MoodManager.h 2009-11-22 15:10:06 UTC (rev 6119)
@@ -1,72 +1,72 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Kevin 'youngk' Young
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _MoodManager_H__
-#define _MoodManager_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <cassert>
-#include <list>
-#include <string>
-
-#include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
-
-// tolua_begin
-namespace orxonox
-{
- class _OrxonoxExport MoodManager
- // tolua_end
- : public Singleton<MoodManager>, public OrxonoxClass
- { // tolua_export
- friend class Singleton<MoodManager>;
- public:
- MoodManager();
- ~MoodManager();
-
- void setConfigValues();
-
- void setMood(const std::string& mood);
- const std::string& getMood();
-
- static MoodManager& getInstance() { return Singleton<MoodManager>::getInstance(); } // tolua_export
-
- private:
-
- // config values
- std::string mood_;
- std::string moodOld_;
-
- void checkMoodValidity();
-
- static MoodManager* singletonPtr_s;
- }; // tolua_export
-} // tolua_export
-
-#endif /* _MoodManager_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Kevin 'youngk' Young
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _MoodManager_H__
+#define _MoodManager_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <cassert>
+#include <list>
+#include <string>
+
+#include "util/Singleton.h"
+#include "core/OrxonoxClass.h"
+
+// tolua_begin
+namespace orxonox
+{
+ class _OrxonoxExport MoodManager
+ // tolua_end
+ : public Singleton<MoodManager>, public OrxonoxClass
+ { // tolua_export
+ friend class Singleton<MoodManager>;
+ public:
+ MoodManager();
+ ~MoodManager();
+
+ void setConfigValues();
+
+ void setMood(const std::string& mood);
+ const std::string& getMood();
+
+ static MoodManager& getInstance() { return Singleton<MoodManager>::getInstance(); } // tolua_export
+
+ private:
+
+ // config values
+ std::string mood_;
+ std::string moodOld_;
+
+ void checkMoodValidity();
+
+ static MoodManager* singletonPtr_s;
+ }; // tolua_export
+} // tolua_export
+
+#endif /* _MoodManager_H__ */
Property changes on: code/branches/presentation2/src/orxonox/MoodManager.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list