simono41/TerminalImageViewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

.

Browse source
This commit is contained in:
David Tschumperlé 2018-06-15 08:33:36 +02:00 committed by Stefan Haustein
parent e3b51a1b15
commit bf7a2ef987
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/cpp/CImg.h
View file

@ -46209,7 +46209,7 @@ namespace cimg_library_suffixed {
} }
} }
} break; } break;
case 4 : // Rectangle case 4 : // Quadrangle
case 12 : { case 12 : {
const unsigned int const unsigned int
i0 = (unsigned int)primitive(0), i0 = (unsigned int)primitive(0),
@ -46315,13 +46315,13 @@ namespace cimg_library_suffixed {
const unsigned int psize = (unsigned int)primitive.size(); const unsigned int psize = (unsigned int)primitive.size();
const bool const bool
triangle_flag = (psize==3) || (psize==9), triangle_flag = (psize==3) || (psize==9),
rectangle_flag = (psize==4) || (psize==12); quadrangle_flag = (psize==4) || (psize==12);
if (triangle_flag || rectangle_flag) { if (triangle_flag || quadrangle_flag) {
const unsigned int const unsigned int
i0 = (unsigned int)primitive(0), i0 = (unsigned int)primitive(0),
i1 = (unsigned int)primitive(1), i1 = (unsigned int)primitive(1),
i2 = (unsigned int)primitive(2), i2 = (unsigned int)primitive(2),
i3 = rectangle_flag?(unsigned int)primitive(3):0; i3 = quadrangle_flag?(unsigned int)primitive(3):0;
const tpfloat const tpfloat
x0 = (tpfloat)vertices(i0,0), y0 = (tpfloat)vertices(i0,1), z0 = (tpfloat)vertices(i0,2), x0 = (tpfloat)vertices(i0,0), y0 = (tpfloat)vertices(i0,1), z0 = (tpfloat)vertices(i0,2),
x1 = (tpfloat)vertices(i1,0), y1 = (tpfloat)vertices(i1,1), z1 = (tpfloat)vertices(i1,2), x1 = (tpfloat)vertices(i1,0), y1 = (tpfloat)vertices(i1,1), z1 = (tpfloat)vertices(i1,2),
@ -46340,7 +46340,7 @@ namespace cimg_library_suffixed {
vertices_normals(i0,ix)+=nx; vertices_normals(i0,iy)+=ny; vertices_normals(i0,iz)+=nz; vertices_normals(i0,ix)+=nx; vertices_normals(i0,iy)+=ny; vertices_normals(i0,iz)+=nz;
vertices_normals(i1,ix)+=nx; vertices_normals(i1,iy)+=ny; vertices_normals(i1,iz)+=nz; vertices_normals(i1,ix)+=nx; vertices_normals(i1,iy)+=ny; vertices_normals(i1,iz)+=nz;
vertices_normals(i2,ix)+=nx; vertices_normals(i2,iy)+=ny; vertices_normals(i2,iz)+=nz; vertices_normals(i2,ix)+=nx; vertices_normals(i2,iy)+=ny; vertices_normals(i2,iz)+=nz;
if (rectangle_flag) { if (quadrangle_flag) {
vertices_normals(i3,ix)+=nx; vertices_normals(i3,iy)+=ny; vertices_normals(i3,iz)+=nz; vertices_normals(i3,ix)+=nx; vertices_normals(i3,iy)+=ny; vertices_normals(i3,iz)+=nz;
} }
} }
@ -46719,7 +46719,7 @@ namespace cimg_library_suffixed {
} break; } break;
} }
} break; } break;
case 4 : { // Colored rectangle case 4 : { // Colored quadrangle
const unsigned int const unsigned int
n0 = (unsigned int)primitive[0], n0 = (unsigned int)primitive[0],
n1 = (unsigned int)primitive[1], n1 = (unsigned int)primitive[1],