[Jake2-commits] jake2/src/jake2/render/lwjgl Warp.java,1.3,1.4

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

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

Modified Files:
	Warp.java 
Log Message:
replaces the local float[][];
code clean up

Index: Warp.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Warp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Warp.java	9 Jan 2005 22:35:31 -0000	1.3
--- Warp.java	10 Jan 2005 00:05:22 -0000	1.4
***************
*** 29,41 ****
  import jake2.Globals;
  import jake2.qcommon.Com;
! import jake2.render.glpoly_t;
! import jake2.render.image_t;
! import jake2.render.msurface_t;
  import jake2.util.Math3D;
  
- import java.nio.FloatBuffer;
- 
- import net.java.games.jogl.GL;
- 
  import org.lwjgl.opengl.GL11;
  
--- 29,35 ----
  import jake2.Globals;
  import jake2.qcommon.Com;
! import jake2.render.*;
  import jake2.util.Math3D;
  
  import org.lwjgl.opengl.GL11;
  
***************
*** 226,230 ****
          poly.t1(0, total_t * scale);
  
-         // memcpy (poly.verts[i+1], poly.verts[1], sizeof(poly.verts[0]));
          poly.x(i + 1, poly.x(1));
          poly.y(i + 1, poly.y(1));
--- 220,223 ----
***************
*** 245,277 ****
  	================
  	*/
! 	void GL_SubdivideSurface(msurface_t fa)
! 	{
! 		float[][] verts = new float[64][3];
! 
! 		int numverts;
! 		int i;
! 		int lindex;
! 		float[] vec;
! 
! 		warpface = fa;
! 
! 		//
! 		// convert edges back to a normal polygon
! 		//
! 		numverts = 0;
! 		for (i=0 ; i < fa.numedges ; i++)
! 		{
! 			lindex = loadmodel.surfedges[fa.firstedge + i];
  
! 			if (lindex > 0)
! 				vec = loadmodel.vertexes[loadmodel.edges[lindex].v[0]].position;
! 			else
! 				vec = loadmodel.vertexes[loadmodel.edges[-lindex].v[1]].position;
! 			Math3D.VectorCopy(vec, verts[numverts]);
! 			numverts++;
! 		}
  
! 		SubdividePolygon(numverts, verts);
! 	}
  
  //	  =========================================================
--- 238,263 ----
  	================
  	*/
! 	float[][] tmpVerts = new float[64][3];
  
!     void GL_SubdivideSurface(msurface_t fa) {
!         float[][] verts = tmpVerts;
!         float[] vec;
!         warpface = fa;
!         //
!         // convert edges back to a normal polygon
!         //
!         int numverts = 0;
!         for (int i = 0; i < fa.numedges; i++) {
!             int lindex = loadmodel.surfedges[fa.firstedge + i];
  
!             if (lindex > 0)
!                 vec = loadmodel.vertexes[loadmodel.edges[lindex].v[0]].position;
!             else
!                 vec = loadmodel.vertexes[loadmodel.edges[-lindex].v[1]].position;
!             Math3D.VectorCopy(vec, verts[numverts]);
!             numverts++;
!         }
!         SubdividePolygon(numverts, verts);
!     }
  
  //	  =========================================================
***************
*** 560,564 ****
  	void R_AddSkySurface(msurface_t fa)
  	{
! 	       // calculate vertex values for sky box
          for (glpoly_t p = fa.polys; p != null; p = p.next) {
              for (int i = 0; i < p.numverts; i++) {
--- 546,550 ----
  	void R_AddSkySurface(msurface_t fa)
  	{
! 	    // calculate vertex values for sky box
          for (glpoly_t p = fa.polys; p != null; p = p.next) {
              for (int i = 0; i < p.numverts; i++) {
***************
*** 579,585 ****
  	void R_ClearSkyBox()
  	{
! 		int i;
! 
! 		for (i=0 ; i<6 ; i++)
  		{
  			skymins[0][i] = skymins[1][i] = 9999;
--- 565,569 ----
  	void R_ClearSkyBox()
  	{
! 		for (int i=0 ; i<6 ; i++)
  		{
  			skymins[0][i] = skymins[1][i] = 9999;
***************
*** 730,734 ****
  		}
  	}
- 
- 
  }
--- 714,716 ----