compilation bugs

include/Utils/pointSprite.h

@@ -62,8 +62,6 @@ protected:
 
 	CGoGNGLuint m_uniform_texture;
 	
-	CGoGNGLuint m_uniform_texture;
-	
 	CGoGNGLuint m_uniform_planeX;
 	
 	CGoGNGLuint m_uniform_planeY;
@@ -107,7 +105,7 @@ public:
 	/**
 	* 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);
 
 
 	/**

include/Utils/text3d.h

@@ -148,7 +148,7 @@ public:
 	/**
 	* 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);

src/Utils/Shaders/shaderPhong.cpp

@@ -44,7 +44,7 @@ ShaderPhong::ShaderPhong(bool doubleSided, bool withEyePosition):
 	m_lightPos(Geom::Vec3f(10.0f,10.0f,1000.0f)),
 	m_vboPos(NULL),
 	m_vboNormal(NULL),
-	m_vboColor(NULL),
+	m_vboColor(NULL)
 {
 
 	m_nameVS = "ShaderPhong_vs";
@@ -133,7 +133,7 @@ void ShaderPhong::setEyePosition( Geom::Vec3f eyePos)
 	if (m_with_eyepos)
 	{
 		this->bind();
-		glUniform3fv(*m_unif_eyetPos,1,eyePos.data());
+		glUniform3fv(*m_unif_eyePos,1,eyePos.data());
 		m_eyePos = eyePos;
 	}
 }

src/Utils/pointSprite.cpp

@@ -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");
 

src/Utils/text3d.cpp

@@ -68,7 +68,7 @@ Strings3D::Strings3D(bool withBackground, const Geom::Vec3f& bgc, bool with_plan
 
 	std::string glxvert(*GLSLShader::DEFINES_GL);
 	if (with_plane)
-		glxverte.append("#define WITH_PLANE 1")
+		glxvert.append("#define WITH_PLANE 1");
 	glxvert.append(vertexShaderText);
 	std::string glxfrag(*GLSLShader::DEFINES_GL);
 
@@ -116,11 +116,11 @@ void Strings3D::setScale(float scale)
 	unbind();
 }
 
-void Strings3D::setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& ox)
+void Strings3D::setPlane(const Geom::Vec3f& ox, const Geom::Vec3f& oy)
 {
 	bind();
-	glUniform3f(*m_uniform_planeX, ox);
-	glUniform3f(*m_uniform_planeY, oy);
+	glUniform3fv(*m_uniform_planeX, 1, ox.data());
+	glUniform3fv(*m_uniform_planeY, 1, oy.data());
 	unbind();
 }