From: <au...@us...> - 2011-08-30 19:39:44
|
Revision: 9666 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9666&view=rev Author: auria Date: 2011-08-30 19:39:37 +0000 (Tue, 30 Aug 2011) Log Message: ----------- Update city for new LOD Modified Paths: -------------- main/trunk/data/tracks/city/building_1.b3d main/trunk/data/tracks/city/building_2.b3d main/trunk/data/tracks/city/city_track.b3d main/trunk/data/tracks/city/crate.b3d main/trunk/data/tracks/city/fern.b3d main/trunk/data/tracks/city/graph.xml main/trunk/data/tracks/city/grass.b3d main/trunk/data/tracks/city/materials.xml main/trunk/data/tracks/city/quads.xml main/trunk/data/tracks/city/scene.xml main/trunk/data/tracks/city/track.xml main/trunk/data/tracks/city/tree_1_LOD150.b3d main/trunk/data/tracks/city/tree_1_LOD50.b3d main/trunk/data/tracks/city/tree_1_LOD550.b3d main/trunk/data/tracks/city/tree_2_LOD150.b3d main/trunk/data/tracks/city/tree_2_LOD50.b3d main/trunk/data/tracks/city/tree_2_LOD500.b3d Modified: main/trunk/data/tracks/city/building_1.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/building_2.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/city_track.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/crate.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/fern.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/graph.xml =================================================================== --- main/trunk/data/tracks/city/graph.xml 2011-08-30 19:13:06 UTC (rev 9665) +++ main/trunk/data/tracks/city/graph.xml 2011-08-30 19:39:37 UTC (rev 9666) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 7732 --> +<!-- Generated with script from SVN rev 9664 --> <graph> <!-- First define all nodes of the graph, and what quads they represent --> <node-list from-quad="0" to-quad="632"/> <!-- map each quad to a node --> Modified: main/trunk/data/tracks/city/grass.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/materials.xml =================================================================== --- main/trunk/data/tracks/city/materials.xml 2011-08-30 19:13:06 UTC (rev 9665) +++ main/trunk/data/tracks/city/materials.xml 2011-08-30 19:39:37 UTC (rev 9666) @@ -1,19 +1,16 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 7732 --> +<!-- Generated with script from SVN rev Unknown --> <materials> <material name="canyon_water.png" surface="Y"> - <sfx filename="splash.ogg" name="splash"/> + <sfx filename="splash.ogg"/> <particles base="splash.xml" condition="skid drive"/> </material> - <material name="city_asphalt_1.jpg" anisotropic="Y"> + <material name="city_asphalt_1.jpg"> <particles base="smoke.xml" condition="skid"/> </material> - <material name="city_asphalt_2.jpg" anisotropic="Y"> + <material name="city_asphalt_2.jpg"> <particles base="smoke.xml" condition="skid"/> </material> - <material name="city_asphalt_blend.jpg" anisotropic="Y"/> - <material name="city_bricks.png" anisotropic="Y"/> - <material name="city_building_2.png" backface-culling="Y"/> <material name="city_checker.png"> <particles base="smoke.xml" condition="skid"/> </material> @@ -21,8 +18,7 @@ <material name="city_grass.png" compositing="blend"/> <material name="city_metal.png" backface-culling="N"/> <material name="city_reflection.png" sphere="Y"/> - <material name="city_tree.jpg" compositing="none"/> - <material name="city_tree_leaves.jpg" mask="city_tree_leaves_alpha.jpg" compositing="test" backface-culling="N" anisotropic="Y" ignore="Y"/> + <material name="city_tree_leaves.jpg" compositing="test" ignore="Y" backface-culling="N" mask="city_tree_leaves_alpha.jpg"/> <material name="canyon_conveyor_belt.png"> <zipper/> </material> Modified: main/trunk/data/tracks/city/quads.xml =================================================================== --- main/trunk/data/tracks/city/quads.xml 2011-08-30 19:13:06 UTC (rev 9665) +++ main/trunk/data/tracks/city/quads.xml 2011-08-30 19:39:37 UTC (rev 9666) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 7732 --> +<!-- Generated with script from SVN rev 9664 --> <quads> <!-- Driveline: driveline_main --> <quad p0="-5.999999 0.000000 -2.000000" p1="5.999654 0.000000 -2.000000" p2="5.999244 0.000000 0.095226" p3="-5.998899 0.000000 -0.095221"/> Modified: main/trunk/data/tracks/city/scene.xml =================================================================== --- main/trunk/data/tracks/city/scene.xml 2011-08-30 19:13:06 UTC (rev 9665) +++ main/trunk/data/tracks/city/scene.xml 2011-08-30 19:39:37 UTC (rev 9666) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 7732 --> +<!-- Generated with script from SVN rev 9664 --> <scene> <track model="city_track.b3d" x="0" y="0" z="0"> <static-object model="building_2.b3d" xyz="-24.000000 -3.200000 152.000000" hpr="-0.000000 70.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> @@ -47,29 +47,29 @@ <static-object model="grass.b3d" xyz="57.000000 21.799999 244.199997" hpr="-0.000000 -0.000000 10.000000" scale="2.400000 1.800000 2.400000"/> <static-object model="grass.b3d" xyz="53.999996 21.200001 245.199997" hpr="-0.000000 -0.000000 10.000000" scale="2.400000 1.800000 2.400000"/> <static-object model="grass.b3d" xyz="-194.000000 -0.200000 13.000000" hpr="-0.000000 -0.000000 -0.000000" scale="2.400000 1.600000 2.400000"/> - <static-object model="tree_1_LODx.b3d" xyz="-16.000000 -0.200000 30.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="175.000000 -0.200000 0.000000" hpr="-0.000000 -45.000001 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="195.000000 39.000000 82.000000" hpr="-0.000000 -90.000003 0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="56.000000 21.800001 246.000000" hpr="-0.000000 -90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="264.000000 22.199999 32.000000" hpr="-0.000000 90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="34.000000 -0.200000 -34.000000" hpr="-0.000000 -45.000001 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LODx.b3d" xyz="15.000000 -0.200000 -50.000000" hpr="-0.000000 -180.000005 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LOD50.b3d" xyz="-16.000000 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LOD550.b3d" xyz="-50.295204 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_1_LOD150.b3d" xyz="-33.713127 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_2_LODx.b3d" xyz="-14.000000 -0.200000 15.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_2_LODx.b3d" xyz="78.000000 -0.200000 114.000000" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LODx.b3d" xyz="280.000000 12.600000 -15.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LODx.b3d" xyz="270.000000 19.599998 21.000000" hpr="-0.000000 -90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> - <static-object model="tree_2_LODx.b3d" xyz="258.000000 22.000000 21.000000" hpr="-0.000000 45.000001 -0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LODx.b3d" xyz="-22.000000 -0.020000 45.000000" hpr="-0.000000 -224.999996 -0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LODx.b3d" xyz="-22.000000 -0.020000 142.000000" hpr="-0.000000 -0.000000 -0.000000" scale="0.900000 0.900000 0.900000"/> - <static-object model="tree_2_LODx.b3d" xyz="8.000000 0.600000 -33.000000" hpr="-0.000000 -74.999999 0.000000" scale="0.900000 0.900000 0.900000"/> - <static-object model="tree_2_LOD50.b3d" xyz="78.000023 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LOD150.b3d" xyz="60.891808 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> - <static-object model="tree_2_LOD500.b3d" xyz="45.183064 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> - <animated-texture name="canyon_conveyor_belt.png" dy="2" /> - <animated-texture name="canyon_water.png" dy="0.2" /> + <static-object lod_instance="true" lod_group="tree_1" xyz="-16.000000 -0.200000 30.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="175.000000 -0.200000 0.000000" hpr="-0.000000 -45.000001 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="195.000000 39.000000 82.000000" hpr="-0.000000 -90.000003 0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="56.000000 21.800001 246.000000" hpr="-0.000000 -90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="264.000000 22.199999 32.000000" hpr="-0.000000 90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="34.000000 -0.200000 -34.000000" hpr="-0.000000 -45.000001 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_1" xyz="15.000000 -0.200000 -50.000000" hpr="-0.000000 -180.000005 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_distance="50.0" lod_group="tree_1" model="tree_1_LOD50.b3d" xyz="-16.000000 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_distance="550.0" lod_group="tree_1" model="tree_1_LOD550.b3d" xyz="-50.295204 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_distance="150.0" lod_group="tree_1" model="tree_1_LOD150.b3d" xyz="-33.713127 -0.200000 377.859558" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="-14.000000 -0.200000 15.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="78.000000 -0.200000 114.000000" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="280.000000 12.600000 -15.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="270.000000 19.599998 21.000000" hpr="-0.000000 -90.000003 -0.000000" scale="1.000000 1.000000 1.000000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="258.000000 22.000000 21.000000" hpr="-0.000000 45.000001 -0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="-22.000000 -0.020000 45.000000" hpr="-0.000000 -224.999996 -0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="-22.000000 -0.020000 142.000000" hpr="-0.000000 -0.000000 -0.000000" scale="0.900000 0.900000 0.900000"/> + <static-object lod_instance="true" lod_group="tree_2" xyz="8.000000 0.600000 -33.000000" hpr="-0.000000 -74.999999 0.000000" scale="0.900000 0.900000 0.900000"/> + <static-object lod_distance="50.0" lod_group="tree_2" model="tree_2_LOD50.b3d" xyz="78.000023 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_distance="150.0" lod_group="tree_2" model="tree_2_LOD150.b3d" xyz="60.891808 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> + <static-object lod_distance="500.0" lod_group="tree_2" model="tree_2_LOD500.b3d" xyz="45.183064 -0.200000 385.943268" hpr="-0.000000 180.000005 0.000000" scale="1.200000 1.200000 1.200000"/> + <animated-texture name="canyon_conveyor_belt.png" dy="2.000" /> + <animated-texture name="canyon_water.png" dy="0.200" /> </track> <object type="movable" xyz="178.600006 40.700001 64.900002" hpr="-0.000000 24.999998 0.000000" scale="1.000000 1.000000 1.000000" model="crate.b3d" shape="box" mass="100.0"/> @@ -83,7 +83,7 @@ model="crate.b3d" shape="box" mass="100.0"/> <object type="movable" xyz="177.600006 40.700001 62.900005" hpr="-0.000000 24.999998 0.000000" scale="1.000000 1.000000 1.000000" model="crate.b3d" shape="box" mass="100.0"/> - <sun xyz="-800.0 500.0 -300.0"/> + <weather particles="none.xml" /> <banana x="36" y="45.820133" z="205" /> <banana x="25" y="45.820133" z="187" /> <banana x="141" y="45.820133" z="103.5" /> @@ -138,8 +138,9 @@ min-height="40.000000" same-group="1"/> </checks> <sky-box texture="summersky_t.jpg summersky_b.jpg summersky_e.jpg summersky_w.jpg summersky_s.jpg summersky_n.jpg"/> + <camera far="1000.0"/> <default-start karts-per-row ="2" - forwards-distance ="1.5" - sidewards-distance="3" - upwards-distance ="0.1"/> + forwards-distance ="1.50" + sidewards-distance="3.00" + upwards-distance ="0.10"/> </scene> Modified: main/trunk/data/tracks/city/track.xml =================================================================== --- main/trunk/data/tracks/city/track.xml 2011-08-30 19:13:06 UTC (rev 9665) +++ main/trunk/data/tracks/city/track.xml 2011-08-30 19:39:37 UTC (rev 9666) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 7732 --> +<!-- Generated with script from SVN rev 9664 --> <track name = "Shiny Suburbs" version = "5" groups = "standard" Modified: main/trunk/data/tracks/city/tree_1_LOD150.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/tree_1_LOD50.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/tree_1_LOD550.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/tree_2_LOD150.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/tree_2_LOD50.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/city/tree_2_LOD500.b3d =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |