[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire/spanimages/gl PageScrollBlo...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire/org/fenfire/spanimages/gl PageScrollBlo... |
Date: |
Mon, 18 Aug 2003 05:44:04 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/18 05:44:03
Modified files:
org/fenfire/spanimages/gl: PageScrollBlockImager.java
papermakers.py
Log message:
filt
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java
diff -u fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.11
fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.12
--- fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.11 Mon Aug
18 04:32:09 2003
+++ fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java Mon Aug
18 05:44:03 2003
@@ -44,6 +44,12 @@
public int RESOLUTION = 160;
public int MAXTEXSIZE = 2048;
+ public String filter =
+ "TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR\n"+
+ "TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR\n"+
+ "TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10\n"+
+ "";
+
/** A cache of block file names.
* Useful because usually pages of the same file are created
* right next to each other.
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.10
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.11
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.10 Mon Aug 18
03:48:57 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py Mon Aug 18 05:44:03 2003
@@ -28,11 +28,6 @@
from org.fenfire.spanimages.gl import PlainPaperMaker
-anisofilter = """
- TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
- TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
-# TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
-"""
class OffsetPaperMill(PaperMill):
def __init__(self, mill, offset):
@@ -52,7 +47,7 @@
return paperMill
def white(w = None, paperMill = None, paperOffset = 0,
- filter = anisofilter):
+ filter = ""):
return PlainPaperMaker(1, """
TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
Enable TEXTURE_2D
@@ -61,7 +56,7 @@
""", None)
def fancyBlend(paperMill = None, paperOffset = 0,
- filter = anisofilter):
+ filter = ""):
paperMill = getPaperMill(paperMill, paperOffset)
return PlainPaperMaker(1,
"""
@@ -106,7 +101,7 @@
# Blend the halo over the texture
color = EF * (1) + (1 - EF) * TEX0
alpha = 1
- """ % { "filter" : anisofilter }),
+ """ % { "filter" : "" }),
"""
""",
None, paperMill)