diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp index baffa4ebf55..4846d60a13d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp @@ -203,13 +203,13 @@ struct Scene_edit_box_item_priv{ if(QOpenGLContext::currentContext()->format().majorVersion() >= 3) { - pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/shader_spheres.v"); - pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Fragment,":/cgal/Polyhedron_3/resources/shader_without_light.f"); + pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/shader_spheres.vert"); + pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Fragment,":/cgal/Polyhedron_3/resources/shader_without_light.frag"); } else { - pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_spheres.v"); - pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Fragment,":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.f"); + pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_spheres.vert"); + pick_sphere_program.addShaderFromSourceFile(QOpenGLShader::Fragment,":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.frag"); } pick_sphere_program.bindAttributeLocation("colors", 1); pick_sphere_program.link(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp index 921ff997411..ad5493d3843 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp @@ -342,7 +342,7 @@ Scene_alpha_shape_item::Scene_alpha_shape_item(Scene_points_with_normal_item *po { facet_program.addShaderFromSourceCode(QOpenGLShader::Vertex, vertex_source_comp); } - facet_program.addShaderFromSourceFile(QOpenGLShader::Fragment, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_old_flat.f"); + facet_program.addShaderFromSourceFile(QOpenGLShader::Fragment, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_old_flat.frag"); facet_program.link(); invalidateOpenGLBuffers(); alpha_changed(alpha); diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc b/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc index ddfef37241e..bca90692a1f 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc +++ b/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc @@ -34,23 +34,23 @@ resources/about.html - resources/shader_with_light.v - resources/shader_with_light.f - resources/shader_without_light.f - resources/shader_without_light.v - resources/shader_with_texture.f - resources/shader_with_textured_edges.f - resources/shader_with_textured_edges.v - resources/shader_with_texture.v - resources/shader_instanced.v - resources/shader_no_light_no_selection.f - resources/shader_c3t3_spheres.v - resources/shader_c3t3_edges.v - resources/shader_c3t3_edges.f - resources/shader_c3t3.v - resources/shader_c3t3.f - resources/shader_plane_two_faces.f - resources/shader_spheres.v + resources/shader_with_light.vert + resources/shader_with_light.frag + resources/shader_without_light.frag + resources/shader_without_light.vert + resources/shader_with_texture.frag + resources/shader_with_textured_edges.frag + resources/shader_with_textured_edges.vert + resources/shader_with_texture.vert + resources/shader_instanced.vert + resources/shader_no_light_no_selection.frag + resources/shader_c3t3_spheres.vert + resources/shader_c3t3_edges.vert + resources/shader_c3t3_edges.frag + resources/shader_c3t3.vert + resources/shader_c3t3.frag + resources/shader_plane_two_faces.frag + resources/shader_spheres.vert resources/general_collapse.png resources/add_facet1.png resources/add_facet2.png @@ -58,7 +58,7 @@ resources/euler_facet.png resources/euler_vertex.png javascript/lib.js - resources/shader_flat.f + resources/shader_flat.frag resources/hexahedron.png resources/icosphere.png resources/tetrahedron.png @@ -67,37 +67,37 @@ resources/prism-open.png resources/pyramid.png resources/pyramid-open.png - resources/no_interpolation_shader.f - resources/no_interpolation_shader.g - resources/no_interpolation_shader.v - resources/shader_flat.g - resources/shader_flat.v - resources/shader_old_flat.f - resources/solid_wireframe_shader.v - resources/solid_wireframe_shader.f - resources/solid_wireframe_shader.g - resources/compatibility_shaders/shader_c3t3_edges.f - resources/compatibility_shaders/shader_c3t3_edges.v - resources/compatibility_shaders/shader_c3t3_spheres.v - resources/compatibility_shaders/shader_c3t3.f - resources/compatibility_shaders/shader_c3t3.v - resources/compatibility_shaders/shader_instanced.v - resources/compatibility_shaders/shader_no_light_no_selection.f - resources/compatibility_shaders/shader_old_flat.f - resources/compatibility_shaders/shader_plane_two_faces.f - resources/compatibility_shaders/shader_spheres.v - resources/compatibility_shaders/shader_with_light.f - resources/compatibility_shaders/shader_with_light.v - resources/compatibility_shaders/shader_with_texture.f - resources/compatibility_shaders/shader_with_texture.v - resources/compatibility_shaders/shader_with_textured_edges.f - resources/compatibility_shaders/shader_with_textured_edges.v - resources/compatibility_shaders/shader_without_light.f - resources/compatibility_shaders/shader_without_light.v - resources/heat_intensity_shader.f - resources/heat_intensity_shader.v - resources/compatibility_shaders/heat_intensity_shader.f - resources/compatibility_shaders/heat_intensity_shader.v + resources/no_interpolation_shader.frag + resources/no_interpolation_shader.geom + resources/no_interpolation_shader.vert + resources/shader_flat.geom + resources/shader_flat.vert + resources/shader_old_flat.frag + resources/solid_wireframe_shader.vert + resources/solid_wireframe_shader.frag + resources/solid_wireframe_shader.geom + resources/compatibility_shaders/shader_c3t3_edges.frag + resources/compatibility_shaders/shader_c3t3_edges.vert + resources/compatibility_shaders/shader_c3t3_spheres.vert + resources/compatibility_shaders/shader_c3t3.frag + resources/compatibility_shaders/shader_c3t3.vert + resources/compatibility_shaders/shader_instanced.vert + resources/compatibility_shaders/shader_no_light_no_selection.frag + resources/compatibility_shaders/shader_old_flat.frag + resources/compatibility_shaders/shader_plane_two_faces.frag + resources/compatibility_shaders/shader_spheres.vert + resources/compatibility_shaders/shader_with_light.frag + resources/compatibility_shaders/shader_with_light.vert + resources/compatibility_shaders/shader_with_texture.frag + resources/compatibility_shaders/shader_with_texture.vert + resources/compatibility_shaders/shader_with_textured_edges.frag + resources/compatibility_shaders/shader_with_textured_edges.vert + resources/compatibility_shaders/shader_without_light.frag + resources/compatibility_shaders/shader_without_light.vert + resources/heat_intensity_shader.frag + resources/heat_intensity_shader.vert + resources/compatibility_shaders/heat_intensity_shader.frag + resources/compatibility_shaders/heat_intensity_shader.vert resources/rotate_around_cursor.png diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp index c61f608d2f5..8ff062cb5cb 100644 --- a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp @@ -592,16 +592,16 @@ void Scene_image_item_priv::compile_shaders() } else { - if(!rendering_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/no_interpolation_shader.v")) + if(!rendering_program.addShaderFromSourceFile(QOpenGLShader::Vertex,":/cgal/Polyhedron_3/resources/no_interpolation_shader.vert")) { std::cerr<<"adding vertex shader FAILED"<addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/shader_flat.g" )) + if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/shader_flat.geom" )) { std::cerr<<"adding geometry shader FAILED"<addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/solid_wireframe_shader.g" )) + if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/solid_wireframe_shader.geom" )) { std::cerr<<"adding geometry shader FAILED"<setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasCutPlane", true); @@ -1083,18 +1083,18 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_C3T3_EDGES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.v" , ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.vert" , ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.frag"); program->setProperty("hasCutPlane", true); return program; } case PROGRAM_WITH_LIGHT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.v" , ":/cgal/Polyhedron_3/resources/shader_with_light.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasTransparency", true); @@ -1104,9 +1104,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_HEAT_INTENSITY: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/heat_intensity_shader.v" , ":/cgal/Polyhedron_3/resources/heat_intensity_shader.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/heat_intensity_shader.vert" , ":/cgal/Polyhedron_3/resources/heat_intensity_shader.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasTransparency", true); @@ -1116,27 +1116,27 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITHOUT_LIGHT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.v" , ":/cgal/Polyhedron_3/resources/shader_without_light.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_without_light.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.frag"); program->setProperty("hasFMatrix", true); return program; } case PROGRAM_NO_SELECTION: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.v" , ":/cgal/Polyhedron_3/resources/shader_no_light_no_selection.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_no_light_no_selection.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_no_light_no_selection.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_no_light_no_selection.frag"); program->setProperty("hasFMatrix", true); return program; } case PROGRAM_WITH_TEXTURE: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_texture.v" , ":/cgal/Polyhedron_3/resources/shader_with_texture.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_texture.vert" , ":/cgal/Polyhedron_3/resources/shader_with_texture.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasFMatrix", true); @@ -1146,9 +1146,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_PLANE_TWO_FACES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.v" , ":/cgal/Polyhedron_3/resources/shader_plane_two_faces.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_plane_two_faces.f"); + ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_plane_two_faces.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_plane_two_faces.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); return program; @@ -1156,9 +1156,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITH_TEXTURED_EDGES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.v" , ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.vert" , ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.frag"); program->setProperty("hasFMatrix", true); program->setProperty("hasTexture", true); return program; @@ -1166,9 +1166,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_INSTANCED: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.v" , ":/cgal/Polyhedron_3/resources/shader_with_light.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); @@ -1178,9 +1178,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_INSTANCED_WIRE: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.v" , ":/cgal/Polyhedron_3/resources/shader_without_light.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.vert" , ":/cgal/Polyhedron_3/resources/shader_without_light.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasBarycenter", true); @@ -1190,9 +1190,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_CUTPLANE_SPHERES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_spheres.v" , ":/cgal/Polyhedron_3/resources/shader_c3t3.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_spheres.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3.f"); + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_spheres.vert" , ":/cgal/Polyhedron_3/resources/shader_c3t3.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_spheres.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasBarycenter", true); @@ -1203,9 +1203,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_SPHERES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_spheres.v" , ":/cgal/Polyhedron_3/resources/shader_with_light.f") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_spheres.v" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.f"); + ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_spheres.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_spheres.vert" , + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasBarycenter", true); @@ -1221,7 +1221,7 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const std::cerr<<"An OpenGL context of version 4.3 is required for the program ("<setProperty("hasLight", true); program->setProperty("hasNormals", true); return program; @@ -1229,10 +1229,10 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_OLD_FLAT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.v", ":/cgal/Polyhedron_3/resources/shader_old_flat.f") + ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.vert", ":/cgal/Polyhedron_3/resources/shader_old_flat.frag") : declare_program(name, - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.v", - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_old_flat.f"); + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.vert", + ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_old_flat.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); return program; @@ -1244,8 +1244,8 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const return 0; } return declare_program(name, - ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.v", - ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.f"); + ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.vert", + ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.frag"); break; default: std::cerr<<"ERROR : Program not found."<