diff --git a/include/Utils/Shaders/shaderColorPerVertex.frag b/include/Utils/Shaders/shaderColorPerVertex.frag index 06259d201edc71ed71b27cbc27b1e13d191bec37..e0751703279135bbd882f415c79c65d6a1cc3416 100644 --- a/include/Utils/Shaders/shaderColorPerVertex.frag +++ b/include/Utils/Shaders/shaderColorPerVertex.frag @@ -1,6 +1,6 @@ // ShaderColorPerVertex::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 color; uniform float alpha; FRAG_OUT_DEF; diff --git a/include/Utils/Shaders/shaderCustomTex.frag b/include/Utils/Shaders/shaderCustomTex.frag index e2aca96473d04d6305ceade0c7b75412698c77d7..145e8c6dac5125968c49228d7a704e922aef75e1 100644 --- a/include/Utils/Shaders/shaderCustomTex.frag +++ b/include/Utils/Shaders/shaderCustomTex.frag @@ -1,6 +1,6 @@ // ShaderCustomTex::fragmentShaderText -PRECISON; +PRECISION; uniform sampler2D textureUnit; in vec3 N; in vec2 fragTexCoord; diff --git a/include/Utils/Shaders/shaderEnvMap.frag b/include/Utils/Shaders/shaderEnvMap.frag index e0de5e0820a8a49e70a917ebca5523496c0b9d34..4821439eb3b53a13a33e4d010386aa5a53fc446a 100644 --- a/include/Utils/Shaders/shaderEnvMap.frag +++ b/include/Utils/Shaders/shaderEnvMap.frag @@ -1,6 +1,6 @@ //ShaderEnvMap::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 EyeVector, Normal, LightDir; #ifdef WITH_COLOR VARYING_FRAG vec3 Color; diff --git a/include/Utils/Shaders/shaderMatCustom.frag b/include/Utils/Shaders/shaderMatCustom.frag index 589b61bb60a70a0582fa9f8e38bca48eb5b311ed..059c68f5b1ff01a7334af185703e831df32f9f41 100644 --- a/include/Utils/Shaders/shaderMatCustom.frag +++ b/include/Utils/Shaders/shaderMatCustom.frag @@ -1,6 +1,6 @@ //ShaderMatCustom::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 EyeVector, Normal, LightDir; #ifdef WITH_COLOR VARYING_FRAG vec3 Color; diff --git a/include/Utils/Shaders/shaderPhong.frag b/include/Utils/Shaders/shaderPhong.frag index d0d07383b2ad00212f9675e9e56b97f767877690..fa1a6a81cd6ce2224cec3e6865598a3725829263 100644 --- a/include/Utils/Shaders/shaderPhong.frag +++ b/include/Utils/Shaders/shaderPhong.frag @@ -1,6 +1,6 @@ //ShaderPhong::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 EyeVector, Normal, LightDir; #ifdef WITH_COLOR VARYING_FRAG vec3 Color; diff --git a/include/Utils/Shaders/shaderPhongTexture.frag b/include/Utils/Shaders/shaderPhongTexture.frag index cdb31a2a03b08bfa50494820376bc45bf3a4b8de..dbdbc1850a11ca281439b37356325304c16a36fc 100644 --- a/include/Utils/Shaders/shaderPhongTexture.frag +++ b/include/Utils/Shaders/shaderPhongTexture.frag @@ -1,6 +1,6 @@ // ShaderPhongTexture::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 EyeVector, Normal, LightDir; VARYING_FRAG vec2 texCoord; diff --git a/include/Utils/Shaders/shaderRadiancePerVertex.frag b/include/Utils/Shaders/shaderRadiancePerVertex.frag index 7825e335b51dd3a98e3bd398c6fed739cecc53da..610804cc2875f8e7466fb8872f953d2341a276cd 100644 --- a/include/Utils/Shaders/shaderRadiancePerVertex.frag +++ b/include/Utils/Shaders/shaderRadiancePerVertex.frag @@ -1,7 +1,6 @@ // ShaderRadiancePerVertex::fragmentShaderText -// PRECISION; // pose un pb non élucidé. remplacé temporairement par : -precision highp float; +PRECISION; VARYING_FRAG vec3 vxColor; FRAG_OUT_DEF; void main (void) diff --git a/include/Utils/Shaders/shaderScalarField.frag b/include/Utils/Shaders/shaderScalarField.frag index 3f4a5e0095202b2487b68313def968ca00faf4be..59e9757577ba072e3e58d652f93ce72a25826c79 100644 --- a/include/Utils/Shaders/shaderScalarField.frag +++ b/include/Utils/Shaders/shaderScalarField.frag @@ -1,6 +1,6 @@ // ShaderScalarField::fragmentShaderText -PRECISON; +PRECISION; uniform float minValue; uniform float maxValue; VARYING_FRAG vec3 color; diff --git a/include/Utils/Shaders/shaderSimpleColor.frag b/include/Utils/Shaders/shaderSimpleColor.frag index 3310165cd71a0d91afdbca07ef800f07e935acf2..4b53d3a88b88079904e4fb2e129c2d12a2dbb09a 100644 --- a/include/Utils/Shaders/shaderSimpleColor.frag +++ b/include/Utils/Shaders/shaderSimpleColor.frag @@ -1,6 +1,6 @@ // ShaderSimpleColor::fragmentShaderText -PRECISON; +PRECISION; uniform vec4 color; FRAG_OUT_DEF; void main() diff --git a/include/Utils/Shaders/shaderSimpleFlat.frag b/include/Utils/Shaders/shaderSimpleFlat.frag index a95cbc986691f256e71f4155986949487d19bdd3..6150a177012c7aa78b31927ac92625ed797e43c3 100644 --- a/include/Utils/Shaders/shaderSimpleFlat.frag +++ b/include/Utils/Shaders/shaderSimpleFlat.frag @@ -1,6 +1,6 @@ //ShaderSimpleFlat::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec3 LightDir; VARYING_FRAG vec3 Position; #ifdef WITH_COLOR diff --git a/include/Utils/Shaders/shaderSimpleTexture.frag b/include/Utils/Shaders/shaderSimpleTexture.frag index 93e23f47f1bca8dbbd58e2012a75af01accfd09b..a595a9002dd97eccb3c90f4382775a37ba235771 100644 --- a/include/Utils/Shaders/shaderSimpleTexture.frag +++ b/include/Utils/Shaders/shaderSimpleTexture.frag @@ -1,6 +1,6 @@ // ShaderSimpleTexture::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec2 texCoord; uniform sampler2D textureUnit; FRAG_OUT_DEF; diff --git a/include/Utils/Shaders/shaderTextureDepth.frag b/include/Utils/Shaders/shaderTextureDepth.frag index a48d8871b891f8824aa972d698e7408382c457fb..23ef74aedc2ef7d117a05741e43d776f02f3cc61 100644 --- a/include/Utils/Shaders/shaderTextureDepth.frag +++ b/include/Utils/Shaders/shaderTextureDepth.frag @@ -1,6 +1,6 @@ // ShaderTextureDepth::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec2 texCoord; uniform sampler2D textureUnit; uniform sampler2D textureDepthUnit; diff --git a/include/Utils/Shaders/shaderTextureMask.frag b/include/Utils/Shaders/shaderTextureMask.frag index 1d53eb9480d9a3eb5df594c3437b54366804eed8..d9ecb8c3586dd1a1a02e5561c06cf777666f486d 100644 --- a/include/Utils/Shaders/shaderTextureMask.frag +++ b/include/Utils/Shaders/shaderTextureMask.frag @@ -1,6 +1,6 @@ // ShaderTextureMask::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec2 texCoord; uniform sampler2D textureUnit; uniform sampler2D textureUnitMask; diff --git a/include/Utils/Shaders/shaderVectorPerVertex.frag b/include/Utils/Shaders/shaderVectorPerVertex.frag index a1f68fef5282e64eee6c5f17e8858e1adfd28087..b956fd99c459d30323cb584f7d55977555049898 100644 --- a/include/Utils/Shaders/shaderVectorPerVertex.frag +++ b/include/Utils/Shaders/shaderVectorPerVertex.frag @@ -1,6 +1,6 @@ // ShaderVectorPerVertex::fragmentShaderText -PRECISON; +PRECISION; uniform vec4 vectorColor; FRAG_OUT_DEF; void main() diff --git a/include/Utils/Shaders/shaderWallPaper.frag b/include/Utils/Shaders/shaderWallPaper.frag index 61f99d1cbde63e6e25e76420af849fed54e51767..649e6b07c56b466163cf12260e5b4f40417e572d 100644 --- a/include/Utils/Shaders/shaderWallPaper.frag +++ b/include/Utils/Shaders/shaderWallPaper.frag @@ -1,6 +1,6 @@ // ShaderWallPaper::fragmentShaderText -PRECISON; +PRECISION; VARYING_FRAG vec2 texCoord; uniform sampler2D textureUnit; FRAG_OUT_DEF; diff --git a/src/Utils/GLSLShader.cpp b/src/Utils/GLSLShader.cpp index 7c2bf7c0a338e85d52a90b44774bf1ae76ae46c3..4baba1ff7e341fd2647511f469d2fc07f925b561 100644 --- a/src/Utils/GLSLShader.cpp +++ b/src/Utils/GLSLShader.cpp @@ -52,7 +52,7 @@ unsigned int GLSLShader::MINOR_OGL_CORE = 3; std::string GLSLShader::DEFINES_GL2=\ "#version 110\n" -"#define PRECISON float pipo_PRECISION\n" +"#define PRECISION float pipo_PRECISION\n" "#define ATTRIBUTE attribute\n" "#define VARYING_VERT varying\n" "#define VARYING_FRAG varying\n" @@ -63,7 +63,7 @@ std::string GLSLShader::DEFINES_GL2=\ std::string GLSLShader::DEFINES_GL3=\ "#version 150\n" -"#define PRECISON precision highp float\n" +"#define PRECISION precision highp float\n" "#define ATTRIBUTE in\n" "#define VARYING_VERT out\n" "#define VARYING_FRAG in\n" @@ -144,7 +144,7 @@ std::string GLSLShader::defines_Geom(const std::string& primitivesIn, const std: { std::string str("#version 110\n"); str.append("#extension GL_EXT_geometry_shader4 : enable\n"); - str.append("#define PRECISON float pipo_PRECISION\n"); + str.append("#define PRECISION float pipo_PRECISION\n"); str.append("#define ATTRIBUTE attribute\n"); str.append("#define VARYING_IN varying in\n"); str.append("#define VARYING_OUT varying out\n"); diff --git a/src/Utils/Shaders/shaderColorPerVertex.cpp b/src/Utils/Shaders/shaderColorPerVertex.cpp index ccb7de7aaae90725a7247c034bb15f9fb441a498..bc138b80b245ae72df9ddee1263045deb705e34b 100644 --- a/src/Utils/Shaders/shaderColorPerVertex.cpp +++ b/src/Utils/Shaders/shaderColorPerVertex.cpp @@ -48,7 +48,7 @@ namespace Utils // // //std::string ShaderColorPerVertex::fragmentShaderText = -// "PRECISON;\n" +// "PRECISION;\n" // "VARYING_FRAG vec3 color;\n" // "FRAG_OUT_DEF;\n" // "void main()\n" diff --git a/src/Utils/Shaders/shaderCustomTex.cpp b/src/Utils/Shaders/shaderCustomTex.cpp index 9a997e232646075a1211582b4ef2d4ce1ffe3cb9..4145f25020f7d992c12cf721bafa8c03bc83bb07 100644 --- a/src/Utils/Shaders/shaderCustomTex.cpp +++ b/src/Utils/Shaders/shaderCustomTex.cpp @@ -43,7 +43,7 @@ // // //std::string ShaderCustomTex::fragmentShaderText = -// "PRECISON;\n" +// "PRECISION;\n" // "VARYING_FRAG vec2 texCoord;\n" // "uniform sampler2D textureUnit;\n" // "FRAG_OUT_DEF;\n" diff --git a/src/Utils/Shaders/shaderSimpleColor.cpp b/src/Utils/Shaders/shaderSimpleColor.cpp index 8610737ba2f062ea83391f4f2be0bacbeb3de985..e58cac293e4cc2db0d6d88556eef1a9aba378ca2 100644 --- a/src/Utils/Shaders/shaderSimpleColor.cpp +++ b/src/Utils/Shaders/shaderSimpleColor.cpp @@ -44,7 +44,7 @@ namespace Utils // // //std::string ShaderSimpleColor::fragmentShaderText = -// "PRECISON;\n" +// "PRECISION;\n" // "uniform vec4 color;\n" // "FRAG_OUT_DEF;\n" // "void main()\n" diff --git a/src/Utils/Shaders/shaderSimpleTexture.cpp b/src/Utils/Shaders/shaderSimpleTexture.cpp index f5762fc070f54de980e51fcaffd935d786355464..d4cddb2a662da686a08be5e8e0167f0946ead0a3 100644 --- a/src/Utils/Shaders/shaderSimpleTexture.cpp +++ b/src/Utils/Shaders/shaderSimpleTexture.cpp @@ -48,7 +48,7 @@ namespace Utils // // //std::string ShaderSimpleTexture::fragmentShaderText = -// "PRECISON;\n" +// "PRECISION;\n" // "VARYING_FRAG vec2 texCoord;\n" // "uniform sampler2D textureUnit;\n" // "FRAG_OUT_DEF;\n"