[Gzz-commits] gzz gfx/librenderables/renderables.py gzz/vob/T...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/28 05:59:03

Modified files:
        gfx/librenderables: renderables.py 
        gzz/vob        : TextVob.java 

Log message:
        better

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.76 
gzz/gfx/librenderables/renderables.py:1.77
*** gzz/gfx/librenderables/renderables.py:1.76  Sat Sep 28 05:50:06 2002
--- gzz/gfx/librenderables/renderables.py       Sat Sep 28 05:59:03 2002
***************
*** 807,817 ****
      "RenderCode" : """
            Coords *coords2inv = coords2.getInverse();
            ZPt orig = coords2inv->transform(coords1.transform(origin));
!           ZPt h = 
coords2inv->transform(coords1.transform(origin+ZVec(0,h1,0)));
!           float scale = (h-orig).length();
            DBG(dbg_horiztext2) << "Origin: "<<origin<<" 
"<<coords1.transform(origin)<<orig<<"\\n";
!           DBG(dbg_horiztext2) << "h: "<<h1<<" "<<h<<" "<<scale<<"\\n";
!           Vertexer<Coords> v(coords2, scale, orig.z);
            glPushAttrib(GL_ENABLE_BIT);
            glEnable(GL_BLEND);
            Text::renderIter(*r, txt.begin(), txt.end(), 
--- 807,817 ----
      "RenderCode" : """
            Coords *coords2inv = coords2.getInverse();
            ZPt orig = coords2inv->transform(coords1.transform(origin));
!           // ZPt h = 
coords2inv->transform(coords1.transform(origin+ZVec(0,h1,0)));
!           // float scale = (h-orig).length();
            DBG(dbg_horiztext2) << "Origin: "<<origin<<" 
"<<coords1.transform(origin)<<orig<<"\\n";
!           // DBG(dbg_horiztext2) << "h: "<<h1<<" "<<h<<" "<<scale<<"\\n";
!           Vertexer<Coords> v(coords2, h1, orig.z);
            glPushAttrib(GL_ENABLE_BIT);
            glEnable(GL_BLEND);
            Text::renderIter(*r, txt.begin(), txt.end(), 
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.29 gzz/gzz/vob/TextVob.java:1.30
*** gzz/gzz/vob/TextVob.java:1.29       Sat Sep 28 05:50:06 2002
--- gzz/gzz/vob/TextVob.java    Sat Sep 28 05:59:03 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.29 2002/09/28 09:50:06 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 31,37 ----
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.30 2002/09/28 09:59:03 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 113,119 ****
                                int coordsys2) {
        if(dbg) pa("Addtolistgl text "+text);
        if(ht == null) {
!           float sh = 2.0f/style.getHeight(1);
            //  float sw = 2.0f/style.getWidth(text, 1);
            GLTextStyle gls = (GLTextStyle)style;
            ht = GLRen.createHorizText2(
--- 113,119 ----
                                int coordsys2) {
        if(dbg) pa("Addtolistgl text "+text);
        if(ht == null) {
!           float sh = scale;
            //  float sw = 2.0f/style.getWidth(text, 1);
            GLTextStyle gls = (GLTextStyle)style;
            ht = GLRen.createHorizText2(