[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/demo/opengl/glinfo.py gfx/libpap...
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz ./TODO gfx/demo/opengl/glinfo.py gfx/libpap... |
|
Date: |
Mon, 30 Sep 2002 10:04:26 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/09/30 10:04:26
Modified files:
. : TODO
gfx/demo/opengl: glinfo.py
gfx/libpaper : texcomb_NV1X.py texcoords.py textures.py
Added files:
gfx/demo : texlab.py
Log message:
Try different papermill basis textures
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.200&tr2=1.201&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texlab.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_NV1X.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcoords.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.200 gzz/TODO:1.201
*** gzz/TODO:1.200 Mon Sep 30 08:47:59 2002
--- gzz/TODO Mon Sep 30 10:04:25 2002
***************
*** 334,339 ****
--- 334,340 ----
":" appropriately.
- tidy up UML appearance: all matters of centering, aligning etc.
- return error codes from gfx/libtexture/*.texture
+ - move FPARAM definition from *.texture to Texture.hxx
0.8alpha15: new round of features
tuukkah:
***************
*** 407,412 ****
--- 408,418 ----
when locale is changed from the default
- invert PaperQuad coords2
+ - in gldemo.py, add "R" key for "cvs update":ing in addition
+ to reloading the scenefile
+
+ - In Texture_pipetexture.cxx, do "make foobar.bin" if
+ foobar.texture is newer than "foobar.bin"
-------------------------------------------
PUBLICATIONS (approximate planned time order)
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.4 gzz/gfx/demo/opengl/glinfo.py:1.5
*** gzz/gfx/demo/opengl/glinfo.py:1.4 Mon Sep 23 05:09:29 2002
--- gzz/gfx/demo/opengl/glinfo.py Mon Sep 30 10:04:25 2002
***************
*** 40,46 ****
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys(0, "1", 10, 0, 0, 40, 0, 0, 40)
vendor = GL.getGLString("VENDOR")
renderer = GL.getGLString("RENDERER")
--- 40,47 ----
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, 40, 0, 0, 40)
! vs.matcher.add(cs1, "1")
vendor = GL.getGLString("VENDOR")
renderer = GL.getGLString("RENDERER")
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.13
gzz/gfx/libpaper/texcomb_NV1X.py:1.14
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.13 Tue Sep 24 12:11:41 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py Mon Sep 30 10:04:26 2002
***************
*** 47,52 ****
--- 47,53 ----
type = rnd.nextInt(3)
# types: 0=BAND-LIKE, 1=3-COL-LERP, 2=FRACTION-LINE
+
# Then, select the combiner path type.
if 0:
# Stage 0: calculate dot products of the textures, and of
***************
*** 91,96 ****
--- 92,102 ----
""")
elif type == 0:
+ #scale = "SCALE_BY_ONE_HALF_NV"
+ #scale = "NONE"
+ #scale = "SCALE_BY_TWO_NV"
+ scale = "SCALE_BY_FOUR_NV"
+
# Band-like texture.
#
# A little different from what Tjl and Jvk originally
***************
*** 117,123 ****
CI1 RGB B SPARE0_NV SIGNED_IDENTITY_NV RGB
CI1 RGB C TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
CI1 RGB D CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
! CO1 RGB SPARE1_NV SPARE0_NV DISCARD_NV SCALE_BY_TWO_NV NONE
FALSE TRUE FALSE
# EF <- SPARE0 * SPARE1
FCI E SPARE1_NV UNSIGNED_INVERT_NV RGB
--- 123,129 ----
CI1 RGB B SPARE0_NV SIGNED_IDENTITY_NV RGB
CI1 RGB C TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
CI1 RGB D CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
! CO1 RGB SPARE1_NV SPARE0_NV DISCARD_NV %(scale)s NONE FALSE
TRUE FALSE
# EF <- SPARE0 * SPARE1
FCI E SPARE1_NV UNSIGNED_INVERT_NV RGB
***************
*** 132,137 ****
--- 138,148 ----
FCI G %(finalG)s UNSIGNED_INVERT_NV BLUE
""")
elif type == 1:
+ #scale = "SCALE_BY_ONE_HALF_NV"
+ #scale = "NONE"
+ scale = "SCALE_BY_TWO_NV"
+ #scale = "SCALE_BY_FOUR_NV"
+
# Interpolate between three colors:
# d0 = t0 . r0
# d1 = t1 . r1
***************
*** 152,158 ****
CI0 RGB B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
CI0 RGB C TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
CI0 RGB D CONSTANT_COLOR1_NV EXPAND_NORMAL_NV RGB
! CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV NONE NONE TRUE TRUE FALSE
# PRI_COL <- lerp(SPARE0, PRI_COL, SEC_COL)
CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
--- 163,169 ----
CI0 RGB B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
CI0 RGB C TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
CI0 RGB D CONSTANT_COLOR1_NV EXPAND_NORMAL_NV RGB
! CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV %(scale)s NONE TRUE TRUE
FALSE
# PRI_COL <- lerp(SPARE0, PRI_COL, SEC_COL)
CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
***************
*** 177,182 ****
--- 188,198 ----
FCI G %(finalG)s ALPHA
""")
else:
+ #scale = "SCALE_BY_ONE_HALF_NV"
+ scale = "NONE"
+ #scale = "SCALE_BY_TWO_NV"
+ #scale = "SCALE_BY_FOUR_NV"
+
# Interpolate on the fraction line c0,c1,c2:
# d0 = t0 . t1
# c(d0) =
***************
*** 201,207 ****
CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
CI0 RGB C TEXTURE%(t0)s EXPAND_NEGATE_NV RGB
CI0 RGB D TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
! CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV SCALE_BY_ONE_HALF_NV
NONE TRUE TRUE FALSE
# PRI_COL <- lerp(SPARE1, SEC_COL, PRI_COL)
CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
--- 217,223 ----
CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
CI0 RGB C TEXTURE%(t0)s EXPAND_NEGATE_NV RGB
CI0 RGB D TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
! CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV %(scale)s NONE TRUE TRUE
FALSE
# PRI_COL <- lerp(SPARE1, SEC_COL, PRI_COL)
CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
Index: gzz/gfx/libpaper/texcoords.py
diff -c gzz/gfx/libpaper/texcoords.py:1.10 gzz/gfx/libpaper/texcoords.py:1.11
*** gzz/gfx/libpaper/texcoords.py:1.10 Fri Sep 6 08:35:01 2002
--- gzz/gfx/libpaper/texcoords.py Mon Sep 30 10:04:26 2002
***************
*** 159,164 ****
--- 159,166 ----
if 0:
print "S: ", [self.vecs[0][0], self.vecs[1][0]]
print "T: ", [self.vecs[0][1], self.vecs[1][1]]
+ print "S': ", [vecs[0][0], vecs[1][0]]
+ print "T': ", [vecs[0][1], vecs[1][1]]
print "a S' + b T':", [a*vecs[0][0]+b*vecs[0][1],
a*vecs[1][0]+b*vecs[1][1]]
print "c S' + d T':", [c*vecs[0][0]+d*vecs[0][1],
c*vecs[1][0]+d*vecs[1][1]]
print "a,b,c,d:", a,b,c,d
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.8 gzz/gfx/libpaper/textures.py:1.9
*** gzz/gfx/libpaper/textures.py:1.8 Mon Sep 23 04:37:04 2002
--- gzz/gfx/libpaper/textures.py Mon Sep 30 10:04:26 2002
***************
*** 37,44 ****
# "noise", ["type", "turbulence", "freq", "40", "scale", "-3", "bias",
"2"]]),
# ("rgbw", [tres, tres, 0, 3, "RGB", "RGB",
# "fnoise", ["scale", "2","bias",".5"]]),
("rgbw2", [tres, tres, 0, 3, "RGB", "RGB",
! "fnoise", ["scale", "2", "freq", "1", "df", "2", "bias", "0.5"]]),
]]
def getPaperTexture(type, gen):
--- 37,50 ----
# "noise", ["type", "turbulence", "freq", "40", "scale", "-3", "bias",
"2"]]),
# ("rgbw", [tres, tres, 0, 3, "RGB", "RGB",
# "fnoise", ["scale", "2","bias",".5"]]),
+
("rgbw2", [tres, tres, 0, 3, "RGB", "RGB",
! "fnoise", ["scale", ".5", "freq", "1", "df", "2", "bias", "0.5"]]),
!
! ("pyramid", [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "0"]]),
! ("checkerboard", [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type",
"1"]]),
! ("cone", [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "2"]]),
! ("checkerboard2", [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type",
"3"]]),
]]
def getPaperTexture(type, gen):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./TODO gfx/demo/opengl/glinfo.py gfx/libpap...,
Janne V. Kujala <=