mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Merge pull request #12992 from Zvork/procedural
Fixed procedural shaders
This commit is contained in:
commit
7699a19267
5 changed files with 49 additions and 0 deletions
|
@ -16,11 +16,21 @@
|
|||
<@include ForwardGlobalLight.slh@>
|
||||
<$declareEvalSkyboxGlobalColor()$>
|
||||
|
||||
|
||||
// the interpolated normal
|
||||
in vec3 _normalWS;
|
||||
in vec3 _normalMS;
|
||||
in vec4 _color;
|
||||
in vec2 _texCoord0;
|
||||
in vec4 _positionMS;
|
||||
in vec4 _positionES;
|
||||
|
||||
// For retro-compatibility
|
||||
#define _normal _normalWS
|
||||
#define _modelNormal _normalMS
|
||||
#define _position _positionMS
|
||||
#define _eyePosition _positionES
|
||||
|
||||
layout(location = 0) out vec4 _fragColor0;
|
||||
|
||||
//PROCEDURAL_COMMON_BLOCK
|
||||
|
|
|
@ -18,9 +18,18 @@
|
|||
|
||||
// the interpolated normal
|
||||
in vec3 _normalWS;
|
||||
in vec3 _normalMS;
|
||||
in vec4 _color;
|
||||
in vec2 _texCoord0;
|
||||
in vec4 _positionMS;
|
||||
in vec4 _positionES;
|
||||
|
||||
// For retro-compatibility
|
||||
#define _normal _normalWS
|
||||
#define _modelNormal _normalMS
|
||||
#define _position _positionMS
|
||||
#define _eyePosition _positionES
|
||||
|
||||
layout(location = 0) out vec4 _fragColor0;
|
||||
|
||||
//PROCEDURAL_COMMON_BLOCK
|
||||
|
|
|
@ -16,7 +16,17 @@
|
|||
|
||||
// the interpolated normal
|
||||
in vec3 _normalWS;
|
||||
in vec3 _normalMS;
|
||||
in vec4 _color;
|
||||
in vec2 _texCoord0;
|
||||
in vec4 _positionMS;
|
||||
in vec4 _positionES;
|
||||
|
||||
// For retro-compatibility
|
||||
#define _normal _normalWS
|
||||
#define _modelNormal _normalMS
|
||||
#define _position _positionMS
|
||||
#define _eyePosition _positionES
|
||||
|
||||
//PROCEDURAL_COMMON_BLOCK
|
||||
|
||||
|
|
|
@ -19,9 +19,19 @@
|
|||
|
||||
// the interpolated normal
|
||||
in vec3 _normalWS;
|
||||
in vec3 _normalMS;
|
||||
in vec4 _color;
|
||||
in vec2 _texCoord0;
|
||||
in vec4 _positionMS;
|
||||
in vec4 _positionES;
|
||||
in vec4 _positionWS;
|
||||
|
||||
// For retro-compatibility
|
||||
#define _normal _normalWS
|
||||
#define _modelNormal _normalMS
|
||||
#define _position _positionMS
|
||||
#define _eyePosition _positionES
|
||||
|
||||
//PROCEDURAL_COMMON_BLOCK
|
||||
|
||||
#line 1001
|
||||
|
|
|
@ -16,7 +16,17 @@
|
|||
|
||||
// the interpolated normal
|
||||
in vec3 _normalWS;
|
||||
in vec3 _normalMS;
|
||||
in vec4 _color;
|
||||
in vec2 _texCoord0;
|
||||
in vec4 _positionMS;
|
||||
in vec4 _positionES;
|
||||
|
||||
// For retro-compatibility
|
||||
#define _normal _normalWS
|
||||
#define _modelNormal _normalMS
|
||||
#define _position _positionMS
|
||||
#define _eyePosition _positionES
|
||||
|
||||
//PROCEDURAL_COMMON_BLOCK
|
||||
|
||||
|
|
Loading…
Reference in a new issue