[Jake2-commits] jake2/test/jake2/render DebugCulling.java, 1.5, 1.6 TestMap.java, 1.9, 1.10 DancingQueens.java, 1.12, 1.13 TestRenderer.java, 1.8, 1.9

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

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

Modified Files:
	DebugCulling.java TestMap.java DancingQueens.java 
	TestRenderer.java 
Log Message:
use getters and setters of modified viddef_t

Index: TestMap.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestMap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestMap.java	27 Feb 2007 14:00:35 -0000	1.9
--- TestMap.java	2 Mar 2008 14:56:21 -0000	1.10
***************
*** 144,149 ****
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
! 				re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
  				currentState = 1;
  				break;
--- 144,149 ----
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
! 				re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
  				currentState = 1;
  				break;
***************
*** 164,168 ****
  				testMap();
  
! 				drawString(10, viddef.height - 16, text);
  		}
  		
--- 164,168 ----
  				testMap();
  
! 				drawString(10, viddef.getHeight() - 16, text);
  		}
  		
***************
*** 235,240 ****
  	};
  
- 	private float yaw = 0;
- 
  	private float fov_x = 90;
  	
--- 235,238 ----
***************
*** 255,260 ****
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.width;
! 			refdef.height = viddef.height;
  			refdef.fov_x = (Globals.fov == null) ? this.fov_x : Globals.fov.value;
  			refdef.fov_x = this.fov_x;
--- 253,258 ----
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.getWidth();
! 			refdef.height = viddef.getHeight();
  			refdef.fov_x = (Globals.fov == null) ? this.fov_x : Globals.fov.value;
  			refdef.fov_x = this.fov_x;
***************
*** 367,375 ****
  	
  	private LinkedList active_particles = new LinkedList();
- 	private boolean explode = false; 
- 	private float[] target; 
- 	
- 	private boolean initParticles = true;
- 	
  	private void animateParticles()
  	{
--- 365,368 ----

Index: DebugCulling.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DebugCulling.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DebugCulling.java	27 Feb 2007 14:00:35 -0000	1.5
--- DebugCulling.java	2 Mar 2008 14:56:21 -0000	1.6
***************
*** 103,108 ****
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
! 				re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
  				currentState = 1;
  				break;
--- 103,108 ----
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
! 				re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
  				currentState = 1;
  				break;
***************
*** 125,129 ****
  				testMap();
  
! 				drawString(10, viddef.height - 16, text);
  		}
  		
--- 125,129 ----
  				testMap();
  
! 				drawString(10, viddef.getHeight() - 16, text);
  		}
  		
***************
*** 134,139 ****
  	//		===================================================================
  
- 	private float yaw = 0;
- 
  	private float fov_x = 90;
  	
--- 134,137 ----
***************
*** 148,153 ****
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.width;
! 			refdef.height = viddef.height;
  			refdef.fov_x = fov_x;
  			refdef.fov_y = CalcFov(fov_x, refdef.width -10, refdef.height-10);
--- 146,151 ----
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.getWidth();
! 			refdef.height = viddef.getHeight();
  			refdef.fov_x = fov_x;
  			refdef.fov_y = CalcFov(fov_x, refdef.width -10, refdef.height-10);

Index: TestRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestRenderer.java	21 Nov 2006 01:59:41 -0000	1.8
--- TestRenderer.java	2 Mar 2008 14:56:21 -0000	1.9
***************
*** 110,114 ****
          re.BeginFrame(0.0f);
          viddef = Globals.viddef;
