jake2-commits

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

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

Modified Files:
	JoglRenderer.java Jsr231Renderer.java LwjglRenderer.java 
	RenderAPI.java 
Log Message:
better driver dependent screenshot handling

Index: RenderAPI.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/RenderAPI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RenderAPI.java	21 Nov 2006 00:51:22 -0000	1.2
--- RenderAPI.java	22 Nov 2006 15:05:39 -0000	1.3
***************
*** 50,52 ****
--- 50,54 ----
  
      void R_BeginFrame(float camera_separation);
+     
+     void GL_ScreenShot_f();
  }

Index: JoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JoglRenderer.java	21 Nov 2006 00:51:22 -0000	1.8
--- JoglRenderer.java	22 Nov 2006 15:05:39 -0000	1.9
***************
*** 315,326 ****
  	}
  
  	public int apiVersion() {
  		return Defines.API_VERSION;
  	}
      
!     public KBD getKeyboardHandler() {
!         return kbd;
!     }
! 
  	// ============================================================================
  	// Ref interface
--- 315,339 ----
  	}
  
+     	public void screenshot() {
+ 		if (contextInUse) {
+ 			impl.GL_ScreenShot_f();
+ 		} else {
+ 			updateScreen(new xcommand_t() {
+ 				public void execute() {
+ 					impl.GL_ScreenShot_f();
+ 				}
+ 			});
+ 		}
+ 
+     	}
+ 
  	public int apiVersion() {
  		return Defines.API_VERSION;
  	}
      
! 	public KBD getKeyboardHandler() {
! 		return kbd;
! 	}
!     	
  	// ============================================================================
  	// Ref interface

Index: LwjglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/LwjglRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LwjglRenderer.java	21 Nov 2006 02:22:19 -0000	1.3
--- LwjglRenderer.java	22 Nov 2006 15:05:39 -0000	1.4
***************
*** 217,220 ****
--- 217,224 ----
          appActivate(activate);
  	}
+ 	
+     	public void screenshot() {
+     	    impl.GL_ScreenShot_f();
+ 	}
  
  	public final int apiVersion() {
***************
*** 222,228 ****
  	}
      
!     public KBD getKeyboardHandler() {
!         return kbd;
!     }
  
  	// ============================================================================
--- 226,232 ----
  	}
      
! 	public KBD getKeyboardHandler() {
! 		return kbd;
! 	}
  
  	// ============================================================================

Index: Jsr231Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Jsr231Renderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Jsr231Renderer.java	21 Nov 2006 00:51:22 -0000	1.2
--- Jsr231Renderer.java	22 Nov 2006 15:05:39 -0000	1.3
***************
*** 215,219 ****
  		endFrame();
  	}
! 
  	/** 
  	 * @see jake2.client.refexport_t#AppActivate(boolean)
--- 215,219 ----
  		endFrame();
  	}
! 	
  	/** 
  	 * @see jake2.client.refexport_t#AppActivate(boolean)
***************
*** 222,225 ****
--- 222,230 ----
          appActivate(activate);
  	}
+ 	
+     	public void screenshot() {
+     	    activate();
+     	    impl.GL_ScreenShot_f();
+ 	}
  
  	public final int apiVersion() {
***************
*** 227,233 ****
  	}
      
!     public KBD getKeyboardHandler() {
!         return kbd;
!     }
  	// ============================================================================
  	// Ref interface
--- 232,238 ----
  	}
      
! 	public KBD getKeyboardHandler() {
! 	    return kbd;
! 	}
  	// ============================================================================
  	// Ref interface