Просмотр исходного кода

Renamed light test resources.
Updated the template vertex shader and Material.

Dimitry Tomilovskiy 13 лет назад
Родитель
Сommit
f94eeda41c
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      gameplay-template/res/box.material
  2. 2 2
      gameplay-template/res/colored.vert

+ 1 - 1
gameplay-template/res/box.material

@@ -10,7 +10,7 @@ material box
             
             // uniforms
             u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
-            u_inverseTransposeWorldMatrix = INVERSE_TRANSPOSE_WORLD_MATRIX
+            u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX
             u_diffuseColor = 1.0, 1.0, 1.0, 1.0
 
             // render state

+ 2 - 2
gameplay-template/res/colored.vert

@@ -4,7 +4,7 @@ attribute vec3 a_normal;                            // Vertex Normal (x, y, z)
 
 // Uniforms
 uniform mat4 u_worldViewProjectionMatrix;           // Matrix to transform a position to clip space.
-uniform mat4 u_inverseTransposeWorldMatrix;         // Matrix to transform a normal to view space.
+uniform mat4 u_inverseTransposeWorldViewMatrix;         // Matrix to transform a normal to view space.
 
 // Outputs
 varying vec3 v_normalVector;                        // Normal vector in view space.
@@ -19,6 +19,6 @@ void main()
     gl_Position = u_worldViewProjectionMatrix * position;
 
     // Transform normal to view space.
-    mat3 inverseTransposeWorldViewMatrix = mat3(u_inverseTransposeWorldMatrix[0].xyz, u_inverseTransposeWorldMatrix[1].xyz, u_inverseTransposeWorldMatrix[2].xyz);
+    mat3 inverseTransposeWorldViewMatrix = mat3(u_inverseTransposeWorldViewMatrix[0].xyz, u_inverseTransposeWorldViewMatrix[1].xyz, u_inverseTransposeWorldViewMatrix[2].xyz);
     v_normalVector = inverseTransposeWorldViewMatrix * normal;
 }