Changeset 12115 for data/branches/Shader_HS18/materials/Cube_Lava_Normal.material

Timestamp:

Nov 21, 2018, 12:04:03 PM (5 years ago)

Author:

wiesep

Message:

Changed folder structure, deletet some unused files and cleaned up code

File:

• data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (modified) (6 diffs)

data/branches/Shader_HS18/materials/Cube_Lava_Normal.material

@@ -9 +9 @@
           // base colours, not needed for rendering, but as information
           // to lighting pass categorisation routine
-          ambient 1 1 1
           diffuse 0 0 0
-          specular 0 0 0 0
-          // Really basic vertex program
-          // NB we don't use fixed function here because GL does not like
-          // mixing fixed function and vertex programs, depth fighting can
-          // be an issue
-          vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
-          {
-            param_named_auto ambient ambient_light_colour
-          }
-          fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
-          {
-          }
 
         }
@@ -39 +26 @@
 
             // Vertex program reference
-            vertex_program_ref Examples/BumpMapVP
+            vertex_program_ref BumpMapping/BumpMapVP
             {
                 param_named_auto lightPosition light_position_object_space 0
@@ -46 +33 @@
 
             // Fragment program
-            fragment_program_ref Examples/BumpMapFP
+            fragment_program_ref BumpMapping/BumpMapFP
             {
                 param_named_auto lightDiffuse light_diffuse_colour 0
@@ -52 +39 @@
 
             // texture shadow receiver program
-            shadow_receiver_vertex_program_ref Examples/BumpMapVPShadowRcv
+            shadow_receiver_vertex_program_ref BumpMapping/BumpMapVPShadowRcv
             {
                 param_named_auto lightPosition light_position_object_space 0
@@ -60 +47 @@
             }
             // Additive texture shadow receiver program
-            shadow_receiver_fragment_program_ref Examples/BumpMapFPShadowRcv
+            shadow_receiver_fragment_program_ref BumpMapping/BumpMapFPShadowRcv
             {
                 param_named_auto lightDiffuse light_diffuse_colour 0
             }
+
+            // Vertex program reference
+            vertex_program_ref BumpMapping/BumpMapVPSpecular
+            {
+                param_named_auto lightPosition light_position_object_space 0
+                param_named_auto eyePosition camera_position_object_space
+                param_named_auto worldViewProj worldviewproj_matrix
+            }
+
+            // Fragment program
+            fragment_program_ref BumpMapping/BumpMapFPSpecular
+            {
+                param_named_auto lightDiffuse light_diffuse_colour 0 
+                param_named_auto lightSpecular light_specular_colour 0
+            }
+            
 
             // Base bump map
@@ -79 +82 @@
             // to lighting pass categorisation routine
             lighting off
-            // Really basic vertex program
-            // NB we don't use fixed function here because GL does not like
-            // mixing fixed function and vertex programs, depth fighting can
-            // be an issue
             
             scene_blend dest_colour zero