Update examples

1 files changed, 117 insertions, 81 deletions

diff --git a/examples/web/shaders/shaders_postprocessing.data b/examples/web/shaders/shaders_postprocessing.data
index 51653c7..eb80d38 100644
--- a/examples/web/shaders/shaders_postprocessing.data
+++ b/examples/web/shaders/shaders_postprocessing.data
@@ -6937,6 +6937,42 @@ void main()
     // Calculate final vertex position

     gl_Position = mvp*vec4(vertexPosition, 1.0);

 }

+#version 330

+

+// Input vertex attributes

+in vec3 vertexPosition;

+in vec2 vertexTexCoord;

+in vec3 vertexNormal;

+in vec4 vertexColor;

+

+layout (location = 12) in mat4 instance;

+

+// Input uniform values

+uniform mat4 mvp;

+

+// Output vertex attributes (to fragment shader)

+out vec3 fragPosition;

+out vec2 fragTexCoord;

+out vec4 fragColor;

+out vec3 fragNormal;

+

+// NOTE: Add here your custom variables

+

+void main()

+{

+    // Send vertex attributes to fragment shader

+    fragPosition = vec3(instance * vec4(vertexPosition, 1.0));

+    fragTexCoord = vertexTexCoord;

+    fragColor = vertexColor;

+

+    mat3 normalMatrix = transpose(inverse(mat3(instance)));

+    fragNormal = normalize(normalMatrix * vertexNormal);

+

+    mat4 mvpi = mvp * instance;

+

+    // Calculate final vertex position

+    gl_Position = mvpi * vec4(vertexPosition, 1.0);

+}

 #version 100

 

 precision mediump float;

@@ -7610,87 +7646,87 @@ void main()
     if (norm > 0.999) gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);

     else gl_FragColor = vec4(Hsv2rgb(vec3(norm, 1.0, 1.0)), 1.0);

 }

-#version 100

-

-precision mediump float;

-

-// Input vertex attributes (from vertex shader)

-varying vec3 fragPosition;

-varying vec2 fragTexCoord;

-varying vec4 fragColor;

-varying vec3 fragNormal;

-

-// Input uniform values

-uniform sampler2D texture0;

-uniform vec4 colDiffuse;

-

-// NOTE: Add here your custom variables

-

-#define     MAX_LIGHTS              4

-#define     LIGHT_DIRECTIONAL       0

-#define     LIGHT_POINT             1

-

-struct MaterialProperty {

-    vec3 color;

-    int useSampler;

-    sampler2D sampler;

-};

-

-struct Light {

-    int enabled;

-    int type;

-    vec3 position;

-    vec3 target;

-    vec4 color;

-};

-

-// Input lighting values

-uniform Light lights[MAX_LIGHTS];

-uniform vec4 ambient;

-uniform vec3 viewPos;

-

-void main()

-{

-    // Texel color fetching from texture sampler

-    vec4 texelColor = texture2D(texture0, fragTexCoord);

-    vec3 lightDot = vec3(0.0);

-    vec3 normal = normalize(fragNormal);

-    vec3 viewD = normalize(viewPos - fragPosition);

-    vec3 specular = vec3(0.0);

-

-    // NOTE: Implement here your fragment shader code

-

-    for (int i = 0; i < MAX_LIGHTS; i++)

-    {

-        if (lights[i].enabled == 1)

-        {

-            vec3 light = vec3(0.0);

-            

-            if (lights[i].type == LIGHT_DIRECTIONAL) 

-            {

-                light = -normalize(lights[i].target - lights[i].position);

-            }

-            

-            if (lights[i].type == LIGHT_POINT) 

-            {

-                light = normalize(lights[i].position - fragPosition);

-            }

-            

-            float NdotL = max(dot(normal, light), 0.0);

-            lightDot += lights[i].color.rgb*NdotL;

-

-            float specCo = 0.0;

-            if (NdotL > 0.0) specCo = pow(max(0.0, dot(viewD, reflect(-(light), normal))), 16.0); // 16 refers to shine

-            specular += specCo;

-        }

-    }

-

-    vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0)));

-    finalColor += texelColor*(ambient/10.0);

-    

-    // Gamma correction

-    gl_FragColor = pow(finalColor, vec4(1.0/2.2));

-}

+#version 100
+
+precision mediump float;
+
+// Input vertex attributes (from vertex shader)
+varying vec3 fragPosition;
+varying vec2 fragTexCoord;
+varying vec4 fragColor;
+varying vec3 fragNormal;
+
+// Input uniform values
+uniform sampler2D texture0;
+uniform vec4 colDiffuse;
+
+// NOTE: Add here your custom variables
+
+#define     MAX_LIGHTS              4
+#define     LIGHT_DIRECTIONAL       0
+#define     LIGHT_POINT             1
+
+struct MaterialProperty {
+    vec3 color;
+    int useSampler;
+    sampler2D sampler;
+};
+
+struct Light {
+    int enabled;
+    int type;
+    vec3 position;
+    vec3 target;
+    vec4 color;
+};
+
+// Input lighting values
+uniform Light lights[MAX_LIGHTS];
+uniform vec4 ambient;
+uniform vec3 viewPos;
+
+void main()
+{
+    // Texel color fetching from texture sampler
+    vec4 texelColor = texture2D(texture0, fragTexCoord);
+    vec3 lightDot = vec3(0.0);
+    vec3 normal = normalize(fragNormal);
+    vec3 viewD = normalize(viewPos - fragPosition);
+    vec3 specular = vec3(0.0);
+
+    // NOTE: Implement here your fragment shader code
+
+    for (int i = 0; i < MAX_LIGHTS; i++)
+    {
+        if (lights[i].enabled == 1)
+        {
+            vec3 light = vec3(0.0);
+            
+            if (lights[i].type == LIGHT_DIRECTIONAL) 
+            {
+                light = -normalize(lights[i].target - lights[i].position);
+            }
+            
+            if (lights[i].type == LIGHT_POINT) 
+            {
+                light = normalize(lights[i].position - fragPosition);
+            }
+            
+            float NdotL = max(dot(normal, light), 0.0);
+            lightDot += lights[i].color.rgb*NdotL;
+
+            float specCo = 0.0;
+            if (NdotL > 0.0) specCo = pow(max(0.0, dot(viewD, reflect(-(light), normal))), 16.0); // 16 refers to shine
+            specular += specCo;
+        }
+    }
+
+    vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
+    finalColor += texelColor*(ambient/10.0);
+    
+    // Gamma correction
+    gl_FragColor = pow(finalColor, vec4(1.0/2.2));
+}
 #version 100

 

 precision mediump float;