… | |
… | |
72 | |
72 | |
73 | update (); |
73 | update (); |
74 | |
74 | |
75 | glNewList (list, GL_COMPILE); |
75 | glNewList (list, GL_COMPILE); |
76 | |
76 | |
77 | m->enable (); |
|
|
78 | |
|
|
79 | #if 0 |
77 | #if 0 |
80 | glBegin (type); |
78 | glBegin (type); |
81 | |
79 | |
82 | for (vector<vertex_t2f_n3f_v3f>::const_iterator i = v.begin (); i < v.end (); ++i) |
80 | for (vector<vertex_t2f_n3f_v3f>::const_iterator i = v.begin (); i < v.end (); ++i) |
83 | { |
81 | { |
… | |
… | |
100 | glDisableClientState (GL_VERTEX_ARRAY); |
98 | glDisableClientState (GL_VERTEX_ARRAY); |
101 | glDisableClientState (GL_NORMAL_ARRAY); |
99 | glDisableClientState (GL_NORMAL_ARRAY); |
102 | glDisableClientState (GL_TEXTURE_COORD_ARRAY); |
100 | glDisableClientState (GL_TEXTURE_COORD_ARRAY); |
103 | #endif |
101 | #endif |
104 | |
102 | |
105 | m->disable (); |
|
|
106 | |
|
|
107 | glEndList (); |
103 | glEndList (); |
108 | } |
104 | } |
109 | |
105 | |
110 | template<GLenum type> |
106 | template<GLenum type> |
111 | void geometry_opengl2d<type>::draw (view &ctx) |
107 | void geometry_opengl2d<type>::draw (view &ctx) |
112 | { |
108 | { |
|
|
109 | m->enable (ctx); |
113 | glCallList (list); |
110 | glCallList (list); |
|
|
111 | m->disable (ctx); |
114 | } |
112 | } |
115 | |
113 | |
116 | void geometry_sphere::update () |
114 | void geometry_sphere::update () |
117 | { |
115 | { |
118 | bbox.reset (); |
116 | bbox.reset (); |