[Jake2-commits] jake2/src/jake2/util QuakeFile.java,1.2,1.3 Math3D.java,1.5,1.6

[Rene S. <sa...@us...>]

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

Modified Files:
	QuakeFile.java Math3D.java 
Log Message:
did some cource cleanups

Index: Math3D.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/util/Math3D.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Math3D.java	19 Jul 2004 19:32:12 -0000	1.5
--- Math3D.java	10 Sep 2004 19:02:56 -0000	1.6
***************
*** 117,132 ****
  		return length;
  	}
! //	public static final float VectorNormalize2(float[] v, float[] to) {
! //		float length, ilength;
! //
! //		length = VectorLength(v);
! //		if (length != 0.0f) {
! //			ilength = 1.0f / length;
! //			to[0] = v[0] * ilength;
! //			to[1] = v[1] * ilength;
! //			to[2] = v[2] * ilength;
! //		}
! //		return length;
! //	}
  	public static final float VectorLength(float v[]) {
  		return (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
--- 117,121 ----
  		return length;
  	}
! 
  	public static final float VectorLength(float v[]) {
  		return (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
***************
*** 200,210 ****
  	private static float tmpmat[][] = new float[3][3];
  	private static float zrot[][] = new float[3][3];
  	public static void RotatePointAroundVector(float[] dst, float[] dir, float[] point, float degrees) {
- 					
- 		//float m[][] = new float[3][3];
- 		//float im[][] = new float[3][3];
- 		//float zrot[][] = new float[3][3];
- 		//float tmpmat[][] = new float[3][3];
- 		//float rot[][] = new float[3][3];
  		
  		float[] vr = { 0.0f, 0.0f, 0.0f };
--- 189,194 ----
  	private static float tmpmat[][] = new float[3][3];
  	private static float zrot[][] = new float[3][3];
+ 	
  	public static void RotatePointAroundVector(float[] dst, float[] dir, float[] point, float degrees) {
  		
  		float[] vr = { 0.0f, 0.0f, 0.0f };
***************
*** 231,236 ****
  		m[2][2] = vf[2];
  
- 		//Math3D.MatCopy(m, im); // achtung: src -> dst
- 
  		im[0][0] = m[0][0];
  		im[0][1] = m[1][0];
--- 215,218 ----
***************
*** 250,255 ****
  		zrot[0][1] = (float) Math.sin(Math3D.DEG2RAD(degrees));
  		zrot[1][0] = -zrot[0][1];
- 		//zrot[1][0] = - (float) Math.sin(Math3D.DEG2RAD(degrees));
- 		//zrot[1][1] = (float) Math.cos(Math3D.DEG2RAD(degrees));
  
  		Math3D.R_ConcatRotations(m, zrot, tmpmat);
--- 232,235 ----
***************
*** 486,505 ****
  	}
  
- //	public static void MatClear(float m[][]) {
- //		m[0][0] = m[0][1] = m[0][2] = m[1][0] = m[1][1] = m[1][2] = m[2][0] = m[2][1] = m[2][2] = 0.0f;
- //	}
- 
- //	private static final void MatCopy(float src[][], float dst[][]) {
- //		dst[0][0]=src[0][0];
- //		dst[0][1]=src[0][1];
- //		dst[0][2]=src[0][2];
- //		dst[1][0]=src[1][0];
- //		dst[1][1]=src[1][1];
- //		dst[1][2]=src[1][2];
- //		dst[2][0]=src[2][0];
- //		dst[2][1]=src[2][1];
- //		dst[2][2]=src[2][2];
- //	}
- 
  	public static void G_ProjectSource(float[] point, float[] distance, float[] forward, float[] right, float[] result) {
  		result[0] = point[0] + forward[0] * distance[0] + right[0] * distance[1];
--- 466,469 ----

Index: QuakeFile.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/util/QuakeFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QuakeFile.java	4 Sep 2004 19:08:30 -0000	1.2
--- QuakeFile.java	10 Sep 2004 19:02:56 -0000	1.3
***************
*** 32,37 ****
  import java.io.*;
  
! /** RandomAccessFile, bur handles readString/WriteString specially and
!  * offers other helper functions */
  public class QuakeFile extends RandomAccessFile
  {
--- 32,39 ----
  import java.io.*;
  
! /** 
!  * RandomAccessFile, but handles readString/WriteString specially and
!  * offers other helper functions 
!  */
  public class QuakeFile extends RandomAccessFile
  {