[Orxonox-commit 4305] r8976 - in code/branches/presentation2011: . data/levels data/levels/includes src/libraries/util
smerkli at orxonox.net
smerkli at orxonox.net
Wed Dec 14 13:50:57 CET 2011
Author: smerkli
Date: 2011-12-14 13:50:57 +0100 (Wed, 14 Dec 2011)
New Revision: 8976
Added:
code/branches/presentation2011/data/levels/asteroidField.oxw
code/branches/presentation2011/data/levels/includes/asteroidField.lua
Modified:
code/branches/presentation2011/
code/branches/presentation2011/src/libraries/util/SignalHandler.cc
Log:
Merged environment3 branch.
Property changes on: code/branches/presentation2011
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/steering:5949-6091,8140-8595
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
+ /code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/fps:6591-7072
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/steering:5949-6091,8140-8595
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
Copied: code/branches/presentation2011/data/levels/asteroidField.oxw (from rev 8975, code/branches/environment3/data/levels/asteroidField.oxw)
===================================================================
--- code/branches/presentation2011/data/levels/asteroidField.oxw (rev 0)
+++ code/branches/presentation2011/data/levels/asteroidField.oxw 2011-12-14 12:50:57 UTC (rev 8976)
@@ -0,0 +1,44 @@
+<LevelInfo
+ name = "asteroidFieldTest"
+ description = "Test of the asteroidField generator."
+ tags = ""
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+?>
+
+<Level
+ name = "Sample"
+ description = "Just a few tests"
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ hasPhysics = true
+ >
+
+ <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
+
+ <!-- Generate asteroid field and asteroid belt -->
+ <?lua
+ dofile("includes/asteroidField.lua")
+ asteroidBelt(0, 0, 0, -48, -34, 70, 100, 200, 219900, 210000, 900, 1)
+ ?>
+
+ </Scene>
+</Level>
+
Copied: code/branches/presentation2011/data/levels/includes/asteroidField.lua (from rev 8975, code/branches/environment3/data/levels/includes/asteroidField.lua)
===================================================================
--- code/branches/presentation2011/data/levels/includes/asteroidField.lua (rev 0)
+++ code/branches/presentation2011/data/levels/includes/asteroidField.lua 2011-12-14 12:50:57 UTC (rev 8976)
@@ -0,0 +1,103 @@
+--[[ fog generator
+generates fog
+ posX, posY, posZ - position in space
+ size - size of billboard
+ brightness - [0,1] fog brightness
+--]]
+function generateFog(posX, posY, posZ, size, brightness)
+ print("<Billboard ")
+ print("position = \"")
+ print(posX) print(",")
+ print(posY) print(",")
+ print(posZ) print("\" ")
+ print("colour=\"")
+ print(brightness) print(",")
+ print(brightness) print(",")
+ print(brightness) print("\" ")
+ print("material=\"Smoke/Smoke\" scale=")
+ print(size)
+ print(" />")
+end
+
+--[[ asteroid field generator
+generates asteroid field
+ posX, posY, posZ - position in space
+ minSize, maxSize - size boundaries of each asteroid
+ radius - size of the cube around position in space
+ count - number of asteroids
+ fog - enable fog 0/1
+--]]
+function asteroidField(posX, posY, posZ, minSize, maxSize, radius, count, fog)
+ for i = 1, count, 1
+ do
+ size = (math.random() * (maxSize - minSize)) + minSize
+ pX = (2 * math.random() * radius) - radius + posX
+ pY = (2 * math.random() * radius) - radius + posY
+ pZ = (2 * math.random() * radius) - radius + posZ
+ print("<StaticEntity ")
+
+ print("position = \"")
+ print(pX) print(",")
+ print(pY) print(",")
+ print(pZ) print("\" ")
+
+ print("scale = \"") print(size) print("\" ")
+
+ print("collisionType = static linearDamping = 0.8 angularDamping = 1 ")
+ print("collisiondamage = 1000 enablecollisiondamage = true>")
+
+ print("<attached>")
+ print("<Model mass=\"") print(size * 10) print("\" ")
+ print("mesh=\"ast") print(math.mod(i,6) + 1) print(".mesh\" />")
+ print("</attached>")
+
+ print("<collisionShapes> ")
+ print("<SphereCollisionShape radius=\"")
+ print(size * 2.5) print("\" />")
+ print("</collisionShapes>")
+
+ print("</StaticEntity>")
+
+ if fog == 1 and i % 5 == 0 then
+ generateFog(pX, pY, pZ, radius*0.04, 0.2)
+ end
+ end
+end
+
+
+--[[ asteroid belt generator
+generates asteroid belt
+ posX, posY, posZ - position in space
+ yaw, pitch - rotation
+ minSize, maxSize - size boundaries of each asteroid
+ radius0, radius1 - inner/outer radius
+ count - number of asteroids
+ fog - enable fog 0/1
+--]]
+function asteroidBelt(centerX, centerY, centerZ, yaw, pitch, segments, minSize, maxSize, radius0, radius1, count, fog)
+ dPhi = (2 * math.pi) / segments
+ width = math.abs(radius1 - radius0)
+ radius = (radius1 + radius0) / 2
+ segmentCount = count / segments
+
+ print("<StaticEntity collisionType=static yaw=") print(yaw)
+ print(" pitch=") print(pitch)
+
+ print(" position = \"")
+ print(centerX) print(",")
+ print(centerY) print(",")
+ print(centerZ) print("\"")
+ print(">")
+
+ print("<attached>")
+
+ for i = 0, segments - 1, 1
+ do
+ asteroidField((radius * math.cos(i * dPhi)),
+ (radius * math.sin(i * dPhi)),
+ 0, minSize, maxSize, width, segmentCount, fog)
+ end
+
+ print("</attached>")
+ print("</StaticEntity>")
+end
Modified: code/branches/presentation2011/src/libraries/util/SignalHandler.cc
===================================================================
--- code/branches/presentation2011/src/libraries/util/SignalHandler.cc 2011-12-14 12:39:43 UTC (rev 8975)
+++ code/branches/presentation2011/src/libraries/util/SignalHandler.cc 2011-12-14 12:50:57 UTC (rev 8976)
@@ -69,7 +69,7 @@
assert( sigRecList.size() == 0 );
catchSignal( SIGSEGV );
- catchSignal( SIGABRT );
+ catchSignal( SIGABRT );
catchSignal( SIGILL );
}
@@ -674,7 +674,7 @@
}
/// Returns a description of the given exception.
- // Based on code from Dr. Mingw by José Fonseca
+ // Based on code from Dr. Mingw by Jos\E9 Fonseca
/* static */ std::string SignalHandler::getExceptionType(PEXCEPTION_POINTERS pExceptionInfo)
{
PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
@@ -744,7 +744,7 @@
}
/// Retrieves the base address of the module that contains the specified address.
- // Code from Dr. Mingw by José Fonseca
+ // Code from Dr. Mingw by Jos\E9 Fonseca
/* static */ DWORD SignalHandler::getModuleBase(DWORD dwAddress)
{
MEMORY_BASIC_INFORMATION Buffer;
More information about the Orxonox-commit
mailing list