jake2-commits

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

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

Modified Files:
      Tag: render-refactoring
	Renderer.java Ref.java JoglRenderer.java Jsr231Renderer.java 
	LwjglRenderer.java 
Log Message:
the Renderer factory sets the right RenderAPI (fast or basic) for driver impls

Index: JoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Attic/JoglRenderer.java,v
retrieving revision 1.6.8.5
retrieving revision 1.6.8.6
diff -C2 -d -r1.6.8.5 -r1.6.8.6
*** JoglRenderer.java	20 Nov 2006 21:27:57 -0000	1.6.8.5
--- JoglRenderer.java	20 Nov 2006 23:15:13 -0000	1.6.8.6
***************
*** 45,52 ****
  	public static final String DRIVER_NAME = "jogl";
      
!     private KBD kbd = new JOGLKBD();
  
!     // TODO extract a interface from render code
!     private RenderAPI impl = new jake2.render.fast.Misc(); 
  
  	static {
--- 45,52 ----
  	public static final String DRIVER_NAME = "jogl";
      
!     	private KBD kbd = new JOGLKBD();
  
!     	// is set from Renderer factory
!     	private RenderAPI impl;
  
  	static {
***************
*** 335,340 ****
  	}
  
! 	public refexport_t GetRefAPI() {
  		return this;
  	}
  }
\ No newline at end of file
--- 335,342 ----
  	}
  
! 	public refexport_t GetRefAPI(RenderAPI renderer) {
!         	this.impl = renderer;
  		return this;
  	}
+     
  }
\ No newline at end of file

Index: Ref.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Ref.java,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -C2 -d -r1.2 -r1.2.12.1
*** Ref.java	16 Jul 2004 10:11:34 -0000	1.2
--- Ref.java	20 Nov 2006 23:15:13 -0000	1.2.12.1
***************
*** 35,42 ****
  public interface Ref {
  	
! 	// ============================================================================
! 	// extensions (cwei) 
! 	// ============================================================================
! 	refexport_t GetRefAPI();
  	String getName();
  }
--- 35,39 ----
  public interface Ref {
  	
! 	refexport_t GetRefAPI(RenderAPI renderer);
  	String getName();
  }

Index: Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Renderer.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -C2 -d -r1.6.6.1 -r1.6.6.2
*** Renderer.java	14 Nov 2005 23:59:00 -0000	1.6.6.1
--- Renderer.java	20 Nov 2006 23:15:13 -0000	1.6.6.2
***************
*** 26,33 ****
  package jake2.render;
  
- import java.util.Vector;
- 
  import jake2.client.refexport_t;
  
  /**
   * Renderer
--- 26,33 ----
  package jake2.render;
  
  import jake2.client.refexport_t;
  
+ import java.util.Vector;
+ 
  /**
   * Renderer
***************
*** 36,39 ****
--- 36,42 ----
   */
  public class Renderer {
+     
+     static RenderAPI fastRenderer = new jake2.render.fast.Misc();
+     static RenderAPI basicRenderer = new jake2.render.basic.Misc();
  
  	static Vector drivers = new Vector(3);
***************
*** 73,81 ****
  	}
  
! 	/**
  	 * Factory method to get the Renderer implementation.
  	 * @return refexport_t (Renderer singleton)
  	 */
! 	public static refexport_t getDriver(String driverName) {
  		// find a driver
  		Ref driver = null;
--- 76,92 ----
  	}
  
!     /**
!      * Factory method to get the Renderer implementation.
!      * @return refexport_t (Renderer singleton)
!      */
!     public static refexport_t getDriver(String driverName) {
!         return getDriver(driverName, true);
!     }
! 
!     /**
  	 * Factory method to get the Renderer implementation.
  	 * @return refexport_t (Renderer singleton)
  	 */
! 	public static refexport_t getDriver(String driverName, boolean fast) {
  		// find a driver
  		Ref driver = null;
***************
*** 84,88 ****
  			driver = (Ref) drivers.get(i);
  			if (driver.getName().equals(driverName)) {
! 				return driver.GetRefAPI();
  			}
  		}
--- 95,99 ----
  			driver = (Ref) drivers.get(i);
  			if (driver.getName().equals(driverName)) {
! 				return driver.GetRefAPI((fast) ? fastRenderer : basicRenderer);
  			}
  		}
***************
*** 108,110 ****
--- 119,122 ----
  		return names;
  	}
+ 
  }
\ No newline at end of file

Index: LwjglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Attic/LwjglRenderer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** LwjglRenderer.java	20 Nov 2006 21:27:57 -0000	1.1.2.3
--- LwjglRenderer.java	20 Nov 2006 23:15:13 -0000	1.1.2.4
***************
*** 42,51 ****
  final class LwjglRenderer extends LwjglDriver implements refexport_t, Ref {
  	
!     public static final String DRIVER_NAME = "lwjgl";
      
!     private KBD kbd = new LWJGLKBD();
      
!     // TODO extract a interface from render code
!     private RenderAPI impl = new jake2.render.fast.Misc(); 
  
  	static {
--- 42,51 ----
  final class LwjglRenderer extends LwjglDriver implements refexport_t, Ref {
  	
!     	public static final String DRIVER_NAME = "lwjgl";
      
!     	private KBD kbd = new LWJGLKBD();
      
!     	// is set from Renderer factory
!     	private RenderAPI impl;
  
  	static {
***************
*** 238,242 ****
  	}
  
! 	public final refexport_t GetRefAPI() {
  		return this;
  	}
--- 238,243 ----
  	}
  
! 	public final refexport_t GetRefAPI(RenderAPI renderer) {
!         	this.impl = renderer;
  		return this;
  	}

Index: Jsr231Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Attic/Jsr231Renderer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Jsr231Renderer.java	20 Nov 2006 21:27:57 -0000	1.1.2.3
--- Jsr231Renderer.java	20 Nov 2006 23:15:13 -0000	1.1.2.4
***************
*** 42,53 ****
  final class Jsr231Renderer extends Jsr231Driver implements refexport_t, Ref {
  	
!     public static final String DRIVER_NAME = "jsr231";
      
!     private KBD kbd = new JOGLKBD();
  	
!     // TODO extract a interface from render code
!     private RenderAPI impl = new jake2.render.fast.Misc(); 
  
!     static {
  		Renderer.register(new Jsr231Renderer());
  	};
--- 42,53 ----
  final class Jsr231Renderer extends Jsr231Driver implements refexport_t, Ref {
  	
!     	public static final String DRIVER_NAME = "jsr231";
      
!     	private KBD kbd = new JOGLKBD();
  	
!     	// is set from Renderer factory
!     	private RenderAPI impl;
  
!     	static {
  		Renderer.register(new Jsr231Renderer());
  	};
***************
*** 242,247 ****
  	}
  
! 	public final refexport_t GetRefAPI() {
! 		return this;
  	}
  }
\ No newline at end of file
--- 242,248 ----
  	}
  
! 	public final refexport_t GetRefAPI(RenderAPI renderer) {
! 		this.impl = renderer;
!         	return this;
  	}
  }
\ No newline at end of file