Merge branch 'master' of /home/thery/CGoGN

* 'master' of /home/thery/CGoGN:
  update systeme de compilation des shaders pour windows
  Shader dans fichier separe mais compile dans le .o Ajout executable Tools/shader_to_h Modification de la compilation de utils pour generer les fichiers a inclure  a la compilation

Apps/Tuto/tp_master.cpp

@@ -522,7 +522,7 @@ void MyQT::cb_keyPress(int keycode)
 		if (!d_vertices.empty())
 		{
 			std::stringstream ss;
-			ss << "Sommet:  dart: " << d_vertices[0].index << ": " << position[d_vertices[0]];
+			ss << "Sommet:  dart: " << d_vertices[0].index << ": " << position[d_vertices[0]]<< "( id emb:"<< myMap.getEmbedding(VERTEX,d_vertices[0])<<")"<< std::endl; ;
 			statusMsg(ss.str().c_str());
 
 			updateGL();

ThirdParty/CMakeLists.txt

@@ -20,6 +20,7 @@ IF(WIN32)
 	add_subdirectory(gzstream/Build)
 	add_subdirectory(Numerical)
 	add_subdirectory(Assimp/code)
+	add_subdirectory(Tools)
 #	if(CMAKE_CONFIGURATION_TYPES)
 #		set(CMAKE_CONFIGURATION_TYPES Release)
 #		set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Use only Release configuration for ThirdParty" FORCE)
@@ -34,5 +35,6 @@ ELSE(WIN32)
 	add_subdirectory(AntTweakBar)
 	add_subdirectory(Numerical)
 	add_subdirectory(Assimp)
+	add_subdirectory(Tools)
 ENDIF(WIN32)
 

ThirdParty/Tools/CMakeLists.txt

+cmake_minimum_required(VERSION 2.6)
+
+project(Tools)
+
+SET (CMAKE_BUILD_TYPE Release)
+
+SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/ThirdParty/Tools)
+
+add_executable( shader_to_h shader_to_h.cpp )
+target_link_libraries( shader_to_h )
+

ThirdParty/Tools/shader_to_h.cpp

+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+int main(int argc, char **argv)
+{
+	char buffer[512];
+	for (int i=1; i< argc; ++i)
+	{
+		std::string filename(argv[i]);
+
+		std::ifstream fs(filename.c_str(), std::ios::in);
+		if (!fs.good())
+		{
+			std::cerr << "Unable to open file " << filename << std::endl;
+			return 1;
+		}
+
+		size_t last_slash = filename.rfind('/');
+		if (last_slash == std::string::npos)
+		{
+			last_slash = filename.rfind('\\');
+			if (last_slash == std::string::npos)
+				last_slash = 0;
+			else
+				++last_slash;
+		}
+		else
+			++last_slash;
+		
+		std::string outName = filename.substr(last_slash,filename.size()-last_slash);
+		
+		std::stringstream ssi;
+		std::stringstream sso;			
+		
+		std::ifstream fsi(outName.c_str(),std::ios::in);
+		if (fsi.good())
+		{
+			while (!fsi.eof())
+			{
+				fsi.getline(buffer,512);
+				if (!fsi.eof())
+					ssi << buffer << std::endl ;
+			}
+			fsi.close();
+		}
+		
+		
+		// fist line
+		fs.getline(buffer,512);				
+		char *sub=buffer;
+		while ((*sub=='/') || (*sub==' '))
+			++sub;
+		sso << "std::string "<<sub<< " =";
+
+		// text of shader		
+		unsigned int nbbl=0;
+		while (!fs.eof())
+		{
+			fs.getline(buffer,512);
+			//std::cout << buffer << std::endl;
+			if (*buffer!=0)
+			{
+				for (unsigned int i=0; i<nbbl;++i)
+					sso << std::endl <<"\"\\n\"";
+				nbbl=0;
+				sso << std::endl << "\"" << buffer <<"\\n\"";
+			}
+			else
+				nbbl++;
+		};
+		sso << ";"<< std::endl<< std::endl;	
+		
+		std::string ssostr = sso.str();
+		if (ssostr != ssi.str())
+		{
+			std::ofstream fso(outName.c_str(),std::ios::out);
+			fso << ssostr;
+			std::cout << "Shader_to_h: "<< outName << " copy"<< std::endl;
+			fso.close();
+		}
+		else
+			std::cout << "Shader_to_h: "<< outName << " ok"<< std::endl;
+		
+		fs.close();
+		
+	}
+	
+	
+	return 0;
+	
+}
+		

