[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/10/11 07:08:42

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

Log message:
        Enable anistropic filtering done

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.274&tr2=1.275&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcache.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_NV2X.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_STD.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.274 gzz/TODO:1.275
*** gzz/TODO:1.274      Thu Oct 10 12:43:38 2002
--- gzz/TODO    Fri Oct 11 07:08:42 2002
***************
*** 12,18 ****
  0.8alpha4: Cleanup release after crucial demos; make it possible for anyone to
            get *THE* demo up and running
      jvk:
-       - turn on anisotropic filtering for all paper textures.
        + [GI03] simplify libpaper color space
        + [GI03] think about modeling textures
        + [GI03] libpaper NV2x combined passes
--- 12,17 ----
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.40 gzz/gfx/demo/papertest.py:1.41
*** gzz/gfx/demo/papertest.py:1.40      Fri Oct 11 06:37:58 2002
--- gzz/gfx/demo/papertest.py   Fri Oct 11 07:08:42 2002
***************
*** 25,30 ****
--- 25,31 ----
  def ignore(s):
      return ""
  
+ import gfx.libpaper.papermill
  from gfx.libpaper.papermill import ThePaperMill
  
  benchmark = 0
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.42 gzz/gfx/libpaper/papermill.py:1.43
*** gzz/gfx/libpaper/papermill.py:1.42  Fri Oct 11 06:37:58 2002
--- gzz/gfx/libpaper/papermill.py       Fri Oct 11 07:08:42 2002
***************
*** 1,17 ****
- #import gfx.libutil.myimport
- #reload(gfx.libutil.myimport)
- #from gfx.libutil.myimport import my_import
- 
- #my_import("gfx.libpaper.textures")
  from gfx.libpaper.textures import Textures
- 
- #my_import("gfx.libpaper.colors")
  from gfx.libpaper.colors import Colors
- 
- #my_import("gfx.libpaper.texcoords")
  from gfx.libpaper.texcoords import TexGenXYRepeatUnit
- 
- #my_import("gfx.libpaper.params")
  from gfx.libpaper.params import *
  
  from gzz.gfx.gl import GL,GLRen,Paper,PaperMill
--- 1,6 ----
***************
*** 38,49 ****
      # XXX Should check separately for texture_shader2,
      # otherwise it'll be SLOW.
      if dbg: print "Using NV20 texture shaders"
!     #my_import("gfx.libpaper.texops_NV2X")
!     from gfx.libpaper.texops_NV2X import *    
  else:
      if dbg: print "Using unextended OpenGL texture accesses"
!     #my_import("gfx.libpaper.texops_STD")
!     from gfx.libpaper.texops_STD import *
  
  
  # Check which combiners to use.
--- 27,36 ----
      # XXX Should check separately for texture_shader2,
      # otherwise it'll be SLOW.
      if dbg: print "Using NV20 texture shaders"
!     from gfx.libpaper.texops_NV2X import makeNormalShaderPass
  else:
      if dbg: print "Using unextended OpenGL texture accesses"
!     from gfx.libpaper.texops_STD import makeNormalShaderPass
  
  
  # Check which combiners to use.
***************
*** 54,72 ****
      if maxcomb < 4:
          # use NV10 version
          if dbg: print "Using NV10 combiners ",maxcomb
!         #my_import("gfx.libpaper.texcomb_NV1X")
!         from gfx.libpaper.texcomb_NV1X import *
      else:
          # use NV20 version
          if dbg: print "Using NV20 combiners ",maxcomb
!         #my_import("gfx.libpaper.texcomb_NV2X")
!         from gfx.libpaper.texcomb_NV2X import *
  else:
      # Must use OpenGL 1.1 specified calls.
      print "NEED FIX - DOES _NOT_ WORK : Using OpenGL 1.1 texenv and blending"
-     #my_import("gfx.libpaper.texcomb_GL1_1")
-     
  
  dbg = 0
  
  def randvec(rnd): return [rnd.nextDouble() for i in range(0,3)]
--- 41,65 ----
      if maxcomb < 4:
          # 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"
  
+ 
+ # Check whether anisotropic filtering is supported
+ if GL.hasExtension("GL_EXT_texture_filter_anisotropic"):
+     maxaniso = 2.0
+     if dbg: print "Using anisotropic filtering with maximum degree", maxaniso
+ else:
+     maxaniso = None
+     if dbg: print "Anisotropic filtering not available"
+ 
+     
  dbg = 0
  
  def randvec(rnd): return [rnd.nextDouble() for i in range(0,3)]
***************
*** 152,160 ****
          rnd = java.util.Random(seed)
          #sh = ShaderPass(selectRandom(shaderTypes,rnd))
          if emboss:
!             sh = makeEmbossShaderPass()
          else:
!             sh = makeNormalShaderPass()
  
          types = sh.getTextureTypes()
          for i in range(0, len(types)):
--- 145,153 ----
          rnd = java.util.Random(seed)
          #sh = ShaderPass(selectRandom(shaderTypes,rnd))
          if emboss:
!             sh = makeEmbossShaderPass(maxaniso)
          else:
!             sh = makeNormalShaderPass(maxaniso)
  
          types = sh.getTextureTypes()
          for i in range(0, len(types)):
Index: gzz/gfx/libpaper/texcache.py
diff -c gzz/gfx/libpaper/texcache.py:1.1 gzz/gfx/libpaper/texcache.py:1.2
*** gzz/gfx/libpaper/texcache.py:1.1    Fri Oct 11 06:37:58 2002
--- gzz/gfx/libpaper/texcache.py        Fri Oct 11 07:08:42 2002
***************
*** 10,16 ****
  from java.io import File
  import os
  
! if "texcache" not in globals().keys():
      texcache = {}
      
  def getCachedTexture(args):
--- 10,16 ----
  from java.io import File
  import os
  
! if not globals().has_key("texcache"):
      texcache = {}
      
  def getCachedTexture(args):
Index: gzz/gfx/libpaper/texops_NV2X.py
diff -c gzz/gfx/libpaper/texops_NV2X.py:1.1 gzz/gfx/libpaper/texops_NV2X.py:1.2
*** gzz/gfx/libpaper/texops_NV2X.py:1.1 Mon Sep  2 08:56:56 2002
--- gzz/gfx/libpaper/texops_NV2X.py     Fri Oct 11 07:08:42 2002
***************
*** 127,131 ****
        return [i for i in range(0,len(self.st))
                if self.st[i][1] in ("RGB2", "RGB3")]
  
! def makeNormalShaderPass():
      return ShaderPass(shaderTypes[3])
--- 127,132 ----
        return [i for i in range(0,len(self.st))
                if self.st[i][1] in ("RGB2", "RGB3")]
  
! def makeNormalShaderPass(maxaniso = None):
!     # XXX: TODO: implement maxaniso as in texops_STD
      return ShaderPass(shaderTypes[3])
Index: gzz/gfx/libpaper/texops_STD.py
diff -c gzz/gfx/libpaper/texops_STD.py:1.4 gzz/gfx/libpaper/texops_STD.py:1.5
*** gzz/gfx/libpaper/texops_STD.py:1.4  Wed Oct  9 10:07:27 2002
--- gzz/gfx/libpaper/texops_STD.py      Fri Oct 11 07:08:42 2002
***************
*** 10,18 ****
  ];
  
  class ShaderPass:
!     def __init__(self, shaderType):
        self.st = shaderType
        self.tex = [None for texunit in shaderType]
      def getTextureTypes(self):
        return [texunit[1] for texunit in self.st]
      def getTexgenTypes(self):
--- 10,19 ----
  ];
  
  class ShaderPass:
!     def __init__(self, shaderType, maxaniso):
        self.st = shaderType
        self.tex = [None for texunit in shaderType]
+         self.maxaniso = maxaniso
      def getTextureTypes(self):
        return [texunit[1] for texunit in self.st]
      def getTexgenTypes(self):
***************
*** 45,53 ****
                TexParameter %(target)s TEXTURE_WRAP_T REPEAT
                TexParameter %(target)s TEXTURE_MIN_FILTER %(minfilter)s
                TexParameter %(target)s TEXTURE_MAG_FILTER %(magfilter)s
- 
            """ % locals()
        return c
  
! def makeNormalShaderPass():
!     return ShaderPass(shaderTypes[0])
--- 46,59 ----
                TexParameter %(target)s TEXTURE_WRAP_T REPEAT
                TexParameter %(target)s TEXTURE_MIN_FILTER %(minfilter)s
                TexParameter %(target)s TEXTURE_MAG_FILTER %(magfilter)s
            """ % locals()
+ 
+         if self.maxaniso != None:
+             maxaniso = self.maxaniso
+             c += """
+               TexParameter %(target)s TEXTURE_MAX_ANISOTROPY_EXT %(maxaniso)s
+             """ % locals()
        return c
  
! def makeNormalShaderPass(maxaniso = None):
!     return ShaderPass(shaderTypes[0], maxaniso)