[Gzz-commits] gzz/gfx/libpaper papermill.py texcoords.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/08/31 01:42:32

Modified files:
        gfx/libpaper   : papermill.py texcoords.py 

Log message:
        fix angle

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcoords.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.14 gzz/gfx/libpaper/papermill.py:1.15
*** gzz/gfx/libpaper/papermill.py:1.14  Sat Aug 31 01:26:58 2002
--- gzz/gfx/libpaper/papermill.py       Sat Aug 31 01:42:32 2002
***************
*** 156,161 ****
--- 156,162 ----
        return c
  
  execfile("gfx/libcolor/spaces.py")
+ execfile("gfx/libpaper/texcoords.py")
  
  class SimpleCombinerPass:
      def setupCode(self, texinputs, rnd):
***************
*** 550,556 ****
                sca2 = 0.8
  
                  if ttyp[i] == "A":
!                     data = getTexMat(rnd)
                      
                elif ttyp[i] == "C":
                      data = [ 0, 0, 0, sca2*rnd.nextGaussian(), 
--- 551,558 ----
                sca2 = 0.8
  
                  if ttyp[i] == "A":
!                     #data = getTexMat(rnd)
!                     data = TexCoords.get2DTexGenData(rnd)
                      
                elif ttyp[i] == "C":
                      data = [ 0, 0, 0, sca2*rnd.nextGaussian(), 
Index: gzz/gfx/libpaper/texcoords.py
diff -c gzz/gfx/libpaper/texcoords.py:1.1 gzz/gfx/libpaper/texcoords.py:1.2
*** gzz/gfx/libpaper/texcoords.py:1.1   Sat Aug 31 01:26:58 2002
--- gzz/gfx/libpaper/texcoords.py       Sat Aug 31 01:42:32 2002
***************
*** 16,22 ****
        # The angle of the first basis vector
        as = rnd.nextDouble() * 2 * math.pi
        # And the angle of the second basis vector
!       at = as + a
  
  
        # The (geometric) average of the basis vector lengths
--- 16,22 ----
        # The angle of the first basis vector
        as = rnd.nextDouble() * 2 * math.pi
        # And the angle of the second basis vector
!       at = as + angle
  
  
        # The (geometric) average of the basis vector lengths