[Gzz-commits] gzz gfx/librenderables/Renderables.cxx gfx/libr...

[Tuomas J. Lukka]

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

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

Log message:
        betterbutnotgood

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.cxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/Renderables.cxx
diff -c gzz/gfx/librenderables/Renderables.cxx:1.3 
gzz/gfx/librenderables/Renderables.cxx:1.4
*** gzz/gfx/librenderables/Renderables.cxx:1.3  Wed Aug 21 03:12:43 2002
--- gzz/gfx/librenderables/Renderables.cxx      Sat Sep 28 05:50:06 2002
***************
*** 7,12 ****
--- 7,13 ----
  
  
      DBGVAR(dbg, "Renderable.general");
+     DBGVAR(dbg_horiztext2, "Renderable.horiztext2");
  
      void setStandardCoordinates(Vec windowSize) {
        int w = (int)windowSize.x;
Index: gzz/gfx/librenderables/Renderables.hxx
diff -c gzz/gfx/librenderables/Renderables.hxx:1.14 
gzz/gfx/librenderables/Renderables.hxx:1.15
*** gzz/gfx/librenderables/Renderables.hxx:1.14 Fri Sep 27 14:22:59 2002
--- gzz/gfx/librenderables/Renderables.hxx      Sat Sep 28 05:50:06 2002
***************
*** 59,64 ****
--- 59,65 ----
  namespace Renderables {
  
      PREDBGVAR(dbg);
+     PREDBGVAR(dbg_horiztext2);
  
      using Util::ObjectStorer;
  
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.75 
gzz/gfx/librenderables/renderables.py:1.76
*** gzz/gfx/librenderables/renderables.py:1.75  Sat Sep 28 05:16:46 2002
--- gzz/gfx/librenderables/renderables.py       Sat Sep 28 05:50:06 2002
***************
*** 778,794 ****
        TextRenderer *r;
        unistring txt;
        ZPt origin;
!       float scale;
        """,
      "Params" : """
        Font f,
        String text, float x, float y, float z,
!       float scale
        """,
      "ParamCode" : """
        r = f;
        txt = text; origin.x = x; origin.y = y; origin.z = z;
!       this->scale = scale;
        """,
      "ExtraClass" : """
        template<class Coords> struct Vertexer {
--- 778,794 ----
        TextRenderer *r;
        unistring txt;
        ZPt origin;
!       float h1;
        """,
      "Params" : """
        Font f,
        String text, float x, float y, float z,
!       float h1
        """,
      "ParamCode" : """
        r = f;
        txt = text; origin.x = x; origin.y = y; origin.z = z;
!       this->h1 = h1;
        """,
      "ExtraClass" : """
        template<class Coords> struct Vertexer {
***************
*** 799,810 ****
--- 799,816 ----
            template<class T> void operator()(const T &x, const T &y) {
                ZPt tmp(x * scale, y * scale, 0);
                c.vertex(tmp);
+               DBG(dbg_horiztext2) << "Vertex: "<<x<<" "<<y<<" "<<tmp<<" 
"<<c.transform(tmp)
+                       << "\\n";
            }
        };
        """,
      "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);
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.28 gzz/gzz/vob/TextVob.java:1.29
*** gzz/gzz/vob/TextVob.java:1.28       Sat Sep 28 05:25:40 2002
--- gzz/gzz/vob/TextVob.java    Sat Sep 28 05:50:06 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.28 2002/09/28 09:25:40 benja 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.29 2002/09/28 09:50:06 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 114,126 ****
        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(
                    gls.theFont,
                    text,
                    -1, -1, 0,
!                   sw * gls.fontScale);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");
--- 114,126 ----
        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(
                    gls.theFont,
                    text,
                    -1, -1, 0,
!                   sh);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");