[Gzz-commits] gzz/gfx demo/paperbasis.py librenderables/rende...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/16 01:33:36

Modified files:
        gfx/demo       : paperbasis.py 
        gfx/librenderables: renderables.py 

Log message:
        Show 2x2 blocks of basis textures, fix RGB basis combiner color

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/paperbasis.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/paperbasis.py
diff -c gzz/gfx/demo/paperbasis.py:1.4 gzz/gfx/demo/paperbasis.py:1.5
*** gzz/gfx/demo/paperbasis.py:1.4      Sun Sep 15 06:49:06 2002
--- gzz/gfx/demo/paperbasis.py  Mon Sep 16 01:33:35 2002
***************
*** 25,30 ****
--- 25,32 ----
      ActiveTexture TEXTURE1
      Disable TEXTURE_2D
      Disable REGISTER_COMBINERS_NV
+     Color 1 1 1
+     SecondaryColorEXT 0 0 0
      """,
      "DOT" : nvcode.combinercode("""
      CombinerParameterNV NUM_GENERAL_COMBINERS_NV 1
***************
*** 48,53 ****
--- 50,57 ----
      ActiveTexture TEXTURE0
      Disable TEXTURE_2D
      Disable REGISTER_COMBINERS_NV
+     Color 1 1 1
+     SecondaryColorEXT 0 0 0
      """,
      "DOT" : nvcode.combinercode("""
      CombinerParameterNV NUM_GENERAL_COMBINERS_NV 1
***************
*** 90,96 ****
  def getpaper(seed):
      pap = ThePaperMill().getPaper(seed, passmask=passmask)
  
!     return GZZGL.createBasisPaperQuad(pap,
                                        tex0codes[tex0comb],
                                        tex1codes[tex1comb],
                                        isectcodes[isectcomb])
--- 94,100 ----
  def getpaper(seed):
      pap = ThePaperMill().getPaper(seed, passmask=passmask)
  
!     return GZZGL.createBasisPaperQuad(pap, -1, -1, 1, 1,
                                        tex0codes[tex0comb],
                                        tex1codes[tex1comb],
                                        isectcodes[isectcomb])
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.29 
gzz/gfx/librenderables/renderables.py:1.30
*** gzz/gfx/librenderables/renderables.py:1.29  Sun Sep 15 06:49:06 2002
--- gzz/gfx/librenderables/renderables.py       Mon Sep 16 01:33:36 2002
***************
*** 514,525 ****
  {
      "Type" : "2",
      "Name": "BasisPaperQuad",
!     "Data": "Paper::Paper* paper; CallGLCode tex0code, tex1code, isectcode;",
      "Params" : """
!           Paper paper, String tex0, String tex1, String isect
        """,
      "ParamCode" : """
            this->paper = paper;
              tex0code = CallGLCode(string(tex0.begin(), tex0.end()).c_str());
              tex1code = CallGLCode(string(tex1.begin(), tex1.end()).c_str());
              isectcode = CallGLCode(string(isect.begin(), 
isect.end()).c_str());
--- 514,530 ----
  {
      "Type" : "2",
      "Name": "BasisPaperQuad",
!     "Data": "Paper::Paper* paper; CallGLCode tex0code, tex1code, isectcode; 
float x0, y0, x1, y1;",
      "Params" : """
!           Paper paper, float x0, float y0, float x1, float y1,
!             String tex0, String tex1, String isect
        """,
      "ParamCode" : """
            this->paper = paper;
+             this->x0 = x0;
+             this->y0 = y0;
+             this->x1 = x1;
+             this->y1 = y1;
              tex0code = CallGLCode(string(tex0.begin(), tex0.end()).c_str());
              tex1code = CallGLCode(string(tex1.begin(), tex1.end()).c_str());
              isectcode = CallGLCode(string(isect.begin(), 
isect.end()).c_str());
***************
*** 558,564 ****
                  //glActiveTexture(GL_TEXTURE0);
                  //clampTexture2D(1.0);
  
!                 Pt p[] = { Pt(0,0), Pt(0,1), Pt(1,1), Pt(1,0) };
                  Pt q;
  
                  // Draw the first texture
--- 563,569 ----
                  //glActiveTexture(GL_TEXTURE0);
                  //clampTexture2D(1.0);
  
!                 Pt p[] = { Pt(x0,y0), Pt(x0,y1), Pt(x1,y1), Pt(x1,y0) };
                  Pt q;
  
                  // Draw the first texture