[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/librenderables/renderables.py gz...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] gzz ./TODO gfx/librenderables/renderables.py gz... |
|
Date: |
Wed, 27 Nov 2002 11:35:42 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 02/11/27 11:35:41
Modified files:
. : TODO
gfx/librenderables: renderables.py
gzz/gfx/gl : GLCache.java
gzz/modules/pp : ImageCell.java
gzz/modules/pp/vob: CursorVob.java TextCursorVob.java
gzz/view : BoxCellView.java DimDecorator.java
gzz/vob/vobs : FilledRectVob.java LineVob.java OvalBgVob.java
RectBgVob.java TestSpotVob.java
TextCursorVob.java
test/tools : gfx.py
Added files:
test/gzz/vob : bgvobs.test
Log message:
vobs to use box in GL side, removed extra unitSqCS's from code
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.422&tr2=1.423&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.155&tr2=1.156&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLCache.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ImageCell.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/CursorVob.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/TextCursorVob.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/BoxCellView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/FilledRectVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/LineVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/OvalBgVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/RectBgVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TestSpotVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextCursorVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/bgvobs.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.422 gzz/TODO:1.423
--- gzz/TODO:1.422 Wed Nov 27 04:51:41 2002
+++ gzz/TODO Wed Nov 27 11:35:40 2002
@@ -71,9 +71,6 @@
mudyc:
-fix documentation script
humppake:
- - fix vobs' GL drawing to use the box CS right and
- remove then extra vs.unitSqCS() calls from code
- - remember to make a test for this first :)
- TDecor drawing for GL?
+ try to doc/fix SimpleCalculator in AbstractUpdateManager:
tjl:
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.155
gzz/gfx/librenderables/renderables.py:1.156
--- gzz/gfx/librenderables/renderables.py:1.155 Tue Nov 26 15:18:14 2002
+++ gzz/gfx/librenderables/renderables.py Wed Nov 27 11:35:41 2002
@@ -151,6 +151,27 @@
{
"Type": "1",
+ "Name" : "CallListBoxCoorded",
+ "Data" : "int no;",
+ "Params" : "DisplayList list",
+ # XXX Should store DisplayList
+ "ParamCode" : """
+ this->no = list;
+ """,
+ "RenderCode" : """
+ DBG(dbg) << "CallListBoxCoorded "<<no<<"\\n";
+ glPushMatrix();
+ coords1.performGL();
+ ZPt boxwh = coords1.getSqSize();
+ glScalef(boxwh.x, boxwh.y, 1.0);
+ glCallList(no);
+ glPopMatrix();
+ GLERR
+ """,
+},
+
+{
+ "Type": "1",
"Name": "DrawPixels",
"Data" : "GLenum format, type; int w,h; GLubyte *bytes; ",
"Params" : "int w, int h, GLToken format, GLToken type, ByteVector bytes",
@@ -487,35 +508,6 @@
},
{
- "Type": "1",
- "Name": "Line",
- "Data": "float px1, py1, px2, py2, red, green, blue, alpha;",
- "Params": """float px1, float py1, float px2, float py2,
- float red, float green, float blue, float alpha""",
- "ParamCode": """ this->px1 = px1; this->py1 = py1;
- this->px2 = px2; this->py2 = py2;
- this->red = red; this->green = green;
- this->blue = blue; this->alpha = alpha;""",
- "RenderCode": """
- bool colored = true;
- if (red < 0 || green < 0 || blue < 0 || alpha < 0) colored = false;
- Pt box = coords1.getSqSize();
- ZPt p1 = coords1.transform(ZPt(box.x*px1,box.y*py1,0));
- ZPt p2 = coords1.transform(ZPt(box.x*px2,box.y*py2,0));
- if (colored) glPushAttrib(GL_COLOR_BUFFER_BIT);
- glPushAttrib(GL_ENABLE_BIT);
- glDisable(GL_TEXTURE_2D);
- if (colored) glColor4f(red, green, blue, alpha);
- glBegin(GL_LINE_STRIP);
- glVertex2f(p1.x, p1.y);
- glVertex2f(p2.x, p2.y);
- glEnd();
- if (colored) glPopAttrib();
- glPopAttrib();
- """
-},
-
-{
"Type": "2",
"Name": "SqFilletConnection",
"Data": "float width;int flags; float blendw; int power;",
@@ -2299,6 +2291,9 @@
}
public static gzz.vob.Vob createCallListCoorded(String s) {
return createCallListCoorded(createDisplayList(s));
+ }
+ public static gzz.vob.Vob createCallListBoxCoorded(String s) {
+ return createCallListBoxCoorded(createDisplayList(s));
}
Index: gzz/gzz/gfx/gl/GLCache.java
diff -u gzz/gzz/gfx/gl/GLCache.java:1.2 gzz/gzz/gfx/gl/GLCache.java:1.3
--- gzz/gzz/gfx/gl/GLCache.java:1.2 Tue Oct 1 10:06:36 2002
+++ gzz/gzz/gfx/gl/GLCache.java Wed Nov 27 11:35:41 2002
@@ -46,4 +46,13 @@
}
return ret;
}
+ static HashMap callListBoxCoordedCache = new HashMap();
+ public static Vob getCallListBoxCoorded(String s) {
+ Vob ret = (Vob)callListBoxCoordedCache.get(s);
+ if(ret == null) {
+ ret = GLRen.createCallListBoxCoorded(s);
+ callListBoxCoordedCache.put(s, ret);
+ }
+ return ret;
+ }
}
Index: gzz/gzz/modules/pp/ImageCell.java
diff -u gzz/gzz/modules/pp/ImageCell.java:1.3
gzz/gzz/modules/pp/ImageCell.java:1.4
--- gzz/gzz/modules/pp/ImageCell.java:1.3 Sat Nov 23 08:44:20 2002
+++ gzz/gzz/modules/pp/ImageCell.java Wed Nov 27 11:35:41 2002
@@ -54,7 +54,7 @@
double y0 = im.t.getTexCoord(1, 0);
double y1 = im.t.getTexCoord(1, 1);
- im.v = GLCache.getCallListCoorded(
+ im.v = GLCache.getCallListBoxCoorded(
"PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT\n"+
"Enable TEXTURE_2D\n"+
"BindTexture TEXTURE_2D "+im.t.getTexId()+"\n"+
@@ -86,8 +86,7 @@
}
// Now, place the image.
- int usq = vs.unitSqCS(box, "IMGC_USQ");
- vs.map.put(r.v, usq);
+ vs.map.put(r.v, box);
}
Index: gzz/gzz/modules/pp/vob/CursorVob.java
diff -u gzz/gzz/modules/pp/vob/CursorVob.java:1.7
gzz/gzz/modules/pp/vob/CursorVob.java:1.8
--- gzz/gzz/modules/pp/vob/CursorVob.java:1.7 Mon Sep 23 04:24:26 2002
+++ gzz/gzz/modules/pp/vob/CursorVob.java Wed Nov 27 11:35:41 2002
@@ -29,7 +29,7 @@
public class CursorVob extends gzz.vob.Vob {
-public static final String rcsid = "$Id: CursorVob.java,v 1.7 2002/09/23
08:24:26 tjl Exp $";
+public static final String rcsid = "$Id: CursorVob.java,v 1.8 2002/11/27
16:35:41 humppake Exp $";
static Point p1 = new Point();
@@ -65,7 +65,7 @@
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
- crosshair = GLRen.createCallListCoorded(
+ crosshair = GLRen.createCallListBoxCoorded(
"Begin LINES\nVertex -1 -1\nVertex 1 1\nVertex 1 -1\nVertex
-1 1\nEnd"
);
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
Index: gzz/gzz/modules/pp/vob/TextCursorVob.java
diff -u gzz/gzz/modules/pp/vob/TextCursorVob.java:1.6
gzz/gzz/modules/pp/vob/TextCursorVob.java:1.7
--- gzz/gzz/modules/pp/vob/TextCursorVob.java:1.6 Mon Nov 25 11:03:38 2002
+++ gzz/gzz/modules/pp/vob/TextCursorVob.java Wed Nov 27 11:35:41 2002
@@ -29,7 +29,7 @@
/** A vertical line for now */
public class TextCursorVob extends gzz.vob.Vob {
-public static final String rcsid = "$Id: TextCursorVob.java,v 1.6 2002/11/25
16:03:38 humppake Exp $";
+public static final String rcsid = "$Id: TextCursorVob.java,v 1.7 2002/11/27
16:35:41 humppake Exp $";
static Point p1 = new Point();
static Point p2 = new Point();
@@ -53,11 +53,8 @@
int coordsys2) {
if (crosshair == null) {
- crosshair = GLRen.createLine(0, -1, 0, 1, -1, -1, -1, -1);
- /*
- crosshair = GLRen.createCallListCoorded(
+ crosshair = GLRen.createCallListBoxCoorded(
"Begin LINE_STRIP\nVertex 0 1\nVertex 0 -1\nEnd\n");
- */
}
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
Index: gzz/gzz/view/BoxCellView.java
diff -u gzz/gzz/view/BoxCellView.java:1.3 gzz/gzz/view/BoxCellView.java:1.4
--- gzz/gzz/view/BoxCellView.java:1.3 Sat Nov 23 08:44:20 2002
+++ gzz/gzz/view/BoxCellView.java Wed Nov 27 11:35:41 2002
@@ -45,7 +45,7 @@
*/
public class BoxCellView extends CellView {
-public static final String rcsid = "$Id: BoxCellView.java,v 1.3 2002/11/23
13:44:20 benja Exp $";
+public static final String rcsid = "$Id: BoxCellView.java,v 1.4 2002/11/27
16:35:41 humppake Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
@@ -106,7 +106,6 @@
vs.coords.getSqSize(box, boxwh);
final int contentBox = vs.orthoBoxCS(box, "CONTENT", 0, pad, pad, 1, 1,
boxwh[0]-2*pad, boxwh[1]-2*pad);
- final int unitsq = vs.unitSqCS(box, "UNIT");
GraphicsAPI api = GraphicsAPI.getInstance();
if(api instanceof gzz.client.awt.AWTAPI) {
@@ -133,13 +132,13 @@
g.setClip(clipshape[0]);
}
}, unclip_cs);
- vs.map.put(bg, unitsq);
+ vs.map.put(bg, box);
} else if(api instanceof gzz.client.gl.GLAPI) {
- vs.map.put(bg, unitsq);
+ vs.map.put(bg, box);
gzz.gfx.gl.Stencil.drawStenciled(
vs,
new Runnable() { public void run() {
- vs.map.put(bg, unitsq);
+ vs.map.put(bg, box);
}},
null,
null,
Index: gzz/gzz/view/DimDecorator.java
diff -u gzz/gzz/view/DimDecorator.java:1.20 gzz/gzz/view/DimDecorator.java:1.21
--- gzz/gzz/view/DimDecorator.java:1.20 Mon Nov 25 11:03:38 2002
+++ gzz/gzz/view/DimDecorator.java Wed Nov 27 11:35:41 2002
@@ -34,7 +34,7 @@
* vob scene.
*/
public class DimDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: DimDecorator.java,v 1.20 2002/11/25 16:03:38 humppake Exp
$";
+String rcsid = "$Id: DimDecorator.java,v 1.21 2002/11/27 16:35:41 humppake Exp
$";
public static boolean dbg = true;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
@@ -48,7 +48,6 @@
static Object origKey = new Object(), viewKey = new Object();
static Object boxKey = new Object(), whKey = new Object();
static Object[] dimKeys = { new Object(), new Object(), new Object() };
- static Object[] dimRectKeys = { new Object(), new Object(), new Object() };
/** The spacing between the boxes with the different dimensions.
*/
@@ -77,16 +76,12 @@
sc.orthoBoxCS(into, dimKeys[1], 0, 0, h+space, 1, 1, w, h),
sc.orthoBoxCS(into, dimKeys[2], 0, w+space, h+space, 1, 1, w, h)
};
- int targ_unitSq[] = new int[3];
for(int i=0; i<3; i++) {
int cs = sc.orthoCS(targ[i], dimKeys[i], 0, 5, 5, h-10, h-10);
- /* XXX Because we cannot give depth for UnisSqCS, and AWT crashes
- with depth for TextVobCS, we should create background CS last. */
- targ_unitSq[i] = sc.unitSqCS(targ[i], dimRectKeys[0]);
sc.map.put(conn, targ[i], orig);
- sc.map.put(bg, targ_unitSq[i]);
+ sc.map.put(bg, targ[i]);
sc.map.put(new TextVob(style, dims[i].name), cs);
}
Index: gzz/gzz/vob/vobs/FilledRectVob.java
diff -u gzz/gzz/vob/vobs/FilledRectVob.java:1.2
gzz/gzz/vob/vobs/FilledRectVob.java:1.3
--- gzz/gzz/vob/vobs/FilledRectVob.java:1.2 Mon Nov 25 11:03:40 2002
+++ gzz/gzz/vob/vobs/FilledRectVob.java Wed Nov 27 11:35:41 2002
@@ -39,7 +39,7 @@
*/
public class FilledRectVob extends Vob {
-public static final String rcsid = "$Id: FilledRectVob.java,v 1.2 2002/11/25
16:03:40 humppake Exp $";
+public static final String rcsid = "$Id: FilledRectVob.java,v 1.3 2002/11/27
16:35:41 humppake Exp $";
public static boolean dbg = false;
static final void pa(String s) { System.out.println(s); }
@@ -73,10 +73,13 @@
public int addToListGL(GraphicsAPI.Window win,
int[] list, int curs, int coordsys1,
int coordsys2) {
+ float [] boxwh = new float[2];
+
+
if(dbg) pa("Addtolistgl rectbg "+coordsys1);
if(glList == null) {
- glList = GLRen.createCallListCoorded(
+ glList = GLRen.createCallListBoxCoorded(
"PushAttrib COLOR_BUFFER_BIT ENABLE_BIT\n"+
"Disable TEXTURE_2D\n"+
"Color "+ColorUtil.colorGLString(bg)+" 1\n" +
Index: gzz/gzz/vob/vobs/LineVob.java
diff -u gzz/gzz/vob/vobs/LineVob.java:1.4 gzz/gzz/vob/vobs/LineVob.java:1.5
--- gzz/gzz/vob/vobs/LineVob.java:1.4 Mon Nov 25 11:03:40 2002
+++ gzz/gzz/vob/vobs/LineVob.java Wed Nov 27 11:35:41 2002
@@ -35,7 +35,7 @@
*/
public class LineVob extends Vob {
-public static final String rcsid = "$Id: LineVob.java,v 1.4 2002/11/25
16:03:40 humppake Exp $";
+public static final String rcsid = "$Id: LineVob.java,v 1.5 2002/11/27
16:35:41 humppake Exp $";
int x0, y0, x1, y1;
Color color;
@@ -73,20 +73,11 @@
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dlist == null)
- if(color != null)
- dlist = GLRen.createLine(x0, y0, x1, y1,
- color.getRed()/255f,
- color.getGreen()/255f,
- color.getBlue()/255f, 1);
- else
- dlist = GLRen.createLine(x0, y0, x1, y1, -1, -1, -1, -1);
-
- /*
- dlist = GLCache.getCallListCoorded(
- "PushAttrib CURRENT_BIT\nColor "+ColorUtil.colorGLString(color)+"\n"+
- "Begin LINE_STRIP\nVertex "+x0+" "+y0+
- "\nVertex "+x1+" "+y1+"\nEnd\nPopAttrib\n");
- */
+ dlist = GLCache.getCallListBoxCoorded(
+ "PushAttrib CURRENT_BIT ENABLE_BIT\nColor
"+ColorUtil.colorGLString(color)+"\n"+
+ "Disable TEXTURE_2D\nBegin LINE_STRIP\nVertex "+x0+" "+y0+
+ "\nVertex "+x1+" "+y1+"\nEnd\nPopAttrib\n");
+
curs = dlist.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
}
Index: gzz/gzz/vob/vobs/OvalBgVob.java
diff -u gzz/gzz/vob/vobs/OvalBgVob.java:1.3 gzz/gzz/vob/vobs/OvalBgVob.java:1.4
--- gzz/gzz/vob/vobs/OvalBgVob.java:1.3 Mon Nov 18 10:40:49 2002
+++ gzz/gzz/vob/vobs/OvalBgVob.java Wed Nov 27 11:35:41 2002
@@ -41,7 +41,7 @@
*/
public class OvalBgVob extends Vob {
-public static final String rcsid = "$Id: OvalBgVob.java,v 1.3 2002/11/18
15:40:49 humppake Exp $";
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.4 2002/11/27
16:35:41 humppake Exp $";
public static boolean dbg = false;
static final void p(String s) { if(dbg) System.out.println(s); }
static final void pa(String s) { System.out.println(s); }
@@ -147,7 +147,7 @@
"End\n");
}
- glList = GLRen.createCallListCoorded(
+ glList = GLRen.createCallListBoxCoorded(
"PushAttrib CURRENT_BIT ENABLE_BIT\n"+
"BindTexture TEXTURE_2D "+tex.getTexId()+"\n"+
"TexParameter TEXTURE_2D TEXTURE_MIN_FILTER
LINEAR_MIPMAP_LINEAR\n"+
Index: gzz/gzz/vob/vobs/RectBgVob.java
diff -u gzz/gzz/vob/vobs/RectBgVob.java:1.3 gzz/gzz/vob/vobs/RectBgVob.java:1.4
--- gzz/gzz/vob/vobs/RectBgVob.java:1.3 Mon Nov 25 11:03:40 2002
+++ gzz/gzz/vob/vobs/RectBgVob.java Wed Nov 27 11:35:41 2002
@@ -40,7 +40,7 @@
*/
public class RectBgVob extends Vob {
-public static final String rcsid = "$Id: RectBgVob.java,v 1.3 2002/11/25
16:03:40 humppake Exp $";
+public static final String rcsid = "$Id: RectBgVob.java,v 1.4 2002/11/27
16:35:41 humppake Exp $";
public static boolean dbg = false;
static final void pa(String s) { System.out.println(s); }
@@ -125,7 +125,7 @@
"End\n");
}
- glList = GLRen.createCallListCoorded(
+ glList = GLRen.createCallListBoxCoorded(
"PushAttrib COLOR_BUFFER_BIT ENABLE_BIT\n"+
"Disable TEXTURE_2D\n"+
Index: gzz/gzz/vob/vobs/TestSpotVob.java
diff -u gzz/gzz/vob/vobs/TestSpotVob.java:1.1
gzz/gzz/vob/vobs/TestSpotVob.java:1.2
--- gzz/gzz/vob/vobs/TestSpotVob.java:1.1 Fri Nov 1 20:23:46 2002
+++ gzz/gzz/vob/vobs/TestSpotVob.java Wed Nov 27 11:35:41 2002
@@ -34,7 +34,7 @@
* This is most likely not useful for anything else.
*/
public class TestSpotVob extends Vob {
-public static final String rcsid = "$Id: TestSpotVob.java,v 1.1 2002/11/02
01:23:46 benja Exp $";
+public static final String rcsid = "$Id: TestSpotVob.java,v 1.2 2002/11/27
16:35:41 humppake Exp $";
float x, y, z;
@@ -54,11 +54,16 @@
boolean fast,
Vob.RenderInfo info1,
Vob.RenderInfo info2) {
+ /* XXX: This don't seem to work with box CS.
+ If we want to draw a TestSpot into (1,1,1) in some
+ CS, we probably don't mean the "bottom right"
+ corner of the box. */
Point i = new Point();
info1.xform(x, y, i);
g.setColor(color);
g.fillRect(i.x-1, i.y-1, 3, 3);
}
+
public int addToListGL(gzz.client.GraphicsAPI.Window win,
int[] list, int curs, int coordsys1,
int coordsys2) {
Index: gzz/gzz/vob/vobs/TextCursorVob.java
diff -u gzz/gzz/vob/vobs/TextCursorVob.java:1.3
gzz/gzz/vob/vobs/TextCursorVob.java:1.4
--- gzz/gzz/vob/vobs/TextCursorVob.java:1.3 Fri Nov 22 19:35:21 2002
+++ gzz/gzz/vob/vobs/TextCursorVob.java Wed Nov 27 11:35:41 2002
@@ -39,7 +39,7 @@
*/
public class TextCursorVob extends Vob {
-String rcsid = "$Id: TextCursorVob.java,v 1.3 2002/11/23 00:35:21 benja Exp $";
+String rcsid = "$Id: TextCursorVob.java,v 1.4 2002/11/27 16:35:41 humppake Exp
$";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
@@ -87,7 +87,7 @@
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dlist == null)
- dlist = GLCache.getCallListCoorded(
+ dlist = GLCache.getCallListBoxCoorded(
"Begin LINE_STRIP\nVertex 0 -.1\nVertex 0 1.1\nEnd\n");
curs = dlist.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
Index: gzz/test/tools/gfx.py
diff -u gzz/test/tools/gfx.py:1.11 gzz/test/tools/gfx.py:1.12
--- gzz/test/tools/gfx.py:1.11 Mon Nov 11 07:01:32 2002
+++ gzz/test/tools/gfx.py Wed Nov 27 11:35:41 2002
@@ -62,7 +62,7 @@
dst = vs.coords.transformPoints3(cs, src, None)
failUnless(dst == None)
-def checkTrans(vs, cs, srclist, dstlist, delta=0, alsoGL = 1):
+def checkTrans(vs, cs, srclist, dstlist, delta=0, alsoRender = 1):
"""Check that a transformation works a certain way.
"""
src = array(srclist, 'f')
@@ -71,7 +71,7 @@
for i in range(0, len(src)):
if abs(dst[i]-dstlist[i]) > delta:
raise str([srclist, dstlist, dst, i, dst[i], dstlist[i]])
- if alsoGL:
+ if alsoRender:
for i in range(0, len(src), 3):
vs.map.clear()
vs.map.put(SolidBgVob(Color.red))
- [Gzz-commits] gzz ./TODO gfx/librenderables/renderables.py gz...,
Asko Soukka <=