Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
670639f1
Commit
670639f1
authored
Apr 14, 2015
by
Sylvain Thery
Browse files
shader bug
parent
519aeb8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
View file @
670639f1
...
@@ -55,7 +55,7 @@ ShaderBoldColorLines::ShaderBoldColorLines() :
...
@@ -55,7 +55,7 @@ ShaderBoldColorLines::ShaderBoldColorLines() :
std
::
string
glxfrag
(
GLSLShader
::
defines_gl
());
std
::
string
glxfrag
(
GLSLShader
::
defines_gl
());
glxfrag
.
append
(
fragmentShaderText
);
glxfrag
.
append
(
fragmentShaderText
);
loadShadersFromMemory
(
glxvert
.
c_str
(),
glxfrag
.
c_str
(),
glxgeom
.
c_str
(),
GL_LINES
,
GL_
LIN
E_STRIP
,
6
);
loadShadersFromMemory
(
glxvert
.
c_str
(),
glxfrag
.
c_str
(),
glxgeom
.
c_str
(),
GL_LINES
,
GL_
TRIANGL
E_STRIP
,
6
);
// get and fill uniforms
// get and fill uniforms
getLocations
();
getLocations
();
...
...
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
View file @
670639f1
...
@@ -53,7 +53,7 @@ ShaderBoldLines::ShaderBoldLines() :
...
@@ -53,7 +53,7 @@ ShaderBoldLines::ShaderBoldLines() :
std
::
string
glxfrag
(
GLSLShader
::
defines_gl
());
std
::
string
glxfrag
(
GLSLShader
::
defines_gl
());
glxfrag
.
append
(
fragmentShaderText
);
glxfrag
.
append
(
fragmentShaderText
);
loadShadersFromMemory
(
glxvert
.
c_str
(),
glxfrag
.
c_str
(),
glxgeom
.
c_str
(),
GL_LINES
,
GL_
LIN
E_STRIP
,
6
);
loadShadersFromMemory
(
glxvert
.
c_str
(),
glxfrag
.
c_str
(),
glxgeom
.
c_str
(),
GL_LINES
,
GL_
TRIANGL
E_STRIP
,
6
);
// get and fill uniforms
// get and fill uniforms
getLocations
();
getLocations
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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