From 5f66eeacb4e853ebf4f3d9fb97c7fda07aa2663d Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Mon, 19 Mar 2018 14:57:15 -0400 Subject: [PATCH] in-pass-shadows: use glsllib extension --- .../src/main/resources/Common/MatDefs/Light/PBRLighting.frag | 2 +- .../src/main/resources/Common/MatDefs/Light/PBRLighting.vert | 2 +- .../src/main/resources/Common/MatDefs/Light/StaticLighting.frag | 2 +- .../src/main/resources/Common/MatDefs/Light/StaticLighting.vert | 2 +- .../ShaderLib/{InPassShadows.glsl => InPassShadows.glsllib} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename jme3-core/src/main/resources/Common/ShaderLib/{InPassShadows.glsl => InPassShadows.glsllib} (100%) diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag index b6581888b..a38cbc138 100644 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag @@ -2,7 +2,7 @@ #import "Common/ShaderLib/PBR.glsllib" #import "Common/ShaderLib/Parallax.glsllib" #import "Common/ShaderLib/Lighting.glsllib" -#import "Common/ShaderLib/InPassShadows.glsl" +#import "Common/ShaderLib/InPassShadows.glsllib" varying vec2 texCoord; #ifdef SEPARATE_TEXCOORD diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert index 99c50564f..45d484181 100644 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert @@ -1,7 +1,7 @@ #import "Common/ShaderLib/GLSLCompat.glsllib" #import "Common/ShaderLib/Instancing.glsllib" #import "Common/ShaderLib/Skinning.glsllib" -#import "Common/ShaderLib/InPassShadows.glsl" +#import "Common/ShaderLib/InPassShadows.glsllib" uniform vec4 m_BaseColor; diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.frag b/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.frag index 7366a60d8..f458a556c 100755 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.frag +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.frag @@ -1,6 +1,6 @@ #import "Common/ShaderLib/GLSLCompat.glsllib" #import "Common/ShaderLib/Lighting.glsllib" -#import "Common/ShaderLib/InPassShadows.glsl" +#import "Common/ShaderLib/InPassShadows.glsllib" #import "Common/ShaderLib/PBR.glsllib" #ifndef NUM_DIR_LIGHTS diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.vert b/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.vert index c974fa440..9a78fa67a 100755 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.vert +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/StaticLighting.vert @@ -1,7 +1,7 @@ #import "Common/ShaderLib/GLSLCompat.glsllib" #import "Common/ShaderLib/Skinning.glsllib" #import "Common/ShaderLib/Instancing.glsllib" -#import "Common/ShaderLib/InPassShadows.glsl" +#import "Common/ShaderLib/InPassShadows.glsllib" attribute vec3 inPosition; attribute vec3 inNormal; diff --git a/jme3-core/src/main/resources/Common/ShaderLib/InPassShadows.glsl b/jme3-core/src/main/resources/Common/ShaderLib/InPassShadows.glsllib similarity index 100% rename from jme3-core/src/main/resources/Common/ShaderLib/InPassShadows.glsl rename to jme3-core/src/main/resources/Common/ShaderLib/InPassShadows.glsllib