Commit 6ddae940 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge branch 'develop' into 'develop'

Bug fix in GLSLShader.cpp

See merge request !38
parents 16a8470d f3df2e7e
// ShaderColorPerVertex::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 color;
uniform float alpha;
FRAG_OUT_DEF;
......
// ShaderCustomTex::fragmentShaderText
PRECISON;
PRECISION;
uniform sampler2D textureUnit;
in vec3 N;
in vec2 fragTexCoord;
......
//ShaderEnvMap::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 EyeVector, Normal, LightDir;
#ifdef WITH_COLOR
VARYING_FRAG vec3 Color;
......
//ShaderMatCustom::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 EyeVector, Normal, LightDir;
#ifdef WITH_COLOR
VARYING_FRAG vec3 Color;
......
//ShaderPhong::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 EyeVector, Normal, LightDir;
#ifdef WITH_COLOR
VARYING_FRAG vec3 Color;
......
// ShaderPhongTexture::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 EyeVector, Normal, LightDir;
VARYING_FRAG vec2 texCoord;
......
// 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)
......
// ShaderScalarField::fragmentShaderText
PRECISON;
PRECISION;
uniform float minValue;
uniform float maxValue;
VARYING_FRAG vec3 color;
......
// ShaderSimpleColor::fragmentShaderText
PRECISON;
PRECISION;
uniform vec4 color;
FRAG_OUT_DEF;
void main()
......
//ShaderSimpleFlat::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec3 LightDir;
VARYING_FRAG vec3 Position;
#ifdef WITH_COLOR
......
// ShaderSimpleTexture::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec2 texCoord;
uniform sampler2D textureUnit;
FRAG_OUT_DEF;
......
// ShaderTextureDepth::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec2 texCoord;
uniform sampler2D textureUnit;
uniform sampler2D textureDepthUnit;
......
// ShaderTextureMask::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec2 texCoord;
uniform sampler2D textureUnit;
uniform sampler2D textureUnitMask;
......
// ShaderVectorPerVertex::fragmentShaderText
PRECISON;
PRECISION;
uniform vec4 vectorColor;
FRAG_OUT_DEF;
void main()
......
// ShaderWallPaper::fragmentShaderText
PRECISON;
PRECISION;
VARYING_FRAG vec2 texCoord;
uniform sampler2D textureUnit;
FRAG_OUT_DEF;
......
......@@ -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");
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment