[Jake2-commits] jake2/test/jake2/render DancingQueens.java,1.7,1.8 TestRenderer.java,1.6,1.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jake2/jake2/test/jake2/render
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30157/test/jake2/render

Modified Files:
	DancingQueens.java TestRenderer.java 
Log Message:
code cleanup

Index: TestRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestRenderer.java	14 Dec 2004 01:08:32 -0000	1.6
--- TestRenderer.java	11 Jun 2005 19:43:48 -0000	1.7
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
[...1426 lines suppressed...]
!      * V_AddParticle
!      */
!     void AddParticle(float[] org, int color, float alpha) {
!         if (r_numparticles >= Defines.MAX_PARTICLES)
!             return;
!         
!         int i = r_numparticles++;
!         
!         int c = particle_t.colorTable[color];
!         c |= (int) (alpha * 255) << 24;
!         particle_t.colorArray.put(i, c);
!         
!         i *= 3;
!         FloatBuffer vertexBuf = particle_t.vertexArray;
!         vertexBuf.put(i, org[0]);
!         vertexBuf.put(i + 1, org[1]);
!         vertexBuf.put(i + 2, org[2]);
!     }
! }
\ No newline at end of file

Index: DancingQueens.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DancingQueens.java	9 Feb 2005 09:21:10 -0000	1.7
--- DancingQueens.java	11 Jun 2005 19:43:48 -0000	1.8
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
  package jake2.render;
  
--- 6,27 ----
   */
  /*
!  Copyright (C) 1997-2001 Id Software, Inc.
!  
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
!  
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!  
!  See the GNU General Public License for more details.
!  
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
!  
!  */
  package jake2.render;
  
***************
*** 30,243 ****
  import jake2.client.*;
  import jake2.game.Cmd;
- import jake2.game.cvar_t;
  import jake2.qcommon.*;
  import jake2.sys.IN;
  import jake2.sys.KBD;
  import jake2.util.Math3D;
- import jake2.util.Vargs;
  
- import java.awt.Dimension;
  import java.util.Arrays;
  
- 
  /**
   * DancingQueens
!  *  
   * @author cwei
   */
! public class DancingQueens
! {
! 	String[] args;
! 
! 	refexport_t re;
! 	viddef_t viddef;
! 	int framecount = 0;
! 
! 	public DancingQueens(String[] args) {
! 		this.args = args;
! 	}
! 
! 	public static void main(String[] args) {
! 
! 		DancingQueens test = new DancingQueens(args);
! 		test.init();
! 		test.run();
! 	}
! 
! 	KBD kbd;
! 
! 	void init() {
! 
! 		Qcommon.Init(new String[] {"DancingQueens", "+set", "s_initsound", "0", "+set", "vid_ref", "lwjgl"});
! 		// sehr wichtig !!!
! 		VID.Shutdown();
! 
! 		String[] names = Renderer.getDriverNames();
! 		System.out.println("Registered Drivers: " + Arrays.asList(names));
! 
! 		this.re = Renderer.getDriver("lwjgl");
! 
! 		System.out.println("Use driver: " + re);
! 		System.out.println();
! 		
! 		re.Init(0, 0);
! 		kbd = re.getKeyboardHandler();
! 		kbd.Init();
! 		
! 		Cmd.AddCommand("togglemouse", togglemouse);
! 		Cbuf.AddText("bind t togglemouse");
! 		Cbuf.Execute();
! 		Globals.cls.key_dest = Defines.key_game;
! 		Globals.cls.state = Defines.ca_active;
! 						
! 		viddef = Globals.viddef;
! 		fov_y = Math3D.CalcFov(fov_x, viddef.width, viddef.height);
! 	}
! 
! 	float fps = 0.0f;
! 	long start = 0;
! 
! 	void updateScreen()
! 	{
! 		re.BeginFrame(0.0f);
! 
! 		if (framecount % 500 == 0)
! 		{
! 			long time = System.currentTimeMillis();
! 			fps = 500000.0f / (time - start);
! 			start = time;
! 		}
! 		String text = fps + " fps";
! 
! 		testModel();
! 
! 		drawString(10, viddef.height - 16, text);
! 
! 		re.EndFrame();
! 		framecount++;
! 	}
! 
! 	long startTime;
! 
! 	void run()
! 	{
! 		startTime = System.currentTimeMillis();
! 		xcommand_t callback = new xcommand_t() {
! 			public void execute() {
! 				updateScreen();
! 			}
! 		};
! 		while (true)
! 		{
! 			re.updateScreen(callback);
! 			kbd.Update();
! 			Cbuf.Execute();
! 		}
! 	}
! 	
! //	===================================================================
! 
! 	private float yaw = 0;
! 	private entity_t[] models;
! 	
! 	private final static String[] skinNames = {
! 		"players/female/athena",
! 		"players/female/lotus",
! 		"players/female/venus",
! 		"players/female/voodoo",
! 		"players/female/cobalt",
! 		"players/female/lotus",
! 		"players/female/brianna"
! 	};
! 		
! 	private float fov_x = 50;
! 	private float fov_y;
! 
! 	private void testModel() {
! 
! 		refdef_t refdef = new refdef_t();
! 
! 		refdef.x = 0;
! 		refdef.y = 0;
! 		refdef.width = viddef.width;
! 		refdef.height = viddef.height;
! 		refdef.fov_x = fov_x;
! 		refdef.fov_y = fov_y;
! 		refdef.time = 1.0f * 0.001f;
! 
! 		if (models == null) {
! 			models = new entity_t[12]; // model count
! 			entity_t m = null;
! 			for (int i = 0; i < models.length; i++)
! 			{
! 				m = getModel(skinNames[i % skinNames.length]);
! 				m.origin[0] += 30 * i;
! 				m.origin[1] += ((i % 4)) * 30 - 20;
! 				models[i] = m;
! 			}
! 		}
! 
! 
! 		yaw = time() * 0.1f;
! 		if (yaw > 360)
! 			yaw -= 360;
! 		if (yaw < 0)
! 			yaw += 360;
! 			
! 		for (int i = 0; i < models.length; i++)
! 		{
! 			models[i].frame = (time() / 70) % models[i].model.numframes;
! 			models[i].angles[1] = yaw;
! 			models[i].origin[0] += KBD.my;
! 			models[i].origin[1] += KBD.mx;
! 			
! 		}
! 
! 		refdef.areabits = null;
! 		refdef.num_entities = models.length;
! 		refdef.entities = models;
! 
! 		refdef.lightstyles = null;
! 		refdef.rdflags = Defines.RDF_NOWORLDMODEL;
! 
! 		re.RenderFrame(refdef);
! 	}
! 	
! 	private entity_t getModel(String name) {
! 		entity_t entity = new entity_t();
! 		String modelName = "players/female/tris.md2";
! 		String modelSkin = name +".pcx";
! 
! 		entity.model = re.RegisterModel(modelName);
! 		entity.skin = re.RegisterSkin(modelSkin);
! 		entity.flags = Defines.RF_FULLBRIGHT;
! 		entity.origin[0] = 80;
! 		entity.origin[1] = 0;
! 		entity.origin[2] = 0;
! 		Math3D.VectorCopy(entity.origin, entity.oldorigin);
! 		entity.frame = 0;
! 		entity.oldframe = 0;
! 		entity.backlerp = 0.0f;
! 		return entity;
! 	}
! 	
! 	
! 	private void drawString(int x, int y, String text)
! 	{
! 		for (int i = 0; i < text.length(); i++)
! 		{
! 			re.DrawChar(x + 8 * i, y, (int) text.charAt(i));
! 		}
! 	}
! 
! 	private final int time()
! 	{
! 		return (int) (System.currentTimeMillis() - startTime);
! 	}
! 	
! 	static xcommand_t togglemouse = new xcommand_t() {
! 		public void execute() {
! 			IN.toggleMouse();
! 		}
! 	};
  }
\ No newline at end of file
--- 30,228 ----
  import jake2.client.*;
  import jake2.game.Cmd;
  import jake2.qcommon.*;
  import jake2.sys.IN;
  import jake2.sys.KBD;
  import jake2.util.Math3D;
  
  import java.util.Arrays;
  
  /**
   * DancingQueens
!  * 
   * @author cwei
   */
! public class DancingQueens {
!     String[] args;
!     
!     refexport_t re;
!     
!     viddef_t viddef;
!     
!     int framecount = 0;
!     
!     public DancingQueens(String[] args) {
!         this.args = args;
!     }
!     
!     public static void main(String[] args) {
!         
!         DancingQueens test = new DancingQueens(args);
!         test.init();
!         test.run();
!     }
!     
!     KBD kbd;
!     
!     void init() {
!         
!         Qcommon.Init(new String[] { "DancingQueens", "+set", "gl_mode", "5",
!                 "+set", "vid_fullscreen", "0" });
!         // sehr wichtig !!!
!         VID.Shutdown();
!         
!         String[] names = Renderer.getDriverNames();
!         System.out.println("Registered Drivers: " + Arrays.asList(names));
!         
!         this.re = Renderer.getDriver("fastjogl");
!         
!         System.out.println("Use driver: " + re);
!         System.out.println();
!         
!         re.Init(0, 0);
!         kbd = re.getKeyboardHandler();
!         kbd.Init();
!         
!         Cmd.AddCommand("togglemouse", togglemouse);
!         Cbuf.AddText("bind t togglemouse");
!         Cbuf.Execute();
!         Globals.cls.key_dest = Defines.key_game;
!         Globals.cls.state = Defines.ca_active;
!         
!         viddef = Globals.viddef;
!         fov_y = Math3D.CalcFov(fov_x, viddef.width, viddef.height);
!     }
!     
!     float fps = 0.0f;
!     
!     long start = 0;
!     
!     void updateScreen() {
!         re.BeginFrame(0.0f);
!         
!         if (framecount % 500 == 0) {
!             long time = System.currentTimeMillis();
!             fps = 500000.0f / (time - start);
!             start = time;
!         }
!         String text = ((int)(fps + 0.5f)) + " fps";
!         
!         testModel();
!         
!         drawString(10, viddef.height - 16, text);
!         
!         re.EndFrame();
!         framecount++;
!     }
!     
!     long startTime;
!     
!     void run() {
!         startTime = System.currentTimeMillis();
!         xcommand_t callback = new xcommand_t() {
!             public void execute() {
!                 updateScreen();
!             }
!         };
!         while (true) {
!             re.updateScreen(callback);
!             kbd.Update();
!             Cbuf.Execute();
!         }
!     }
!     
!     //	===================================================================
!     
!     private float yaw = 0;
!     
!     private entity_t[] models;
!     
!     private final static String[] skinNames = { "players/female/athena",
!             "players/female/lotus", "players/female/venus",
!             "players/female/voodoo", "players/female/cobalt",
!             "players/female/lotus", "players/female/brianna" };
!     
!     private float fov_x = 50;
!     
!     private float fov_y;
!     
!     private void testModel() {
!         
!         refdef_t refdef = new refdef_t();
!         
!         refdef.x = 0;
!         refdef.y = 0;
!         refdef.width = viddef.width;
!         refdef.height = viddef.height;
!         refdef.fov_x = fov_x;
!         refdef.fov_y = fov_y;
!         refdef.time = 1.0f * 0.001f;
!         
!         if (models == null) {
!             models = new entity_t[12]; // model count
!             entity_t m = null;
!             for (int i = 0; i < models.length; i++) {
!                 m = getModel(skinNames[i % skinNames.length]);
!                 m.origin[0] += 30 * i;
!                 m.origin[1] += ((i % 4)) * 30 - 20;
!                 models[i] = m;
!             }
!         }
!         
!         yaw = time() * 0.1f;
!         if (yaw > 360)
!             yaw -= 360;
!         if (yaw < 0)
!             yaw += 360;
!         
!         for (int i = 0; i < models.length; i++) {
!             models[i].frame = (time() / 70) % models[i].model.numframes;
!             models[i].angles[1] = yaw;
!             models[i].origin[0] += KBD.my;
!             models[i].origin[1] += KBD.mx;
!             
!         }
!         
!         refdef.areabits = null;
!         refdef.num_entities = models.length;
!         refdef.entities = models;
!         
!         refdef.lightstyles = null;
!         refdef.rdflags = Defines.RDF_NOWORLDMODEL;
!         
!         re.RenderFrame(refdef);
!     }
!     
!     private entity_t getModel(String name) {
!         entity_t entity = new entity_t();
!         String modelName = "players/female/tris.md2";
!         String modelSkin = name + ".pcx";
!         
!         entity.model = re.RegisterModel(modelName);
!         entity.skin = re.RegisterSkin(modelSkin);
!         entity.flags = Defines.RF_FULLBRIGHT;
!         entity.origin[0] = 80;
!         entity.origin[1] = 0;
!         entity.origin[2] = 0;
!         Math3D.VectorCopy(entity.origin, entity.oldorigin);
!         entity.frame = 0;
!         entity.oldframe = 0;
!         entity.backlerp = 0.0f;
!         return entity;
!     }
!     
!     private void drawString(int x, int y, String text) {
!         for (int i = 0; i < text.length(); i++) {
!             re.DrawChar(x + 8 * i, y, (int) text.charAt(i));
!         }
!     }
!     
!     private final int time() {
!         return (int) (System.currentTimeMillis() - startTime);
!     }
!     
!     static xcommand_t togglemouse = new xcommand_t() {
!         public void execute() {
!             IN.toggleMouse();
!         }
!     };
  }
\ No newline at end of file