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
Thomas Pitiot
CGoGN
Commits
10afca5c
Commit
10afca5c
authored
Jun 29, 2011
by
Maire Nicolas
Browse files
Rajout des noms de shaders dans les constructeurs.
parent
7d0e253b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/Utils/Shaders/shaderColorPerVertex.cpp
View file @
10afca5c
...
...
@@ -57,6 +57,10 @@ std::string ShaderColorPerVertex::fragmentShaderText =
ShaderColorPerVertex
::
ShaderColorPerVertex
()
{
m_nameVS
=
"ShaderColorPerVertex_vs"
;
m_nameFS
=
"ShaderColorPerVertex_fs"
;
m_nameGS
=
"ShaderColorPerVertex_gs"
;
std
::
string
glxvert
(
*
GLSLShader
::
DEFINES_GL
);
glxvert
.
append
(
vertexShaderText
);
...
...
src/Utils/Shaders/shaderPhong.cpp
View file @
10afca5c
...
...
@@ -111,6 +111,11 @@ ShaderPhong::ShaderPhong(bool doubleSided):
m_vboNormal
(
NULL
),
m_vboColor
(
NULL
)
{
m_nameVS
=
"ShaderPhong_vs"
;
m_nameFS
=
"ShaderPhong_fs"
;
m_nameGS
=
"ShaderPhong_gs"
;
// get choose GL defines (2 or 3)
// ans compile shaders
std
::
string
glxvert
(
*
GLSLShader
::
DEFINES_GL
);
...
...
src/Utils/Shaders/shaderVectorPerVertex.cpp
View file @
10afca5c
...
...
@@ -71,6 +71,11 @@ ShaderVectorPerVertex::ShaderVectorPerVertex() :
m_scale
(
1.0
f
),
m_color
(
Geom
::
Vec4f
(
1.0
f
,
0.0
f
,
0.0
f
,
0.0
f
))
{
m_nameVS
=
"ShaderVectorPerVertex_vs"
;
m_nameFS
=
"ShaderVectorPerVertex_fs"
;
m_nameGS
=
"ShaderVectorPerVertex_gs"
;
std
::
string
glxvert
(
*
GLSLShader
::
DEFINES_GL
);
glxvert
.
append
(
vertexShaderText
);
...
...
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