[Gzz-commits] gzz ./TODO gfx/demo/papertest.py gfx/libpaper/p...

[Janne V. Kujala]

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

Modified files:
        .              : TODO 
        gfx/demo       : papertest.py 
        gfx/libpaper   : papermill.py 

Log message:
        3d textures

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.64 gzz/TODO:1.65
*** gzz/TODO:1.64       Fri Aug 30 04:54:39 2002
--- gzz/TODO    Sat Aug 31 03:06:06 2002
***************
*** 132,137 ****
--- 132,138 ----
        - check our UML code: e.g. mpseqobject should underline and use
            ":" appropriately.
        - tidy up UML appearance: all matters of centering, aligning etc.
+       - return error codes from gfx/libtexture/*.texture
  
  0.8alpha15: new round of features
      tuukkah:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.13 gzz/gfx/demo/papertest.py:1.14
*** gzz/gfx/demo/papertest.py:1.13      Fri Aug 30 04:53:27 2002
--- gzz/gfx/demo/papertest.py   Sat Aug 31 03:06:06 2002
***************
*** 108,114 ****
      passes = [ { "trans" : 0, "emboss" : 0 },
                 { "trans" : .5, "emboss" : 0 },
                 { "trans" : .9375, "emboss" : 0 },
!                { "trans" : 0, "emboss" : 1 },
                 ]
  
      
--- 108,114 ----
      passes = [ { "trans" : 0, "emboss" : 0 },
                 { "trans" : .5, "emboss" : 0 },
                 { "trans" : .9375, "emboss" : 0 },
!                #{ "trans" : 0, "emboss" : 1 },
                 ]
  
      
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.16 gzz/gfx/libpaper/papermill.py:1.17
*** gzz/gfx/libpaper/papermill.py:1.16  Sat Aug 31 02:04:44 2002
--- gzz/gfx/libpaper/papermill.py       Sat Aug 31 03:06:06 2002
***************
*** 462,469 ****
              rgb3DTextures = [
                  ("rgbw", [128, 128, 128, 3,
                            "RGB", "RGB",
!                           "filereader", ["file", 
"lava/gfx/data/map3d_F0.01_k0.0325_eps0.015_teps0.5_iter10000.dat",  "scale", 
"10", "bias", "-1.5" ]]),
!                 ]
  
              dotTextures = [
                  ("dotprodn", [512, 512, 0, 2,
--- 462,473 ----
              rgb3DTextures = [
                  ("rgbw", [128, 128, 128, 3,
                            "RGB", "RGB",
!                           "filereader", ["file", 
"lava/gfx/data/map3d_F0.01_k0.0325_eps0.015_teps0.5_iter5000.dat",  "scale", 
"10", "bias", "-1.5" ]]),
!                 #("rgbw", [64, 64, 64, 3,
!                 #          "RGB", "RGB",
!                 #          "filereader", ["file", "lava/gfx/map3d.dat",  
"scale", "10", "bias", "-3" ]]),
!                 
!                ]
  
              dotTextures = [
                  ("dotprodn", [512, 512, 0, 2,
***************
*** 481,489 ****
                  ]
              
            self.textures = {
!               "R2": [ NamedTexture(name, args) for (name, args) in 
rgbTextures ],
                  "R3": [ NamedTexture(name, args) for (name, args) in 
rgb3DTextures ],                
!               "D2": [ NamedTexture(name, args) for (name, args) in 
dotTextures ],
            }
              
      def makePaperPass(self, seed, ppass, trans = 0, type = None, emboss = 0):
--- 485,493 ----
                  ]
              
            self.textures = {
!               #"R2": [ NamedTexture(name, args) for (name, args) in 
rgbTextures ],
                  "R3": [ NamedTexture(name, args) for (name, args) in 
rgb3DTextures ],                
!               #"D2": [ NamedTexture(name, args) for (name, args) in 
dotTextures ],
            }
              
      def makePaperPass(self, seed, ppass, trans = 0, type = None, emboss = 0):
***************
*** 502,507 ****
--- 506,512 ----
                      selectRandom(self.textures[types[i]],rnd)
                      (t, type) = selectDet(self.textures[types[i]], type)
                  else:
+                     #print types, self.textures
                      t = selectRandom(self.textures[types[i]],rnd)
  
                  if emboss: