[Orxonox-commit 3427] r8114 - in code/branches/mac_osx: data/levels src
youngk at orxonox.net
youngk at orxonox.net
Fri Mar 25 20:33:39 CET 2011
Author: youngk
Date: 2011-03-25 20:33:38 +0100 (Fri, 25 Mar 2011)
New Revision: 8114
Added:
code/branches/mac_osx/data/levels/planets.oxw
Modified:
code/branches/mac_osx/src/CMakeLists.txt
Log:
Xcode 4 build-fix and a new level.
Added: code/branches/mac_osx/data/levels/planets.oxw
===================================================================
--- code/branches/mac_osx/data/levels/planets.oxw (rev 0)
+++ code/branches/mac_osx/data/levels/planets.oxw 2011-03-25 19:33:38 UTC (rev 8114)
@@ -0,0 +1,65 @@
+<?lua
+ include("hudtemplates3.oxo")
+ include("stats.oxo")
+ include("templates/lodinformation.oxt")
+ include("templates/spaceship_swallow.oxt")
+ include("templates/spaceship_pirate.oxt")
+?>
+
+
+
+<Level
+ name = "Planet_Demo"
+ description = "Demonstration of planets with high resolution."
+
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ skybox = "Orxonox/skypanoramagen1"
+ >
+
+<AmbientSound ambientSource="AlphaCentauri.ogg" looping="true" playOnLoad="true" />
+<Light type=directional position="-10000,-10000,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" />
+
+<?lua
+planetsize=40000
+?>
+
+<SpawnPoint position="<?lua print(math.sin(1.5) *(3)*planetsize) ?>,<?lua print(math.cos(1.5) *3*planetsize) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
+
+
+<?lua
+max = 50
+
+for i = 1, max, 1
+do
+ x = math.sin(i/max*6)*(1.5)*planetsize
+ y = math.cos(i/max*6)*(1.5)*planetsize
+ z = i*100
+ ?>
+<?lua
+for k = 1, 25, 1
+do
+j = math.random()
+?>
+
+ <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <attached>
+ <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ </attached>
+ <?lua if i == 5 then ?><collisionShapes>
+ <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+ </collisionShapes> <?lua end ?>
+ </MovableEntity>
+<?lua
+end
+?>
+<?lua end ?>
+ <Planet position="0,0,0" scale="<?lua print(planetsize) ?>" pitch=-90 mesh="jupiter.mesh" atmosphere="atmosphere1" rotationaxis="0,0,1" rotationrate="0.2" atmospheresize=300.0f imagesize=1024.0f />
+ <Planet position="<?lua print(5*planetsize) ?>,0,0" scale=7000 pitch=30 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
+ </Scene>
+</Level>
Property changes on: code/branches/mac_osx/data/levels/planets.oxw
___________________________________________________________________
Added: svn:executable
+ *
Modified: code/branches/mac_osx/src/CMakeLists.txt
===================================================================
--- code/branches/mac_osx/src/CMakeLists.txt 2011-03-25 01:39:52 UTC (rev 8113)
+++ code/branches/mac_osx/src/CMakeLists.txt 2011-03-25 19:33:38 UTC (rev 8114)
@@ -143,30 +143,6 @@
OUTPUT_NAME orxonox
)
-# Apple Mac OS X specific build settings
-IF(APPLE)
- # On Apple we need to link to AppKit and Foundation frameworks
- TARGET_LINK_LIBRARIES(orxonox-main
- "-framework AppKit"
- "-framework Foundation"
- )
-
- # Post-build step for the creation of the Dev-App bundle
- INCLUDE(PrepareDevBundle)
- ADD_CUSTOM_COMMAND(
- TARGET orxonox-main
- POST_BUILD
- # Copy the Orxonox.app from the dummy location to the correct one
- COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/Dummy/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app"
- # Copy the executable into the Orxonox.app
- COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
- # Copy the dev-build marker file to Orxonox.app
- COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
- # Create a shortcut of the application to the Desktop
- COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "$ENV{HOME}/Desktop/${PROJECT_NAME}.app"
- )
-ENDIF(APPLE)
-
# Main executable should depend on all modules
ADD_DEPENDENCIES(orxonox-main ${ORXONOX_MODULES})
@@ -194,6 +170,30 @@
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
ENDIF(MSVC)
+# Apple Mac OS X specific build settings
+IF(APPLE)
+ # On Apple we need to link to AppKit and Foundation frameworks
+ TARGET_LINK_LIBRARIES(orxonox-main
+ "-framework AppKit"
+ "-framework Foundation"
+ )
+
+ # Post-build step for the creation of the Dev-App bundle
+ INCLUDE(PrepareDevBundle)
+ ADD_CUSTOM_COMMAND(
+ TARGET orxonox-main
+ POST_BUILD
+ # Copy the Orxonox.app from the dummy location to the correct one
+ COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/Dummy/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app"
+ # Copy the executable into the Orxonox.app
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+ # Copy the dev-build marker file to Orxonox.app
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+ # Create a shortcut of the application to the Desktop
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "$ENV{HOME}/Desktop/${PROJECT_NAME}.app"
+ )
+ENDIF(APPLE)
+
#################### Doxygen ####################
# Prepare include paths for Doxygen. This is necessary to display
More information about the Orxonox-commit
mailing list