songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix textured_polys.

This commit is contained in:
Jane 2018-07-02 16:26:55 +01:00
parent 441f2b8da6
commit c8c12fdff4
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp
View File

@ -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);

1
Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp
View File

@ -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<GLsizei>(d->faces_buffer.size()/8));
//Clean-up
d->program->release();

2
Polyhedron/demo/Polyhedron/Viewer.cpp
View File

@ -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"

3
Polyhedron/demo/Polyhedron/resources/shader_with_texture.v
View File

@ -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;
}