[Jake2-commits] jake2/src/jake2/render/fastjogl Warp.java,1.5,1.6

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

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

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

Index: Warp.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Warp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Warp.java	9 Jan 2005 22:36:30 -0000	1.5
--- Warp.java	10 Jan 2005 00:05:23 -0000	1.6
***************
*** 29,39 ****
  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;
  
--- 29,34 ----
  import jake2.Globals;
  import jake2.qcommon.Com;
! import jake2.render.*;
  import jake2.util.Math3D;
  import net.java.games.jogl.GL;
  
***************
*** 230,234 ****
          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));
--- 225,228 ----
***************
*** 241,265 ****
  
      /*
!      * ================ GL_SubdivideSurface
       * 
       * Breaks a polygon up along axial 64 unit boundaries so that turbulent and
!      * sky warps can be done reasonably. ================
       */
!     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)
--- 235,255 ----
  
      /*
!      * GL_SubdivideSurface
       * 
       * Breaks a polygon up along axial 64 unit boundaries so that turbulent and
!      * sky warps can be done reasonably.
       */
!     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)
***************
*** 270,274 ****
              numverts++;
          }
- 
          SubdividePolygon(numverts, verts);
      }
--- 260,263 ----
***************
*** 290,294 ****
      void EmitWaterPolys(msurface_t fa) {
          glpoly_t p, bp;
-         int i;
          float s = 0;
          float t = 0;
--- 279,282 ----
***************
*** 307,311 ****
  
              gl.glBegin(GL.GL_TRIANGLE_FAN);
!             for (i = 0; i < p.numverts; i++) {
                  os = p.s1(i);
                  ot = p.t1(i);
--- 295,299 ----
  
              gl.glBegin(GL.GL_TRIANGLE_FAN);
!             for (int i = 0; i < p.numverts; i++) {
                  os = p.s1(i);
                  ot = p.t1(i);