From 273ebc2982d872de46efdcc3d19dc33af2a29271 Mon Sep 17 00:00:00 2001
From: Chien Yang <jada@dev.java.net>
Date: Sat, 28 Oct 2006 18:19:45 +0000
Subject: 1) Fixed Issue 349 : OffScreen Canvas3D needlessly forces
 power-of-two for its buffer 2) Fixed Issue 371 : Poor raster quality for
 systems that don't support NPOT textures 3) Minor clean up to native piples

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@731 ba19aa83-45c5-6ac9-afd3-db810772062c
---
 src/native/d3d/Canvas3D.cpp | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'src/native/d3d/Canvas3D.cpp')

diff --git a/src/native/d3d/Canvas3D.cpp b/src/native/d3d/Canvas3D.cpp
index dbe7042..ea84d95 100644
--- a/src/native/d3d/Canvas3D.cpp
+++ b/src/native/d3d/Canvas3D.cpp
@@ -352,7 +352,8 @@ void JNICALL Java_javax_media_j3d_NativePipeline_textureFillBackground(
 							jfloat mapMinX, 
 							jfloat mapMaxX, 
 							jfloat mapMinY,
-							jfloat mapMaxY)
+							jfloat mapMaxY,
+							jboolean useBilinearFilter)
 {
     
     DWORD alphaTest, alphaBlend, cull, zBuffer,
@@ -398,12 +399,7 @@ void JNICALL Java_javax_media_j3d_NativePipeline_textureFillBackground(
 		   d3dCtx->texUnitStage, d3dCtx->bindTextureIdLen);
 	}
 	return;
-    }
-    
-    device->SetTextureStageState(tus,
-				 D3DTSS_TEXCOORDINDEX,
-				 D3DTSS_TCI_PASSTHRU);
-    
+    }    
 
     if (d3dCtx->texTransformSet[tus]) {
 	device->GetTransform((D3DTRANSFORMSTATETYPE)
@@ -415,6 +411,24 @@ void JNICALL Java_javax_media_j3d_NativePipeline_textureFillBackground(
 			     &identityMatrix);
     }
 
+    // TextureStage will be restore by caller.
+    device->SetTextureStageState(tus,
+				 D3DTSS_TEXCOORDINDEX,
+				 D3DTSS_TCI_PASSTHRU);
+    
+    /* Setup filter mode if needed */
+    if(useBilinearFilter) {
+	/* fprintf(stderr, "Background  : use bilinear filter\n"); */
+	device->SetSamplerState (tus, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+	device->SetSamplerState (tus, D3DSAMP_MIPFILTER, D3DTEXF_POINT);
+	device->SetSamplerState (tus, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+    }
+    /* For debugging only
+    else {
+	fprintf(stderr, "Background  : Not use bilinear filter\n");         
+    }
+    */
+
     device->GetTransform(D3DTS_PROJECTION, &ptm);
     device->GetTransform(D3DTS_WORLD, &wtm);
     device->GetTransform(D3DTS_VIEW, &vtm);
@@ -526,7 +540,8 @@ void JNICALL Java_javax_media_j3d_NativePipeline_textureFillRaster(JNIEnv *env,
 							jfloat mapMinY,
 							jfloat mapMaxY,
                                                         jfloat mapZ,
-                                                        jfloat alpha)
+							jfloat alpha,
+							jboolean useBilinearFilter)
 { 
 
     DWORD  cull, lighting;
@@ -558,6 +573,19 @@ void JNICALL Java_javax_media_j3d_NativePipeline_textureFillRaster(JNIEnv *env,
     device->SetTextureStageState(tus, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
     device->SetTextureStageState(tus, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
     device->SetTextureStageState(tus, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
+
+    /* Setup filter mode if needed */
+    if(useBilinearFilter) {
+	/* fprintf(stderr, "Raster  : use bilinear filter\n"); */
+	device->SetSamplerState (tus, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+	device->SetSamplerState (tus, D3DSAMP_MIPFILTER, D3DTEXF_POINT);
+	device->SetSamplerState (tus, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+    }
+    /* For debugging only
+    else {
+	fprintf(stderr, "Raster  : Not use bilinear filter\n");         
+    }
+    */
     
     device->GetTransform(D3DTS_PROJECTION, &ptm);
     device->GetTransform(D3DTS_WORLD, &wtm);
-- 
cgit v1.2.3