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

Fix sphere picking for c3t3

This commit is contained in:
Maxime Gimeno 2019-12-23 10:37:50 +01:00
parent cbf8e33009
commit 23337e6207
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,10 +170,10 @@ void Scene_spheres_item::draw(Viewer_interface *viewer) const
{ {
QVector4D cp(d->plane.a(),d->plane.b(),d->plane.c(),d->plane.d()); QVector4D cp(d->plane.a(),d->plane.b(),d->plane.c(),d->plane.d());
getTriangleContainer(0)->setPlane(cp); getTriangleContainer(0)->setPlane(cp);
getTriangleContainer(1)->setPlane(cp);
} }
if(d->spheres.size() > 1 && viewer->inDrawWithNames()) if(d->spheres.size() > 1 && viewer->inDrawWithNames())
{ {
getTriangleContainer(1)->allocate(Tc::Flat_normals, 0, 0);
getTriangleContainer(1)->getVao(viewer)->program->setAttributeValue("normals", QVector3D(0,0,0)); getTriangleContainer(1)->getVao(viewer)->program->setAttributeValue("normals", QVector3D(0,0,0));
getTriangleContainer(1)->draw(viewer, false); getTriangleContainer(1)->draw(viewer, false);
} }

5
Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3.frag
View File

@ -40,7 +40,10 @@ void main(void) {
highp vec3 V = -fP.xyz; highp vec3 V = -fP.xyz;
highp vec3 N; highp vec3 N;
if(fN == vec3(0.0,0.0,0.0)) if(fN == vec3(0.0,0.0,0.0))
N = vec3(0.0,0.0,0.0); {
gl_FragColor = my_color;
return;
}
else else
N = normalize(fN); N = normalize(fN);
L = normalize(L); L = normalize(L);

2
Polyhedron/demo/Polyhedron/resources/shader_with_light.frag
View File

@ -57,8 +57,6 @@ void main(void) {
out_color = my_color; out_color = my_color;
return; return;
} }
if(fN == vec3(0.0,0.0,0.0))
N = vec3(0.0,0.0,0.0);
else else
N = normalize(fN); N = normalize(fN);
L = normalize(L); L = normalize(L);