Changeset 2489

Timestamp:

07/02/07 20:23:43 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media

Files:

• Station/GTPStationPostProc.material (modified) (4 diffs)
• Station/hallLamp.mesh (added)
• Station/hallLampHolder.mesh (added)
• Station/lamp.bmp (added)
• Station/lamp.jpg (added)
• Station/roomLamp.mesh (added)
• Station/scientist.material (modified) (1 diff)
• Station/station.material (modified) (3 diffs)
• materials/GTPBasic/GTPBasic.material (modified) (1 diff)

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/GTPStationPostProc.material

@@ -7 +7 @@
         fragment_program_ref
         { 
-          param_named cutValue float 6.0
-          param_named timeBlur float 0.24               
+          param_named cutValue float 5.0
+          param_named timeBlur float 0.3                
         }               
       }
@@ -23 +23 @@
          { 
                 param_named weight1 float 1.0
-                param_named weight2 float 0.35
+                param_named weight2 float 0.2
                  }     
       }
@@ -37 +37 @@
          fragment_program_ref
          { 
-           param_named Stretch float 1.7           
+           param_named Stretch float 1.6           
          }                              
       }
@@ -51 +51 @@
          fragment_program_ref
          { 
-           param_named Stretch float 1.7               
+           param_named Stretch float 1.6               
          }                       
       }

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/scientist.material

@@ -52 +52 @@
                 pass indirect_color
                 {
-                        lighing off
+                        lighting off
                         depth_bias 1
                         depth_write on

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/station.material

@@ -249 +249 @@
    fragment_program_ref GTP/Caustic/CauCube_PointSprite_PS
    {
-     param_named CausticColor float4          1 1 1 0.06
+     param_named CausticColor float4          1 1 1 0.15
    }
    texture_unit
@@ -434 +434 @@
                         diffuse 1 0.2 0.2 1
                         specular 0 0 0 1
-                        emissive 0.1 0.01 0.01 1
+                        emissive 1 0.1 0.1 1
                 }
         }
@@ -448 +448 @@
                         diffuse 0.2 0.2 1 1
                         specular 0 0 0 1
-                        emissive 0.01 0.01 0.1 1
-                }
+                        emissive 0.1 0.1 1 1
+                }
+        }
+}
+
+material station_equipt
+{
+        technique
+        {
+                pass
+                {
+                        ambient 0 0 0 1
+                        diffuse 0.07444 0.07444 0.07444 1
+                        specular 0.80166 0.80166 0.80166 62.744
+                        emissive 0 0 0
+                }
+        }
+}
+
+material Station_lamp
+{
+        technique
+        {
+                pass
+                {
+                        vertex_program_ref GTP/Basic/PlainTex_VS
+                   {  
+                     param_named_auto WorldViewProj worldviewproj_matrix     
+                   } 
+                   fragment_program_ref GTP/Basic/PlainTex2DColored_PS
+                   {    
+                           param_named color float4 20 20 20 20
+                   } 
+                        texture_unit
+                {
+                 texture lamp.bmp
+                }
+                }
+        }
+}
+
+material tation_room_lamp
+{
+        technique
+        {
+                pass
+                {
+                        vertex_program_ref GTP/Basic/PlainTex_VS
+                   {  
+                     param_named_auto WorldViewProj worldviewproj_matrix     
+                   } 
+                   fragment_program_ref GTP/Basic/PlainTex2DColored_PS
+                   {    
+                           param_named color float4 10 10 10 10
+                   }   
+                   texture_unit
+                   {
+                           texture lamp.bmp
+                   }
+
+                }               
         }
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic.material

@@ -28 +28 @@
      param_named_auto WorldViewProj worldviewproj_matrix     
    } 
-   vertex_program_ref GTP/Basic/PlainTex2D_PS
+   fragment_program_ref GTP/Basic/PlainTex2D_PS
    {    
    }