build/Debug/CMakeLists.txt

@@ -19,6 +19,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 
 include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
 	/usr/include/libxml2
 	${CGoGN_ROOT_DIR}/include
 	${CGoGN_ROOT_DIR}/ThirdParty/Numerical
@@ -66,17 +67,33 @@ add_library(
 	${files_algo}
 )
 
-#file(
-#	GLOB_RECURSE
-#	files_geometry
-#	${CGoGN_ROOT_DIR}/src/Geometry/*.cpp
-#	${CGoGN_ROOT_DIR}/include/Geometry/*.hpp
-#	${CGoGN_ROOT_DIR}/include/Geometry/*.h
-#)
-#add_library(
-#	geometryD
-#	${files_geometry}
-#)
+
+file(
+	GLOB_RECURSE
+	shaders_srcD
+	${CGoGN_ROOT_DIR}/include/Utils/*.frag
+	${CGoGN_ROOT_DIR}/include/Utils/*.vert
+	${CGoGN_ROOT_DIR}/include/Utils/*.geom	
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.frag
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.vert
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.geom
+)
+
+IF(WIN32)
+add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/ThirdParty/Tools/Release/shader_to_h ${shaders_srcD}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	SOURCES ${shaders_srcD} 
+)
+ELSE(WIN32)
+add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/ThirdParty/Tools/shader_to_h ${shaders_srcD}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	SOURCES ${shaders_srcD} 
+)
+ENDIF(WIN32)
+
+
+
+
 
 
 file(
@@ -102,4 +119,5 @@ add_library(
 	${files_utils_withQt}
 )
 
+add_dependencies(utilsD shader_targetD )
 

build/Release/CMakeLists.txt

@@ -21,6 +21,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 
 include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
 	/usr/include/libxml2
 	${CGoGN_ROOT_DIR}/include
 	${CGoGN_ROOT_DIR}/ThirdParty/Numerical
@@ -81,6 +82,33 @@ add_library(
 #)
 
 
+file(
+	GLOB_RECURSE
+	shaders_src
+	${CGoGN_ROOT_DIR}/include/Utils/*.frag
+	${CGoGN_ROOT_DIR}/include/Utils/*.vert
+	${CGoGN_ROOT_DIR}/include/Utils/*.geom	
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.frag
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.vert
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.geom
+)
+
+
+IF(WIN32)
+add_custom_target(shader_target ${CGoGN_ROOT_DIR}/ThirdParty/Tools/Release/shader_to_h ${shaders_src}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	SOURCES ${shaders_src} 
+)
+ELSE(WIN32)
+add_custom_target(shader_target ${CGoGN_ROOT_DIR}/ThirdParty/Tools/shader_to_h ${shaders_src}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	SOURCES ${shaders_src} 
+)
+ENDIF(WIN32)
+
+
+
+
 file(
 	GLOB_RECURSE
 	files_utils
@@ -104,6 +132,7 @@ add_library(
 	${files_utils_withQt}
 )
 
+add_dependencies(utils shader_target )
 
 
 

include/Utils/Shaders/shaderColorPerVertex.frag

+// ShaderColorPerVertex::fragmentShaderText
+
+PRECISON;
+VARYING_FRAG vec3 color;
+FRAG_OUT_DEF;
+void main()
+{
+	gl_FragColor=vec4(color,0.0);
+}

include/Utils/Shaders/shaderColorPerVertex.vert

+// ShaderColorPerVertex::vertexShaderText
+
+ATTRIBUTE vec3 VertexPosition;
+ATTRIBUTE vec3 VertexColor;
+uniform mat4 ModelViewProjectionMatrix;
+VARYING_VERT vec3 color;
+INVARIANT_POS;
+void main ()
+{
+	gl_Position = ModelViewProjectionMatrix * vec4 (VertexPosition, 1.0);
+	color = VertexColor;
+}

include/Utils/Shaders/shaderFlat.frag

+// ShaderFlat::fragmentShaderText
+VARYING_FRAG vec4 ColorFS;
+void main()
+{
+	gl_FragColor = ColorFS;
+}

include/Utils/Shaders/shaderFlat.geom

+// ShaderFlat::geometryShaderText
+
+uniform float explode;
+uniform mat4 ModelViewProjectionMatrix;
+uniform mat4 NormalMatrix;
+uniform mat4 ModelViewMatrix;
+uniform vec3 lightPosition;
+uniform vec4 diffuse;
+uniform vec4 ambient;
+VARYING_OUT vec4 ColorFS;
+void main(void)
+{
+	vec3 v1 = POSITION_IN(1).xyz - POSITION_IN(0).xyz;
+	vec3 v2 = POSITION_IN(2).xyz - POSITION_IN(0).xyz;
+	vec3 N  = cross(v1,v2);
+	N  =  normalize (vec3(NormalMatrix*vec4(N,0.0))); 
+	vec3 center = POSITION_IN(0).xyz + POSITION_IN(1).xyz + POSITION_IN(2).xyz; 
+	center /= 3.0;
+	vec4 newPos =  ModelViewMatrix * vec4(center,0.0);
+	vec3 L =  normalize (lightPosition - newPos.xyz);
+	float lambertTerm = dot(N,L);
+	ColorFS = ambient;
+	if(lambertTerm > 0.0)
+		ColorFS += diffuse * lambertTerm;
+	int i;
+	for(i=0; i< NBVERTS_IN; i++)
+	{
+		vec4 pos =  explode * POSITION_IN(i) + (1.0-explode)* vec4(center,1.0);
+		gl_Position = ModelViewProjectionMatrix *  pos;
+		EmitVertex();
+	}
+	EndPrimitive();
+}

include/Utils/Shaders/shaderFlat.vert

+// ShaderFlat::vertexShaderText
+ATTRIBUTE vec3 VertexPosition;
+void main()
+{
+	gl_Position = vec4(VertexPosition, 1.0);
+}

include/Utils/Shaders/shaderPhong.frag

+//ShaderPhong::fragmentShaderText
+
+PRECISON;
+VARYING_FRAG vec3 EyeVector, Normal, LightDir;
+#ifdef WITH_COLOR
+VARYING_FRAG vec3 Color;
+#endif
+uniform vec4 materialDiffuse;
+uniform vec4 materialSpecular;
+uniform vec4 materialAmbient;
+uniform float shininess;
+FRAG_OUT_DEF;
+void main()
+{
+	vec3 N = normalize (Normal);
+	vec3 L = normalize (LightDir);
+	float lambertTerm = dot(N,L);
+
+	vec4 finalColor = materialAmbient;
+	if(lambertTerm > 0.0)
+	{
+		#ifndef WITH_COLOR
+		finalColor += materialDiffuse * lambertTerm;
+		#else
+		finalColor += vec4((Color*lambertTerm),0.0) ;
+		#endif
+		vec3 E = normalize(EyeVector);
+		vec3 R = reflect(-L, N);
+		float specular = pow( max(dot(R, E), 0.0), shininess );
+		finalColor += materialSpecular * specular;
+	}
+	gl_FragColor=finalColor;
+}

include/Utils/Shaders/shaderPhong.vert

+//ShaderPhong::vertexShaderText
+
+ATTRIBUTE vec3 VertexPosition, VertexNormal;
+#ifdef WITH_COLOR
+ATTRIBUTE vec3 VertexColor;
+#endif
+uniform mat4 ModelViewProjectionMatrix;
+uniform mat4 ModelViewMatrix;
+uniform mat4 NormalMatrix;
+uniform vec3 lightPosition;
+VARYING_VERT vec3 EyeVector, Normal, LightDir;
+#ifdef WITH_COLOR
+VARYING_VERT vec3 Color;
+#endif
+INVARIANT_POS;
+void main ()
+{
+	Normal = vec3 (NormalMatrix * vec4 (VertexNormal, 0.0));
+ 	vec3 Position = vec3 (ModelViewMatrix * vec4 (VertexPosition, 1.0));
+	LightDir = lightPosition - Position;
+	EyeVector = -Position;
+	#ifdef WITH_COLOR
+	Color = VertexColor;
+	#endif
+	gl_Position = ModelViewProjectionMatrix * vec4 (VertexPosition, 1.0);
+}

include/Utils/Shaders/shaderSimpleColor.frag

+// ShaderSimpleColor::fragmentShaderText
+
+PRECISON;
+uniform vec4 color;
+FRAG_OUT_DEF;
+void main()
+{
+	gl_FragColor=color;
+}

include/Utils/Shaders/shaderSimpleColor.vert

+// ShaderSimpleColor::vertexShaderText
+
+ATTRIBUTE vec3 VertexPosition, VertexNormal;
+uniform mat4 ModelViewProjectionMatrix;
+
+void main ()
+{
+	gl_Position = ModelViewProjectionMatrix * vec4 (VertexPosition, 1.0);
+}

include/Utils/Shaders/shaderSimpleTexture.frag

+// ShaderSimpleTexture::fragmentShaderText
+
+PRECISON;
+VARYING_FRAG vec2 texCoord;
+uniform sampler2D textureUnit;
+FRAG_OUT_DEF;
+void main()
+{
+	gl_FragColor=texture2D(textureUnit,texCoord);
+}
\ No newline at end of file

include/Utils/Shaders/shaderSimpleTexture.vert

+// ShaderSimpleTexture::vertexShaderText
+
+ATTRIBUTE vec3 VertexPosition;
+ATTRIBUTE vec2 VertexTexCoord;
+uniform mat4 ModelViewProjectionMatrix;
+VARYING_VERT vec2 texCoord;
+INVARIANT_POS;
+void main ()
+{
+	gl_Position = ModelViewProjectionMatrix * vec4 (VertexPosition, 1.0);
+	texCoord = VertexTexCoord;
+}
+

include/Utils/Shaders/shaderTextureMask.frag

+// ShaderTextureMask::fragmentShaderText
+
+PRECISON;
+VARYING_FRAG vec2 texCoord;
+uniform sampler2D textureUnit;
+uniform sampler2D textureUnitMask;
+FRAG_OUT_DEF;
+void main()
+{
+	float m = texture2D(textureUnitMask,texCoord).r;
+	if (m < 0.5)
+		discard;
+	gl_FragColor=texture2D(textureUnit,texCoord)*m;
+}

include/Utils/Shaders/shaderTextureMask.vert

+// ShaderTextureMask::vertexShaderText
+
+ATTRIBUTE vec3 VertexPosition;
+ATTRIBUTE vec2 VertexTexCoord;
+uniform mat4 ModelViewProjectionMatrix;
+VARYING_VERT vec2 texCoord;
+INVARIANT_POS;
+void main ()
+{
+	gl_Position = ModelViewProjectionMatrix * vec4 (VertexPosition, 1.0);
+	texCoord = VertexTexCoord;
+}
\ No newline at end of file

include/Utils/Shaders/shaderVectorPerVertex.frag

+// ShaderVectorPerVertex::fragmentShaderText
+
+PRECISON;
+uniform vec4 vectorColor;
+FRAG_OUT_DEF;
+void main()
+{
+	gl_FragColor = vectorColor;
+}