Merge branch 'develop' into 'develop'

Develop

See merge request !62

CGoGN/src/Utils/Shaders/shaderPhong.cpp

@@ -54,30 +54,17 @@ ShaderPhong::ShaderPhong(bool withClipping, bool doubleSided, bool withEyePositi
 	std::string glxvert(GLSLShader::defines_gl());
 	std::string glxfrag(GLSLShader::defines_gl());
 
-	if (withClipping)
-	{
-		m_nameVS = "ShaderPhongClip_vs";
-		m_nameFS = "ShaderPhongClip_fs";
-		if (m_with_eyepos)
-			glxvert.append("#define WITH_EYEPOSITION");
-		glxvert.append(vertexShaderClipText);
-		// Use double sided lighting if set
-		if (doubleSided)
-			glxfrag.append("#define DOUBLE_SIDED\n");
-		glxfrag.append(fragmentShaderClipText);
-	}
-	else
-	{
-		m_nameVS = "ShaderPhong_vs";
-		m_nameFS = "ShaderPhong_fs";
-		if (m_with_eyepos)
-			glxvert.append("#define WITH_EYEPOSITION");
-		glxvert.append(vertexShaderText);
-		// Use double sided lighting if set
-		if (doubleSided)
-			glxfrag.append("#define DOUBLE_SIDED\n");
-		glxfrag.append(fragmentShaderText);
-	}
+	// get choose GL defines (2 or 3)
+	// ans compile shaders
+	std::string glxvert(GLSLShader::defines_gl());
+	if (m_with_eyepos)
+		glxvert.append("#define WITH_EYEPOSITION");
+	glxvert.append(vertexShaderText);
+	std::string glxfrag(GLSLShader::defines_gl());
+	// Use double sided lighting if set
+	if (doubleSided)
+		glxfrag.append("#define DOUBLE_SIDED\n");
+	glxfrag.append(fragmentShaderText);
 
 	loadShadersFromMemory(glxvert.c_str(), glxfrag.c_str());
 

SCHNApps/src/view.cpp

@@ -13,7 +13,7 @@
 #include <QKeyEvent>
 #include <QMouseEvent>
 #include <QWheelEvent>
-#include <QMessageBox>
+#include <QWindow>
 
 namespace CGoGN
 {
@@ -337,6 +337,7 @@ void View::init()
 	m_buttonArea = new ViewButtonArea(this);
 	m_buttonArea->setTopRightPosition(this->width(), 0);
 
+	std::cout << this->width() << std::endl;
 	m_VsplitButton = new ViewButton(":icons/icons/Vsplit.png", this);
 	m_buttonArea->addButton(m_VsplitButton);
 	connect(m_VsplitButton, SIGNAL(clicked(int, int, int, int)), this, SLOT(ui_verticalSplitView(int, int, int, int)));