Changeset 12096 for data

Timestamp:

Nov 11, 2018, 5:37:35 PM (6 years ago)

Author:

wiesep

Message:

Working version

Location:

data/branches/Shader_HS18

Files:

• materials/Cube_Lava_Normal.material (modified) (5 diffs)
• materials/Example (added)
• materials/Example/Examples-Advanced.program (added)
• materials/Example/Examples.program (added)
• programs/Example/GLSL120/AmbientOneTexture.glsl (modified) (1 diff)
• programs/Example/GLSL120/skinningTwoWeightsVp.glsl (modified) (1 diff)
• programs/OLD/skinningTwoWeightsVp.glsl (modified) (3 diffs)
• resources.oxr (modified) (1 diff)

data/branches/Shader_HS18/materials/Cube_Lava_Normal.material

@@ -7 +7 @@
         pass ambient
         {
-            // base colours, not needed for rendering, but as information
-            // to lighting pass categorisation routine
-            diffuse 0 0 0
+          // 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
+          {
+          }
+
         }
         // Now do the lighting pass
@@ -15 +29 @@
         pass perlight
         {
+
             // do this for each light
             iteration once_per_light
@@ -33 +48 @@
             fragment_program_ref Examples/BumpMapFP
             {
-                param_named_auto lightDiffuse light_diffuse_colour 0 
+                param_named_auto lightDiffuse light_diffuse_colour 0
             }
 
@@ -47 +62 @@
             shadow_receiver_fragment_program_ref Examples/BumpMapFPShadowRcv
             {
-                param_named_auto lightDiffuse light_diffuse_colour 0 
+                param_named_auto lightDiffuse light_diffuse_colour 0
             }
-            
+
             // Base bump map
             texture_unit normalmap
@@ -57 +72 @@
             }
         }
-        
+
         // Decal pass
         pass decal
         {
-            // hint to pass categorisation routine, that this is decal only
+            // base colours, not needed for rendering, but as information
+            // 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
             texture_unit decalmap
             {
-                texture Cube_Lava_COLOR.jpg 
+                texture Cube_Lava_COLOR.jpg
             }
         }

data/branches/Shader_HS18/programs/Example/GLSL120/AmbientOneTexture.glsl

@@ -14 +14 @@
 {
         gl_Position = worldViewProj * position;
-        colour = ambient;
+        gl_FrontColor = ambient;
 }

data/branches/Shader_HS18/programs/Example/GLSL120/skinningTwoWeightsVp.glsl

@@ -14 +14 @@
 uniform vec4 lightDiffuseColour[2];
 uniform vec4 ambient;
+uniform vec4 diffuse;
 
 void main()

data/branches/Shader_HS18/programs/OLD/skinningTwoWeightsVp.glsl

@@ -16 +16 @@
         vec3 blendPos = vec3(0,0,0);
         vec3 blendNorm = vec3(0,0,0);
-        
+
         for (int bone = 0; bone < 2; ++bone)
         {
@@ -30 +30 @@
                 worldMatrix[2] = worldMatrix3x4Array[idx + 2];
                 worldMatrix[3] = vec4(0);
-                // now weight this into final 
+                // now weight this into final
             float weight = blendWeights[bone];
                 blendPos += (gl_Vertex * worldMatrix).xyz * weight;
-                
+
                 mat3 worldRotMatrix = mat3(worldMatrix[0].xyz, worldMatrix[1].xyz, worldMatrix[2].xyz);
                 blendNorm += (gl_Normal * worldRotMatrix) * weight;
@@ -47 +47 @@
         vec3 lightDir1 = normalize(
                 lightPos[1].xyz -  (blendPos.xyz * lightPos[1].w));
-                
+
         gl_FrontSecondaryColor = vec4(0);
-        gl_FrontColor = vec4(0.5, 0.5, 0.5, 1.0) 
+        gl_FrontColor = vec4(0.5, 0.5, 0.5, 1.0)
                 + clamp(dot(lightDir0, blendNorm), 0.0, 1.0) * lightDiffuseColour[0]
                 + clamp(dot(lightDir1, blendNorm), 0.0, 1.0) * lightDiffuseColour[1];
 
         gl_TexCoord[0] = gl_MultiTexCoord0;
-        
+
 }

data/branches/Shader_HS18/resources.oxr

@@ -13 +13 @@
     <ResourceLocation path = "images/textures/stellarobjects"/>
     <ResourceLocation path = "materials"        />
+    <ResourceLocation path = "materials/Example"        />
     <ResourceLocation path = "models"           />
     <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip"/>
     <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip"/>
-    
+
     <ResourceLocation path = "programs"         />
     <ResourceLocation path = "programs/GLSL"    />