Changeset 12120 for data

Timestamp:

Nov 28, 2018, 10:13:16 AM (6 years ago)

Author:

wiesep

Message:

Implemented material script inheritance for bump mapping

Location:

data/branches/Shader_HS18

Files:

• materials/BumpMapping/BumpMap.material (added)
• materials/Cube_Lava_Normal-Mask.material (deleted)
• materials/Cube_Lava_Normal.material (modified) (3 diffs)
• materials/Cube_Lava_Normal_Blank.material (added)
• models/Cube_Lava_V2_Normal_Blank.mesh (added)

data/branches/Shader_HS18/materials/Cube_Lava_Normal.material

@@ +1 @@
+import * from "BumpMap.material"
 // Any number of lights, diffuse
-material Cube_Lava_Normal
+material Cube_Lava_Normal : BumpMap_Base
 {
     technique
     {
-        // Base ambient pass
         pass ambient
         {
-          // base colours, not needed for rendering, but as information
-          // to lighting pass categorisation routine
-          diffuse 0 0 0
-          depth_write on
-          depth_bias 0
-
         }
         // Now do the lighting pass
@@ -18 +12 @@
         pass perlight
         {
-
-            // do this for each light
-            iteration once_per_light
-            scene_blend add
-            depth_write on
-            depth_bias 1
-
-            // base colours, not needed for rendering, but as information
-            // to lighting pass categorisation routine
-            ambient 0 0 0
-
-            // Vertex program reference
-            vertex_program_ref BumpMapping/BumpMapVP
-            {
-                param_named_auto lightPosition light_position_object_space 0
-                param_named_auto worldViewProj worldviewproj_matrix
-            }
-
-            // Fragment program
-            fragment_program_ref BumpMapping/BumpMapFP
-            {
-                param_named_auto lightDiffuse light_diffuse_colour 0
-            }
-
-            // texture shadow receiver program
-            shadow_receiver_vertex_program_ref BumpMapping/BumpMapVPShadowRcv
-            {
-                param_named_auto lightPosition light_position_object_space 0
-                param_named_auto worldViewProj worldviewproj_matrix
-                param_named_auto worldMatrix world_matrix
-                param_named_auto texViewProj texture_viewproj_matrix
-            }
-            // Additive texture shadow receiver program
-            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
             texture_unit normalmap
@@ -83 +23 @@
         pass decal
         {
-            // base colours, not needed for rendering, but as information
-            // to lighting pass categorisation routine
-            lighting off
-            depth_write on
-            depth_bias 2
-
-            scene_blend dest_colour zero
             texture_unit decalmap
             {