!         re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
          
          if (framecount % 500 == 0) {
--- 110,114 ----
          re.BeginFrame(0.0f);
          viddef = Globals.viddef;
!         re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
          
          if (framecount % 500 == 0) {
***************
*** 120,124 ****
          
          for (int i = 0; i < text.length(); i++) {
!             re.DrawChar(10 + 8 * i, viddef.height / 2, (int) text.charAt(i));
          }
          
--- 120,124 ----
          
          for (int i = 0; i < text.length(); i++) {
!             re.DrawChar(10 + 8 * i, viddef.getHeight() / 2, (int) text.charAt(i));
          }
          
***************
*** 126,130 ****
          re.DrawGetPicSize(wal, "/textures/e1u1/basemap.wal");
          
!         re.DrawPic(0, viddef.height - wal.height, "/textures/e1u1/basemap.wal");
          
          switch (testnr) {
--- 126,130 ----
          re.DrawGetPicSize(wal, "/textures/e1u1/basemap.wal");
          
!         re.DrawPic(0, viddef.getHeight() - wal.height, "/textures/e1u1/basemap.wal");
          
          switch (testnr) {
***************
*** 173,178 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 173,178 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 182,186 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          String modelName = "players/female/tris.md2";
--- 182,185 ----
***************
*** 224,229 ****
          //			 Menu_Draw(& s_player_config_menu);
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 223,228 ----
          //			 Menu_Draw(& s_player_config_menu);
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 250,257 ****
          if (loading) {
              
!             re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
              String name = sprites[spriteCount];
              
!             drawString(viddef.width / 2 - 50, viddef.height / 2 + 50, name);
              
              re.RegisterModel(name);
--- 249,256 ----
          if (loading) {
              
!             re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
              String name = sprites[spriteCount];
              
!             drawString(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2 + 50, name);
              
              re.RegisterModel(name);
***************
*** 262,267 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 261,266 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 271,275 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          
--- 270,273 ----
***************
*** 295,300 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 293,298 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 308,313 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 306,311 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 317,321 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          
--- 315,318 ----
***************
*** 351,356 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 348,353 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 365,370 ****
      private float[] target;
      
-     private boolean initParticles = true;
-     
      private void testParticles() {
          
--- 362,365 ----
***************
*** 384,389 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 400;
          refdef.height = 400;
--- 379,384 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 400;
          refdef.height = 400;
***************
*** 406,411 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 401,406 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 465,470 ****
       */
      private void M_DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.width - 320) >> 1), cy
!                 + ((viddef.height - 240) >> 1), num);
      }
      
--- 460,465 ----
       */
      private void M_DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.getWidth() - 320) >> 1), cy
!                 + ((viddef.getHeight() - 240) >> 1), num);
      }
      
***************
*** 472,480 ****
      
      private void Explosion(float[] org) {
-         float[] dir = { 0, 0, 0 };
-         int i;
          cparticle_t p;
          
!         for (i = 0; i < 256; i++) {
              p = new cparticle_t();
              
--- 467,473 ----
      
      private void Explosion(float[] org) {
          cparticle_t p;
          
!         for (int i = 0; i < 256; i++) {
              p = new cparticle_t();
              

Index: DancingQueens.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DancingQueens.java	20 Mar 2007 18:57:16 -0000	1.12
--- DancingQueens.java	2 Mar 2008 14:56:21 -0000	1.13
***************
*** 101,105 ****
          
          viddef = Globals.viddef;
!         fov_y = Math3D.CalcFov(fov_x, viddef.width, viddef.height);
      }
      
--- 101,105 ----
          
          viddef = Globals.viddef;
!         fov_y = Math3D.CalcFov(fov_x, viddef.getWidth(), viddef.getHeight());
      }
      
***************
*** 120,124 ****
          testModel();
          
!         drawString(10, viddef.height - 16, text);
          
          re.EndFrame();
--- 120,124 ----
          testModel();
          
!         drawString(10, viddef.getHeight() - 16, text);
          
          re.EndFrame();
***************
*** 163,168 ****
          refdef.x = 0;
          refdef.y = 0;
!         refdef.width = viddef.width;
!         refdef.height = viddef.height;
          refdef.fov_x = fov_x;
          refdef.fov_y = fov_y;
--- 163,168 ----
          refdef.x = 0;
          refdef.y = 0;
!         refdef.width = viddef.getWidth();
!         refdef.height = viddef.getHeight();
          refdef.fov_x = fov_x;
          refdef.fov_y = fov_y;