From: <sam...@us...> - 2012-10-18 23:00:37
|
Revision: 11716 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=11716&view=rev Author: samuncle Date: 2012-10-18 23:00:30 +0000 (Thu, 18 Oct 2012) Log Message: ----------- Add a swamp in mansion Modified Paths: -------------- main/trunk/data/tracks/mansion/Plane.b3d main/trunk/data/tracks/mansion/graph.xml main/trunk/data/tracks/mansion/groundLightMap.png main/trunk/data/tracks/mansion/mansion_track.b3d main/trunk/data/tracks/mansion/materials.xml main/trunk/data/tracks/mansion/quads.xml main/trunk/data/tracks/mansion/scene.xml Added Paths: ----------- main/trunk/data/tracks/mansion/bronze-subsea.jpg main/trunk/data/tracks/mansion/bugsSwamp.b3d main/trunk/data/tracks/mansion/roof-straw.png main/trunk/data/tracks/mansion/swamp.b3d main/trunk/data/tracks/mansion/swamp.png main/trunk/data/tracks/mansion/tracks.b3d main/trunk/data/tracks/mansion/wall.png main/trunk/data/tracks/mansion/waterPond.b3d main/trunk/data/tracks/mansion/woodBridge-subsea.jpg Modified: main/trunk/data/tracks/mansion/Plane.b3d =================================================================== (Binary files differ) Added: main/trunk/data/tracks/mansion/bronze-subsea.jpg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/bronze-subsea.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/bugsSwamp.b3d =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/bugsSwamp.b3d ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: main/trunk/data/tracks/mansion/graph.xml =================================================================== --- main/trunk/data/tracks/mansion/graph.xml 2012-10-18 22:54:52 UTC (rev 11715) +++ main/trunk/data/tracks/mansion/graph.xml 2012-10-18 23:00:30 UTC (rev 11716) @@ -2,7 +2,7 @@ <!-- Generated with script from SVN rev 11688 --> <graph> <!-- First define all nodes of the graph, and what quads they represent --> - <node-list from-quad="0" to-quad="90"/> <!-- map each quad to a node --> + <node-list from-quad="0" to-quad="91"/> <!-- map each quad to a node --> <!-- Define the main loop --> - <edge-loop from="0" to="90"/> + <edge-loop from="0" to="91"/> </graph> Modified: main/trunk/data/tracks/mansion/groundLightMap.png =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/mansion/mansion_track.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/mansion/materials.xml =================================================================== --- main/trunk/data/tracks/mansion/materials.xml 2012-10-18 22:54:52 UTC (rev 11715) +++ main/trunk/data/tracks/mansion/materials.xml 2012-10-18 23:00:30 UTC (rev 11716) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- Generated with script from SVN rev Unknown --> <materials> - <material name="bugslight.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y"/> + <material name="bugslight.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y" ignore="Y"/> <material name="carpet.png" backface-culling="N" compositing="test" ignore="Y"/> <material name="clouds.png" fog="N" compositing="blend" disable-z-write="Y"/> <material name="dead_tree.png" backface-culling="N" compositing="blend" disable-z-write="Y" ignore="Y"/> @@ -15,8 +15,13 @@ <material name="mansion_windows.png" compositing="blend" disable-z-write="Y"/> <material name="pix.png" compositing="test" reset="Y"/> <material name="plants.png" backface-culling="N" compositing="blend" disable-z-write="Y" ignore="Y"/> + <material name="roof-straw.png" backface-culling="N"/> + <material name="swamp.png" compositing="blend" disable-z-write="Y" max-speed="0.90"> + <particles base="swampDriving.xml" condition="drive skid"/> + </material> <material name="torch.png" backface-culling="N" compositing="test"/> <material name="tree_1Low.png" backface-culling="N" compositing="blend" disable-z-write="Y"/> - <material name="water_light2.png" compositing="blend" disable-z-write="Y"/> + <material name="wall.png" backface-culling="N"/> + <material name="water_light2.png" compositing="blend" disable-z-write="Y" falling-effect="Y" graphical-effect="water"/> <material name="woodPost.png" backface-culling="N"/> </materials> Modified: main/trunk/data/tracks/mansion/quads.xml =================================================================== --- main/trunk/data/tracks/mansion/quads.xml 2012-10-18 22:54:52 UTC (rev 11715) +++ main/trunk/data/tracks/mansion/quads.xml 2012-10-18 23:00:30 UTC (rev 11716) @@ -47,9 +47,9 @@ <quad p0="41:3" p1="41:2" p2="5.856705 13.861456 -97.285645" p3="12.733093 13.861456 -97.276642"/> <quad p0="42:3" p1="42:2" p2="6.792320 13.861458 -105.427063" p3="13.668709 13.861458 -105.418060"/> <quad p0="43:3" p1="43:2" p2="8.930862 13.861460 -113.568474" p3="15.807251 13.861460 -113.559471"/> - <quad p0="44:3" p1="44:2" p2="7.463730 13.861460 -115.383034" p3="7.472733 13.861462 -122.259422"/> - <quad p0="45:3" p1="45:2" p2="3.944046 13.861460 -115.383034" p3="3.953049 13.861462 -122.259422"/> - <quad p0="46:3" p1="46:2" p2="-0.109781 13.826939 -113.985329" p3="-3.693450 13.826939 -113.830757"/> + <quad p0="44:3" p1="44:2" p2="7.463730 13.861460 -114.733154" p3="7.472733 13.861462 -121.609543"/> + <quad p0="45:3" p1="45:2" p2="3.944046 13.861460 -114.733154" p3="3.953049 13.861462 -121.609543"/> + <quad p0="46:3" p1="46:2" p2="-0.109781 13.826939 -113.291000" p3="-3.693450 13.826939 -113.136429"/> <quad p0="47:3" p1="47:2" p2="2.369102 11.954844 -106.780434" p3="-5.541229 11.954844 -106.439247"/> <quad p0="48:3" p1="48:2" p2="2.644653 10.851484 -100.327148" p3="-5.272926 10.851484 -100.285324"/> <quad p0="49:3" p1="49:2" p2="2.437592 9.358824 -94.335823" p3="-5.425568 9.358824 -95.263443"/> @@ -80,17 +80,18 @@ <quad p0="74:3" p1="74:2" p2="-78.552208 -7.106323 30.430649" p3="-85.395622 -7.106319 26.510437"/> <quad p0="75:3" p1="75:2" p2="-82.117012 -6.370872 39.022392" p3="-89.983650 -6.370872 38.124672"/> <quad p0="76:3" p1="76:2" p2="-81.272522 -5.760120 47.652031" p3="-88.978210 -5.760120 49.471947"/> - <quad p0="77:3" p1="77:2" p2="-77.127968 -5.172146 58.286423" p3="-84.217216 -5.172146 61.812386"/> - <quad p0="78:3" p1="78:2" p2="-70.256470 -4.656933 69.419388" p3="-76.630310 -4.656933 74.116615"/> - <quad p0="79:3" p1="79:2" p2="-61.410751 -4.264465 79.564606" p3="-66.846123 -4.264469 85.321907"/> - <quad p0="80:3" p1="80:2" p2="-51.423004 -4.044727 87.333054" p3="-55.360077 -4.044731 94.202499"/> - <quad p0="81:3" p1="81:2" p2="-41.798473 -3.875256 91.192535" p3="-43.618099 -3.875259 98.898293"/> - <quad p0="82:3" p1="82:2" p2="-31.763123 -3.634037 92.022316" p3="-31.291466 -3.634037 99.925941"/> - <quad p0="83:3" p1="83:2" p2="-22.217808 -3.407890 90.071480" p3="-19.478851 -3.407890 97.500336"/> - <quad p0="84:3" p1="84:2" p2="-14.138607 -3.283638 85.625168" p3="-9.152878 -3.283638 91.775963"/> - <quad p0="85:3" p1="85:2" p2="-6.223907 -3.349693 78.421822" p3="-7.368736 -3.744884 91.417259"/> - <quad p0="86:3" p1="86:2" p2="-5.556015 -3.456921 77.424538" p3="2.329361 -3.456921 78.139168"/> - <quad p0="87:3" p1="87:2" p2="-3.917610 -3.164013 66.262947" p3="3.788765 -3.164013 68.079948"/> - <quad p0="88:3" p1="88:2" p2="-3.261925 -2.894138 60.945885" p3="4.509092 -2.894138 62.332047"/> - <quad p0="89:3" p1="89:2" p2="0:1" p3="0:0"/> + <quad p0="77:3" p1="77:2" p2="-78.798508 -5.172146 57.296844" p3="-83.494873 -5.172146 59.632668"/> + <quad p0="78:3" p1="78:2" p2="-76.504036 -3.494934 63.313705" p3="-80.401955 -3.494934 65.623703"/> + <quad p0="79:3" p1="79:2" p2="-73.228241 -3.758213 71.214706" p3="-76.327728 -3.758213 73.498886"/> + <quad p0="80:3" p1="80:2" p2="-61.410751 -4.264465 79.564606" p3="-66.846123 -4.264469 85.321907"/> + <quad p0="81:3" p1="81:2" p2="-51.423004 -4.044727 87.333054" p3="-55.360077 -4.044731 94.202499"/> + <quad p0="82:3" p1="82:2" p2="-41.798473 -3.875256 91.192535" p3="-43.618099 -3.875259 98.898293"/> + <quad p0="83:3" p1="83:2" p2="-31.763123 -3.634037 92.022316" p3="-31.291466 -3.634037 99.925941"/> + <quad p0="84:3" p1="84:2" p2="-22.217808 -3.407890 90.071480" p3="-19.478851 -3.407890 97.500336"/> + <quad p0="85:3" p1="85:2" p2="-14.138607 -3.283638 85.625168" p3="-9.152878 -3.283638 91.775963"/> + <quad p0="86:3" p1="86:2" p2="-6.223907 -3.349693 78.421822" p3="-7.368736 -3.744884 91.417259"/> + <quad p0="87:3" p1="87:2" p2="-5.556015 -3.456921 77.424538" p3="2.329361 -3.456921 78.139168"/> + <quad p0="88:3" p1="88:2" p2="-3.917610 -3.164013 66.262947" p3="3.788765 -3.164013 68.079948"/> + <quad p0="89:3" p1="89:2" p2="-3.261925 -2.894138 60.945885" p3="4.509092 -2.894138 62.332047"/> + <quad p0="90:3" p1="90:2" p2="0:1" p3="0:0"/> </quads> Added: main/trunk/data/tracks/mansion/roof-straw.png =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/roof-straw.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: main/trunk/data/tracks/mansion/scene.xml =================================================================== --- main/trunk/data/tracks/mansion/scene.xml 2012-10-18 22:54:52 UTC (rev 11715) +++ main/trunk/data/tracks/mansion/scene.xml 2012-10-18 23:00:30 UTC (rev 11716) @@ -5,6 +5,7 @@ <static-object lod_instance="true" lod_group="tombStone" xyz="-91.29 -1.13 -84.42" hpr="0.0 -87.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_distance="70.0" lod_group="tombStone" model="BezierCurve.002.b3d" xyz="79.06 -1.13 -2.68" hpr="0.0 -87.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tombStone" xyz="-73.38 -0.41 -66.52" hpr="15.1 -29.9 -8.3" scale="0.84 0.84 0.84"/> <!-- writeStaticObjects 3 --> + <static-object model="tracks.b3d" xyz="-77.55 0.78 -8.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tombStone" xyz="-119.92 -0.99 -50.39" hpr="13.0 2.8 0.0" scale="1.35 1.35 1.35"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tombStone" xyz="-89.06 -2.79 -52.37" hpr="30.7 95.1 31.2" scale="1.35 1.35 1.35"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tombStone" xyz="-66.21 -4.32 -25.22" hpr="-74.5 106.6 -74.7" scale="1.35 1.35 1.35"/> <!-- writeStaticObjects 3 --> @@ -69,7 +70,7 @@ </static-object> <static-object lod_instance="true" lod_group="lantern" xyz="2.68 1.63 68.97" hpr="-90.0 177.1 -0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="lantern" xyz="-47.60 0.58 89.62" hpr="-90.0 -127.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="lantern" xyz="-80.50 -0.40 66.40" hpr="-90.0 34.2 -0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> + <static-object lod_instance="true" lod_group="lantern" xyz="-76.28 -0.20 64.30" hpr="-90.0 -145.8 -0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="lantern" xyz="-86.48 -1.63 34.48" hpr="-90.0 -23.6 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="lantern" xyz="-77.66 -2.59 25.73" hpr="-90.0 140.6 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="lantern" xyz="-61.29 -2.87 -5.74" hpr="-90.0 -138.6 -0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> @@ -82,10 +83,22 @@ <static-object lod_distance="75.0" lod_group="dead_tree" model="Mesh.015.b3d" xyz="73.39 1.70 26.07" hpr="-90.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_distance="200.0" lod_group="dead_tree" model="Mesh.016.b3d" xyz="73.39 1.70 35.07" hpr="-90.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="dead_tree" xyz="4.45 -3.93 90.58" hpr="-85.3 138.4 -1.7" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="dead_tree" xyz="-45.73 -3.93 87.81" hpr="-82.7 48.3 2.0" scale="0.88 0.88 0.88"/> <!-- writeStaticObjects 3 --> + <static-object lod_instance="true" lod_group="dead_tree" xyz="-45.73 -4.27 87.81" hpr="-82.7 48.3 2.0" scale="0.88 0.88 0.88"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="dead_tree" xyz="-80.55 -8.05 -4.51" hpr="-82.7 48.3 2.0" scale="1.46 1.46 1.46"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="dead_tree" xyz="-55.32 -0.98 -67.66" hpr="-85.4 137.6 -1.8" scale="1.46 1.46 1.46"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="dead_tree" xyz="10.71 -1.87 43.07" hpr="-83.9 -167.5 -1.3" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> + <static-object model="bugsSwamp.b3d" xyz="-78.88 -2.44 75.08" hpr="-90.0 -111.2 -0.0" scale="1.00 1.00 1.00"> <!-- writeStaticObjects 2 --> + <animated-texture name="bugslight.png" dy="1.000" /> + </static-object> + <static-object model="bugsSwamp.b3d" xyz="-74.69 -0.90 46.35" hpr="-90.0 -47.7 0.0" scale="1.47 1.47 1.47"> <!-- writeStaticObjects 2 --> + <animated-texture name="bugslight.png" dy="1.000" /> + </static-object> + <static-object model="bugsSwamp.b3d" xyz="-50.23 -0.90 99.13" hpr="-90.0 -0.0 0.0" scale="1.47 1.47 1.47"> <!-- writeStaticObjects 2 --> + <animated-texture name="bugslight.png" dy="1.000" /> + </static-object> + <static-object model="bugsSwamp.b3d" xyz="-81.80 -0.90 99.13" hpr="-90.0 -15.9 -0.0" scale="1.47 1.47 1.47"> <!-- writeStaticObjects 2 --> + <animated-texture name="bugslight.png" dy="1.000" /> + </static-object> <static-object lod_instance="true" lod_group="old_barrier" xyz="-9.48 4.09 4.48" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="old_barrier" xyz="15.33 4.09 4.20" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object model="dead_tree_low.b3d" xyz="-115.36 2.47 -92.47" hpr="-0.0 37.3 -0.0" scale="0.70 0.70 0.70"/> <!-- writeStaticObjects 3 --> @@ -141,8 +154,11 @@ <static-object model="dead_branch.b3d" xyz="-65.91 -4.62 68.25" hpr="6.0 126.6 4.8" scale="0.45 0.45 0.45"/> <!-- writeStaticObjects 3 --> <static-object model="dead_branch.b3d" xyz="-94.04 -4.62 -55.02" hpr="6.0 126.6 4.8" scale="0.45 0.45 0.45"/> <!-- writeStaticObjects 3 --> <static-object model="dead_branch.b3d" xyz="-64.61 -0.01 -87.47" hpr="6.0 126.6 4.8" scale="0.45 0.45 0.45"/> <!-- writeStaticObjects 3 --> - <animated-texture name="water_light2.png" dx="1.000" /> </track> + <water model="waterPond.b3d" xyz="-75.02 -12.93 26.30" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" height="0.10" speed="500.00" length="5.00"> + <animated-texture name="water_light2.png" dx="0.100" /> + </water> + <water model="swamp.b3d" xyz="-72.90 -7.49 108.53" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" height="0.09" speed="500.00" length="10.00"/> <particle-emitter kind="fire.xml" x="-5.13" y="19.78" z="-115.89" h="-89.999996"> </particle-emitter> <particle-emitter kind="fire.xml" x="-5.15" y="19.78" z="-107.17" h="-89.999996"> @@ -155,6 +171,16 @@ </particle-emitter> <particle-emitter kind="fire.xml" x="18.66" y="19.78" z="-116.38" h="-270.000001"> </particle-emitter> + <particle-emitter kind="black_smoke.xml" x="28.42" y="46.26" z="-80.29" h="0.000000"> + </particle-emitter> + <particle-emitter kind="black_smoke.xml" x="5.96" y="13.58" z="-124.45" h="0.000000"> + </particle-emitter> + <particle-emitter kind="fire.xml" x="5.87" y="12.96" z="-123.87" h="0.000000"> + </particle-emitter> + <particle-emitter kind="fire.xml" x="-29.18" y="-4.23" z="108.15" h="0.000000"> + </particle-emitter> + <particle-emitter kind="black_smoke.xml" x="-29.09" y="-3.61" z="107.57" h="0.000000"> + </particle-emitter> <object type="billboard" texture="lightHaloY.png" xyz="-0.826620 2.265366 38.080910" width="3.600000" height="3.600001" > </object> @@ -179,10 +205,10 @@ <object type="billboard" texture="lightHaloY.png" xyz="-47.706966 0.106140 89.592186" width="3.600000" height="3.600001" > </object> - <object type="billboard" texture="lightHaloY.png" xyz="-80.448563 -0.917364 66.538048" + <object type="billboard" texture="lightHaloY.png" xyz="-76.228058 -0.714618 64.440941" width="3.600000" height="3.600001" > </object> - <object type="billboard" texture="halo.png" xyz="-80.448563 -0.917364 66.554604" + <object type="billboard" texture="halo.png" xyz="-76.228058 -0.714618 64.457497" width="2.000000" height="2.000000" fadeout="true" start="10.0" end="20.0"> </object> <object type="billboard" texture="halo.png" xyz="-86.487244 -2.021050 34.501274" @@ -233,7 +259,7 @@ <item x="-79.663261" y="-6.536561" z="21.54475" h="-89.999997" /> <item x="0.157635" y="6.144967" z="-34.361755" h="-89.999997" /> <item x="-3.487213" y="10.955063" z="-100.19828" h="-179.999994" /> - <item x="-79.663261" y="-4.816978" z="63.002438" h="-89.999997" /> + <item x="-79.663261" y="-3.64723" z="63.002438" h="-89.999997" /> <item x="0.512787" y="10.955063" z="-100.19828" h="-179.999994" /> <item x="-63.461121" y="1.354621" z="-76.763016" h="-89.999997" /> <item x="-63.461121" y="1.354621" z="-78.763008" h="-89.999997" /> Added: main/trunk/data/tracks/mansion/swamp.b3d =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/swamp.b3d ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/swamp.png =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/swamp.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/tracks.b3d =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/tracks.b3d ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/wall.png =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/wall.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/waterPond.b3d =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/waterPond.b3d ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: main/trunk/data/tracks/mansion/woodBridge-subsea.jpg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/mansion/woodBridge-subsea.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |