[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: |
Fri, 04 Oct 2002 09:18:19 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/04 09:18:18
Modified files:
gfx/demo : texlab.py
gfx/libpaper : papermill.py texcomb_NV1X.py textures.py
Log message:
Scale color and alpha dot products maximally to reduce blurry textures
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texlab.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_NV1X.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/texlab.py
diff -c gzz/gfx/demo/texlab.py:1.2 gzz/gfx/demo/texlab.py:1.3
*** gzz/gfx/demo/texlab.py:1.2 Mon Sep 30 12:23:21 2002
--- gzz/gfx/demo/texlab.py Fri Oct 4 09:18:18 2002
***************
*** 7,17 ****
#tex.shade(256, 256, 0, 3, "RGB", "RGB", "fnoise",
! # ["scale", ".43", "freq", "1", "df", "2", "bias", "0.5"])
#tex.shade(256, 256, 0, 3, "RGB", "RGB", "fnoise",
# ["scale", "2.5", "freq", "1", "df", "2", "bias", "0.5"])
! #tex.shade(256, 256, 0, 4, "RGBA", "RGBA", "geometric", ["type", "3"])
--- 7,17 ----
#tex.shade(256, 256, 0, 3, "RGB", "RGB", "fnoise",
! # ["scale", ".43", "freq", "1", "df", "2", "bias", "0.5", "seed",
"1412"])
#tex.shade(256, 256, 0, 3, "RGB", "RGB", "fnoise",
# ["scale", "2.5", "freq", "1", "df", "2", "bias", "0.5"])
! tex.shade(256, 256, 0, 4, "RGBA", "RGBA", "geometric", ["type", "0"])
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.33 gzz/gfx/libpaper/papermill.py:1.34
*** gzz/gfx/libpaper/papermill.py:1.33 Mon Sep 30 12:23:21 2002
--- gzz/gfx/libpaper/papermill.py Fri Oct 4 09:18:18 2002
***************
*** 1,6 ****
--- 1,10 ----
dbg = 0
initialized = 0
+ import gfx.libpaper.textures
+ reload(gfx.libpaper.textures)
+ from gfx.libpaper.textures import Textures
+
import gfx.libpaper.colors
reload(gfx.libpaper.colors)
from gfx.libpaper.colors import Colors
***************
*** 23,29 ****
vendor,renderer,version)
# The backend files to load
files = [
! "textures.py",
"texcoords.py",
#"colors.py",
"params.py"
--- 27,33 ----
vendor,renderer,version)
# The backend files to load
files = [
! #"textures.py",
"texcoords.py",
#"colors.py",
"params.py"
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.15
gzz/gfx/libpaper/texcomb_NV1X.py:1.16
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.15 Thu Oct 3 12:12:11 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py Fri Oct 4 09:18:18 2002
***************
*** 51,56 ****
--- 51,66 ----
type = rnd.nextInt(3)
# types: 0=BAND-LIKE, 1=3-COL-LERP, 2=FRACTION-LINE
+ if 0:
+ if trans > 0:
+ scale = "SCALE_BY_FOUR_NV"
+ else:
+ scale = [ "SCALE_BY_ONE_HALF_NV",
+ "NONE",
+ "SCALE_BY_TWO_NV",
+ "SCALE_BY_FOUR_NV",
+ ][rnd.nextInt(4)]
+
# Then, select the combiner path type.
if 0:
***************
*** 144,151 ****
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
--- 154,161 ----
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
***************
*** 181,187 ****
CI1 ALPHA B SPARE0_NV SIGNED_IDENTITY_NV BLUE
CI1 ALPHA C SPARE1_NV SIGNED_NEGATE_NV BLUE
CI1 ALPHA D SPARE1_NV SIGNED_IDENTITY_NV BLUE
! CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV NONE NONE FALSE
FALSE FALSE
# lerp(SPARE1, PRI_COL, FOG)
FCI A SPARE1_NV UNSIGNED_INVERT_NV RGB
--- 191,197 ----
CI1 ALPHA B SPARE0_NV SIGNED_IDENTITY_NV BLUE
CI1 ALPHA C SPARE1_NV SIGNED_NEGATE_NV BLUE
CI1 ALPHA D SPARE1_NV SIGNED_IDENTITY_NV BLUE
! CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV %(scale)s NONE
FALSE FALSE FALSE
# lerp(SPARE1, PRI_COL, FOG)
FCI A SPARE1_NV UNSIGNED_INVERT_NV RGB
***************
*** 193,201 ****
""")
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
--- 203,211 ----
""")
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
***************
*** 241,247 ****
CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE
CI1 ALPHA B CONSTANT_COLOR1_NV EXPAND_NORMAL_NV BLUE
! CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV NONE NONE FALSE
FALSE FALSE
FCI G %(finalG)s ALPHA
""")
--- 251,257 ----
CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE
CI1 ALPHA B CONSTANT_COLOR1_NV EXPAND_NORMAL_NV BLUE
! CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV %(scale)s NONE
FALSE FALSE FALSE
FCI G %(finalG)s ALPHA
""")
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.11 gzz/gfx/libpaper/textures.py:1.12
*** gzz/gfx/libpaper/textures.py:1.11 Thu Oct 3 09:48:00 2002
--- gzz/gfx/libpaper/textures.py Fri Oct 4 09:18:18 2002
***************
*** 9,14 ****
--- 9,16 ----
# OFFS2
# OFFS3
+ from gzz.gfx.gl import GL
+
import java
from math import exp
- [Gzz-commits] gzz/gfx demo/texlab.py libpaper/papermill.py li...,
Janne V. Kujala <=