[Orxonox-commit 4600] r9271 - in code/branches/presentation2012merge: cmake/tools data/gui/layouts data/gui/scripts data/levels data/levels/includes data/levels/templates data/overlays doc/api/groups src src/external/enet src/external/tolua src/libraries/util/output src/modules/gametypes src/modules/overlays/hud src/modules/pickup/items src/modules/towerdefense src/orxonox src/orxonox/controllers src/orxonox/gametypes
landauf at orxonox.net
landauf at orxonox.net
Sun Jun 3 17:17:19 CEST 2012
Author: landauf
Date: 2012-06-03 17:17:18 +0200 (Sun, 03 Jun 2012)
New Revision: 9271
Modified:
code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake
code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout
code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout
code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua
code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.lua
code/branches/presentation2012merge/data/levels/Spacerace2.oxw
code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw
code/branches/presentation2012merge/data/levels/asteroidField.oxw
code/branches/presentation2012merge/data/levels/includes/asteroidField.lua
code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi
code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi
code/branches/presentation2012merge/data/levels/missionOne.oxw
code/branches/presentation2012merge/data/levels/presentationHS11.oxw
code/branches/presentation2012merge/data/levels/surfaceRace.oxw
code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt
code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt
code/branches/presentation2012merge/data/levels/templates/tower.oxt
code/branches/presentation2012merge/data/levels/towerDefense.oxw
code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo
code/branches/presentation2012merge/doc/api/groups/Portals.dox
code/branches/presentation2012merge/doc/api/groups/Weapons.dox
code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake
code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake
code/branches/presentation2012merge/src/external/enet/VERSION
code/branches/presentation2012merge/src/external/tolua/README_ORXONOX
code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc
code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc
code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h
code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc
code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h
code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc
code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h
code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc
code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h
code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc
code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h
code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h
code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt
code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h
code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc
code/branches/presentation2012merge/src/modules/towerdefense/Tower.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.cc
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h
code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h
code/branches/presentation2012merge/src/modules/towerdefense/towerdefensereadme.txt
code/branches/presentation2012merge/src/orxonox/ShipManager.cc
code/branches/presentation2012merge/src/orxonox/ShipManager.h
code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc
code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h
code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc
code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h
code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc
code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h
Log:
svn:eol-style native (no changes in code)
Modified: code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake
===================================================================
--- code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake 2012-06-03 15:17:18 UTC (rev 9271)
@@ -1,146 +1,146 @@
- #
- # 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
- #
-
-FUNCTION(GENERATE_BUILD_UNITS _target_name _all_files_var)
- SET(_source_files)
- SET(_total_file_count 0)
-
- # Count the number of actual C++ source files
- FOREACH(_file ${${_all_files_var}})
- # Only look at C++ source files
- IF(_file MATCHES "\\.(cpp|cc|cxx)$")
- # Some files might be marked as not to compile at all
- GET_SOURCE_FILE_PROPERTY(_skip1 ${_file} HEADER_FILE_ONLY)
- GET_SOURCE_FILE_PROPERTY(_skip2 ${_file} EXCLUDE_FROM_BUILD_UNITS)
- IF(NOT _skip1 AND NOT _skip2)
- GET_SOURCE_FILE_PROPERTY(_size ${_file} BUILD_UNIT_SIZE)
- IF(NOT _size)
- SET(_size 1)
- ENDIF()
- # Append file AND size to the list (like storing an std::pair)
- LIST(APPEND _source_files ${_file} ${_size})
- MATH(EXPR _total_file_count "${_total_file_count} + ${_size}")
- # Don't compile
- SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES HEADER_FILE_ONLY TRUE)
- ENDIF()
- ENDIF()
- ENDFOREACH(_file)
-
- # Get number of build units we have to make. The default is NR_OF_BUILD_UNITS
- # However we can specify different values in a config file
- SET(_config ${BUILD_UNITS_CONFIG_${NR_OF_BUILD_UNITS}_THREADS})
- SET(_nr_of_units)
- IF(_config)
- LIST(FIND _config ${_target_name} _index)
- IF(NOT _index EQUAL -1)
- # Nr of build units is the next element in the list (we assume it exists)
- MATH(EXPR _index "${_index} + 1")
- LIST(GET _config ${_index} _nr_of_units)
- ENDIF()
- ENDIF()
- IF(NOT _nr_of_units)
- # Use default as specified (e.g. "full4" --> 4) or 1 for externals
- IF(_arg_ORXONOX_EXTERNAL)
- SET(_nr_of_units 1)
- ELSE()
- SET(_nr_of_units ${NR_OF_BUILD_UNITS})
- ENDIF()
- ENDIF()
-
- # Disable precompiled header files for targets with two or less build units
- IF(_nr_of_units LESS 3)
- SET(PCH_DISABLE_${_target_name} TRUE PARENT_SCOPE)
- ENDIF()
-
- SET(_remaining_files ${_total_file_count})
- SET(_remaining_units ${_nr_of_units})
- SET(_unit_nr 1)
- # Loop counts back from ${_nr_of_units} to 1
- FOREACH(_remaining_units RANGE ${_nr_of_units} 1 -1)
- # Use integer division to get the current build unit size
- MATH(EXPR _aimed_size "${_remaining_files} / ${_remaining_units}")
-
- SET(_current_size 0)
- SET(_current_unit)
-
- SET(_file_index 0)
- LIST(LENGTH _source_files _list_size)
- WHILE(${_file_index} LESS ${_list_size} AND NOT ${_current_size} EQUAL ${_aimed_size})
- # _source_files stores pairs of values (file followed by its size)
- MATH(EXPR _size_index "${_file_index} + 1")
- LIST(GET _source_files ${_file_index} _file)
- LIST(GET _source_files ${_size_index} _size)
-
- MATH(EXPR _new_size "${_current_size} + ${_size}")
- IF(${_new_size} GREATER ${_aimed_size})
- # Try next file in list (jump 2 because pairs are stored)
- MATH(EXPR _file_index "${_file_index} + 2")
- ELSE()
- SET(_current_size ${_new_size})
- LIST(APPEND _current_unit ${_file})
- # Remove from _source_files list
- LIST(REMOVE_AT _source_files ${_file_index} ${_size_index})
- MATH(EXPR _list_size "${_list_size} - 2")
- ENDIF()
- ENDWHILE()
-
- # Finalise
- LIST(LENGTH _current_unit _nr_of_included_files)
- IF(_nr_of_included_files EQUAL 1)
- # If unit consists of one file, we can compile it the old fashioned way
- SET_SOURCE_FILES_PROPERTIES(${_current_unit} PROPERTIES HEADER_FILE_ONLY FALSE)
- ELSEIF(_nr_of_included_files GREATER 1)
- # Assemble unit by writing some #include statements
- SET(_include_string)
- FOREACH(_file ${_current_unit})
- SET(_include_string "${_include_string}#include \"${_file}\"\n")
- ENDFOREACH(_file)
-
- # Generate the filename
- IF(NOT _nr_of_units EQUAL 1)
- SET(_suffix ${_unit_nr})
- ENDIF()
- SET(_unit_file ${CMAKE_CURRENT_BINARY_DIR}/${_target_name}BuildUnit${_suffix}.cc)
- # Only write if content has changed (avoids recompile)
- IF(EXISTS ${_unit_file})
- FILE(READ ${_unit_file} _file_include_string)
- ENDIF()
- IF(NOT _include_string STREQUAL "${_file_include_string}")
- FILE(WRITE ${_unit_file} "${_include_string}")
- ENDIF()
-
- LIST(APPEND _build_units ${_unit_file})
-
- # Increase file name counter
- MATH(EXPR _unit_nr "${_unit_nr} + 1")
- ENDIF()
-
- # Compute remaining files
- MATH(EXPR _remaining_files "${_remaining_files} - ${_current_size}")
- ENDFOREACH(_remaining_units)
-
- # Add units to list of source files (function, not macro --> parent scope)
- # Do this ONCE because parent scope changes will NOT be visible here
- SET(${_all_files_var} ${${_all_files_var}} ${_build_units} PARENT_SCOPE)
-
-ENDFUNCTION(GENERATE_BUILD_UNITS)
+ #
+ # 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
+ #
+
+FUNCTION(GENERATE_BUILD_UNITS _target_name _all_files_var)
+ SET(_source_files)
+ SET(_total_file_count 0)
+
+ # Count the number of actual C++ source files
+ FOREACH(_file ${${_all_files_var}})
+ # Only look at C++ source files
+ IF(_file MATCHES "\\.(cpp|cc|cxx)$")
+ # Some files might be marked as not to compile at all
+ GET_SOURCE_FILE_PROPERTY(_skip1 ${_file} HEADER_FILE_ONLY)
+ GET_SOURCE_FILE_PROPERTY(_skip2 ${_file} EXCLUDE_FROM_BUILD_UNITS)
+ IF(NOT _skip1 AND NOT _skip2)
+ GET_SOURCE_FILE_PROPERTY(_size ${_file} BUILD_UNIT_SIZE)
+ IF(NOT _size)
+ SET(_size 1)
+ ENDIF()
+ # Append file AND size to the list (like storing an std::pair)
+ LIST(APPEND _source_files ${_file} ${_size})
+ MATH(EXPR _total_file_count "${_total_file_count} + ${_size}")
+ # Don't compile
+ SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES HEADER_FILE_ONLY TRUE)
+ ENDIF()
+ ENDIF()
+ ENDFOREACH(_file)
+
+ # Get number of build units we have to make. The default is NR_OF_BUILD_UNITS
+ # However we can specify different values in a config file
+ SET(_config ${BUILD_UNITS_CONFIG_${NR_OF_BUILD_UNITS}_THREADS})
+ SET(_nr_of_units)
+ IF(_config)
+ LIST(FIND _config ${_target_name} _index)
+ IF(NOT _index EQUAL -1)
+ # Nr of build units is the next element in the list (we assume it exists)
+ MATH(EXPR _index "${_index} + 1")
+ LIST(GET _config ${_index} _nr_of_units)
+ ENDIF()
+ ENDIF()
+ IF(NOT _nr_of_units)
+ # Use default as specified (e.g. "full4" --> 4) or 1 for externals
+ IF(_arg_ORXONOX_EXTERNAL)
+ SET(_nr_of_units 1)
+ ELSE()
+ SET(_nr_of_units ${NR_OF_BUILD_UNITS})
+ ENDIF()
+ ENDIF()
+
+ # Disable precompiled header files for targets with two or less build units
+ IF(_nr_of_units LESS 3)
+ SET(PCH_DISABLE_${_target_name} TRUE PARENT_SCOPE)
+ ENDIF()
+
+ SET(_remaining_files ${_total_file_count})
+ SET(_remaining_units ${_nr_of_units})
+ SET(_unit_nr 1)
+ # Loop counts back from ${_nr_of_units} to 1
+ FOREACH(_remaining_units RANGE ${_nr_of_units} 1 -1)
+ # Use integer division to get the current build unit size
+ MATH(EXPR _aimed_size "${_remaining_files} / ${_remaining_units}")
+
+ SET(_current_size 0)
+ SET(_current_unit)
+
+ SET(_file_index 0)
+ LIST(LENGTH _source_files _list_size)
+ WHILE(${_file_index} LESS ${_list_size} AND NOT ${_current_size} EQUAL ${_aimed_size})
+ # _source_files stores pairs of values (file followed by its size)
+ MATH(EXPR _size_index "${_file_index} + 1")
+ LIST(GET _source_files ${_file_index} _file)
+ LIST(GET _source_files ${_size_index} _size)
+
+ MATH(EXPR _new_size "${_current_size} + ${_size}")
+ IF(${_new_size} GREATER ${_aimed_size})
+ # Try next file in list (jump 2 because pairs are stored)
+ MATH(EXPR _file_index "${_file_index} + 2")
+ ELSE()
+ SET(_current_size ${_new_size})
+ LIST(APPEND _current_unit ${_file})
+ # Remove from _source_files list
+ LIST(REMOVE_AT _source_files ${_file_index} ${_size_index})
+ MATH(EXPR _list_size "${_list_size} - 2")
+ ENDIF()
+ ENDWHILE()
+
+ # Finalise
+ LIST(LENGTH _current_unit _nr_of_included_files)
+ IF(_nr_of_included_files EQUAL 1)
+ # If unit consists of one file, we can compile it the old fashioned way
+ SET_SOURCE_FILES_PROPERTIES(${_current_unit} PROPERTIES HEADER_FILE_ONLY FALSE)
+ ELSEIF(_nr_of_included_files GREATER 1)
+ # Assemble unit by writing some #include statements
+ SET(_include_string)
+ FOREACH(_file ${_current_unit})
+ SET(_include_string "${_include_string}#include \"${_file}\"\n")
+ ENDFOREACH(_file)
+
+ # Generate the filename
+ IF(NOT _nr_of_units EQUAL 1)
+ SET(_suffix ${_unit_nr})
+ ENDIF()
+ SET(_unit_file ${CMAKE_CURRENT_BINARY_DIR}/${_target_name}BuildUnit${_suffix}.cc)
+ # Only write if content has changed (avoids recompile)
+ IF(EXISTS ${_unit_file})
+ FILE(READ ${_unit_file} _file_include_string)
+ ENDIF()
+ IF(NOT _include_string STREQUAL "${_file_include_string}")
+ FILE(WRITE ${_unit_file} "${_include_string}")
+ ENDIF()
+
+ LIST(APPEND _build_units ${_unit_file})
+
+ # Increase file name counter
+ MATH(EXPR _unit_nr "${_unit_nr} + 1")
+ ENDIF()
+
+ # Compute remaining files
+ MATH(EXPR _remaining_files "${_remaining_files} - ${_current_size}")
+ ENDFOREACH(_remaining_units)
+
+ # Add units to list of source files (function, not macro --> parent scope)
+ # Do this ONCE because parent scope changes will NOT be visible here
+ SET(${_all_files_var} ${${_all_files_var}} ${_build_units} PARENT_SCOPE)
+
+ENDFUNCTION(GENERATE_BUILD_UNITS)
Property changes on: code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.lua
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/Spacerace2.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/asteroidField.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/includes/asteroidField.lua
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/missionOne.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/presentationHS11.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/surfaceRace.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/templates/tower.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/levels/towerDefense.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/doc/api/groups/Portals.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/doc/api/groups/Weapons.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake
===================================================================
--- code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake 2012-06-03 15:17:18 UTC (rev 9271)
@@ -1,74 +1,74 @@
- #
- # 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:
- # Configures the number of build units per library
- #
-
-SET(BUILD_UNITS_CONFIG_1_THREADS
- util 1
- core 2
- network 1
- tools 1
- orxonox 8
- designtools 1
- notifications 1
- objects 2
- overlays 2
- pickup 2
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_2_THREADS ${BUILD_UNITS_CONFIG_1_THREADS})
-
-SET(BUILD_UNITS_CONFIG_4_THREADS
- util 1
- core 4
- network 2
- tools 2
- orxonox 8
- designtools 1
- notifications 1
- objects 2
- overlays 2
- pickup 1
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_8_THREADS
- util 2
- core 8
- network 5
- tools 3
- orxonox 8
- designtools 1
- notifications 1
- objects 3
- overlays 3
- pickup 2
- pong 1
- questsystem 3
- weapons 3
-)
+ #
+ # 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:
+ # Configures the number of build units per library
+ #
+
+SET(BUILD_UNITS_CONFIG_1_THREADS
+ util 1
+ core 2
+ network 1
+ tools 1
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 2
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_2_THREADS ${BUILD_UNITS_CONFIG_1_THREADS})
+
+SET(BUILD_UNITS_CONFIG_4_THREADS
+ util 1
+ core 4
+ network 2
+ tools 2
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 1
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_8_THREADS
+ util 2
+ core 8
+ network 5
+ tools 3
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 3
+ overlays 3
+ pickup 2
+ pong 1
+ questsystem 3
+ weapons 3
+)
Property changes on: code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake
===================================================================
--- code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake 2012-06-03 15:17:18 UTC (rev 9271)
@@ -1,88 +1,88 @@
- #
- # 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:
- # Configures the number of build units per library
- #
-
-SET(BUILD_UNITS_CONFIG_1_THREADS
- util 1
- core 1
- network 1
- tools 1
- orxonox 2 # Avoids running out of symbol adresses (fix with /bigobj)
- designtools 1
- notifications 1
- objects 1
- overlays 1
- pickup 1
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_2_THREADS
- util 1
- core 2
- network 1
- tools 1
- orxonox 2
- designtools 1
- notifications 1
- objects 2
- overlays 1
- pickup 1
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_4_THREADS
- util 2
- core 4
- network 2
- tools 2
- orxonox 4
- designtools 1
- notifications 1
- objects 2
- overlays 2
- pickup 1
- pong 1
- questsystem 2
- weapons 2
-)
-
-SET(BUILD_UNITS_CONFIG_8_THREADS
- util 2
- core 8
- network 5
- tools 3
- orxonox 8
- designtools 1
- notifications 1
- objects 3
- overlays 3
- pickup 2
- pong 1
- questsystem 3
- weapons 3
-)
+ #
+ # 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:
+ # Configures the number of build units per library
+ #
+
+SET(BUILD_UNITS_CONFIG_1_THREADS
+ util 1
+ core 1
+ network 1
+ tools 1
+ orxonox 2 # Avoids running out of symbol adresses (fix with /bigobj)
+ designtools 1
+ notifications 1
+ objects 1
+ overlays 1
+ pickup 1
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_2_THREADS
+ util 1
+ core 2
+ network 1
+ tools 1
+ orxonox 2
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 1
+ pickup 1
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_4_THREADS
+ util 2
+ core 4
+ network 2
+ tools 2
+ orxonox 4
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 1
+ pong 1
+ questsystem 2
+ weapons 2
+)
+
+SET(BUILD_UNITS_CONFIG_8_THREADS
+ util 2
+ core 8
+ network 5
+ tools 3
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 3
+ overlays 3
+ pickup 2
+ pong 1
+ questsystem 3
+ weapons 3
+)
Property changes on: code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/external/enet/VERSION
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/external/tolua/README_ORXONOX
===================================================================
--- code/branches/presentation2012merge/src/external/tolua/README_ORXONOX 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/external/tolua/README_ORXONOX 2012-06-03 15:17:18 UTC (rev 9271)
@@ -1,2 +1,2 @@
-Beware that this tolua folder does not fully contain Tolua++. Instead you can only find the source code required for the generator executable.
-The actual tolua library has to be supplied and is called CEGUI_TOLUA_LIBRARY because we use the one supplied with CEGUI.
+Beware that this tolua folder does not fully contain Tolua++. Instead you can only find the source code required for the generator executable.
+The actual tolua library has to be supplied and is called CEGUI_TOLUA_LIBRARY because we use the one supplied with CEGUI.
Property changes on: code/branches/presentation2012merge/src/external/tolua/README_ORXONOX
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc
===================================================================
--- code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc 2012-06-03 15:17:18 UTC (rev 9271)
@@ -1,107 +1,107 @@
-/*
- * 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:
- * Fabian 'x3n' Landau
- * Co-authors:
- * Reto Grieder
- *
- */
-
-/**
- @file
- @brief Implementation of the ConsoleWriter singleton.
-*/
-
-#include "ConsoleWriter.h"
-
-#include <iostream>
-
-#include "OutputManager.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor, initializes the output level.
-
- In debug builds, it writes output up to level::internal_warning to the
- console, in release builds only up to level::user_info.
-
- After creation, the instance is enabled.
- */
- ConsoleWriter::ConsoleWriter() : BaseWriter("Console")
- {
-#ifdef ORXONOX_RELEASE
- this->setLevelMax(level::user_info);
-#else
- this->setLevelMax(level::internal_warning);
-#endif
- this->bEnabled_ = true;
- }
-
- /**
- @brief Destructor.
- */
- ConsoleWriter::~ConsoleWriter()
- {
- }
-
- /**
- @brief Returns the only existing instance of this class.
- */
- /*static*/ ConsoleWriter& ConsoleWriter::getInstance()
- {
- static ConsoleWriter instance;
- return instance;
- }
-
- /**
- @brief Inherited function from BaseWriter, writes output to the console using std::cout.
- */
- void ConsoleWriter::printLine(const std::string& line, OutputLevel)
- {
- std::cout << line << std::endl;
- }
-
- /**
- @brief Enables the instance by registering itself as listener at OutputManager.
- */
- void ConsoleWriter::enable()
- {
- if (!this->bEnabled_)
- {
- OutputManager::getInstance().registerListener(this);
- this->bEnabled_ = true;
- }
- }
-
- /**
- @brief Disables the instance by unregistering itself from OutputManager.
- */
- void ConsoleWriter::disable()
- {
- if (this->bEnabled_)
- {
- OutputManager::getInstance().unregisterListener(this);
- this->bEnabled_ = false;
- }
- }
-}
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * Reto Grieder
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of the ConsoleWriter singleton.
+*/
+
+#include "ConsoleWriter.h"
+
+#include <iostream>
+
+#include "OutputManager.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor, initializes the output level.
+
+ In debug builds, it writes output up to level::internal_warning to the
+ console, in release builds only up to level::user_info.
+
+ After creation, the instance is enabled.
+ */
+ ConsoleWriter::ConsoleWriter() : BaseWriter("Console")
+ {
+#ifdef ORXONOX_RELEASE
+ this->setLevelMax(level::user_info);
+#else
+ this->setLevelMax(level::internal_warning);
+#endif
+ this->bEnabled_ = true;
+ }
+
+ /**
+ @brief Destructor.
+ */
+ ConsoleWriter::~ConsoleWriter()
+ {
+ }
+
+ /**
+ @brief Returns the only existing instance of this class.
+ */
+ /*static*/ ConsoleWriter& ConsoleWriter::getInstance()
+ {
+ static ConsoleWriter instance;
+ return instance;
+ }
+
+ /**
+ @brief Inherited function from BaseWriter, writes output to the console using std::cout.
+ */
+ void ConsoleWriter::printLine(const std::string& line, OutputLevel)
+ {
+ std::cout << line << std::endl;
+ }
+
+ /**
+ @brief Enables the instance by registering itself as listener at OutputManager.
+ */
+ void ConsoleWriter::enable()
+ {
+ if (!this->bEnabled_)
+ {
+ OutputManager::getInstance().registerListener(this);
+ this->bEnabled_ = true;
+ }
+ }
+
+ /**
+ @brief Disables the instance by unregistering itself from OutputManager.
+ */
+ void ConsoleWriter::disable()
+ {
+ if (this->bEnabled_)
+ {
+ OutputManager::getInstance().unregisterListener(this);
+ this->bEnabled_ = false;
+ }
+ }
+}
Property changes on: code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2012-06-03 15:17:18 UTC (rev 9271)
@@ -22,7 +22,7 @@
* Author:
* Matthias Spalinger
* Co-authors:
- * Fabian 'x3n' Landau
+ * Fabian 'x3n' Landau
*
*/
@@ -55,8 +55,8 @@
void HUDEnemyHealthBar::tick(float dt)
{
this->updateTarget();
-
- SUPER(HUDEnemyHealthBar, tick, dt);
+
+ SUPER(HUDEnemyHealthBar, tick, dt);
}
void HUDEnemyHealthBar::updateTarget()
@@ -81,9 +81,9 @@
void HUDEnemyHealthBar::changedOwner()
{
- SUPER(HUDEnemyHealthBar, changedOwner);
-
- this->owner_ = orxonox_cast<ControllableEntity*>(this->getOwner());
- this->updateTarget();
+ SUPER(HUDEnemyHealthBar, changedOwner);
+
+ this->owner_ = orxonox_cast<ControllableEntity*>(this->getOwner());
+ this->updateTarget();
}
}
Property changes on: code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h
===================================================================
--- code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h 2012-06-03 15:17:18 UTC (rev 9271)
@@ -22,7 +22,7 @@
* Author:
* Matthias Spalinger
* Co-authors:
- * Fabian 'x3n' Landau
+ * Fabian 'x3n' Landau
*
*/
Property changes on: code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/Tower.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/modules/towerdefense/towerdefensereadme.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/ShipManager.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/ShipManager.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc 2012-06-03 15:17:18 UTC (rev 9271)
@@ -251,14 +251,14 @@
}
}
- //used, when slaves are in DEFEND mode.
- void FormationController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
- {
- if (!this->formationFlight_ || this->state_ != MASTER || this->formationMode_ != DEFEND)
- return;
- this->masterAttacked(originator);
- }
-
+ //used, when slaves are in DEFEND mode.
+ void FormationController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
+ {
+ if (!this->formationFlight_ || this->state_ != MASTER || this->formationMode_ != DEFEND)
+ return;
+ this->masterAttacked(originator);
+ }
+
void FormationController::removeFromFormation()
{
if (this->state_ == SLAVE || this->myMaster_) // slaves can also be temporary free, so check if myMaster_ is set
Property changes on: code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h
===================================================================
--- code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h 2012-06-03 14:56:07 UTC (rev 9270)
+++ code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h 2012-06-03 15:17:18 UTC (rev 9271)
@@ -95,7 +95,7 @@
inline FormationMode getFormationMode() const
{ return this->formationMode_; }
- virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+ virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
protected:
bool formationFlight_;
Property changes on: code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list