From c8c12fdff41a6fab980976f05a3d7ee5efeb0bb3 Mon Sep 17 00:00:00 2001 From: Jane Date: Mon, 2 Jul 2018 16:26:55 +0100 Subject: [PATCH] Fix textured_polys. --- Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp | 2 +- .../demo/Polyhedron/Scene_textured_surface_mesh_item.cpp | 1 + Polyhedron/demo/Polyhedron/Viewer.cpp | 2 ++ Polyhedron/demo/Polyhedron/resources/shader_with_texture.v | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp index fed3246744d..4d448bae2fe 100644 --- a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp @@ -155,7 +155,7 @@ void Scene_textured_polyhedron_item_priv::initializeBuffers(CGAL::Three::Viewer_ viewer->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); viewer->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); viewer->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - viewer->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + //viewer->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); nb_facets = positions_facets.size(); positions_facets.resize(0); diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp index 6b8595f2441..90532ac38d2 100644 --- a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp @@ -311,6 +311,7 @@ void Scene_textured_surface_mesh_item::draw(CGAL::Three::Viewer_interface* viewe attribBuffers(viewer, PROGRAM_WITH_TEXTURE); d->program=getShaderProgram(PROGRAM_WITH_TEXTURE); d->program->bind(); + viewer->glDrawArrays(GL_TRIANGLES, 0, static_cast(d->faces_buffer.size()/8)); //Clean-up d->program->release(); diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Polyhedron/demo/Polyhedron/Viewer.cpp index b546f60f5bd..a9e99cc94fd 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Polyhedron/demo/Polyhedron/Viewer.cpp @@ -258,8 +258,10 @@ void Viewer::init() "#version 120 \n" "attribute highp vec4 vertex;\n" "uniform highp mat4 mvp_matrix;\n" + "uniform highp float point_size;\n" "void main(void)\n" "{\n" + " gl_PointSize = point_size; \n" " gl_Position = mvp_matrix * vertex; \n" "} \n" "\n" diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_texture.v b/Polyhedron/demo/Polyhedron/resources/shader_with_texture.v index 36f91288bfc..a119ea75549 100644 --- a/Polyhedron/demo/Polyhedron/resources/shader_with_texture.v +++ b/Polyhedron/demo/Polyhedron/resources/shader_with_texture.v @@ -1,7 +1,6 @@ #version 120 attribute highp vec4 vertex; attribute highp vec3 normal; -attribute highp vec3 color_facets; attribute highp vec2 v_texCoord; uniform highp mat4 mvp_matrix; @@ -31,6 +30,6 @@ void main(void) else diffuse = max(dot(N,L), 0.0) * light_diff.xyz; f_texCoord = v_texCoord; - fColors = color_facets * (light_amb.xyz + diffuse); + fColors = vec3(1.0f, 1.0f, 1.0f) * (light_amb.xyz + diffuse); gl_Position = mvp_matrix * f_matrix * vertex; }