Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
6ddae940
Commit
6ddae940
authored
Feb 01, 2015
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 'develop'
Bug fix in GLSLShader.cpp See merge request !38
parents
16a8470d
f3df2e7e
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
22 additions
and
23 deletions
+22
-23
include/Utils/Shaders/shaderColorPerVertex.frag
include/Utils/Shaders/shaderColorPerVertex.frag
+1
-1
include/Utils/Shaders/shaderCustomTex.frag
include/Utils/Shaders/shaderCustomTex.frag
+1
-1
include/Utils/Shaders/shaderEnvMap.frag
include/Utils/Shaders/shaderEnvMap.frag
+1
-1
include/Utils/Shaders/shaderMatCustom.frag
include/Utils/Shaders/shaderMatCustom.frag
+1
-1
include/Utils/Shaders/shaderPhong.frag
include/Utils/Shaders/shaderPhong.frag
+1
-1
include/Utils/Shaders/shaderPhongTexture.frag
include/Utils/Shaders/shaderPhongTexture.frag
+1
-1
include/Utils/Shaders/shaderRadiancePerVertex.frag
include/Utils/Shaders/shaderRadiancePerVertex.frag
+1
-2
include/Utils/Shaders/shaderScalarField.frag
include/Utils/Shaders/shaderScalarField.frag
+1
-1
include/Utils/Shaders/shaderSimpleColor.frag
include/Utils/Shaders/shaderSimpleColor.frag
+1
-1
include/Utils/Shaders/shaderSimpleFlat.frag
include/Utils/Shaders/shaderSimpleFlat.frag
+1
-1
include/Utils/Shaders/shaderSimpleTexture.frag
include/Utils/Shaders/shaderSimpleTexture.frag
+1
-1
include/Utils/Shaders/shaderTextureDepth.frag
include/Utils/Shaders/shaderTextureDepth.frag
+1
-1
include/Utils/Shaders/shaderTextureMask.frag
include/Utils/Shaders/shaderTextureMask.frag
+1
-1
include/Utils/Shaders/shaderVectorPerVertex.frag
include/Utils/Shaders/shaderVectorPerVertex.frag
+1
-1
include/Utils/Shaders/shaderWallPaper.frag
include/Utils/Shaders/shaderWallPaper.frag
+1
-1
src/Utils/GLSLShader.cpp
src/Utils/GLSLShader.cpp
+3
-3
src/Utils/Shaders/shaderColorPerVertex.cpp
src/Utils/Shaders/shaderColorPerVertex.cpp
+1
-1
src/Utils/Shaders/shaderCustomTex.cpp
src/Utils/Shaders/shaderCustomTex.cpp
+1
-1
src/Utils/Shaders/shaderSimpleColor.cpp
src/Utils/Shaders/shaderSimpleColor.cpp
+1
-1
src/Utils/Shaders/shaderSimpleTexture.cpp
src/Utils/Shaders/shaderSimpleTexture.cpp
+1
-1
No files found.
include/Utils/Shaders/shaderColorPerVertex.frag
View file @
6ddae940
// ShaderColorPerVertex::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
color
;
uniform
float
alpha
;
FRAG_OUT_DEF
;
...
...
include/Utils/Shaders/shaderCustomTex.frag
View file @
6ddae940
// ShaderCustomTex::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
uniform
sampler2D
textureUnit
;
in
vec3
N
;
in
vec2
fragTexCoord
;
...
...
include/Utils/Shaders/shaderEnvMap.frag
View file @
6ddae940
//ShaderEnvMap::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
EyeVector
,
Normal
,
LightDir
;
#ifdef WITH_COLOR
VARYING_FRAG
vec3
Color
;
...
...
include/Utils/Shaders/shaderMatCustom.frag
View file @
6ddae940
//ShaderMatCustom::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
EyeVector
,
Normal
,
LightDir
;
#ifdef WITH_COLOR
VARYING_FRAG
vec3
Color
;
...
...
include/Utils/Shaders/shaderPhong.frag
View file @
6ddae940
//ShaderPhong::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
EyeVector
,
Normal
,
LightDir
;
#ifdef WITH_COLOR
VARYING_FRAG
vec3
Color
;
...
...
include/Utils/Shaders/shaderPhongTexture.frag
View file @
6ddae940
// ShaderPhongTexture::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
EyeVector
,
Normal
,
LightDir
;
VARYING_FRAG
vec2
texCoord
;
...
...
include/Utils/Shaders/shaderRadiancePerVertex.frag
View file @
6ddae940
// 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
)
...
...
include/Utils/Shaders/shaderScalarField.frag
View file @
6ddae940
// ShaderScalarField::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
uniform
float
minValue
;
uniform
float
maxValue
;
VARYING_FRAG
vec3
color
;
...
...
include/Utils/Shaders/shaderSimpleColor.frag
View file @
6ddae940
// ShaderSimpleColor::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
uniform
vec4
color
;
FRAG_OUT_DEF
;
void
main
()
...
...
include/Utils/Shaders/shaderSimpleFlat.frag
View file @
6ddae940
//ShaderSimpleFlat::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec3
LightDir
;
VARYING_FRAG
vec3
Position
;
#ifdef WITH_COLOR
...
...
include/Utils/Shaders/shaderSimpleTexture.frag
View file @
6ddae940
// ShaderSimpleTexture::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec2
texCoord
;
uniform
sampler2D
textureUnit
;
FRAG_OUT_DEF
;
...
...
include/Utils/Shaders/shaderTextureDepth.frag
View file @
6ddae940
// ShaderTextureDepth::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec2
texCoord
;
uniform
sampler2D
textureUnit
;
uniform
sampler2D
textureDepthUnit
;
...
...
include/Utils/Shaders/shaderTextureMask.frag
View file @
6ddae940
// ShaderTextureMask::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec2
texCoord
;
uniform
sampler2D
textureUnit
;
uniform
sampler2D
textureUnitMask
;
...
...
include/Utils/Shaders/shaderVectorPerVertex.frag
View file @
6ddae940
// ShaderVectorPerVertex::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
uniform
vec4
vectorColor
;
FRAG_OUT_DEF
;
void
main
()
...
...
include/Utils/Shaders/shaderWallPaper.frag
View file @
6ddae940
// ShaderWallPaper::fragmentShaderText
PRECISON
;
PRECIS
I
ON
;
VARYING_FRAG
vec2
texCoord
;
uniform
sampler2D
textureUnit
;
FRAG_OUT_DEF
;
...
...
src/Utils/GLSLShader.cpp
View file @
6ddae940
...
...
@@ -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 PRECIS
I
ON 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 PRECIS
I
ON 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 PRECIS
I
ON 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
"
);
...
...
src/Utils/Shaders/shaderColorPerVertex.cpp
View file @
6ddae940
...
...
@@ -48,7 +48,7 @@ namespace Utils
//
//
//std::string ShaderColorPerVertex::fragmentShaderText =
// "PRECISON;\n"
// "PRECIS
I
ON;\n"
// "VARYING_FRAG vec3 color;\n"
// "FRAG_OUT_DEF;\n"
// "void main()\n"
...
...
src/Utils/Shaders/shaderCustomTex.cpp
View file @
6ddae940
...
...
@@ -43,7 +43,7 @@
//
//
//std::string ShaderCustomTex::fragmentShaderText =
// "PRECISON;\n"
// "PRECIS
I
ON;\n"
// "VARYING_FRAG vec2 texCoord;\n"
// "uniform sampler2D textureUnit;\n"
// "FRAG_OUT_DEF;\n"
...
...
src/Utils/Shaders/shaderSimpleColor.cpp
View file @
6ddae940
...
...
@@ -44,7 +44,7 @@ namespace Utils
//
//
//std::string ShaderSimpleColor::fragmentShaderText =
// "PRECISON;\n"
// "PRECIS
I
ON;\n"
// "uniform vec4 color;\n"
// "FRAG_OUT_DEF;\n"
// "void main()\n"
...
...
src/Utils/Shaders/shaderSimpleTexture.cpp
View file @
6ddae940
...
...
@@ -48,7 +48,7 @@ namespace Utils
//
//
//std::string ShaderSimpleTexture::fragmentShaderText =
// "PRECISON;\n"
// "PRECIS
I
ON;\n"
// "VARYING_FRAG vec2 texCoord;\n"
// "uniform sampler2D textureUnit;\n"
// "FRAG_OUT_DEF;\n"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment