[Jake2-commits] jake2/src/jake2/qcommon PMove.java,1.5,1.6 Com.java,1.6,1.7

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6887/src/jake2/qcommon

Modified Files:
	PMove.java Com.java 
Log Message:
small performance improvements

Index: PMove.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/PMove.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PMove.java	22 Sep 2004 19:22:09 -0000	1.5
--- PMove.java	12 Jan 2005 12:14:16 -0000	1.6
***************
*** 23,31 ****
  package jake2.qcommon;
  
! import jake2.*;
! import jake2.client.*;
  import jake2.game.*;
- import jake2.render.*;
- import jake2.server.*;
  import jake2.util.Math3D;
  
--- 23,29 ----
  package jake2.qcommon;
  
! import jake2.Defines;
! import jake2.Globals;
  import jake2.game.*;
  import jake2.util.Math3D;
  
***************
*** 48,53 ****
          public csurface_t groundsurface;
  
-         public cplane_t groundplane = new cplane_t();
- 
          public int groundcontents;
  
--- 46,49 ----
***************
*** 619,623 ****
              trace = PMove.pm.trace.trace(PMove.pml.origin, PMove.pm.mins,
                      PMove.pm.maxs, point);
-             PMove.pml.groundplane = trace.plane;
              PMove.pml.groundsurface = trace.surface;
              PMove.pml.groundcontents = trace.contents;
--- 615,618 ----
***************
*** 1070,1075 ****
          PMove.pm.waterlevel = 0;
  
!         // clear all pmove local vars
!         PMove.pml = new PMove.pml_t();
  
          // convert origin and velocity to float values
--- 1065,1070 ----
          PMove.pm.waterlevel = 0;
  
!         PMove.pml.groundsurface = null;
!         PMove.pml.groundcontents = 0;
  
          // convert origin and velocity to float values

Index: Com.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Com.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Com.java	22 Aug 2004 18:30:15 -0000	1.6
--- Com.java	12 Jan 2005 12:14:16 -0000	1.7
***************
*** 92,99 ****
--- 92,101 ----
  			{
  				data= null;
+ 				length = 0;
  			}
  			else
  			{
  				data= in.toCharArray();
+ 				length = data.length;
  			}
  			index= 0;
***************
*** 109,127 ****
  			data= in;
  			index= offset;
  		}
  
  		public char getchar()
  		{
! 			// faster than if
! 			try
! 			{
! 				return data[index];
! 			}
! 			catch (Exception e)
! 			{
! 				data= null;
! 				// last char
! 				return 0;
! 			}
  		}
  
--- 111,135 ----
  			data= in;
  			index= offset;
+ 			if (data != null) length = data.length;
+ 			else length = 0;
  		}
  
  		public char getchar()
  		{
! 		    if (index < length) {
! 		        return data[index];
! 		    }
! 		    return 0;			
! //			// faster than if
! //			try
! //			{
! //				return data[index];
! //			}
! //			catch (Exception e)
! //			{
! //				data= null;
! //				// last char
! //				return 0;
! //			}
  		}
  
***************
*** 129,145 ****
  		{
  			// faster than if
! 			try
! 			{
! 				index++;
! 				return data[index];
! 			}
! 			catch (Exception e)
! 			{
! 				data= null;
! 				// avoid int wraps;
! 				index--;
! 				// last char
! 				return 0;
! 			}
  		}
  		
--- 137,158 ----
  		{
  			// faster than if
! 		    index++;
! 		    if (index < length) {
! 		        return data[index];
! 		    }
! 		    return 0;
! //			try
! //			{
! //				index++;
! //				return data[index];
! //			}
! //			catch (Exception e)
! //			{
! //				data= null;
! //				// avoid int wraps;
! //				index--;
! //				// last char
! //				return 0;
! //			}
  		}
  		
***************
*** 155,168 ****
  		public boolean isEof()
  		{
! 			return data == null;
  		}
  
  		public int index;
  		public char data[];
  
  		public char skipwhites()
  		{
! 			char c;
! 			while (((c= getchar()) <= ' ') && c != 0)
  				index++;
  			return c;
--- 168,182 ----
  		public boolean isEof()
  		{
! 			return index >= length;
  		}
  
  		public int index;
  		public char data[];
+ 		private int length;
  
  		public char skipwhites()
  		{
! 			char c = 0;
! 			while ( index < length && ((c= data[index]) <= ' ') && c != 0)
  				index++;
  			return c;
***************
*** 171,176 ****
  		public char skipwhitestoeol()
  		{
! 			char c;
! 			while (((c= getchar()) <= ' ') && c != '\n' && c != 0)
  				index++;
  			return c;
--- 185,190 ----
  		public char skipwhitestoeol()
  		{
! 			char c = 0;
! 			while ( index < length &&((c= data[index]) <= ' ') && c != '\n' && c != 0)
  				index++;
  			return c;
***************
*** 179,184 ****
  		public char skiptoeol()
  		{
! 			char c;
! 			while ((c= getchar()) != '\n' && c != 0)
  				index++;
  			return c;
--- 193,198 ----
  		public char skiptoeol()
  		{
! 			char c = 0;
! 			while ( index < length &&(c= data[index]) != '\n' && c != 0)
  				index++;
  			return c;
***************
*** 408,419 ****
  	public static void Println(String fmt)
  	{
! 		Printf(fmt);
! 		Printf("\n");
! 	}
! 
! 	public static void p(String fmt)
! 	{
! 		Printf(fmt);
! 		Printf("\n");
  	}
  
--- 422,426 ----
  	public static void Println(String fmt)
  	{
! 		Printf(fmt + "\n");
  	}