[Gzz-commits] gzz ./TODO gfx/librenderables/renderables.py gz...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/04 09:07:52

Modified files:
        .              : TODO 
        gfx/librenderables: renderables.py 
        gzz/modules/pp : ViewportVob.java 
        gzz/modules/pp/vob: BgVob.java 

Log message:
        Papers integrated into pp; scale parameter added to PaperQuad for this. 
We need to think about scales at some point.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ViewportVob.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/BgVob.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.72 gzz/TODO:1.73
*** gzz/TODO:1.72       Wed Sep  4 03:37:09 2002
--- gzz/TODO    Wed Sep  4 09:07:52 2002
***************
*** 55,60 ****
--- 55,62 ----
        - ZZ w/ fillets, images, sound, video, libpaper
        - blobs
        - mediaserver - what demo?
+       - a really comprehensive web page of screenshots
+         and instructions on how to get them and run.
  
  0.8alpha5: saving, loading etc. with mediaserver useful
      benja:
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.16 
gzz/gfx/librenderables/renderables.py:1.17
*** gzz/gfx/librenderables/renderables.py:1.16  Wed Sep  4 08:48:09 2002
--- gzz/gfx/librenderables/renderables.py       Wed Sep  4 09:07:52 2002
***************
*** 344,352 ****
  {
      "Type" : "2",
      "Name": "PaperQuad",
!     "Data": "Pt corners[4]; Paper::Paper* paper; ",
      "Params" : """
!           Paper paper, float x0, float y0, float x1, float y1
        """,
      "ParamCode" : """
            this->paper = paper;
--- 344,353 ----
  {
      "Type" : "2",
      "Name": "PaperQuad",
!     "Data": "Pt corners[4]; Paper::Paper* paper; float scale;",
      "Params" : """
!           Paper paper, float x0, float y0, float x1, float y1,
!           float scale
        """,
      "ParamCode" : """
            this->paper = paper;
***************
*** 354,359 ****
--- 355,361 ----
            corners[0].y = corners[3].y = y0;
            corners[2].x = corners[3].x = x1;
            corners[1].y = corners[2].y = y1;
+           this->scale = scale;
        """,
      "RenderCode" : """
            DBG(dbg) << "Paper\\n";
***************
*** 365,373 ****
  
            Paper::LightParam lightParam;
            lightParam.orig = paperorigin-ZPt(0,0,0);
!           lightParam.e0 = paperx;
!           lightParam.e1 = papery;
!           lightParam.e2 = ZVec(0,0,paperx.length());
  
              lightParam.Light = ZVec(-1,-1,1);
              lightParam.Light_w = 0.0;
--- 367,375 ----
  
            Paper::LightParam lightParam;
            lightParam.orig = paperorigin-ZPt(0,0,0);
!           lightParam.e0 = paperx * scale;
!           lightParam.e1 = papery * scale;
!           lightParam.e2 = ZVec(0,0,paperx.length()) * scale;
  
              lightParam.Light = ZVec(-1,-1,1);
              lightParam.Light_w = 0.0;
***************
*** 1093,1098 ****
--- 1095,1107 ----
                p("GOING TO EVENTLOOP");
                eventLoop(!ret);
            }
+       }
+ 
+       /** Shorthands.
+        */
+       public static PaperQuad createPaperQuad(Paper paper, 
+               float x0, float y0, float x1, float y1) {
+           return createPaperQuad(paper, x0, y0, x1, y1, 1);
        }
  
        /** Process native events.
Index: gzz/gzz/modules/pp/ViewportVob.java
diff -c gzz/gzz/modules/pp/ViewportVob.java:1.14 
gzz/gzz/modules/pp/ViewportVob.java:1.15
*** gzz/gzz/modules/pp/ViewportVob.java:1.14    Wed Sep  4 08:48:09 2002
--- gzz/gzz/modules/pp/ViewportVob.java Wed Sep  4 09:07:52 2002
***************
*** 112,122 ****
            callList = GZZGL.createCallList(displayList);
        }
  
-       /*
        curs = vp.addToListGL(win, list, curs, coordsys1, coordsys2);
        curs = callList.addToListGL(win, list, curs, coordsys1, coordsys2);
        curs = cvp.addToListGL(win, list, curs, coordsys1, coordsys2);
-       */
  
        return curs;
      }
--- 112,120 ----
Index: gzz/gzz/modules/pp/vob/BgVob.java
diff -c gzz/gzz/modules/pp/vob/BgVob.java:1.23 
gzz/gzz/modules/pp/vob/BgVob.java:1.24
*** gzz/gzz/modules/pp/vob/BgVob.java:1.23      Wed Sep  4 08:48:09 2002
--- gzz/gzz/modules/pp/vob/BgVob.java   Wed Sep  4 09:07:52 2002
***************
*** 36,42 ****
   * used to pan pretty easily.
   */
  public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.23 2002/09/04 
12:48:09 tjl 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); }
--- 36,42 ----
   * used to pan pretty easily.
   */
  public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.24 2002/09/04 
13:07:52 tjl 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); }
***************
*** 86,92 ****
            Paper  pap;
            GZZGL.PaperQuad pq;
            pap = PaperMill.getInstance().getPaper(c.hashCode());
!           ret = GZZGL.createPaperQuad(pap, -1, -1, 1, 1);
            papers.put(c, ret);
  
            list = GZZGL.createDisplayList(
--- 86,92 ----
            Paper  pap;
            GZZGL.PaperQuad pq;
            pap = PaperMill.getInstance().getPaper(c.hashCode());
!           ret = GZZGL.createPaperQuad(pap, -1, -1, 1, 1, 100);
            papers.put(c, ret);
  
            list = GZZGL.createDisplayList(
***************
*** 94,100 ****
                    "Vertex 1 -1\nVertex 1 1\nEnd\n"
                );
  
!           triangle = GZZGL.createCallListCoorded(list);
        }
        return ret;
      }
--- 94,100 ----
                    "Vertex 1 -1\nVertex 1 1\nEnd\n"
                );
  
!           // triangle = GZZGL.createCallListCoorded(list);
        }
        return ret;
      }
***************
*** 106,112 ****
  
        GZZGL.PaperQuad pq = getPaperQuad(papercode);
        curs = pq.addToListGL(win, list, curs, coordsys1, coordsys2);
!       curs = triangle.addToListGL(win, list, curs, coordsys1, -1);
        return curs;
      }
      
--- 106,112 ----
  
        GZZGL.PaperQuad pq = getPaperQuad(papercode);
        curs = pq.addToListGL(win, list, curs, coordsys1, coordsys2);
!       // curs = triangle.addToListGL(win, list, curs, coordsys1, -1);
        return curs;
      }