diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/BasicShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/BasicShader.java index 1ccaf78d..d66bd792 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/BasicShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/BasicShader.java @@ -38,10 +38,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/basic.vs") + @Source("source/basic.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/basic.fs") + @Source("source/basic.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/CubeShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/CubeShader.java index c97086c5..d54933e1 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/CubeShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/CubeShader.java @@ -39,10 +39,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/cube.vs") + @Source("source/cube.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/cube.fs") + @Source("source/cube.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DashedShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DashedShader.java index aab765f2..817456c1 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DashedShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DashedShader.java @@ -32,10 +32,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/dashed.vs") + @Source("source/dashed.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/dashed.fs") + @Source("source/dashed.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthRGBAShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthRGBAShader.java index 8da8a3de..7ff7b83d 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthRGBAShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthRGBAShader.java @@ -41,10 +41,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/depthRGBA.vs") + @Source("source/depthRGBA.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/depthRGBA.fs") + @Source("source/depthRGBA.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthShader.java index c4849ba6..56a6f79f 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/DepthShader.java @@ -40,10 +40,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/depth.vs") + @Source("source/depth.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/depth.fs") + @Source("source/depth.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/FresnelShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/FresnelShader.java index f09f28bb..f9ec5763 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/FresnelShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/FresnelShader.java @@ -37,10 +37,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/fresnel.vs") + @Source("source/fresnel.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/fresnel.fs") + @Source("source/fresnel.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/LambertShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/LambertShader.java index aa9024e1..7b39d453 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/LambertShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/LambertShader.java @@ -44,10 +44,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/lambert.vs") + @Source("source/lambert.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/lambert.fs") + @Source("source/lambert.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalMapShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalMapShader.java index dc53fcbd..2fc47fe3 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalMapShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalMapShader.java @@ -45,10 +45,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/normalmap.vs") + @Source("source/normalmap.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/normalmap.fs") + @Source("source/normalmap.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalShader.java index 4e420199..c457d1a0 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/NormalShader.java @@ -40,10 +40,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/normal.vs") + @Source("source/normal.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/normal.fs") + @Source("source/normal.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/ParticleBasicShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/ParticleBasicShader.java index 804f890e..c66a5e8a 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/ParticleBasicShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/ParticleBasicShader.java @@ -40,10 +40,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/particle_basic.vs") + @Source("source/particle_basic.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/particle_basic.fs") + @Source("source/particle_basic.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/PhongShader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/PhongShader.java index 1e609782..7feadf6b 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/PhongShader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/PhongShader.java @@ -43,10 +43,10 @@ interface Resources extends DefaultResources { Resources INSTANCE = ClassUtils.newProxyInstance(Resources.class); - @Source("source/phong.vs") + @Source("source/phong.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/phong.fs") + @Source("source/phong.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/Shader.java b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/Shader.java index 423f4b46..e8b72b0a 100644 --- a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/Shader.java +++ b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/Shader.java @@ -50,10 +50,10 @@ public static enum PRECISION public interface DefaultResources extends SourceBundle { - @Source("source/default.vs") + @Source("source/default.vs.glsl") SourceTextResource getVertexShader(); - @Source("source/default.fs") + @Source("source/default.fs.glsl") SourceTextResource getFragmentShader(); } diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/basic.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/cube.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/dashed.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/default.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depth.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/depthRGBA.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/fresnel.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/lambert.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normal.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/normalmap.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/particle_basic.vs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.fs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.fs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.fs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.fs.glsl diff --git a/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.vs b/parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.vs.glsl similarity index 100% rename from parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.vs rename to parallax/src/org/parallax3d/parallax/graphics/renderers/shaders/source/phong.vs.glsl