diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp index eaa7e9cddc6..a6b88ea5edf 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp @@ -157,11 +157,11 @@ private: " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; @@ -377,11 +377,11 @@ private: " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp index 642daa51e06..7d56036a773 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp @@ -675,11 +675,11 @@ private: "precision mediump float; \n" "in vec3 fColors; \n" - "out vec3 color; \n" + "out vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4 (fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp index 889e3548a01..804f1d5378e 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp @@ -170,11 +170,11 @@ private: " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = (fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp index 9f7e04fd3d3..4b644eaf1c2 100644 --- a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp @@ -58,11 +58,11 @@ void Scene_combinatorial_map_item::compile_shaders(void) " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp index fdbbd1cb169..f1b98482fe7 100644 --- a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp @@ -461,11 +461,11 @@ void Scene_edit_polyhedron_item::compile_shaders(void) "precision mediump float; \n" "in vec3 fColors; \n" - "out vec3 color; \n" + "out vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp index a984f58fbc2..388119e5c9c 100644 --- a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp @@ -194,11 +194,11 @@ void Scene_implicit_function_item::compile_shaders(void) "#version 300 es \n" " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; vertex_shader = glCreateShader(GL_VERTEX_SHADER); diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp index 66f84c731f9..97645e7fc22 100644 --- a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp @@ -292,11 +292,11 @@ void Scene_nef_polyhedron_item::compile_shaders(void) "precision mediump float; \n" "in vec3 fColors; \n" - "out vec3 color; \n" + "out vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_plane_item.cpp b/Polyhedron/demo/Polyhedron/Scene_plane_item.cpp index 28537996186..d3d1f0243b7 100644 --- a/Polyhedron/demo/Polyhedron/Scene_plane_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_plane_item.cpp @@ -63,11 +63,11 @@ void Scene_plane_item::compile_shaders(void) "#version 300 es \n" " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp b/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp index ea6d78dc85e..66905d7d6c4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp @@ -325,11 +325,11 @@ void Scene_points_with_normal_item::compile_shaders(void) "precision mediump float; \n" "in vec3 fColors; \n" - "out vec3 color; \n" + "out vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER); diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp index 540b2f50fba..4595a7e8204 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp @@ -195,12 +195,12 @@ Scene_polygon_soup_item::compile_shaders(void) " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" "/* Lighting gestion */ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp index adf02f37f14..88057685129 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp @@ -521,11 +521,11 @@ Scene_polyhedron_item::compile_shaders(void) "precision mediump float; \n" "in vec3 fColors; \n" - "out vec3 color; \n" + "out vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp index b7785c563cd..2dfe0093db4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp @@ -134,11 +134,11 @@ void Scene_polyhedron_selection_item::compile_shaders() " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp index daac51c911c..5615ed0adc0 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp @@ -78,11 +78,11 @@ void Scene_polyhedron_transform_item::compile_shaders() " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp index 063a92dd52d..3526abf7cb3 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp @@ -409,11 +409,11 @@ Scene_polylines_item::compile_shaders() " \n" "in highp vec3 fColors; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = fColors; \n" + " color = vec4(fColors, 1.0); \n" "} \n" }; diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp index dd960ff2478..03031a845db 100644 --- a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp @@ -162,11 +162,11 @@ void Scene_textured_polyhedron_item::compile_shaders(void) "in highp vec3 fColors; \n" "in highp vec2 f_texCoord; \n" "uniform sampler2D s_texture; \n" - "out highp vec3 color; \n" + "out highp vec4 color; \n" " \n" "void main(void) \n" "{ \n" - " color = vec3(texture(s_texture, f_texCoord)) * fColors; \n" + " color = vec4(vec3(texture(s_texture, f_texCoord))*fColors, 1.0); \n" "} \n" };