[Gzz-commits] gzz/gfx Makefile demo/calendarvobtest.py demo/g...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/02 06:05:44

Modified files:
        gfx            : Makefile 
        gfx/demo       : calendarvobtest.py gldemo.py 
        gfx/librenderables: Renderables.hxx renderables.py 
Added files:
        gfx/liblines   : Lines.cxx Lines.hxx Makefile 

Log message:
        added stub liblines and small fixes because of vob changes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/calendarvobtest.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/liblines/Lines.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/liblines/Lines.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/liblines/Makefile?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.121&tr2=1.122&r1=text&r2=text

Patches:
Index: gzz/gfx/Makefile
diff -u gzz/gfx/Makefile:1.16 gzz/gfx/Makefile:1.17
--- gzz/gfx/Makefile:1.16       Tue Oct 22 12:28:22 2002
+++ gzz/gfx/Makefile    Sat Nov  2 06:05:44 2002
@@ -6,9 +6,9 @@
 JAVAC=javac
 JAVA=java
 
-SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor libcoords 
libfillet librenderables libcallgl libglwrapper jni
+SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor libcoords 
libfillet librenderables libcallgl libglwrapper liblines jni
 
-JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o 
libutil/buildmipmaps.o libutil/perlin.o libglwrapper/GL_wrapper.o 
libcoords/Coords.o libfillet/Fillet.cxx libutil/Debug.o 
+JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o liblines/Lines.o libtexture/Texture.o 
libtexture/Texture_pipetexture.o libutil/buildmipmaps.o libutil/perlin.o 
libglwrapper/GL_wrapper.o libcoords/Coords.o libfillet/Fillet.cxx 
libutil/Debug.o
 
 include rules.mk
 
Index: gzz/gfx/demo/calendarvobtest.py
diff -u gzz/gfx/demo/calendarvobtest.py:1.8 gzz/gfx/demo/calendarvobtest.py:1.9
--- gzz/gfx/demo/calendarvobtest.py:1.8 Fri Nov  1 08:38:22 2002
+++ gzz/gfx/demo/calendarvobtest.py     Sat Nov  2 06:05:44 2002
@@ -27,17 +27,16 @@
                                       
 
         # these don't efect
-        gzz.vob.CalendarVob.setStatics(style_date, style_n, 2)
+        gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 2)
 
         # week number width, weekday height, month name height
-        gzz.vob.CalendarVob.setBounds(0.4, 0.5, 1.0)
+        gzz.vob.vobs.CalendarVob.setBounds(0.5, 0.5, 1.0)
 
         # scales: date, weeknum, weekday, month
-        gzz.vob.CalendarVob.setScales(1.1, 0.55, 0.24, 1.3)
+        gzz.vob.vobs.CalendarVob.setScales(1.1, 0.4, 0.24, 1.3)
 
         # shift(something(x,y)): date, weeknum, weekday, month
-        gzz.vob.CalendarVob.setShifting(0.15, 0.85, 0.0, 0.1)
-
+        gzz.vob.vobs.CalendarVob.setShifting(0.05, 0.85, 0.2, 0.1)
         
        
         # annual calendar
@@ -49,7 +48,7 @@
 
             vs.matcher.add(cs_text, "cs_text"+str(i))
 
-            vs.map.put(gzz.vob.CalendarVob(2002, i), cs_cal, cs_text)
+            vs.map.put(gzz.vob.vobs.CalendarVob(2002, i), cs_cal, cs_text)
 
 
         if 0:
@@ -58,7 +57,7 @@
                                               w/6 * self.scale, 0, 0, h/5 * 
self.scale)
             vs.matcher.add(cs_cal, "cs_cal")
             gzz.vob.CalendarVob.setBounds(0.9, 1.1, 0.8)
-            vs.map.put(gzz.vob.CalendarVob(2002, 12), cs_cal)
+            vs.map.put(gzz.vob.vobs.CalendarVob(2002, 12), cs_cal)
 
 
 
Index: gzz/gfx/demo/gldemo.py
diff -u gzz/gfx/demo/gldemo.py:1.45 gzz/gfx/demo/gldemo.py:1.46
--- gzz/gfx/demo/gldemo.py:1.45 Mon Oct 28 04:03:48 2002
+++ gzz/gfx/demo/gldemo.py      Sat Nov  2 06:05:44 2002
@@ -18,7 +18,8 @@
 import java
 from gzz.client import AbstractBinder, AbstractShower, AbstractUpdateManager, 
GraphicsAPI, Screen
 from gzz.gfx.gl import GL, GLRen, GLSpans, Paper, GLCache
-from gzz.vob import GLTextStyle, TextVob
+from gzz.vob.impl.gl import GLTextStyle
+from gzz.vob.vobs import TextVob
 import math
 import getopt
 import gzz.util
@@ -38,7 +39,7 @@
        gzz.util.dbg.option(o,a)
 
 def background(rgb):
-    return gzz.vob.SolidBgVob(java.awt.Color(float(rgb[0]), float(rgb[1]), 
float(rgb[2])))
+    return gzz.vob.vobs.SolidBgVob(java.awt.Color(float(rgb[0]), 
float(rgb[1]), float(rgb[2])))
 
 def texbindcode(texid):
     if texid:
Index: gzz/gfx/librenderables/Renderables.hxx
diff -u gzz/gfx/librenderables/Renderables.hxx:1.21 
gzz/gfx/librenderables/Renderables.hxx:1.22
--- gzz/gfx/librenderables/Renderables.hxx:1.21 Tue Oct 22 12:28:22 2002
+++ gzz/gfx/librenderables/Renderables.hxx      Sat Nov  2 06:05:44 2002
@@ -15,6 +15,8 @@
 #include "libtext/Text.hxx"
 #include "libfillet/Fillet.hxx"
 
+#include "liblines/Lines.hxx"
+
 #include "libcoords/Coords.hxx"
 
 //#include <map> // XXX: used by ../demo/clamptexture.cxx hack
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.121 
gzz/gfx/librenderables/renderables.py:1.122
--- gzz/gfx/librenderables/renderables.py:1.121 Fri Nov  1 08:38:22 2002
+++ gzz/gfx/librenderables/renderables.py       Sat Nov  2 06:05:44 2002
@@ -1221,6 +1221,14 @@
             glLineWidth(linewidth);
             glColor3f(0.0, 0.0, 0.0);
 
+
+            Lines::line(
+              coords1.transform(ZPt(0.0, 0.0, 0.0)),
+              coords1.transform(
+                ZPt(0.0, weeks + weekday_h + month_name_h, 0.0)
+              )
+            );
+
             glBegin(GL_LINES);
 
               // left -vert