code cleanup

6 files changed, 22 insertions, 83 deletions

diff --git a/src/jake2/render/fastjogl/Model.java b/src/jake2/render/fastjogl/Model.java
index a5bcd5b..cdba057 100644
--- a/src/jake2/render/fastjogl/Model.java
+++ b/src/jake2/render/fastjogl/Model.java
@@ -2,7 +2,7 @@
  * Model.java
  * Copyright (C) 2003
  *
- * $Id: Model.java,v 1.6 2005-01-09 22:36:31 cawe Exp $
+ * $Id: Model.java,v 1.7 2005-01-10 00:14:32 cawe Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -29,27 +29,12 @@ import jake2.Defines;
 import jake2.client.VID;
 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.qcommon.*;
+import jake2.render.*;
 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.nio.*;
 import java.util.Arrays;
 import java.util.Vector;
 
diff --git a/src/jake2/render/fastjogl/Polygon.java b/src/jake2/render/fastjogl/Polygon.java
index 6ccdda0..62ed68d 100644
--- a/src/jake2/render/fastjogl/Polygon.java
+++ b/src/jake2/render/fastjogl/Polygon.java
@@ -2,7 +2,7 @@
  * Polygon.java
  * Copyright (C) 2003
  *
- * $Id: Polygon.java,v 1.1 2005-01-09 22:36:31 cawe Exp $
+ * $Id: Polygon.java,v 1.2 2005-01-10 00:14:33 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,12 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package jake2.render.fastjogl;
 
-import java.nio.FloatBuffer;
-
-import jake2.Defines;
 import jake2.render.glpoly_t;
 import jake2.util.Lib;
 
+import java.nio.FloatBuffer;
+
 /**
  * Polygon
  * 
diff --git a/src/jake2/render/fastjogl/Surf.java b/src/jake2/render/fastjogl/Surf.java
index 752d83f..5220a97 100644
--- a/src/jake2/render/fastjogl/Surf.java
+++ b/src/jake2/render/fastjogl/Surf.java
@@ -2,7 +2,7 @@
  * Surf.java
  * Copyright (C) 2003
  *
- * $Id: Surf.java,v 1.6 2005-01-09 22:36:31 cawe Exp $
+ * $Id: Surf.java,v 1.7 2005-01-10 00:14:33 cawe Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,25 +26,14 @@
 package jake2.render.fastjogl;
 
 import jake2.Defines;
-import jake2.client.dlight_t;
-import jake2.client.entity_t;
-import jake2.client.lightstyle_t;
+import jake2.client.*;
 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.render.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
+import java.nio.*;
 import java.util.Arrays;
 
 import net.java.games.jogl.GL;
diff --git a/src/jake2/render/lwjgl/Model.java b/src/jake2/render/lwjgl/Model.java
index 3b32767..20eb452 100644
--- a/src/jake2/render/lwjgl/Model.java
+++ b/src/jake2/render/lwjgl/Model.java
@@ -2,7 +2,7 @@
  * Model.java
  * Copyright (C) 2003
  *
- * $Id: Model.java,v 1.4 2005-01-09 22:35:31 cawe Exp $
+ * $Id: Model.java,v 1.5 2005-01-10 00:12:00 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -29,27 +29,12 @@ import jake2.Defines;
 import jake2.client.VID;
 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.qcommon.*;
+import jake2.render.*;
 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.nio.*;
 import java.util.Arrays;
 import java.util.Vector;
 
diff --git a/src/jake2/render/lwjgl/Polygon.java b/src/jake2/render/lwjgl/Polygon.java
index 3b401e2..8d1a444 100644
--- a/src/jake2/render/lwjgl/Polygon.java
+++ b/src/jake2/render/lwjgl/Polygon.java
@@ -2,7 +2,7 @@
  * Polygon.java
  * Copyright (C) 2003
  *
- * $Id: Polygon.java,v 1.1 2005-01-09 22:35:31 cawe Exp $
+ * $Id: Polygon.java,v 1.2 2005-01-10 00:12:00 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,12 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package jake2.render.lwjgl;
 
-import java.nio.FloatBuffer;
-
-import jake2.Defines;
 import jake2.render.glpoly_t;
 import jake2.util.Lib;
 
+import java.nio.FloatBuffer;
+
 /**
  * Polygon
  * 
diff --git a/src/jake2/render/lwjgl/Surf.java b/src/jake2/render/lwjgl/Surf.java
index 8104a87..22ee73b 100644
--- a/src/jake2/render/lwjgl/Surf.java
+++ b/src/jake2/render/lwjgl/Surf.java
@@ -2,7 +2,7 @@
  * Surf.java
  * Copyright (C) 2003
  *
- * $Id: Surf.java,v 1.5 2005-01-09 22:35:31 cawe Exp $
+ * $Id: Surf.java,v 1.6 2005-01-10 00:12:00 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,29 +26,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package jake2.render.lwjgl;
 
 import jake2.Defines;
-import jake2.client.dlight_t;
-import jake2.client.entity_t;
-import jake2.client.lightstyle_t;
+import jake2.client.*;
 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.render.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
+import java.nio.*;
 import java.util.Arrays;
 
-import net.java.games.jogl.GL;
-
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
@@ -1194,13 +1181,10 @@ public abstract class Surf extends Draw {
 			t /= fa.texinfo.image.height;
 
 			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);
 
@@ -1219,8 +1203,6 @@ public abstract class Surf extends Draw {
 			t += 8;
 			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);
 		}