From ddec65e50f1b0d744c9abc3ae8bcf42c3e251647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20=27Ax=27=20H=C5=AFla?= Date: Wed, 25 Jan 2012 13:44:07 +0100 Subject: [PATCH] Colors! --- gcview.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gcview.py b/gcview.py index 373a46c..51a11a2 100644 --- a/gcview.py +++ b/gcview.py @@ -283,9 +283,9 @@ class gcline(object): ] def glcolor(self): if self.extrusion_ratio == 0: - return [10,10,10,0,10,10,10,0] + return [255,255,255,128,128,128] else: - return[255,128,128,120,255,128,128,120] + return[255,128,128,128,0,0] def float_from_line(axe, line): @@ -317,8 +317,7 @@ class gcview(object): layer_name = line.z if line.z not in self.layers: self.layers[line.z] = pyglet.graphics.Batch() - self.layers[line.z].add(2, GL_LINES, None, ("c4B", line.glcolor())) - self.layers[line.z].add(2, GL_LINES, None, ("v3f", line.glline())) + self.layers[line.z].add(2, GL_LINES, None, ("v3f", line.glline()), ("c3B", line.glcolor())) self.layerlist = self.layers.keys() self.layerlist.sort() t2 = time.time() @@ -800,11 +799,16 @@ class TestGlPanel(GLPanel): glTranslatef(*(i.offsets)) glRotatef(i.rot, 0.0, 0.0, 1.0) glScalef(*i.scale) - #glEnable(GL_COLOR_MATERIAL) - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(0.93, 0.37, 0.25, 1)) + #glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(0.93, 0.37, 0.25, 1)) + glEnable(GL_COLOR_MATERIAL) + glLineWidth (0.5) [i.gc.layers[j].draw() for j in i.gc.layerlist if j < i.curlayer] - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(0.5, 0.6, 0.9, 1)) + + glLineWidth (3.5) i.gc.layers[i.curlayer].draw() + glLineWidth (1.5) + + glDisable(GL_COLOR_MATERIAL) glPopMatrix() glPopMatrix()