Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
David Cazier
CGoGN
Commits
4107949a
Commit
4107949a
authored
May 05, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop
parents
e8ec00fd
e9f92623
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
+6
-6
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
+3
-3
No files found.
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
View file @
4107949a
...
...
@@ -31,9 +31,9 @@ namespace CGoGN
namespace
Utils
{
#include "
S
haderBoldColorLines.vert"
#include "
S
haderBoldColorLines.geom"
#include "
S
haderBoldColorLines.frag"
#include "
s
haderBoldColorLines.vert"
#include "
s
haderBoldColorLines.geom"
#include "
s
haderBoldColorLines.frag"
ShaderBoldColorLines
::
ShaderBoldColorLines
()
:
...
...
@@ -42,9 +42,9 @@ ShaderBoldColorLines::ShaderBoldColorLines() :
m_planeClip
(
0.0
f
,
0.0
f
,
0.0
f
,
0.0
f
)
{
m_nameVS
=
"
S
haderBoldColorLines_vs"
;
m_nameFS
=
"
S
haderBoldColorLines_fs"
;
m_nameGS
=
"
S
haderBoldColorLines_gs"
;
m_nameVS
=
"
s
haderBoldColorLines_vs"
;
m_nameFS
=
"
s
haderBoldColorLines_fs"
;
m_nameGS
=
"
s
haderBoldColorLines_gs"
;
std
::
string
glxvert
(
GLSLShader
::
defines_gl
());
glxvert
.
append
(
vertexShaderText
);
...
...
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
View file @
4107949a
...
...
@@ -41,9 +41,9 @@ ShaderBoldLines::ShaderBoldLines() :
m_color
(
0.0
f
,
0.0
f
,
0.0
f
,
0.0
f
),
m_planeClip
(
0.0
f
,
0.0
f
,
0.0
f
,
0.0
f
)
{
m_nameVS
=
"
S
haderBoldLines_vs"
;
m_nameFS
=
"
S
haderBoldLines_fs"
;
m_nameGS
=
"
S
haderBoldLines_gs"
;
m_nameVS
=
"
s
haderBoldLines_vs"
;
m_nameFS
=
"
s
haderBoldLines_fs"
;
m_nameGS
=
"
s
haderBoldLines_gs"
;
std
::
string
glxvert
(
GLSLShader
::
defines_gl
());
glxvert
.
append
(
vertexShaderText
);
...
...
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