[Jake2-commits] jake2/src/jake2/render/basic Surf.java,1.2,1.3

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

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

Modified Files:
	Surf.java 
Log Message:
clean up

Index: Surf.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Surf.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Surf.java	21 Nov 2006 00:50:46 -0000	1.2
--- Surf.java	27 Feb 2007 14:35:37 -0000	1.3
***************
*** 2,7 ****
   * Surf.java
   * Copyright (C) 2003
-  *
-  * $Id$
   */
  /*
--- 2,5 ----
***************
*** 682,688 ****
  	void GL_RenderLightmappedPoly( msurface_t surf )
  	{
! 		int i, nv = surf.polys.numverts;
! 		int map = 0;
! 		float[] v;
  		image_t image = R_TextureAnimation( surf.texinfo );
  		boolean is_dynamic = false;
--- 680,685 ----
  	void GL_RenderLightmappedPoly( msurface_t surf )
  	{
! 		int nv = surf.polys.numverts;
! 		int map;
  		image_t image = R_TextureAnimation( surf.texinfo );
  		boolean is_dynamic = false;
***************
*** 778,782 ****
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
--- 775,779 ----
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (int i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
***************
*** 794,798 ****
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
--- 791,795 ----
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (int i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
***************
*** 828,832 ****
  				{
  					gl.glBegin(GL_POLYGON);
! 					for (i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
--- 825,829 ----
  				{
  					gl.glBegin(GL_POLYGON);
! 					for (int i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
***************
*** 846,850 ****
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
--- 843,847 ----
  				{
  					gl.glBegin (GL_POLYGON);
! 					for (int i=0 ; i< nv; i++)
  					{
  						gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
***************
*** 1388,1392 ****
  	{
  		int x = pos.x; 
- 		int y = pos.y;
  		int i, j;
  		int best, best2;
--- 1385,1388 ----
***************
*** 1408,1412 ****
  			{	// this is a valid spot
  				pos.x = x = i;
! 				pos.y = y = best = best2;
  			}
  		}
--- 1404,1408 ----
  			{	// this is a valid spot
  				pos.x = x = i;
! 				pos.y = best = best2;
  			}
  		}
***************
*** 1428,1435 ****
  	void GL_BuildPolygonFromSurface(msurface_t fa)
  	{
! 		int i, lindex, lnumverts;
  		medge_t[] pedges;
  		medge_t r_pedge;
- 		int vertpage;
  		float[] vec;
  		float s, t;
--- 1424,1430 ----
  	void GL_BuildPolygonFromSurface(msurface_t fa)
  	{
! 		int lindex, lnumverts;
  		medge_t[] pedges;
  		medge_t r_pedge;
  		float[] vec;
  		float s, t;
***************
*** 1440,1445 ****
  		pedges = currentmodel.edges;
  		lnumverts = fa.numedges;
- 		vertpage = 0;
- 
  		Math3D.VectorClear(total);
  		//
--- 1435,1438 ----
***************
*** 1453,1457 ****
  		fa.polys = poly;
  
! 		for (i=0 ; i<lnumverts ; i++)
  		{
  			lindex = currentmodel.surfedges[fa.firstedge + i];
--- 1446,1450 ----
  		fa.polys = poly;
  
! 		for (int i=0 ; i<lnumverts ; i++)
  		{
  			lindex = currentmodel.surfedges[fa.firstedge + i];