[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/libpaper/papermill.py gfx/util/misc.py ...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] gzz gfx/libpaper/papermill.py gfx/util/misc.py ... |
|
Date: |
Mon, 10 Mar 2003 08:25:36 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 03/03/10 08:25:35
Modified files:
gfx/libpaper : papermill.py
gfx/util : misc.py
gzz/client : Fallback.java
gzz/modules/pp : Win.java
gzz/view : BoxCellView.java LollipopCellView.java
xubuoy.py
gzz/vob/impl : OrthoCoorder.java
lava/gzz/loom : Loom.java
test/gzz/gfx/gl: basicrender.test glvobcoorder.test irregu.test
nadir.test pagespanpaper.test paper.test
test/gzz/view : boxcellview.test coordinateplane.test
pagespancellview.test
test/gzz/vob : bgvobs.test textvob.test
test/gzz/vob/vobs: linevob.test
test/tools : gfx.py
Added files:
gzz/vob/vobs : SolidBackdropVob.java
Removed files:
gzz/vob/vobs : SolidBgVob.java
Log message:
SolidBgVob -> SolidBackdropVob
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/misc.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/BoxCellView.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LollipopCellView.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoorder.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/SolidBackdropVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Loom.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/basicrender.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/irregu.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/nadir.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/pagespanpaper.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/paper.test.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/boxcellview.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/coordinateplane.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/pagespancellview.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/bgvobs.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/textvob.test.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/vobs/linevob.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -u gzz/gfx/libpaper/papermill.py:1.77 gzz/gfx/libpaper/papermill.py:1.78
--- gzz/gfx/libpaper/papermill.py:1.77 Mon Mar 3 09:09:54 2003
+++ gzz/gfx/libpaper/papermill.py Mon Mar 10 08:25:31 2003
@@ -28,7 +28,7 @@
from gfx.libpaper.colors import Colors
from gfx.libpaper.texcoords import TexGenXYRepeatUnit
from gfx.libpaper.params import *
-from gzz.vob.vobs import SolidBgVob
+from gzz.vob.vobs import SolidBackdropVob
import gfx.libutil.texture
import gfx.libpaper.texcomb_NV1X
@@ -179,7 +179,7 @@
s = 256
vs = w.createVobScene()
- vs.map.put(SolidBgVob(java.awt.Color.red))
+ vs.map.put(SolidBackdropVob(java.awt.Color.red))
cs1 = vs.coords.ortho(0, 0, 0, 0, s+1, s+1)
cs2 = vs.coords.affineCoordsys(
Index: gzz/gfx/util/misc.py
diff -u gzz/gfx/util/misc.py:1.9 gzz/gfx/util/misc.py:1.10
--- gzz/gfx/util/misc.py:1.9 Fri Feb 21 15:02:36 2003
+++ gzz/gfx/util/misc.py Mon Mar 10 08:25:32 2003
@@ -23,12 +23,12 @@
from gzz.gfx.gl import GL, GLRen, GLSpans, Paper, GLCache
from gzz.vob.impl.gl import GLTextStyle
-from gzz.vob.vobs import TextVob, SolidBgVob
+from gzz.vob.vobs import TextVob, SolidBackdropVob
import gzz
import java
def background(rgb):
- return SolidBgVob(java.awt.Color(float(rgb[0]), float(rgb[1]),
float(rgb[2])))
+ return SolidBackdropVob(java.awt.Color(float(rgb[0]), float(rgb[1]),
float(rgb[2])))
def texbindcode(texid):
if texid:
Index: gzz/gzz/client/Fallback.java
diff -u gzz/gzz/client/Fallback.java:1.57 gzz/gzz/client/Fallback.java:1.58
--- gzz/gzz/client/Fallback.java:1.57 Wed Mar 5 05:34:28 2003
+++ gzz/gzz/client/Fallback.java Mon Mar 10 08:25:32 2003
@@ -79,7 +79,7 @@
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
-public static final String rcsid = "$Id: Fallback.java,v 1.57 2003/03/05
10:34:28 humppake Exp $";
+public static final String rcsid = "$Id: Fallback.java,v 1.58 2003/03/10
13:25:32 humppake Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -266,7 +266,7 @@
if(cached) return cachedVobScene;
VobScene sc = this.screen.window.createVobScene();
- sc.map.put(new SolidBgVob(bg));
+ sc.map.put(new SolidBackdropVob(bg));
for(int i=0; i<decorators.length; i++) {
if(dbg) pa("Call scene decorator: "+decorators[i]);
Index: gzz/gzz/modules/pp/Win.java
diff -u gzz/gzz/modules/pp/Win.java:1.58 gzz/gzz/modules/pp/Win.java:1.59
--- gzz/gzz/modules/pp/Win.java:1.58 Fri Feb 21 15:02:43 2003
+++ gzz/gzz/modules/pp/Win.java Mon Mar 10 08:25:32 2003
@@ -42,7 +42,7 @@
*/
public class Win extends AbstractBinder implements Shower {
-public static final String rcsid = "$Id: Win.java,v 1.58 2003/02/21 20:02:43
tjl Exp $";
+public static final String rcsid = "$Id: Win.java,v 1.59 2003/03/10 13:25:32
humppake Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
@@ -161,7 +161,7 @@
// See UnifiedShower.generate for margins
VobScene sc = this.screen.window.createVobScene();
if(bg == null)
- bg = new SolidBgVob(new Color(0.4f,0.4f,0.8f));
+ bg = new SolidBackdropVob(new Color(0.4f,0.4f,0.8f));
sc.map.put(bg, 0);
if(view != null)
Index: gzz/gzz/view/BoxCellView.java
diff -u gzz/gzz/view/BoxCellView.java:1.7 gzz/gzz/view/BoxCellView.java:1.8
--- gzz/gzz/view/BoxCellView.java:1.7 Fri Feb 21 15:02:44 2003
+++ gzz/gzz/view/BoxCellView.java Mon Mar 10 08:25:33 2003
@@ -41,7 +41,7 @@
/** A cell view showing a box around a cell.
*/
public class BoxCellView extends CellView {
-public static final String rcsid = "$Id: BoxCellView.java,v 1.7 2003/02/21
20:02:44 tjl Exp $";
+public static final String rcsid = "$Id: BoxCellView.java,v 1.8 2003/03/10
13:25:33 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); }
@@ -89,6 +89,7 @@
throw new NullPointerException("clone dim not set in BoxCellView");
final RectBgVob bg = new RectBgVob();
+ //final OvalBgVob bg = new OvalBgVob();
List cursorColors = context.getCursorColors(c);
if(cursorColors != null)
@@ -140,7 +141,7 @@
gzz.gfx.gl.Stencil.drawStenciled(
vs,
new Runnable() { public void run() {
- vs.map.put(bg, box);
+ vs.map.put(new RectBgVob(), box);
}},
null,
null,
Index: gzz/gzz/view/LollipopCellView.java
diff -u gzz/gzz/view/LollipopCellView.java:1.11
gzz/gzz/view/LollipopCellView.java:1.12
--- gzz/gzz/view/LollipopCellView.java:1.11 Mon Mar 3 08:14:38 2003
+++ gzz/gzz/view/LollipopCellView.java Mon Mar 10 08:25:33 2003
@@ -45,7 +45,7 @@
/** A factory for making ball-and-stick aka lollipop cell vobs. */
public class LollipopCellView extends BoxCellView {
-public static final String rcsid = "$Id: LollipopCellView.java,v 1.11
2003/03/03 13:14:38 humppake Exp $";
+public static final String rcsid = "$Id: LollipopCellView.java,v 1.12
2003/03/10 13:25:33 humppake Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -71,7 +71,8 @@
throw new NullPointerException("clone dim not set in
LollipopCellView");
/** Uses ColoredSectorVob as the ball. */
- final ColoredSectorVob bg = new ColoredSectorVob();
+ // final ColoredSectorVob bg = new ColoredSectorVob();
+ final ColoredSquareSectorVob bg = new ColoredSquareSectorVob();
final RectBgVob stencil = new RectBgVob();
List cursorColors = context.getCursorColors(c);
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.50 gzz/gzz/view/xubuoy.py:1.51
--- gzz/gzz/view/xubuoy.py:1.50 Fri Feb 21 15:02:45 2003
+++ gzz/gzz/view/xubuoy.py Mon Mar 10 08:25:33 2003
@@ -103,7 +103,7 @@
def background(rgb):
- return gzz.vob.vobs.SolidBgVob(java.awt.Color(float(rgb[0]),
float(rgb[1]), float(rgb[2])))
+ return gzz.vob.vobs.SolidBackdropVob(java.awt.Color(float(rgb[0]),
float(rgb[1]), float(rgb[2])))
showFPS = 0
Index: gzz/gzz/vob/impl/OrthoCoorder.java
diff -u gzz/gzz/vob/impl/OrthoCoorder.java:1.6
gzz/gzz/vob/impl/OrthoCoorder.java:1.7
--- gzz/gzz/vob/impl/OrthoCoorder.java:1.6 Sat Mar 8 19:06:39 2003
+++ gzz/gzz/vob/impl/OrthoCoorder.java Mon Mar 10 08:25:33 2003
@@ -34,7 +34,7 @@
*/
public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.6 2003/03/09
00:06:39 benja Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.7 2003/03/10
13:25:33 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); }
@@ -184,8 +184,8 @@
if(dbg) map.dump();
Color bg;
Vob bgvob = map.getVobByCS(0);
- if(bgvob instanceof gzz.vob.vobs.SolidBgVob) {
- bg = ((gzz.vob.vobs.SolidBgVob)bgvob).color;
+ if(bgvob instanceof gzz.vob.vobs.SolidBackdropVob) {
+ bg = ((gzz.vob.vobs.SolidBackdropVob)bgvob).color;
if(dbg) pa("Background color: "+bg);
} else {
bg = Color.white;
Index: gzz/lava/gzz/loom/Loom.java
diff -u gzz/lava/gzz/loom/Loom.java:1.14 gzz/lava/gzz/loom/Loom.java:1.15
--- gzz/lava/gzz/loom/Loom.java:1.14 Thu Feb 27 14:07:12 2003
+++ gzz/lava/gzz/loom/Loom.java Mon Mar 10 08:25:35 2003
@@ -113,7 +113,7 @@
}
public VobScene generate() {
VobScene sc = this.screen.window.createVobScene();
- sc.map.put(new SolidBgVob(java.awt.Color.white), 0);
+ sc.map.put(new SolidBackdropVob(java.awt.Color.white), 0);
View view;
try {
view = (View) viewclasses[viewcur]
Index: gzz/test/gzz/gfx/gl/basicrender.test
diff -u gzz/test/gzz/gfx/gl/basicrender.test:1.9
gzz/test/gzz/gfx/gl/basicrender.test:1.10
--- gzz/test/gzz/gfx/gl/basicrender.test:1.9 Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/basicrender.test Mon Mar 10 08:25:35 2003
@@ -31,7 +31,7 @@
def testBgTriangle():
vs = getvs()
- vs.map.put(SolidBgVob(Color.red))
+ vs.map.put(SolidBackdropVob(Color.red))
vs.map.put(GLCache.getCallList("""
Color 0 1 0
Disable TEXTURE_2D
@@ -47,7 +47,7 @@
def testOvalBgVob():
vs = getvs()
- vs.map.put(SolidBgVob(Color.red))
+ vs.map.put(SolidBackdropVob(Color.red))
cs1 = vs.coords.affineCoordsys(0, 0, 100, 100, 100, 0, 0, 100)
vs.matcher.add(cs1, "cs")
vs.map.put(OvalBgVob(), cs1)
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -u gzz/test/gzz/gfx/gl/glvobcoorder.test:1.38
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.39
--- gzz/test/gzz/gfx/gl/glvobcoorder.test:1.38 Tue Mar 4 05:26:24 2003
+++ gzz/test/gzz/gfx/gl/glvobcoorder.test Mon Mar 10 08:25:35 2003
@@ -265,7 +265,7 @@
def putThings():
vs.map.clear()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
vs.map.put(renderable, cs_cull, 0)
render(vs)
Index: gzz/test/gzz/gfx/gl/irregu.test
diff -u gzz/test/gzz/gfx/gl/irregu.test:1.5 gzz/test/gzz/gfx/gl/irregu.test:1.6
--- gzz/test/gzz/gfx/gl/irregu.test:1.5 Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/irregu.test Mon Mar 10 08:25:35 2003
@@ -45,7 +45,7 @@
irr.getContent()
vs = getvs()
- vs.map.put(gzz.vob.vobs.SolidBgVob(java.awt.Color.blue))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(java.awt.Color.blue))
def dr(renderable):
return R(lambda: vs.map.put(renderable, cs1, cs2))
Index: gzz/test/gzz/gfx/gl/nadir.test
diff -u gzz/test/gzz/gfx/gl/nadir.test:1.4 gzz/test/gzz/gfx/gl/nadir.test:1.5
--- gzz/test/gzz/gfx/gl/nadir.test:1.4 Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/nadir.test Mon Mar 10 08:25:35 2003
@@ -34,7 +34,7 @@
def testSimply():
vs = getvs()
- vs.map.put(SolidBgVob(Color.red))
+ vs.map.put(SolidBackdropVob(Color.red))
tr = vs.coords.translate(0, 100, 100)
nad = vs.coords.translate(0, 100, 300)
Index: gzz/test/gzz/gfx/gl/pagespanpaper.test
diff -u gzz/test/gzz/gfx/gl/pagespanpaper.test:1.11
gzz/test/gzz/gfx/gl/pagespanpaper.test:1.12
--- gzz/test/gzz/gfx/gl/pagespanpaper.test:1.11 Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/pagespanpaper.test Mon Mar 10 08:25:35 2003
@@ -86,7 +86,7 @@
pap = p.getPaper(not blank)
vs = getvs()
- vs.map.put(SolidBgVob(Color.yellow))
+ vs.map.put(SolidBackdropVob(Color.yellow))
pcs = vs.orthoCS(0, "A", 0, 50, 50, 400.0 / p.w, 400.0 / p.h)
vs.map.put(
Index: gzz/test/gzz/gfx/gl/paper.test
diff -u gzz/test/gzz/gfx/gl/paper.test:1.15 gzz/test/gzz/gfx/gl/paper.test:1.16
--- gzz/test/gzz/gfx/gl/paper.test:1.15 Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/paper.test Mon Mar 10 08:25:35 2003
@@ -35,7 +35,7 @@
the Java API, renders anything.
"""
vs = getvs()
- vs.map.put(SolidBgVob(Color.black))
+ vs.map.put(SolidBackdropVob(Color.black))
render(vs)
checkAvgColor(100, 100, 2, 2, (0, 0, 0))
@@ -60,7 +60,7 @@
paper = PaperMill.getInstance().getPaper(57)
for df in (0, .1, .5, 1, 5, 10, 20, 37, 50):
vs = getvs()
- vs.map.put(SolidBgVob(Color.black))
+ vs.map.put(SolidBackdropVob(Color.black))
pq = GLRen.createPaperQuad(paper, 0, 0, 1, 1, df)
cs1 = vs.coords.distort(0, 0, 0, .5, .5, 800, 40)
vs.map.put(pq, cs1, 0)
@@ -81,7 +81,7 @@
pq2 = GLRen.createPaperQuad(p2, 0, 0, 1, 1, 1)
vs = getvs()
- vs.map.put(SolidBgVob(Color.blue))
+ vs.map.put(SolidBackdropVob(Color.blue))
cs1 = vs.orthoCS(0, "1", 0, 0, 0, 150, 300)
cs2 = vs.orthoCS(0, "2", 0, 150, 0, 150, 300)
Index: gzz/test/gzz/view/boxcellview.test
diff -u gzz/test/gzz/view/boxcellview.test:1.8
gzz/test/gzz/view/boxcellview.test:1.9
--- gzz/test/gzz/view/boxcellview.test:1.8 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/view/boxcellview.test Mon Mar 10 08:25:35 2003
@@ -57,9 +57,9 @@
# Finally, should check edge color!
-def testSingle_solidbgvob():
+def testSingle_solidbackdropvob():
vs = getvs()
- vs.map.put(SolidBgVob(Color.blue))
+ vs.map.put(SolidBackdropVob(Color.blue))
box = vs.orthoBoxCS(0, "A", 0, 100, 100, 1, 1, 200, 50)
@@ -79,7 +79,7 @@
# Next, check that hierarchical coordinate systems work
vs = getvs()
- vs.map.put(SolidBgVob(Color.blue))
+ vs.map.put(SolidBackdropVob(Color.blue))
parent = vs.orthoCS(0, "A", 0, 120, 60, 2, 2)
child = vs.orthoCS(parent, "B", 0, 20, 30, .25, .25)
box = vs.boxCS(child, "C", 200, 50)
@@ -87,13 +87,13 @@
render(vs)
checkbox(160, 120, 100, 25, (255, 255, 255))
-def testSingle_solidbgvob_negativeCSdepth():
+def testSingle_solidbackdropvob_negativeCSdepth():
"""Test that negative depths work in hierarchical systems.
fail: AWT
"""
vs = getvs()
- vs.map.put(SolidBgVob(Color.blue))
+ vs.map.put(SolidBackdropVob(Color.blue))
box = vs.orthoBoxCS(0, "A", -1, 100, 100, 1, 1, 200, 50)
Index: gzz/test/gzz/view/coordinateplane.test
diff -u gzz/test/gzz/view/coordinateplane.test:1.4
gzz/test/gzz/view/coordinateplane.test:1.5
--- gzz/test/gzz/view/coordinateplane.test:1.4 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/view/coordinateplane.test Mon Mar 10 08:25:35 2003
@@ -41,7 +41,7 @@
note = ppact.newNote(paper, 100, 200, "FOO")
vc.setAccursed(space.getCell(note))
vs = getvs()
- vs.map.put(SolidBgVob(java.awt.Color.red))
+ vs.map.put(SolidBackdropVob(java.awt.Color.red))
print "PLace"
gzz.view.CoordinatePlaneView(d.contains, d.pan).render(vs, 0, vc)
Index: gzz/test/gzz/view/pagespancellview.test
diff -u gzz/test/gzz/view/pagespancellview.test:1.10
gzz/test/gzz/view/pagespancellview.test:1.11
--- gzz/test/gzz/view/pagespancellview.test:1.10 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/view/pagespancellview.test Mon Mar 10 08:25:35 2003
@@ -105,7 +105,7 @@
gzz.client.AbstractUpdateManager.tickIdle()
vs = getvs()
- vs.map.put(SolidBgVob(Color.yellow))
+ vs.map.put(SolidBackdropVob(Color.yellow))
render(vs)
checkAvgColor(160,150,50,50, (255, 255, 0), delta=5)
@@ -130,7 +130,7 @@
# # Now that the images are loaded, check span offsets
# vs = getvs()
- # vs.map.put(SolidBgVob(Color.yellow))
+ # vs.map.put(SolidBackdropVob(Color.yellow))
# scaled = vs.orthoCS(0, "X", 0, 200, 150, .2, .2)
# v.placeCentered(enfMaker.makeEnfilade(sc.getCurrent()), vs, scaled,
# sc.getCurrent().subSpan(1), 1, 100000)
Index: gzz/test/gzz/vob/bgvobs.test
diff -u gzz/test/gzz/vob/bgvobs.test:1.6 gzz/test/gzz/vob/bgvobs.test:1.7
--- gzz/test/gzz/vob/bgvobs.test:1.6 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/vob/bgvobs.test Mon Mar 10 08:25:35 2003
@@ -33,7 +33,7 @@
"""
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
vob = gzz.vob.vobs.TestSpotVob(10, 10, 10)
cs = vs.orthoBoxCS(0, "window", 0, 0, 0, 1, 1, size.width, size.height)
@@ -48,7 +48,7 @@
"""
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
vob = gzz.vob.vobs.RectBgVob()
cs = vs.orthoBoxCS(0, "window", 0, 0, 0, 1, 1, size.width, size.height)
@@ -63,7 +63,7 @@
"""
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
vob = gzz.vob.vobs.FilledRectVob(Color.white)
cs = vs.orthoBoxCS(0, "window", 0, 0, 0, 1, 1, size.width, size.height)
@@ -73,15 +73,15 @@
checkNotAvgColor(140, 140, 20, 20, (255, 0, 0), delta=1)
-def testSolidBgVob():
- """Tests that SolidBgVob is drawn with wanted color, and after
+def testSolidBackdropVob():
+ """Tests that SolidBackdropVob is drawn with wanted color, and after
that the default color is black. """
sty1 = win.getGraphicsAPI().getTextStyle("SansSerif", 0, 20)
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.black))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.black))
textvob = gzz.vob.vobs.TextVob(sty1, "XXXXXX")
@@ -101,7 +101,7 @@
"""
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
vob = gzz.vob.vobs.OvalBgVob()
cs = vs.orthoBoxCS(0, "window", 0, 0, 0, 1, 1, size.width, size.height)
Index: gzz/test/gzz/vob/textvob.test
diff -u gzz/test/gzz/vob/textvob.test:1.18 gzz/test/gzz/vob/textvob.test:1.19
--- gzz/test/gzz/vob/textvob.test:1.18 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/vob/textvob.test Mon Mar 10 08:25:35 2003
@@ -74,7 +74,7 @@
text_scale += scale
vs = getvs()
size = vs.getSize()
- vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
+ vs.map.put(gzz.vob.vobs.SolidBackdropVob(Color.red))
textvob = gzz.vob.vobs.TextVob(sty1,
"Xj"+chr(196)+"j"+chr(197)+"j"+chr(214)+"jX")
text_width = int(textvob.getWidth(text_scale))
Index: gzz/test/gzz/vob/vobs/linevob.test
diff -u gzz/test/gzz/vob/vobs/linevob.test:1.4
gzz/test/gzz/vob/vobs/linevob.test:1.5
--- gzz/test/gzz/vob/vobs/linevob.test:1.4 Fri Feb 21 15:03:00 2003
+++ gzz/test/gzz/vob/vobs/linevob.test Mon Mar 10 08:25:35 2003
@@ -28,7 +28,7 @@
def testSimply():
vs = getvs()
- vs.map.put(SolidBgVob(java.awt.Color.black))
+ vs.map.put(SolidBackdropVob(java.awt.Color.black))
vs.put(LineVob(0, 0, 0, 1, java.awt.Color.green), "L",
0, 100, 100, 100, 100)
render(vs)
Index: gzz/test/tools/gfx.py
diff -u gzz/test/tools/gfx.py:1.21 gzz/test/tools/gfx.py:1.22
--- gzz/test/tools/gfx.py:1.21 Fri Feb 21 15:03:00 2003
+++ gzz/test/tools/gfx.py Mon Mar 10 08:25:35 2003
@@ -49,7 +49,7 @@
from gzz.gfx.gl import GL, GLCache, GLRen
_buf = GL.createByteVector(500*500*3)
_drawbufvs = _realwin.createVobScene()
- _drawbufvs.map.put(SolidBgVob(Color(0, 0, 0.2)))
+ _drawbufvs.map.put(SolidBackdropVob(Color(0, 0, 0.2)))
_drawbufvs.map.put(GLCache.getCallList("""
Disable TEXTURE_2D
Color 1 1 1 1
@@ -129,7 +129,7 @@
if alsoRender:
for i in range(0, len(src), 3):
vs.map.clear()
- vs.map.put(SolidBgVob(Color.red))
+ vs.map.put(SolidBackdropVob(Color.red))
d = TestSpotVob(src[i], src[i+1], src[i+2])
vs.map.put(d, cs)
render(vs)
- [Gzz-commits] gzz gfx/libpaper/papermill.py gfx/util/misc.py ...,
Asko Soukka <=