Browse Source

line issues

David Rose 17 years ago
parent
commit
b68cd0b513

+ 3 - 1
panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx

@@ -1107,7 +1107,7 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader,
       gl_transform_to_viewport(_c, v);
       gl_transform_to_viewport(_c, v);
     }
     }
 
 
-    v->edge_flag = 0;
+    v->edge_flag = 1;
   }
   }
 
 
   // Set up the appropriate function callback for filling triangles,
   // Set up the appropriate function callback for filling triangles,
@@ -1159,8 +1159,10 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader,
   }
   }
 
 
   int depth_test_state = 1;
   int depth_test_state = 1;
+  _c->depth_test = 1;  // set this for ZB_line
   if (_target._depth_test->get_mode() == DepthTestAttrib::M_none) {
   if (_target._depth_test->get_mode() == DepthTestAttrib::M_none) {
     depth_test_state = 0;
     depth_test_state = 0;
+    _c->depth_test = 0;
   }
   }
   
   
   ShadeModelAttrib::Mode shade_model = _target._shade_model->get_mode();
   ShadeModelAttrib::Mode shade_model = _target._shade_model->get_mode();

+ 1 - 0
panda/src/tinydisplay/zline.c

@@ -1,4 +1,5 @@
 #include <stdlib.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "zbuffer.h"
 #include "zbuffer.h"
 
 
 #define ZCMP(z,zpix) ((z) >= (zpix))
 #define ZCMP(z,zpix) ((z) >= (zpix))