[Gzz-commits] gzz gfx/rules.mk gfx/demo/xupdf.py gfx/libcoord...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/02 09:24:16

Modified files:
        gfx            : rules.mk 
        gfx/demo       : xupdf.py 
        gfx/libcoords  : Coords.cxx 
        gzz/gfx/gl     : GLVobCoorder.java 
        gzz/media/impl : PageImageScroll.java 

Log message:
        Almost working painting

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/rules.mk.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PageImageScroll.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.37 gzz/gfx/demo/xupdf.py:1.38
*** gzz/gfx/demo/xupdf.py:1.37  Wed Oct  2 08:20:22 2002
--- gzz/gfx/demo/xupdf.py       Wed Oct  2 09:24:15 2002
***************
*** 245,266 ****
      def hit(self, coords, point3):
        return self.view.hitClip(coords, point3, self.cliprect)
  
! selectPaper = Paper()
! selectPaper.setNPasses(1)
! pas = selectPaper.getPass(0)
! pas.setSetupcode("""
!     PushAttrib ENABLE_BIT COLOR_BUFFER_BIT
!     Disable TEXTURE_2D
!     Disable DEPTH_TEST
!     Disable STENCIL_TEST
!     Color 1 1 1
!     Enable BLEND
!     BlendFunc ONE_MINUS_DST_COLOR ZERO
! """)
! pas.setTeardowncode("""
!     PopAttrib
! """)
! selectPaperQuad = GLRen.createPaperQuad(selectPaper, -1,-1,1,1, 1)
  
  
  class XuPDFScene_PDFContext:
--- 245,267 ----
      def hit(self, coords, point3):
        return self.view.hitClip(coords, point3, self.cliprect)
  
! if 1:
!     selectPaper = Paper()
!     selectPaper.setNPasses(1)
!     pas = selectPaper.getPass(0)
!     pas.setSetupcode("""
!       PushAttrib ENABLE_BIT COLOR_BUFFER_BIT
!       Disable TEXTURE_2D
!       Disable DEPTH_TEST
!       Disable STENCIL_TEST
!       Color 1 1 1
!       Enable BLEND
!       BlendFunc ONE_MINUS_DST_COLOR ZERO
!     """)
!     pas.setTeardowncode("""
!       PopAttrib
!     """)
!     selectPaperQuad = GLRen.createPaperQuad(selectPaper, -1,-1,1,1, 1)
  
  
  class XuPDFScene_PDFContext:
***************
*** 304,309 ****
--- 305,336 ----
            checkGlobalCoords()
            print "Mouse ",globalx, globaly
            AbstractUpdateManager.chg()
+       elif ev.getID() == ev.MOUSE_PRESSED:
+           self.pressx = ev.getX()
+           self.pressy = ev.getY()
+           self.origpt = None
+           return
+       elif ev.getID() == ev.MOUSE_DRAGGED:
+           if not self.selectCS:
+               self.selectCS = 
self.currentvs.coords.affineCoordsys(self.papercs, 0, 0, 0, 1, 0, 0, 1)
+               self.currentvs.map.put(selectPaperQuad, self.selectCS, 0)
+           if not self.origpt:
+               point = array([self.pressx, self.pressy, 0], 'f')
+               dst = zeros(3, 'f')
+               self.currentvs.coords.inverseTransformPoints3(self.papercs, 
point, dst)
+               self.corner1 = (dst[0], dst[1])
+           point = array([ev.getX(), ev.getY(), 0], 'f')
+           dst = zeros(3, 'f')
+           self.currentvs.coords.inverseTransformPoints3(self.papercs, point, 
dst)
+           self.corner2 = (dst[0], dst[1])
+           ctr = (0.5*(self.corner1[0]+self.corner2[0]),
+                      0.5 *(self.corner1[1]+self.corner1[1]))
+           s = (0.5*(self.corner1[0]-self.corner2[0]),
+                      0.5 *(self.corner1[1]-self.corner1[1]))
+           self.currentvs.coords.setAffineParams(self.selectCS, 0, 
+                   ctr[0], ctr[1], s[0], 0, 0, s[1])
+ 
+ 
        else:
            print "Unused mouse: ",ev
      def scene(self, vs):
***************
*** 348,353 ****
--- 375,382 ----
                b.add(vs, 0, 0, 1, bf, maincs = cs1_trans)
                self.buoys.append(b)
        self.currentvs = vs
+       self.selectCS = None
+       self.papercs = cs1_trans
  
  class XuPDFScene_PDFZoom:
      def __init__(self):
Index: gzz/gfx/libcoords/Coords.cxx
diff -c gzz/gfx/libcoords/Coords.cxx:1.26 gzz/gfx/libcoords/Coords.cxx:1.27
*** gzz/gfx/libcoords/Coords.cxx:1.26   Wed Oct  2 02:50:21 2002
--- gzz/gfx/libcoords/Coords.cxx        Wed Oct  2 09:24:15 2002
***************
*** 62,73 ****
        }
  
        virtual float nonlinearity(const ZPt &p, float radius) { 
            ZPt mp;
            t.tr(p, mp);
!           float srad = t.tr_radius(p, radius);
            float snon = super->nonlinearity(mp, srad);
            // Multiply to take into account shrinking / magnifying.
!           snon *= srad / radius;
            float non = t.nonlinearity(p, radius);
            return (non > snon ? non : snon);
        }
--- 62,74 ----
        }
  
        virtual float nonlinearity(const ZPt &p, float radius) { 
+           radius = fabs(radius);
            ZPt mp;
            t.tr(p, mp);
!           float srad = fabs(t.tr_radius(p, radius));
            float snon = super->nonlinearity(mp, srad);
            // Multiply to take into account shrinking / magnifying.
!           snon *= (srad+0.000001) / (radius+0.00001);
            float non = t.nonlinearity(p, radius);
            return (non > snon ? non : snon);
        }
***************
*** 382,387 ****
--- 383,389 ----
            float wh = 0.5*(w+h);
            float dist = hypot((p.x-x)/w, (p.y-y)/h) - radius/wh;
            if(dist < 0) dist = 0;
+           if(!finite(dist)) return 1;
            return 1 + 10 / (dist + 1);
        }
      };
Index: gzz/gfx/rules.mk
diff -c gzz/gfx/rules.mk:1.11 gzz/gfx/rules.mk:1.12
*** gzz/gfx/rules.mk:1.11       Wed Oct  2 07:50:50 2002
--- gzz/gfx/rules.mk    Wed Oct  2 09:24:14 2002
***************
*** 17,24 ****
  # Choose architecture
  ARCH=-march=pentium4 -mfpmath=sse -msse2
  
! OPTIMIZE =  -O3 -ffast-math $(ARCH) -fomit-frame-pointer
! # OPTIMIZE = -O0
  
  #NVIDIAH = /usr/lib/opengl/nvidia/include
  NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
--- 17,24 ----
  # Choose architecture
  ARCH=-march=pentium4 -mfpmath=sse -msse2
  
! # OPTIMIZE =  -O3 -ffast-math $(ARCH) -fomit-frame-pointer
! OPTIMIZE = -O0
  
  #NVIDIAH = /usr/lib/opengl/nvidia/include
  NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.33 
gzz/gzz/gfx/gl/GLVobCoorder.java:1.34
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.33       Wed Oct  2 08:20:22 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java    Wed Oct  2 09:24:16 2002
***************
*** 29,35 ****
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.33 2002/10/02 
12:20:22 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 29,35 ----
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.34 2002/10/02 
13:24:16 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 68,74 ****
      public void setAffineParams(
            int cs, float depth, float cx, float cy, 
            float x_x, float x_y, float y_x, float y_y) {
!       int ind = inds[cs + 2];
        floats[ind + 0] = cx;
        floats[ind + 1] = cy;
        floats[ind + 2] = depth;
--- 68,74 ----
      public void setAffineParams(
            int cs, float depth, float cx, float cy, 
            float x_x, float x_y, float y_x, float y_y) {
!       int ind = inds[3*cs + 2];
        floats[ind + 0] = cx;
        floats[ind + 1] = cy;
        floats[ind + 2] = depth;
Index: gzz/gzz/media/impl/PageImageScroll.java
diff -c gzz/gzz/media/impl/PageImageScroll.java:1.9 
gzz/gzz/media/impl/PageImageScroll.java:1.10
*** gzz/gzz/media/impl/PageImageScroll.java:1.9 Mon Sep 30 12:30:10 2002
--- gzz/gzz/media/impl/PageImageScroll.java     Wed Oct  2 09:24:16 2002
***************
*** 38,44 ****
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.9 2002/09/30 16:30:10 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
--- 38,44 ----
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.10 2002/10/02 13:24:16 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
***************
*** 48,54 ****
  
      /** Resolution of the images to use.
       */
!     int RESOLUTION=85; // sigh
  
      String DIR="../mstmpimg/"; // XXX Non-platform-independent!
  
--- 48,54 ----
  
      /** Resolution of the images to use.
       */
!     int RESOLUTION=25; // sigh
  
      String DIR="../mstmpimg/"; // XXX Non-platform-independent!