Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4078


Ignore:
Timestamp:
Jul 4, 2006, 12:36:00 AM (18 years ago)
Author:
bensch
Message:

orxonox/data/trunk: merged the data from mountain-lake back here
merged with command:
svn merge -r625:HEAD https://svn.orxonox.net/data/branches/mountain_lake

Location:
data/trunk
Files:
1 deleted
4 edited
7 copied

Legend:

Unmodified
Added
Removed
  • data/trunk/worlds/lake.mtl

    r3994 r4078  
    1 newmtl Mat_12
     1newmtl blinn1SG
    22illum 4
    33Kd 0.00 0.00 0.00
    4 Ka 0.00 0.00 0.00
     4Ka 0.69 0.69 0.69
    55Tf 1.00 1.00 1.00
     6map_Kd map.jpg
    67Ni 1.00
    7 Ks 1.00 0.55 0.40
    8 Ns 50.78
    9 newmtl Mat_14
    10 illum 4
    11 Kd 0.00 0.00 0.00
    12 Ka 0.00 0.00 0.00
    13 Tf 1.00 1.00 1.00
    14 Ni 1.00
    15 Ks 0.00 0.00 0.00
    16 Ns 50.78
    17 newmtl Mat_16
    18 illum 4
    19 Kd 1.00 1.00 1.00
    20 Ka 0.00 0.00 0.00
    21 Tf 1.00 1.00 1.00
    22 Ni 1.00
    23 Ks 0.00 0.00 0.00
    24 Ns 50.78
    25 newmtl default3
    26 illum 4
    27 Kd 0.00 0.00 0.00
    28 Ka 0.00 0.00 0.00
    29 Tf 1.00 1.00 1.00
    30 Ni 1.00
    31 Ks 0.00 0.00 0.00
    32 Ns 0.00
    33 newmtl initialShadingGroup
    34 illum 4
    35 Kd 0.00 0.00 0.00
    36 Ka 0.00 0.00 0.00
    37 Tf 1.00 1.00 1.00
    38 map_Kd gras_128.jpg
    39 Ni 1.00
     8Ks 0.50 0.50 0.50
  • data/trunk/worlds/sp_demo_mountain_lake.oxw

    r4074 r4078  
    11<WorldDataFile>
    2   <name>Demo: Mountain Lake</name>
     2  <name>Mountain Lake</name>
    33  <menu-item-image>pictures/menu/se_vulcano_512x128.png</menu-item-image>
    44  <screenshoot>pictures/menu/ss_vulcano_512x512.png</screenshoot>
     
    1212  </LoadScreen>
    1313
     14  <ScriptManager>
     15
     16   <Scripts>
     17
     18    <Script>
     19     <file>cloud.lua</file>
     20     <object>CloudEffect, myClouds</object>
     21    </Script>
     22
     23   </Scripts>
     24
     25   <ScriptTriggers>
     26
     27    <ScriptTrigger>
     28     <file>cloud.lua</file>
     29     <function>tick</function>
     30     <abs-coor>0,100,0</abs-coor>
     31     <radius>10</radius>
     32     <worldentity>Player</worldentity>
     33     <triggerlasts>true</triggerlasts>
     34     <debugdraw>true</debugdraw>
     35    </ScriptTrigger>
     36
     37   </ScriptTriggers>
     38
     39  </ScriptManager>
    1440
    1541  <WorldEntities>
     42    <Hover>
     43      <name>Player</name>
     44      <abs-coor>50, 100, 50</abs-coor>
     45    </Hover>
    1646
    17     <Spacecraft2D>
    18       <name>Player</name>
     47    <Terrain>
     48      <name>water</name>
     49      <model>worlds/lake.obj, 2</model>
     50    </Terrain>
     51
     52    <SpaceShip>
     53      <name>Player2</name>
    1954      <model>models/ships/reap_#.obj</model>
    20       <abs-coor>50, 100, 50</abs-coor>
    21     </Spacecraft2D>
     55      <abs-coor>50,460,300</abs-coor>
     56    </SpaceShip>
     57
     58    <MappedWater>
     59      <name>water1</name>
     60      <waterpos>-500,20,-500</waterpos>
     61      <watersize>1000,1000</watersize>
     62      <wateruv>9</wateruv>
     63      <waterflow>0.08</waterflow>
     64      <lightpos>50,460,300</lightpos>
     65      <shinesize>128</shinesize>
     66      <shinestrength>0.7</shinestrength>
     67      <reflstrength>1</reflstrength>
     68      <watercolor>0.1, 0.2, 0.4</watercolor>
     69      <waterangle>0</waterangle>
     70      <refraction>0.009</refraction>
     71    </MappedWater>
     72
    2273
    2374    <SkyBox>
     
    2677     <Size>10000</Size>
    2778    </SkyBox>
    28     <Terrain>
    29       <name>water</name>
    30       <model>worlds/sea_ground.obj, 4</model>
    31     </Terrain>
    32 
    33     <MappedWater>
    34       <waterpos>-500,20,-500</waterpos>
    35       <watersize>1000,1000</watersize>
    36       <wateruv>9</wateruv>
    37       <waterflow>0.08</waterflow>
    38       <lightpos>10,15,10</lightpos>
    39       <!--<lightPos>500,4850,4650</lightPos>-->
    40     </MappedWater>
    41 
    42   </WorldEntities>
    43 
     79</WorldEntities>
    4480
    4581  <LightManager>
     
    6298
    6399
     100  <AtmosphericEngine>
     101    <WeatherEffect>
     102
     103      <FogEffect>
     104      </FogEffect>
     105
     106      <RainEffect>
     107        <option>moverain</option>
     108      </RainEffect>
     109
     110      <SnowEffect>
     111      </SnowEffect>
     112
     113      <LightningEffect>
     114      </LightningEffect>
     115
     116      <CloudEffect>
     117        <name>myClouds</name>
     118      </CloudEffect>
     119
     120    </WeatherEffect>
     121  </AtmosphericEngine>
     122
     123
    64124</WorldDataFile>
Note: See TracChangeset for help on using the changeset viewer.