Skip to content

Commit 19997da

Browse files
mvaligurskyMartin Valigursky
andauthored
Moved matrix_normal uniform declaration to more appropriate chunk (playcanvas#7746)
Co-authored-by: Martin Valigursky <mvaligursky@snapchat.com>
1 parent 8b00b5f commit 19997da

5 files changed

Lines changed: 5 additions & 4 deletions

File tree

examples/src/examples/shaders/trees.example.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ assetListLoader.load(() => {
145145
attribute vec4 vertex_position;
146146
uniform mat4 matrix_viewProjection;
147147
uniform mat4 matrix_model;
148-
uniform mat3 matrix_normal;
149148
150149
#if defined(INSTANCING)
151150
#include "transformInstancingVS"

src/scene/shader-lib/glsl/chunks/common/vert/normalCore.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ export default /* glsl */`
22
33
attribute vec3 vertex_normal;
44
5+
uniform mat3 matrix_normal;
6+
57
#ifdef MORPHING_NORMAL
68
#ifdef MORPHING_INT
79
uniform highp usampler2D morphNormalTex;

src/scene/shader-lib/glsl/chunks/common/vert/transformCore.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ attribute vec4 vertex_position;
44
55
uniform mat4 matrix_viewProjection;
66
uniform mat4 matrix_model;
7-
uniform mat3 matrix_normal;
87
98
#ifdef MORPHING
109
uniform vec2 morph_tex_params;

src/scene/shader-lib/wgsl/chunks/common/vert/normalCore.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ export default /* wgsl */`
22
33
attribute vertex_normal: vec3f;
44
5+
uniform matrix_normal: mat3x3f;
6+
57
#ifdef MORPHING_NORMAL
68
#ifdef MORPHING_INT
79
var morphNormalTex: texture_2d<u32>;

src/scene/shader-lib/wgsl/chunks/common/vert/transformCore.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ export default /* wgsl */`
44
55
uniform matrix_viewProjection: mat4x4f;
66
uniform matrix_model: mat4x4f;
7-
uniform matrix_normal: mat3x3f;
8-
7+
98
#ifdef MORPHING
109
1110
uniform morph_tex_params: vec2f;

0 commit comments

Comments
 (0)