Commit ca12b904 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop

parents c1635bb8 e9f92623
...@@ -31,9 +31,9 @@ namespace CGoGN ...@@ -31,9 +31,9 @@ namespace CGoGN
namespace Utils namespace Utils
{ {
#include "ShaderBoldColorLines.vert" #include "shaderBoldColorLines.vert"
#include "ShaderBoldColorLines.geom" #include "shaderBoldColorLines.geom"
#include "ShaderBoldColorLines.frag" #include "shaderBoldColorLines.frag"
ShaderBoldColorLines::ShaderBoldColorLines() : ShaderBoldColorLines::ShaderBoldColorLines() :
...@@ -42,9 +42,9 @@ ShaderBoldColorLines::ShaderBoldColorLines() : ...@@ -42,9 +42,9 @@ ShaderBoldColorLines::ShaderBoldColorLines() :
m_planeClip(0.0f,0.0f,0.0f,0.0f) m_planeClip(0.0f,0.0f,0.0f,0.0f)
{ {
m_nameVS = "ShaderBoldColorLines_vs"; m_nameVS = "shaderBoldColorLines_vs";
m_nameFS = "ShaderBoldColorLines_fs"; m_nameFS = "shaderBoldColorLines_fs";
m_nameGS = "ShaderBoldColorLines_gs"; m_nameGS = "shaderBoldColorLines_gs";
std::string glxvert(GLSLShader::defines_gl()); std::string glxvert(GLSLShader::defines_gl());
glxvert.append(vertexShaderText); glxvert.append(vertexShaderText);
......
...@@ -40,9 +40,9 @@ ShaderBoldLines::ShaderBoldLines() : ...@@ -40,9 +40,9 @@ ShaderBoldLines::ShaderBoldLines() :
m_color (0.0f, 0.0f, 0.0f, 0.0f), m_color (0.0f, 0.0f, 0.0f, 0.0f),
m_planeClip(0.0f,0.0f,0.0f,0.0f) m_planeClip(0.0f,0.0f,0.0f,0.0f)
{ {
m_nameVS = "ShaderBoldLines_vs"; m_nameVS = "shaderBoldLines_vs";
m_nameFS = "ShaderBoldLines_fs"; m_nameFS = "shaderBoldLines_fs";
m_nameGS = "ShaderBoldLines_gs"; m_nameGS = "shaderBoldLines_gs";
std::string glxvert(GLSLShader::defines_gl()); std::string glxvert(GLSLShader::defines_gl());
glxvert.append(vertexShaderText); glxvert.append(vertexShaderText);
......
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