[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx demo/texlab.py libpaper/papermill.py li...
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx demo/texlab.py libpaper/papermill.py li... |
Date: |
Thu, 10 Oct 2002 09:36:46 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/10 09:36:46
Modified files:
gfx/demo : texlab.py
gfx/libpaper : papermill.py texcoords.py textures.py
Log message:
Small libpaper parameter adjustments
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texlab.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcoords.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/texlab.py
diff -c gzz/gfx/demo/texlab.py:1.7 gzz/gfx/demo/texlab.py:1.8
*** gzz/gfx/demo/texlab.py:1.7 Wed Oct 9 10:48:20 2002
--- gzz/gfx/demo/texlab.py Thu Oct 10 09:36:45 2002
***************
*** 12,33 ****
tres = 128
args = [
[tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".43", "freq", ".75", "df", "1", "bias", "0.5", "seed", "2323"
]],
[tres, tres, 0, 3, "RGB", "RGB", "fnoise",
["scale", ".43", "freq", "1", "df", "1.5", "bias", "0.5" ]],
- [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
- ["scale", ".43", "freq", "1", "df", "5", "bias", "0.5",
- "seed", "141", "aniso", "2"]],
! [tres, tres, 0, 4, "RGBA", "RGBA", "fnoise",
! ["scale", ".43", "freq", "1", "df", "1.5", "bias", "0.5" ]],
! [tres, tres, 0, 4, "RGBA", "RGBA", "fnoise",
! ["scale", ".43", "freq", "1", "df", "8", "bias", "0.5",
! "seed", "141", "aniso", "2"]],
! [tres, tres, 0, 4, "RGBA", "RGBA", "fnoise",
["turb", "1", "scale", ".3", "freq", "1",
"freq2", "100", "df", "1", "bias", "0"]],
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "0"]],
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "1"]],
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "2"]],
--- 12,31 ----
tres = 128
args = [
[tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".43", "freq", ".75", "df", "1", "bias", "0.5",
! "seed", "2323" ]],
!
[tres, tres, 0, 3, "RGB", "RGB", "fnoise",
["scale", ".43", "freq", "1", "df", "1.5", "bias", "0.5" ]],
! [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".3", "freq", "1", "df", "1.9", "bias", "0.5",
! "seed", "361", "aniso", "2"]],
! [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
["turb", "1", "scale", ".3", "freq", "1",
"freq2", "100", "df", "1", "bias", "0"]],
+
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "0"]],
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "1"]],
[64, 64, 0, 4, "RGBA", "RGBA", "geometric", ["type", "2"]],
***************
*** 40,64 ****
from gfx.libpaper.textures import getCachedTexture
!
class TexLabScene:
def __init__(self):
- self.ind = 0
if not globals().has_key("tex"): self.inittex()
def inittex(self):
global tex
! tex = getCachedTexture(args[self.ind])
def key(self, k):
reinit = 0
! if k == "+": self.ind = (self.ind+1) % len(args); reinit=1
! if k == "-": self.ind = (self.ind+len(args)-1) % len(args); reinit=1
if reinit:
self.inittex()
! print "Texture", self.ind
pass
--- 38,63 ----
from gfx.libpaper.textures import getCachedTexture
! if not globals().has_key("ind"): ind = 0
class TexLabScene:
def __init__(self):
if not globals().has_key("tex"): self.inittex()
def inittex(self):
global tex
! tex = getCachedTexture(args[ind % len(args)])
def key(self, k):
reinit = 0
! global ind
! if k == "+": ind = (ind+1) % len(args); reinit=1
! if k == "-": ind = (ind+len(args)-1) % len(args); reinit=1
! if k == "0": reinit=1
if reinit:
self.inittex()
! print "Texture", ind
pass
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.40 gzz/gfx/libpaper/papermill.py:1.41
*** gzz/gfx/libpaper/papermill.py:1.40 Wed Oct 9 10:07:27 2002
--- gzz/gfx/libpaper/papermill.py Thu Oct 10 09:36:45 2002
***************
*** 250,254 ****
else:
if dbg: print "TexGen"+str(i), data
ppass.putNormalTexGen(i, data)
-
- papermillInstance = ThePaperMill()
--- 250,252 ----
Index: gzz/gfx/libpaper/texcoords.py
diff -c gzz/gfx/libpaper/texcoords.py:1.13 gzz/gfx/libpaper/texcoords.py:1.14
*** gzz/gfx/libpaper/texcoords.py:1.13 Wed Oct 2 08:20:22 2002
--- gzz/gfx/libpaper/texcoords.py Thu Oct 10 09:36:45 2002
***************
*** 64,70 ****
vecs = None,
angle_stddev = .065,
avg_length_mean = .3,
! avg_length_stddev = .07,
lendiff_mean = 0,
lendiff_stddev = .1):
--- 64,70 ----
vecs = None,
angle_stddev = .065,
avg_length_mean = .3,
! avg_length_stddev = .06,
lendiff_mean = 0,
lendiff_stddev = .1):
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.22 gzz/gfx/libpaper/textures.py:1.23
*** gzz/gfx/libpaper/textures.py:1.22 Wed Oct 9 10:48:20 2002
--- gzz/gfx/libpaper/textures.py Thu Oct 10 09:36:45 2002
***************
*** 79,85 ****
global ptextures
ptextures["RGB2"] = map(NamedTexture, filter(lambda dict: dict["name"] in
[
"rgbw1",
! "rgbw2",
"rgbw3",
"turb",
"pyramid",
--- 79,85 ----
global ptextures
ptextures["RGB2"] = map(NamedTexture, filter(lambda dict: dict["name"] in
[
"rgbw1",
! #"rgbw2",
"rgbw3",
"turb",
"pyramid",
***************
*** 92,98 ****
], [
{"name" : "rgbw1",
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".43", "freq", ".75", "df", "1", "bias", "0.5",
"seed", "2323" ]],
"scale" : 1./2,
},
--- 92,98 ----
], [
{"name" : "rgbw1",
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".43", "freq", "1", "df", ".3", "bias", "0.5",
"seed", "2323" ]],
"scale" : 1./2,
},
***************
*** 105,112 ****
{"name" : "rgbw3",
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".43", "freq", "1", "df", "5", "bias", "0.5",
! "seed", "141", "aniso", "2"]],
"scale" : 1./2,
},
--- 105,112 ----
{"name" : "rgbw3",
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
! ["scale", ".3", "freq", "1", "df", "1.9", "bias", "0.5",
! "seed", "361", "aniso", "2"]],
"scale" : 1./2,
},