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

[Janne V. Kujala]

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

Modified files:
        gfx/libpaper   : papermill.py texops_NV2X.py textures.py 

Log message:
        NV2X testing: noise offsetting of a stripe texture

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_NV2X.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.49 gzz/gfx/libpaper/papermill.py:1.50
*** gzz/gfx/libpaper/papermill.py:1.49  Tue Oct 15 06:46:06 2002
--- gzz/gfx/libpaper/papermill.py       Tue Oct 15 08:03:48 2002
***************
*** 42,52 ****
      if 1: #XXX NV20 version is broken
          # use NV10 version
          if dbg: print "Using NV10 combiners ",maxcomb
!         from gfx.libpaper.texcomb_NV1X import TransparentCombinerPass
      else:
          # use NV20 version
          if dbg: print "Using NV20 combiners ",maxcomb
!         from gfx.libpaper.texcomb_NV2X import TransparentCombinerPass
  else:
      # Must use OpenGL 1.1 specified calls.
      print "NEED FIX - DOES _NOT_ WORK : Using OpenGL 1.1 texenv and blending"
--- 42,52 ----
      if 1: #XXX NV20 version is broken
          # use NV10 version
          if dbg: print "Using NV10 combiners ",maxcomb
!         from gfx.libpaper.texcomb_NV1X import 
TransparentCombinerPass,DebugCombinerPass
      else:
          # use NV20 version
          if dbg: print "Using NV20 combiners ",maxcomb
!         from gfx.libpaper.texcomb_NV2X import 
TransparentCombinerPass,DebugCombinerPass
  else:
      # Must use OpenGL 1.1 specified calls.
      print "NEED FIX - DOES _NOT_ WORK : Using OpenGL 1.1 texenv and blending"
***************
*** 174,180 ****
          if emboss:
              comb = EmbossCombinerPass()
          else:
!             # comb = DebugCombinerPass()
              comb = TransparentCombinerPass()
  
          code = """
--- 174,180 ----
          if emboss:
              comb = EmbossCombinerPass()
          else:
!             #comb = DebugCombinerPass()
              comb = TransparentCombinerPass()
  
          code = """
Index: gzz/gfx/libpaper/texops_NV2X.py
diff -c gzz/gfx/libpaper/texops_NV2X.py:1.3 gzz/gfx/libpaper/texops_NV2X.py:1.4
*** gzz/gfx/libpaper/texops_NV2X.py:1.3 Tue Oct 15 06:46:06 2002
--- gzz/gfx/libpaper/texops_NV2X.py     Tue Oct 15 08:03:48 2002
***************
*** 13,18 ****
--- 13,19 ----
  # texture type
  #     DOT2: 2D dot-product -suitable
  #     RGB2: 2D RGB
+ #       DSDT: 2D DSDT offset texture
  
  shaderTypes = [
      [
***************
*** 39,44 ****
--- 40,48 ----
        ("T2", "RGB2"),
        ("T2", "RGB2"),
      ],
+     [   ("T2", "DSDT"),
+         ("O", "FOOBAR")
+     ]
  ]
  
  # XXX: kluge: odd and even units are for "-eps" and "+eps"
***************
*** 127,137 ****
        the register combiners.
        """
        return [i for i in range(0,len(self.st))
!               if self.st[i][1] in ("RGB2", "RGB3")]
  
      def getRGBoutputscales(self):
          return [self.tex[i].scale for i in self.getRGBoutputs()]
  
  def makeNormalShaderPass(maxaniso = None):
      # XXX: TODO: implement maxaniso as in texops_STD
!     return ShaderPass(shaderTypes[3])
--- 131,142 ----
        the register combiners.
        """
        return [i for i in range(0,len(self.st))
!               if self.st[i][1] in ("RGB2", "RGB3", "FOOBAR")]
  
      def getRGBoutputscales(self):
          return [self.tex[i].scale for i in self.getRGBoutputs()]
  
  def makeNormalShaderPass(maxaniso = None):
      # XXX: TODO: implement maxaniso as in texops_STD
!     #return ShaderPass(shaderTypes[3])
!     return ShaderPass(shaderTypes[4])
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.26 gzz/gfx/libpaper/textures.py:1.27
*** gzz/gfx/libpaper/textures.py:1.26   Tue Oct 15 07:36:33 2002
--- gzz/gfx/libpaper/textures.py        Tue Oct 15 08:03:48 2002
***************
*** 160,165 ****
--- 160,175 ----
                  #              "SIGNED_HILO_NV", "HILO_NV",  # XXX signed
                  #              "rd1", ["iter", "3000", "F", ".04", "k", 
".06"]]),
          ])
+ 
+     ptextures["DSDT"] = map(NamedTexture, [ 
+         { "name" : "dsdtn",
+           "args" : [512, 512, 0, 2,
+                     "DSDT_NV", "DSDT_NV",  # XXX signed
+                     "noise", ["type", "normal", "freq", "10", "scale", "0.2", 
"bias", ".5"]]
+           },
+         ])
+ 
+     ptextures["FOOBAR"] = [ ptextures["RGB2"][-1] ]
      
  def getPaperTexture(type, gen):
      return selectRandom(ptextures[type], gen)