[Gzz-commits] gzz/gfx/demo gldemo.py xupdf.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/02 12:05:18

Modified files:
        gfx/demo       : gldemo.py xupdf.py 

Log message:
        PAINTING WORKS\!\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.27 gzz/gfx/demo/gldemo.py:1.28
*** gzz/gfx/demo/gldemo.py:1.27 Wed Oct  2 08:20:22 2002
--- gzz/gfx/demo/gldemo.py      Wed Oct  2 12:05:18 2002
***************
*** 235,241 ****
        if not currentScene:
            print "No scene\n"
            return vs
!       currentScene.scene(vs)
        return vs
  
  
--- 235,242 ----
        if not currentScene:
            print "No scene\n"
            return vs
!       nvs = currentScene.scene(vs)
!       if nvs: vs = nvs
        return vs
  
  
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.38 gzz/gfx/demo/xupdf.py:1.39
*** gzz/gfx/demo/xupdf.py:1.38  Wed Oct  2 09:24:15 2002
--- gzz/gfx/demo/xupdf.py       Wed Oct  2 12:05:18 2002
***************
*** 256,262 ****
        Disable STENCIL_TEST
        Color 1 1 1
        Enable BLEND
!       BlendFunc ONE_MINUS_DST_COLOR ZERO
      """)
      pas.setTeardowncode("""
        PopAttrib
--- 256,262 ----
        Disable STENCIL_TEST
        Color 1 1 1
        Enable BLEND
!       BlendFunc ZERO ZERO
      """)
      pas.setTeardowncode("""
        PopAttrib
***************
*** 273,288 ****
--- 273,294 ----
        self.nadir = NadirAngler(self.ctrx, screensize[1]*2)
        self.showcontext = 1
        self.clip = 0
+       self.selectCS = None
+       self.currentvs = None
      def key(self, key):
        global currentScene
        if key == 'z':
            currentScene = XuPDFScene_PDFZoom()
+           self.currentvs = None
        if key == 'm':
            rotatelist(self.mag)
+           self.currentvs = None
        if key == 'c':
            self.clip = not self.clip
+           self.currentvs = None
        if key == 's':
            self.showcontext = not self.showcontext
+           self.currentvs = None
      def mouse(self, ev):
        global globalx, globaly
        if ev.getID() == ev.MOUSE_CLICKED:
***************
*** 303,308 ****
--- 309,315 ----
            else:
                print "Didn't hit anything"
            checkGlobalCoords()
+           self.currentvs = None
            print "Mouse ",globalx, globaly
            AbstractUpdateManager.chg()
        elif ev.getID() == ev.MOUSE_PRESSED:
***************
*** 324,339 ****
            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):
        bg(vs)
        bf = effects.NadirCircleFloater_NoAnchor(vs, (self.ctrx, self.ctry), 
self.rad,
                        self.nadir, 1)
--- 331,351 ----
            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.corner2[1]))
            s = (0.5*(self.corner1[0]-self.corner2[0]),
!                      0.5 *(self.corner1[1]-self.corner2[1]))
            self.currentvs.coords.setAffineParams(self.selectCS, 0, 
                    ctr[0], ctr[1], s[0], 0, 0, s[1])
+           print "paint: ",ctr, s
+           AbstractUpdateManager.chg()
  
  
        else:
            print "Unused mouse: ",ev
      def scene(self, vs):
+       if self.currentvs:
+           AbstractUpdateManager.setNoAnimation()
+           return self.currentvs
        bg(vs)
        bf = effects.NadirCircleFloater_NoAnchor(vs, (self.ctrx, self.ctry), 
self.rad,
                        self.nadir, 1)