[Jake2-commits] jake2/src/jake2/render Jsr231cbRenderer.java, NONE, 1.1 Renderer.java, 1.8, 1.9

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Renderer.java 
Added Files:
	Jsr231cbRenderer.java 
Log Message:
add a new renderer which uses the jsr231 callback interface (GLEventListener)

--- NEW FILE: Jsr231cbRenderer.java ---
/*
 * Jsr231cbRenderer.java
 * Copyright (C) 2003
 *
 */
/*
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;

import jake2.Defines;
import jake2.client.refdef_t;
import jake2.client.refexport_t;
import jake2.qcommon.xcommand_t;
import jake2.render.opengl.Jsr231cbDriver;
import jake2.sys.JOGLKBD;
import jake2.sys.KBD;

import java.awt.Dimension;

/**
 * Jsr231cbRenderer
 * 
 * This is render uses the callback version of jsr231
 * 
 * @author cwei
 */
final class Jsr231cbRenderer extends Jsr231cbDriver 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 Jsr231cbRenderer());
	};

	private Jsr231cbRenderer() {
        // singleton
	}

	// ============================================================================
	// public interface for Renderer implementations
	//
	// refexport_t (ref.h)
	// ============================================================================

    private boolean post_init = false;
/** 
	 * @see jake2.client.refexport_t#Init()
	 */
	public boolean Init(int vid_xpos, int vid_ypos) {
        // init the OpenGL drivers
        impl.setGLDriver(this);
		// pre init
		if (!impl.R_Init(vid_xpos, vid_ypos)) return false;
		// calls the R_Init2() internally
		updateScreen(new xcommand_t() {
            public void execute() {
                Jsr231cbRenderer.this.post_init = impl.R_Init2();        
            }
        });
		// the result from R_Init2()
		return post_init;
	}

	/** 
	 * @see jake2.client.refexport_t#Shutdown()
	 */
	public void Shutdown() {
		impl.R_Shutdown();
	}

	/** 
	 * @see jake2.client.refexport_t#BeginRegistration(java.lang.String)
	 */
	public void BeginRegistration(String map) {
		if (contextInUse) {
			impl.R_BeginRegistration(map);
			return;
		}

		this.name = map;

		updateScreen(new xcommand_t() {
			public void execute() {
				impl.R_BeginRegistration(Jsr231cbRenderer.this.name);
			}
		});
	}

	private model_t model = null;
	private String name = null;

	/** 
	 * @see jake2.client.refexport_t#RegisterModel(java.lang.String)
	 */
	public model_t RegisterModel(String name) {

		if (contextInUse)
			return impl.R_RegisterModel(name);

		model = null;
		this.name = name;

		updateScreen(new xcommand_t() {
			public void execute() {
				Jsr231cbRenderer.this.model = impl.R_RegisterModel(Jsr231cbRenderer.this.name);
			}
		});
		return model;
	}

	/** 
	 * @see jake2.client.refexport_t#RegisterSkin(java.lang.String)
	 */
	public image_t RegisterSkin(String name) {
		if (contextInUse)
			return impl.R_RegisterSkin(name);

		this.image = null;
		this.name = name;

		updateScreen(new xcommand_t() {
			public void execute() {
				Jsr231cbRenderer.this.image = impl.R_RegisterSkin(Jsr231cbRenderer.this.name);
			}
		});
		return image;
	}

	private image_t image = null;

	/** 
	 * @see jake2.client.refexport_t#RegisterPic(java.lang.String)
	 */
	public image_t RegisterPic(String name) {
		if (contextInUse)
			return impl.Draw_FindPic(name);

		this.image = null;
		this.name = name;

		updateScreen(new xcommand_t() {
			public void execute() {
				Jsr231cbRenderer.this.image = impl.Draw_FindPic(Jsr231cbRenderer.this.name);
			}
		});
		return image;
	}

	private float[] axis;
	private float rotate;

	/** 
	 * @see jake2.client.refexport_t#SetSky(java.lang.String, float, float[])
	 */
	public void SetSky(String name, float rotate, float[] axis) {
		if (contextInUse) {
			impl.R_SetSky(name, rotate, axis);
			return;
		}

		this.name = name;
		this.rotate = rotate;
		this.axis = axis;

		updateScreen(new xcommand_t() {
			public void execute() {
				impl.R_SetSky(Jsr231cbRenderer.this.name, Jsr231cbRenderer.this.rotate, Jsr231cbRenderer.this.axis);
			}
		});
	}

	/** 
	 * @see jake2.client.refexport_t#EndRegistration()
	 */
	public void EndRegistration() {
		if (contextInUse) {
			impl.R_EndRegistration();
			return;
		}

		updateScreen(new xcommand_t() {
			public void execute() {
				impl.R_EndRegistration();
			}
		});
	}

	/** 
	 * @see jake2.client.refexport_t#RenderFrame(jake2.client.refdef_t)
	 */
	public void RenderFrame(refdef_t fd) {
		impl.R_RenderFrame(fd);
	}

	/** 
	 * @see jake2.client.refexport_t#DrawGetPicSize(java.awt.Dimension, java.lang.String)
	 */
	public void DrawGetPicSize(Dimension dim, String name) {
		impl.Draw_GetPicSize(dim, name);
	}

	/** 
	 * @see jake2.client.refexport_t#DrawPic(int, int, java.lang.String)
	 */
	public void DrawPic(int x, int y, String name) {
		impl.Draw_Pic(x, y, name);
	}

	/** 
	 * @see jake2.client.refexport_t#DrawStretchPic(int, int, int, int, java.lang.String)
	 */
	public void DrawStretchPic(int x, int y, int w, int h, String name) {
		impl.Draw_StretchPic(x, y, w, h, name);
	}

    private int x, y, num;

	/** 
	 * @see jake2.client.refexport_t#DrawChar(int, int, int)
	 */
	public void DrawChar(int x, int y, int num) {
        if (contextInUse) {
            impl.Draw_Char(x, y, num);;
            return;
        }

        this.x = x;
        this.y = y;
        this.num = num;

        updateScreen(new xcommand_t() {
            public void execute() {
                impl.Draw_Char(Jsr231cbRenderer.this.x, Jsr231cbRenderer.this.y, Jsr231cbRenderer.this.num);
            }
        });
	}

	/** 
	 * @see jake2.client.refexport_t#DrawTileClear(int, int, int, int, java.lang.String)
	 */
	public void DrawTileClear(int x, int y, int w, int h, String name) {
		impl.Draw_TileClear(x, y, w, h, name);
	}

	/** 
	 * @see jake2.client.refexport_t#DrawFill(int, int, int, int, int)
	 */
	public void DrawFill(int x, int y, int w, int h, int c) {
		impl.Draw_Fill(x, y, w, h, c);
	}

	/** 
	 * @see jake2.client.refexport_t#DrawFadeScreen()
	 */
	public void DrawFadeScreen() {
		impl.Draw_FadeScreen();
	}

	/** 
	 * @see jake2.client.refexport_t#DrawStretchRaw(int, int, int, int, int, int, byte[])
	 */
	public void DrawStretchRaw(int x, int y, int w, int h, int cols, int rows, byte[] data) {
		impl.Draw_StretchRaw(x, y, w, h, cols, rows, data);
	}

	/** 
	 * @see jake2.client.refexport_t#CinematicSetPalette(byte[])
	 */
	public void CinematicSetPalette(byte[] palette) {
		impl.R_SetPalette(palette);
	}

	/** 
	 * @see jake2.client.refexport_t#BeginFrame(float)
	 */
	public void BeginFrame(float camera_separation) {
		impl.R_BeginFrame(camera_separation);
	}

	/** 
	 * @see jake2.client.refexport_t#EndFrame()
	 */
	public void EndFrame() {
		endFrame();
	}

	/** 
	 * @see jake2.client.refexport_t#AppActivate(boolean)
	 */
	public void AppActivate(boolean activate) {
		appActivate(activate);
	}

    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
	// ============================================================================

	public String getName() {
		return DRIVER_NAME;
	}

	public String toString() {
		return DRIVER_NAME;
	}

	public refexport_t GetRefAPI(RenderAPI renderer) {
        	this.impl = renderer;
		return this;
	}

}
Index: Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Renderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Renderer.java	21 Nov 2006 01:22:00 -0000	1.8
--- Renderer.java	11 Dec 2006 12:56:30 -0000	1.9
***************
*** 58,62 ****
  		try {
  		    Class.forName("javax.media.opengl.GL");
! 		    Class.forName("jake2.render.Jsr231Renderer");
  		} catch (ClassNotFoundException e) {
  		    // ignore the jogl drivers if runtime not in classpath
--- 58,62 ----
  		try {
  		    Class.forName("javax.media.opengl.GL");
! 		    Class.forName("jake2.render.Jsr231cbRenderer");
  		} catch (ClassNotFoundException e) {
  		    // ignore the jogl drivers if runtime not in classpath