Changeset 4074

Timestamp:

Jul 3, 2006, 11:36:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/data/trunk: merged the terrain branche back. conflicts reverted.
merged with
svn merge -r455:HEAD ​https://svn.orxonox.net/data/branches/terrain .

Location:

data/trunk

Files:

• pictures/bright.png (copied) (copied from data/branches/terrain/pictures/bright.png)
• pictures/large_ele.png (copied) (copied from data/branches/terrain/pictures/large_ele.png)
• pictures/large_tex.png (copied) (copied from data/branches/terrain/pictures/large_tex.png)
• pictures/layer2vis.png (copied) (copied from data/branches/terrain/pictures/layer2vis.png)
• pictures/leo.png (copied) (copied from data/branches/terrain/pictures/leo.png)
• pictures/lightmap.png (copied) (copied from data/branches/terrain/pictures/lightmap.png)
• pictures/lm.bmp (copied) (copied from data/branches/terrain/pictures/lm.bmp)
• pictures/lm.png (copied) (copied from data/branches/terrain/pictures/lm.png)
• pictures/small_ele.png (copied) (copied from data/branches/terrain/pictures/small_ele.png)
• pictures/snowvis.png (copied) (copied from data/branches/terrain/pictures/snowvis.png)
• sound/music/menu1.ogg (modified) (previous)
• worlds/Terrain.oxw (copied) (copied from data/branches/terrain/worlds/Terrain.oxw)
• worlds/christmas.oxw (modified) (1 diff)
• worlds/developer_island.oxw (modified) (1 diff)
• worlds/sp_demo_mountain_lake.oxw (modified) (1 diff)

data/trunk/worlds/christmas.oxw

@@ -120 +120 @@
     </SkyBox>
 
-    <Terrain>
-      <name>HardCore</name>
-      <model>models/environments/christmas.obj</model>
-      <vegetation>models/environments/christmas_vegetation.obj</vegetation>
-      <abs-coor>0,-10,100</abs-coor>
-    </Terrain>
+    <TerrainEntity>   
+                <name>Puget Sound</name> 
+                <elevation_map>pictures/small_ele.png</elevation_map>           
+                <light_map>pictures/large_tex.png</light_map>           
+                <material_layer>
+                        <detail_map file="maps/gras_128.jpg">
+                                <repeat x="64" z="64" />
+                        </detail_map>
+                        <alpha full="yes" />
+                </material_layer>
+                <material_layer>
+                        <detail_map file="maps/stucco.jpg">
+                                <repeat x="64" z="64" />
+                        </detail_map>
+                        <alpha file="layer2vis.png" />
+                </material_layer>               
+                <scale>100,100,100</scale>
+    </TerrainEntity>
 
 

data/trunk/worlds/developer_island.oxw

@@ -18 +18 @@
       <Size>10000</Size>
     </SkyBox>
-    <Terrain>
-      <name>HardCore</name>
-      <model>worlds/environ.obj</model>
-    </Terrain>
     <MappedWater>
        <waterHeight>50</waterHeight>

data/trunk/worlds/sp_demo_mountain_lake.oxw

@@ -12 +12 @@
   </LoadScreen>
 
-  
+
   <WorldEntities>
-  
-    <Hover>
+
+    <Spacecraft2D>
       <name>Player</name>
+      <model>models/ships/reap_#.obj</model>
       <abs-coor>50, 100, 50</abs-coor>
-    </Hover>
+    </Spacecraft2D>
 
     <SkyBox>