Update of /cvsroot/pure-data/externals/pdp/opengl/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl/modules
Modified Files: pdp_3d_draw.c Log Message: pdp current darcs merge
Index: pdp_3d_draw.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/modules/pdp_3d_draw.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3d_draw.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3d_draw.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 21,25 ****
//#include "GL/gl.h" ! #include <GL/glut.h> #include <math.h>
--- 21,26 ----
//#include "GL/gl.h" ! //#include <GL/glut.h> ! #include <GL/glu.h> #include <math.h>
*************** *** 163,167 **** static void draw_wcube(t_drawcommand *x) { ! glutWireCube(x->x_p0); }
--- 164,178 ---- static void draw_wcube(t_drawcommand *x) { ! x->x_p1 = x->x_p0; // set square z coord; ! glPushMatrix(); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glPopMatrix(); ! }
*************** *** 170,176 **** x->x_p1 = x->x_p0; // set square z coord;
- //glutSolidCube(x->x_p0); - - //glMatrixMode(GL_MODELVIEW); glPushMatrix(); draw_square(x); --- 181,184 ---- *************** *** 202,206 **** if (m < 1) m = n;
! glutWireTorus(ri, ro, n, m);
} --- 210,214 ---- if (m < 1) m = n;
! // glutWireTorus(ri, ro, n, m);
} *************** *** 216,220 **** if (m < 1) m = n;
! glutSolidTorus(ri, ro, n, m);
} --- 224,228 ---- if (m < 1) m = n;
! // glutSolidTorus(ri, ro, n, m);
} *************** *** 230,234 **** if (m < 1) m = n;
! glutSolidCone(base, height, n, m);
} --- 238,242 ---- if (m < 1) m = n;
! // glutSolidCone(base, height, n, m);
} *************** *** 244,248 **** if (m < 1) m = n;
! glutWireCone(base, height, n, m);
} --- 252,256 ---- if (m < 1) m = n;
! // glutWireCone(base, height, n, m);
} *************** *** 251,255 **** { float f = x->x_p0; ! glutWireTeapot(f);
} --- 259,263 ---- { float f = x->x_p0; ! // glutWireTeapot(f);
} *************** *** 258,262 **** { float f = x->x_p0; ! glutSolidTeapot(f);
} --- 266,270 ---- { float f = x->x_p0; ! // glutSolidTeapot(f);
} *************** *** 271,275 **** if (m < 1) m = n;
! glutWireSphere(f, n, m);
} --- 279,283 ---- if (m < 1) m = n;
! // glutWireSphere(f, n, m);
} *************** *** 290,302 **** }
! static void draw_dodeca(t_drawcommand *x){glutSolidDodecahedron();} ! static void draw_octa(t_drawcommand *x) {glutSolidOctahedron();} ! static void draw_tetra(t_drawcommand *x) {glutSolidTetrahedron();} ! static void draw_icosa(t_drawcommand *x) {glutSolidIcosahedron();}
! static void draw_wdodeca(t_drawcommand *x){glutWireDodecahedron();} ! static void draw_wocta(t_drawcommand *x) {glutWireOctahedron();} ! static void draw_wtetra(t_drawcommand *x) {glutWireTetrahedron();} ! static void draw_wicosa(t_drawcommand *x) {glutWireIcosahedron();}
--- 298,310 ---- }
! static void draw_dodeca(t_drawcommand *x){ /* glutSolidDodecahedron(); */ } ! static void draw_octa(t_drawcommand *x) { /* glutSolidOctahedron(); */ } ! static void draw_tetra(t_drawcommand *x) { /* glutSolidTetrahedron(); */ } ! static void draw_icosa(t_drawcommand *x) { /* glutSolidIcosahedron(); */ }
! static void draw_wdodeca(t_drawcommand *x){ /* glutWireDodecahedron(); */ } ! static void draw_wocta(t_drawcommand *x) { /* glutWireOctahedron(); */ } ! static void draw_wtetra(t_drawcommand *x) { /* glutWireTetrahedron(); */ } ! static void draw_wicosa(t_drawcommand *x) { /* glutWireIcosahedron(); */ }