[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libpaper texops_NV2X.py textures.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/libpaper texops_NV2X.py textures.py |
Date: |
Wed, 16 Oct 2002 04:41:52 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/16 04:41:27
Modified files:
gfx/libpaper : texops_NV2X.py textures.py
Log message:
Enhance NV25 offset textures
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texops_NV2X.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: gzz/gfx/libpaper/texops_NV2X.py
diff -c gzz/gfx/libpaper/texops_NV2X.py:1.6 gzz/gfx/libpaper/texops_NV2X.py:1.7
*** gzz/gfx/libpaper/texops_NV2X.py:1.6 Tue Oct 15 09:52:04 2002
--- gzz/gfx/libpaper/texops_NV2X.py Wed Oct 16 04:41:27 2002
***************
*** 141,147 ****
""" % (self.st[t][2])
if shortOp in [ "O", "OH" ]:
! hyper = rnd.nextGaussian()
mat = ( rnd.nextGaussian()*hyper,
rnd.nextGaussian()*hyper,
rnd.nextGaussian()*hyper,
--- 141,147 ----
""" % (self.st[t][2])
if shortOp in [ "O", "OH" ]:
! hyper = rnd.nextGaussian() * self.tex[t].featurescale * 2
mat = ( rnd.nextGaussian()*hyper,
rnd.nextGaussian()*hyper,
rnd.nextGaussian()*hyper,
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.30 gzz/gfx/libpaper/textures.py:1.31
*** gzz/gfx/libpaper/textures.py:1.30 Tue Oct 15 10:37:30 2002
--- gzz/gfx/libpaper/textures.py Wed Oct 16 04:41:27 2002
***************
*** 50,55 ****
--- 50,59 ----
initialized = 1
global ptextures
+
+ # "scale": something like reciprocal of maximum derivative
+ # "featurescale": reciprocal of the number of "features" on a unit length
+
tres = 128
ptextures["RGB2"] = map(NamedTexture, filter(lambda dict: dict["name"] in
[
"rgbw1",
***************
*** 59,65 ****
"pyramid",
"checkerboard",
"cone",
! "checkerboard2",
"saw",
"triangle",
"stripe",
--- 63,69 ----
"pyramid",
"checkerboard",
"cone",
! #"checkerboard2",
"saw",
"triangle",
"stripe",
***************
*** 68,79 ****
--- 72,85 ----
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
["scale", ".43", "freq", "1", "df", ".3", "bias", "0.5",
"seed", "2323" ]],
"scale" : 1./2,
+ "featurescale" : 1./2,
},
{"name" : "rgbw2",
"args" : [tres, tres, 0, 3, "RGB", "RGB", "fnoise",
["scale", ".43", "freq", "1", "df", "1.2", "bias", "0.5"
]],
"scale" : 1./2,
+ "featurescale" : 1./4,
},
***************
*** 82,87 ****
--- 88,94 ----
["scale", ".3", "freq", "1", "df", "1.9", "bias", "0.5",
"seed", "361", "aniso", "2"]],
"scale" : 1./2,
+ "featurescale" : 1./4,
},
{"name" : "turb",
***************
*** 89,105 ****
--- 96,115 ----
["turb", "1", "scale", ".3", "freq", "1",
"freq2", "100", "df", "1", "bias", "0"]],
"scale" : 1./8,
+ "featurescale" : 1./16,
},
{"name" : "pyramid",
"args" : [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "0"]],
"scale" : 1./2,
+ "featurescale" : 1./2,
},
{"name" : "checkerboard",
"args" : [4, 4, 0, 3, "RGB", "RGB", "geometric", ["type", "1",
"scale", ".5", "bias", ".5"]],
"continuous" : 0,
"scale" : 1./8,
+ "featurescale" : 1./4,
"minfilter" : "NEAREST",
"magfilter" : "NEAREST",
},
***************
*** 107,118 ****
--- 117,130 ----
{"name" : "cone",
"args" : [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "2"]],
"scale" : 1./2,
+ "featurescale" : 1./2,
},
{"name" : "checkerboard2",
"args" : [2, 2, 0, 3, "RGB", "RGB", "geometric", ["type", "3",
"scale", ".5", "bias", ".5"]],
"continuous" : 0,
"scale" : 1./8,
+ "featurescale" : 1./2,
"minfilter" : "NEAREST",
"magfilter" : "NEAREST",
},
***************
*** 121,126 ****
--- 133,139 ----
"args" : [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "4"]],
"continuous" : 0,
"scale" : 1./8,
+ "featurescale" : 1.,
"minfilter" : "NEAREST",
"magfilter" : "NEAREST",
},
***************
*** 128,139 ****
--- 141,154 ----
{"name" : "triangle",
"args" : [64, 64, 0, 3, "RGB", "RGB", "geometric", ["type", "5"]],
"scale" : 1./2,
+ "featurescale" : 1./2,
},
{"name" : "stripe",
"args" : [2, 2, 0, 3, "RGB", "RGB", "geometric", ["type", "6",
"scale", ".5", "bias", ".5"]],
"continuous" : 0,
"scale" : 1./8,
+ "featurescale" : 1./2,
"minfilter" : "NEAREST",
"magfilter" : "NEAREST",
},
***************
*** 167,176 ****
])
ptextures["DSDT_HILO"] = map(NamedTexture, [
! { "name" : "dsdtw1",
! "args" : [512, 512, 0, 2, "SIGNED_HILO_NV", "HILO_NV", "fnoise",
! ["scale", ".43", "freq", "1", "df", ".3", "bias", "0.5",
"seed", "2323" ]],
}
])
--- 182,196 ----
])
ptextures["DSDT_HILO"] = map(NamedTexture, [
! { "name" : "dsdt_w1",
! "args" : [tres, tres, 0, 2, "SIGNED_HILO_NV", "HILO_NV", "fnoise",
! ["scale", ".43", "freq", "1", "df", "1", "bias", "0.5",
"seed", "2323" ]],
+ },
+ { "name" : "dsdt_turb",
+ "args" : [tres, tres, 0, 2, "SIGNED_HILO_NV", "HILO_NV", "fnoise",
+ ["turb", "1", "scale", ".3", "freq", "1",
+ "freq2", "100", "df", "1", "bias", "0"]],
}
])