Commit 0fe57133 authored by Sylvain Thery's avatar Sylvain Thery

compilation bugs

parent 25620752
...@@ -62,8 +62,6 @@ protected: ...@@ -62,8 +62,6 @@ protected:
CGoGNGLuint m_uniform_texture; CGoGNGLuint m_uniform_texture;
CGoGNGLuint m_uniform_texture;
CGoGNGLuint m_uniform_planeX; CGoGNGLuint m_uniform_planeX;
CGoGNGLuint m_uniform_planeY; CGoGNGLuint m_uniform_planeY;
...@@ -107,7 +105,7 @@ public: ...@@ -107,7 +105,7 @@ public:
/** /**
* set the plane of rendering for VR rendering * set the plane of rendering for VR rendering
*/ */
void setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& ox); void setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& oy);
/** /**
......
...@@ -148,7 +148,7 @@ public: ...@@ -148,7 +148,7 @@ public:
/** /**
* set the plane of rendering for VR rendering * set the plane of rendering for VR rendering
*/ */
void setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& ox); void setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& oy);
void toSVG(Utils::SVG::SVGOut& svg); void toSVG(Utils::SVG::SVGOut& svg);
......
...@@ -44,7 +44,7 @@ ShaderPhong::ShaderPhong(bool doubleSided, bool withEyePosition): ...@@ -44,7 +44,7 @@ ShaderPhong::ShaderPhong(bool doubleSided, bool withEyePosition):
m_lightPos(Geom::Vec3f(10.0f,10.0f,1000.0f)), m_lightPos(Geom::Vec3f(10.0f,10.0f,1000.0f)),
m_vboPos(NULL), m_vboPos(NULL),
m_vboNormal(NULL), m_vboNormal(NULL),
m_vboColor(NULL), m_vboColor(NULL)
{ {
m_nameVS = "ShaderPhong_vs"; m_nameVS = "ShaderPhong_vs";
...@@ -133,7 +133,7 @@ void ShaderPhong::setEyePosition( Geom::Vec3f eyePos) ...@@ -133,7 +133,7 @@ void ShaderPhong::setEyePosition( Geom::Vec3f eyePos)
if (m_with_eyepos) if (m_with_eyepos)
{ {
this->bind(); this->bind();
glUniform3fv(*m_unif_eyetPos,1,eyePos.data()); glUniform3fv(*m_unif_eyePos,1,eyePos.data());
m_eyePos = eyePos; m_eyePos = eyePos;
} }
} }
......
...@@ -41,7 +41,7 @@ PointSprite* PointSprite::m_instance0 = NULL; ...@@ -41,7 +41,7 @@ PointSprite* PointSprite::m_instance0 = NULL;
PointSprite::PointSprite(bool withColorPervertex, float radius) PointSprite::PointSprite(bool withColorPervertex, float radius, bool with_plane)
{ {
std::string defineColor("#define WITH_COLOR_PER_VERTEX 1\n"); std::string defineColor("#define WITH_COLOR_PER_VERTEX 1\n");
......
...@@ -68,7 +68,7 @@ Strings3D::Strings3D(bool withBackground, const Geom::Vec3f& bgc, bool with_plan ...@@ -68,7 +68,7 @@ Strings3D::Strings3D(bool withBackground, const Geom::Vec3f& bgc, bool with_plan
std::string glxvert(*GLSLShader::DEFINES_GL); std::string glxvert(*GLSLShader::DEFINES_GL);
if (with_plane) if (with_plane)
glxverte.append("#define WITH_PLANE 1") glxvert.append("#define WITH_PLANE 1");
glxvert.append(vertexShaderText); glxvert.append(vertexShaderText);
std::string glxfrag(*GLSLShader::DEFINES_GL); std::string glxfrag(*GLSLShader::DEFINES_GL);
...@@ -116,11 +116,11 @@ void Strings3D::setScale(float scale) ...@@ -116,11 +116,11 @@ void Strings3D::setScale(float scale)
unbind(); unbind();
} }
void Strings3D::setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& ox) void Strings3D::setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& oy)
{ {
bind(); bind();
glUniform3f(*m_uniform_planeX, ox); glUniform3fv(*m_uniform_planeX, 1, ox.data());
glUniform3f(*m_uniform_planeY, oy); glUniform3fv(*m_uniform_planeY, 1, oy.data());
unbind(); unbind();
} }
......
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