Changeset 5354 for data/media

Timestamp:

Dec 14, 2008, 8:15:46 PM (16 years ago)

Author:

landauf

Message:

• added directional light to the levelfile
• added new skybox
• added new explosion

Location:

data/media

Files:

• levels/sample3.oxw (modified) (1 diff)
• levels/spaceshiptemplates3.oxw (modified) (4 diffs)
• materials/scripts/OrxonoxSky.material (modified) (1 diff)
• materials/textures/skypanoramagen1_BK.jpg (added)
• materials/textures/skypanoramagen1_DN.jpg (added)
• materials/textures/skypanoramagen1_FR.jpg (added)
• materials/textures/skypanoramagen1_LF.jpg (added)
• materials/textures/skypanoramagen1_RT.jpg (added)
• materials/textures/skypanoramagen1_UP.jpg (added)
• particle/explosion2b.particle (added)

data/media/levels/sample3.oxw

@@ -13 +13 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
+   skybox       = "Orxonox/skypanoramagen1"
   >
+    <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" />
+    <!-- This is for Orxonox/Starbox -- Light type=directional position="0,0,0" direction="0.817, -0.400, 0.415" diffuse="1.0, 0.9, 0.6, 1.0" specular="1.0, 0.9, 0.6, 1.0" /-->
+
     <SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
     <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
     <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff />
 
-    <GlobalShader compositor="Old TV" visible=false>
+    <GlobalShader compositor="Bloom" visible=false>
       <events>
         <visibility>

data/media/levels/spaceshiptemplates3.oxw

@@ -6 +6 @@
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
-   explosionchunks        = 7
+   explosionchunks        = 6
 
    health            = 100
@@ -18 +18 @@
     <attached>
       <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
       <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
       <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
     </attached>
   </SpaceShip>
@@ -30 +28 @@
     <camerapositions>
       <CameraPosition position="0,10,40" />
+      <CameraPosition position="0,20,80" />
       <CameraPosition position="0,150,-25" pitch=-90 />
       <CameraPosition position="0,0,-30" yaw=180 />
@@ -56 +55 @@
     <active>
       <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
     </active>
     <forward>

data/media/materials/scripts/OrxonoxSky.material

@@ +1 @@
+material Orxonox/skypanoramagen1
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_write off
+
+                        texture_unit
+                        {
+                                cubic_texture skypanoramagen1.jpg separateUV
+                                tex_address_mode clamp
+                        }
+                }
+        }
+}
+
 material Orxonox/Starbox
 {