--- libgender/entity.h	2004/10/03 02:38:33	1.5
+++ libgender/entity.h	2004/10/03 03:17:09	1.6
@@ -76,24 +76,28 @@
 };
 
 struct vertex2d {
-  colour c; // colour
-  point  p; // vertex
-  vec3   n; // normal
-  texc   t; // texture
+  point p; // vertex
+  vec3  n; // normal
+  texc  t; // texture
 
   vertex2d () { };
-  vertex2d (colour c, point p, vec3 n, texc t = texc()) : c(c), p(p), n(n), t(t) { };
+  vertex2d (point p, vec3 n, texc t = texc()) : p(p), n(n), t(t) { };
+};
+
+struct entity_opengl : entity_base {
 };
 
 template<GLenum type>
-struct entity_opengl1d : entity_base, vector<vertex1d> {
+struct entity_opengl1d : entity_opengl, vector<vertex1d> {
   void update_bbox ();
   void show (const sector &sec);
   void draw (const draw_context &ctx);
 };
 
 template<GLenum type>
-struct entity_opengl2d : entity_base, vector<vertex2d> {
+struct entity_opengl2d : entity_opengl, vector<vertex2d> {
+  material m;
+
   void update_bbox ();
   void show (const sector &sec);
   void draw (const draw_context &ctx);