[Orxonox-commit 2579] r7285 - in code/trunk: cmake/tools data/levels data/levels/includes data/levels/templates src/modules/notifications src/modules/notifications/dispatchers src/modules/pickup
landauf at orxonox.net
landauf at orxonox.net
Tue Aug 31 03:51:37 CEST 2010
Author: landauf
Date: 2010-08-31 03:51:37 +0200 (Tue, 31 Aug 2010)
New Revision: 7285
Modified:
code/trunk/cmake/tools/FindPOCO.cmake
code/trunk/data/levels/includes/weaponsettings_swallow.oxi
code/trunk/data/levels/templates/spaceship_swallow.oxt
code/trunk/data/levels/test_swallow.oxw
code/trunk/src/modules/notifications/NotificationDispatcher.cc
code/trunk/src/modules/notifications/NotificationDispatcher.h
code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h
code/trunk/src/modules/notifications/NotificationsPrereqs.h
code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt
code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc
code/trunk/src/modules/notifications/dispatchers/CommandNotification.h
code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc
code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h
code/trunk/src/modules/pickup/CollectiblePickup.cc
code/trunk/src/modules/pickup/CollectiblePickup.h
Log:
added eol-style native for some files.
note: there are another 6 files in libraries/network, but I won't change them as long as there's an active network branch.
Modified: code/trunk/cmake/tools/FindPOCO.cmake
===================================================================
--- code/trunk/cmake/tools/FindPOCO.cmake 2010-08-31 01:37:40 UTC (rev 7284)
+++ code/trunk/cmake/tools/FindPOCO.cmake 2010-08-31 01:51:37 UTC (rev 7285)
@@ -1,57 +1,57 @@
- #
- # ORXONOX - the hottest 3D action shooter ever to exist
- # > www.orxonox.net <
- #
- # 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:
- # Reto Grieder
- # Description:
- # Finds the POCO Foundation library.
- #
-
-INCLUDE(FindPackageHandleStandardArgs)
-INCLUDE(HandleLibraryTypes)
-
-FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
- PATHS $ENV{POCODIR}
- PATH_SUFFIXES include
-)
-FIND_LIBRARY(POCO_LIBRARY_OPTIMIZED
- NAMES PocoFoundation
- PATHS $ENV{POCODIR}
- PATH_SUFFIXES lib
-)
-FIND_LIBRARY(POCO_LIBRARY_DEBUG
- NAMES PocoFoundationd PocoFoundation_d PocoFoundationD PocoFoundation_D
- PATHS $ENV{POCODIR}
- PATH_SUFFIXES lib
-)
-
-# Handle the REQUIRED argument and set POCO_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(POCO DEFAULT_MSG
- POCO_LIBRARY_OPTIMIZED
- POCO_INCLUDE_DIR
-)
-
-# Collect optimized and debug libraries
-HANDLE_LIBRARY_TYPES(POCO)
-
-MARK_AS_ADVANCED(
- POCO_INCLUDE_DIR
- POCO_LIBRARY_OPTIMIZED
- POCO_LIBRARY_DEBUG
-)
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # 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:
+ # Reto Grieder
+ # Description:
+ # Finds the POCO Foundation library.
+ #
+
+INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE(HandleLibraryTypes)
+
+FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
+ PATHS $ENV{POCODIR}
+ PATH_SUFFIXES include
+)
+FIND_LIBRARY(POCO_LIBRARY_OPTIMIZED
+ NAMES PocoFoundation
+ PATHS $ENV{POCODIR}
+ PATH_SUFFIXES lib
+)
+FIND_LIBRARY(POCO_LIBRARY_DEBUG
+ NAMES PocoFoundationd PocoFoundation_d PocoFoundationD PocoFoundation_D
+ PATHS $ENV{POCODIR}
+ PATH_SUFFIXES lib
+)
+
+# Handle the REQUIRED argument and set POCO_FOUND
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(POCO DEFAULT_MSG
+ POCO_LIBRARY_OPTIMIZED
+ POCO_INCLUDE_DIR
+)
+
+# Collect optimized and debug libraries
+HANDLE_LIBRARY_TYPES(POCO)
+
+MARK_AS_ADVANCED(
+ POCO_INCLUDE_DIR
+ POCO_LIBRARY_OPTIMIZED
+ POCO_LIBRARY_DEBUG
+)
Property changes on: code/trunk/cmake/tools/FindPOCO.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/includes/weaponsettings_swallow.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/data/levels/templates/spaceship_swallow.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_swallow.oxt 2010-08-31 01:37:40 UTC (rev 7284)
+++ code/trunk/data/levels/templates/spaceship_swallow.oxt 2010-08-31 01:51:37 UTC (rev 7285)
@@ -1,88 +1,88 @@
-<Template name=spaceshipswallow>
- <SpaceShip
- hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipswallowcameras
- engine = spaceshipswallowengine
- spawnparticlesource = "Orxonox/fairytwirl"
- spawnparticleduration = 3
- explosionchunks = 6
-
- health = 100
- maxhealth = 200
- initialhealth = 100
-
- primaryThrust = 600;
- auxilaryThrust = 30;
- rotationThrust = 25;
-
- collisionType = "dynamic"
- mass = 100
- linearDamping = 0.7
- angularDamping = 0.9999999
- >
-
- <attached>
- <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="swallow_mat.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 3, 5" />
- <BoxCollisionShape position="13,-1.3,0" halfExtents="3, 1, 2" />
- <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
- <BoxCollisionShape position="0,0,7" halfExtents="3, 2, 2" />
- <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
- <BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
- </collisionShapes>
-<?lua
- include("includes/weaponsettings_swallow.oxi")
-?>
- </SpaceShip>
-</Template>
-
-<Template name=spaceshipswallowcameras defaults=0>
- <SpaceShip>
- <camerapositions>
- <CameraPosition position="0,25,85" drag=true mouselook=true />
- <CameraPosition position="0,40,140" drag=true mouselook=true />
- <CameraPosition position="0,50,160" drag=true mouselook=true />
- </camerapositions>
- </SpaceShip>
-</Template>
-
-<Template name=spaceshipswallowengine baseclass=MultiStateEngine>
- <MultiStateEngine
- boostfactor = 2
-
- speedfront = 600
- speedback = 60
- speedleftright = 60
- speedupdown = 60
-
- accelerationfront = 700
- accelerationbrake = 300
- accelerationback = 100
- accelerationleftright = 120
- accelerationupdown = 120
- >
- <EffectContainer condition="normal or boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
- <Backlight mainstate=activity active=false scale=0.023 name=bltest position=" 2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
- <Backlight mainstate=activity active=false scale=0.023 name=bltest position="-2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
-
-
- </EffectContainer>
- <EffectContainer condition="boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- </EffectContainer>
- <EffectContainer condition="not idle">
- <FadingBillboard mainstate=activity active=false scale=0.4 position="6.6, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000 />
- <FadingBillboard mainstate=activity active=false scale=0.4 position="-6.9, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000/>
- </EffectContainer>
- <EffectContainer condition="brake">
- <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- </EffectContainer>
-</MultiStateEngine>
-</Template>
-
+<Template name=spaceshipswallow>
+ <SpaceShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipswallowcameras
+ engine = spaceshipswallowengine
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 6
+
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ primaryThrust = 600;
+ auxilaryThrust = 30;
+ rotationThrust = 25;
+
+ collisionType = "dynamic"
+ mass = 100
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+ >
+
+ <attached>
+ <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="swallow_mat.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="10, 3, 5" />
+ <BoxCollisionShape position="13,-1.3,0" halfExtents="3, 1, 2" />
+ <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+ <BoxCollisionShape position="0,0,7" halfExtents="3, 2, 2" />
+ <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
+ <BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
+ </collisionShapes>
+<?lua
+ include("includes/weaponsettings_swallow.oxi")
+?>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipswallowcameras defaults=0>
+ <SpaceShip>
+ <camerapositions>
+ <CameraPosition position="0,25,85" drag=true mouselook=true />
+ <CameraPosition position="0,40,140" drag=true mouselook=true />
+ <CameraPosition position="0,50,160" drag=true mouselook=true />
+ </camerapositions>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipswallowengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 2
+
+ speedfront = 600
+ speedback = 60
+ speedleftright = 60
+ speedupdown = 60
+
+ accelerationfront = 700
+ accelerationbrake = 300
+ accelerationback = 100
+ accelerationleftright = 120
+ accelerationupdown = 120
+ >
+ <EffectContainer condition="normal or boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.023 name=bltest position=" 2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
+ <Backlight mainstate=activity active=false scale=0.023 name=bltest position="-2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
+
+
+ </EffectContainer>
+ <EffectContainer condition="boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ </EffectContainer>
+ <EffectContainer condition="not idle">
+ <FadingBillboard mainstate=activity active=false scale=0.4 position="6.6, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000 />
+ <FadingBillboard mainstate=activity active=false scale=0.4 position="-6.9, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000/>
+ </EffectContainer>
+ <EffectContainer condition="brake">
+ <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+</MultiStateEngine>
+</Template>
+
Property changes on: code/trunk/data/levels/templates/spaceship_swallow.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/test_swallow.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/NotificationDispatcher.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/NotificationDispatcher.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/NotificationsPrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/dispatchers/CommandNotification.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/pickup/CollectiblePickup.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/src/modules/pickup/CollectiblePickup.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list