[Jake2-commits] jake2/src/jake2/render/lwjgl Model.java,1.4,1.5 Surf.java,1.5,1.6 Polygon.java,1.1,1.2

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

Update of /cvsroot/jake2/jake2/src/jake2/render/lwjgl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22631/src/jake2/render/lwjgl

Modified Files:
	Model.java Surf.java Polygon.java 
Log Message:
code cleanup

Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Model.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Model.java	9 Jan 2005 22:35:31 -0000	1.4
--- Model.java	10 Jan 2005 00:12:00 -0000	1.5
***************
*** 30,54 ****
  import jake2.game.cplane_t;
  import jake2.game.cvar_t;
! import jake2.qcommon.Com;
! import jake2.qcommon.Cvar;
! import jake2.qcommon.FS;
! import jake2.qcommon.lump_t;
! import jake2.qcommon.qfiles;
! import jake2.qcommon.texinfo_t;
! import jake2.render.medge_t;
! import jake2.render.mleaf_t;
! import jake2.render.mmodel_t;
! import jake2.render.mnode_t;
! import jake2.render.model_t;
! import jake2.render.msurface_t;
! import jake2.render.mtexinfo_t;
! import jake2.render.mvertex_t;
  import jake2.util.Math3D;
  import jake2.util.Vargs;
  
! import java.nio.ByteBuffer;
! import java.nio.ByteOrder;
! import java.nio.FloatBuffer;
! import java.nio.IntBuffer;
  import java.util.Arrays;
  import java.util.Vector;
--- 30,39 ----
  import jake2.game.cplane_t;
  import jake2.game.cvar_t;
! import jake2.qcommon.*;
! import jake2.render.*;
  import jake2.util.Math3D;
  import jake2.util.Vargs;
  
! import java.nio.*;
  import java.util.Arrays;
  import java.util.Vector;

Index: Surf.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Surf.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Surf.java	9 Jan 2005 22:35:31 -0000	1.5
--- Surf.java	10 Jan 2005 00:12:00 -0000	1.6
***************
*** 27,53 ****
  
  import jake2.Defines;
! import jake2.client.dlight_t;
! import jake2.client.entity_t;
! import jake2.client.lightstyle_t;
  import jake2.game.cplane_t;
  import jake2.qcommon.Com;
! import jake2.render.glpoly_t;
! import jake2.render.image_t;
! import jake2.render.medge_t;
! import jake2.render.mleaf_t;
! import jake2.render.mnode_t;
! import jake2.render.model_t;
! import jake2.render.msurface_t;
! import jake2.render.mtexinfo_t;
  import jake2.util.Lib;
  import jake2.util.Math3D;
  
! import java.nio.ByteOrder;
! import java.nio.FloatBuffer;
! import java.nio.IntBuffer;
  import java.util.Arrays;
  
- import net.java.games.jogl.GL;
- 
  import org.lwjgl.BufferUtils;
  import org.lwjgl.opengl.GL11;
--- 27,40 ----
  
  import jake2.Defines;
! import jake2.client.*;
  import jake2.game.cplane_t;
  import jake2.qcommon.Com;
! import jake2.render.*;
  import jake2.util.Lib;
  import jake2.util.Math3D;
  
! import java.nio.*;
  import java.util.Arrays;
  
  import org.lwjgl.BufferUtils;
  import org.lwjgl.opengl.GL11;
***************
*** 1195,1205 ****
  
  			Math3D.VectorAdd (total, vec, total);
- 			//Math3D.VectorCopy (vec, poly.verts[i]);
  			poly.x(i, vec[0]);
  			poly.y(i, vec[1]);
  			poly.z(i, vec[2]);
  			
- 			//poly.verts[i][3] = s;
- 			//poly.verts[i][4] = t;
  			poly.s1(i, s);
  			poly.t1(i, t);
--- 1182,1189 ----
***************
*** 1220,1225 ****
  			t /= BLOCK_HEIGHT*16; //fa.texinfo.texture.height;
  
- //          poly.verts[i][5] = s;
- //          poly.verts[i][6] = t;
  			poly.s2(i, s);
  			poly.t2(i, t);
--- 1204,1207 ----

Index: Polygon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Polygon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Polygon.java	9 Jan 2005 22:35:31 -0000	1.1
--- Polygon.java	10 Jan 2005 00:12:00 -0000	1.2
***************
*** 26,35 ****
  package jake2.render.lwjgl;
  
- import java.nio.FloatBuffer;
- 
- import jake2.Defines;
  import jake2.render.glpoly_t;
  import jake2.util.Lib;
  
  /**
   * Polygon
--- 26,34 ----
  package jake2.render.lwjgl;
  
  import jake2.render.glpoly_t;
  import jake2.util.Lib;
  
+ import java.nio.FloatBuffer;
+ 
  /**
   * Polygon