[Jake2-commits] jake2/src/jake2/render/fast Image.java,1.4,1.5

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/fast
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15402/src/jake2/render/fast

Modified Files:
	Image.java 
Log Message:
clean up

Index: Image.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Image.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Image.java	10 Jan 2007 03:01:31 -0000	1.4
--- Image.java	15 Feb 2007 14:28:47 -0000	1.5
***************
*** 2,7 ****
   * Image.java
   * Copyright (C) 2003
-  *
-  * $Id$
   */
  /*
--- 2,5 ----
***************
*** 36,44 ****
  
  import java.awt.Dimension;
! import java.awt.geom.AffineTransform;
! import java.awt.image.AffineTransformOp;
! import java.awt.image.BufferedImage;
! import java.nio.*;
! import java.util.*;
  
  /**
--- 34,43 ----
  
  import java.awt.Dimension;
! import java.nio.ByteBuffer;
! import java.nio.ByteOrder;
! import java.nio.IntBuffer;
! import java.util.Arrays;
! import java.util.HashMap;
! import java.util.Map;
  
  /**
***************
*** 120,135 ****
  
  	void GL_SelectTexture(int texture /* GLenum */) {
! 		int tmu;
! 
! 		tmu = (texture == TEXTURE0) ? 0 : 1;
  
! 		if (tmu == gl_state.currenttmu) {
! 			return;
  		}
  
- 		gl_state.currenttmu = tmu;
- 
- 		gl.glActiveTextureARB(texture);
- 		gl.glClientActiveTextureARB(texture);
  	}
  
--- 119,130 ----
  
  	void GL_SelectTexture(int texture /* GLenum */) {
! 		int tmu = (texture == TEXTURE0) ? 0 : 1;
  
! 		if (tmu != gl_state.currenttmu) {
! 			gl_state.currenttmu = tmu;
! 			gl.glActiveTextureARB(texture);
! 			gl.glClientActiveTextureARB(texture);
  		}
  
  	}