[Jake2-commits] jake2/test/jake2/render DebugCulling.java,1.2,1.3 TestRenderer.java,1.4,1.5 DancingQueens.java,1.4,1.5 TestMap.java,1.4,1.5

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

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

Modified Files:
	DebugCulling.java TestRenderer.java DancingQueens.java 
	TestMap.java 
Log Message:
refimport_t deleted

Index: TestMap.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMap.java	15 Jul 2004 14:38:40 -0000	1.4
--- TestMap.java	16 Jul 2004 10:11:36 -0000	1.5
***************
*** 54,58 ****
  
  	refexport_t re;
- 	refimport_t ri;
  	viddef_t viddef;
  	int framecount = 0;
--- 54,57 ----
***************
*** 74,187 ****
  	{
  
- 		// only for testing
- 		// a simple refimport_t implementation
- 		ri = new refimport_t()
- 		{
- 			public void Sys_Error(int err_level, String str)
- 			{
- 				Com.Error(err_level, str, null);
- 			}
- 
- 			public void Sys_Error(int err_level, String str, Vargs vargs)
- 			{
- 				Com.Error(err_level, str, vargs);
- 			}
- 
- 			public void Cmd_AddCommand(String name, xcommand_t cmd)
- 			{
- 				Cmd.AddCommand(name, cmd);
- 			}
- 
- 			public void Cmd_RemoveCommand(String name)
- 			{
- 				Cmd.RemoveCommand(name);
- 			}
- 
- 			public int Cmd_Argc()
- 			{
- 				return Cmd.Argc();
- 			}
- 
- 			public String Cmd_Argv(int i)
- 			{
- 				return Cmd.Argv(i);
- 			}
- 
- 			public void Cmd_ExecuteText(int exec_when, String text)
- 			{
- 				Cbuf.ExecuteText(exec_when, text);
- 			}
- 
- 			public void Con_Printf(int print_level, String str)
- 			{
- 				VID.Printf(print_level, str, null);
- 			}
- 
- 			public void Con_Printf(int print_level, String str, Vargs vargs)
- 			{
- 				VID.Printf(print_level, str, vargs);
- 			}
- 
- 			public byte[] FS_LoadFile(String name)
- 			{
- 				return FS.LoadFile(name);
- 			}
- 
- 			public int FS_FileLength(String name)
- 			{
- 				return FS.FileLength(name);
- 			}
- 
- 			public void FS_FreeFile(byte[] buf)
- 			{
- 				FS.FreeFile(buf);
- 			}
- 
- 			public String FS_Gamedir()
- 			{
- 				return FS.Gamedir();
- 			}
- 
- 			public cvar_t Cvar_Get(String name, String value, int flags)
- 			{
- 				return Cvar.Get(name, value, flags);
- 			}
- 
- 			public cvar_t Cvar_Set(String name, String value)
- 			{
- 				return Cvar.Set(name, value);
- 			}
- 
- 			public void Cvar_SetValue(String name, float value)
- 			{
- 				Cvar.SetValue(name, value);
- 			}
- 
- 			public boolean Vid_GetModeInfo(Dimension dim, int mode)
- 			{
- 				return VID.GetModeInfo(dim, mode);
- 			}
- 
- 			public void Vid_MenuInit()
- 			{
- 				VID.MenuInit();
- 			}
- 
- 			public void Vid_NewWindow(int width, int height)
- 			{
- 				VID.NewWindow(width, height);
- 			}
- 
- 			public void updateScreenCallback()
- 			{
- 				TestMap.this.updateScreen();
- 			}
- 		};
- 
  		Qcommon.Init(new String[] { "TestMap $Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		this.re = Renderer.getDriver("jogl", ri);
  
  		re.Init(0, 0);
--- 73,81 ----
  	{
  
  		Qcommon.Init(new String[] { "TestMap $Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		this.re = Renderer.getDriver("jogl");
  
  		re.Init(0, 0);

Index: DebugCulling.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DebugCulling.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DebugCulling.java	15 Jul 2004 14:38:40 -0000	1.2
--- DebugCulling.java	16 Jul 2004 10:11:36 -0000	1.3
***************
*** 51,55 ****
  
  	refexport_t re;
- 	refimport_t ri;
  	viddef_t viddef;
  	int framecount = 0;
--- 51,54 ----
***************
*** 71,184 ****
  	{
  
- 		// only for testing
- 		// a simple refimport_t implementation
- 		ri = new refimport_t()
- 		{
- 			public void Sys_Error(int err_level, String str)
- 			{
- 				Com.Error(err_level, str, null);
- 			}
- 
- 			public void Sys_Error(int err_level, String str, Vargs vargs)
- 			{
- 				Com.Error(err_level, str, vargs);
- 			}
- 
- 			public void Cmd_AddCommand(String name, xcommand_t cmd)
- 			{
- 				Cmd.AddCommand(name, cmd);
- 			}
- 
- 			public void Cmd_RemoveCommand(String name)
- 			{
- 				Cmd.RemoveCommand(name);
- 			}
- 
- 			public int Cmd_Argc()
- 			{
- 				return Cmd.Argc();
- 			}
- 
- 			public String Cmd_Argv(int i)
- 			{
- 				return Cmd.Argv(i);
- 			}
- 
- 			public void Cmd_ExecuteText(int exec_when, String text)
- 			{
- 				Cbuf.ExecuteText(exec_when, text);
- 			}
- 
- 			public void Con_Printf(int print_level, String str)
- 			{
- 				VID.Printf(print_level, str, null);
- 			}
- 
- 			public void Con_Printf(int print_level, String str, Vargs vargs)
- 			{
- 				VID.Printf(print_level, str, vargs);
- 			}
- 
- 			public byte[] FS_LoadFile(String name)
- 			{
- 				return FS.LoadFile(name);
- 			}
- 
- 			public int FS_FileLength(String name)
- 			{
- 				return FS.FileLength(name);
- 			}
- 
- 			public void FS_FreeFile(byte[] buf)
- 			{
- 				FS.FreeFile(buf);
- 			}
- 
- 			public String FS_Gamedir()
- 			{
- 				return FS.Gamedir();
- 			}
- 
- 			public cvar_t Cvar_Get(String name, String value, int flags)
- 			{
- 				return Cvar.Get(name, value, flags);
- 			}
- 
- 			public cvar_t Cvar_Set(String name, String value)
- 			{
- 				return Cvar.Set(name, value);
- 			}
- 
- 			public void Cvar_SetValue(String name, float value)
- 			{
- 				Cvar.SetValue(name, value);
- 			}
- 
- 			public boolean Vid_GetModeInfo(Dimension dim, int mode)
- 			{
- 				return VID.GetModeInfo(dim, mode);
- 			}
- 
- 			public void Vid_MenuInit()
- 			{
- 				VID.MenuInit();
- 			}
- 
- 			public void Vid_NewWindow(int width, int height)
- 			{
- 				VID.NewWindow(width, height);
- 			}
- 
- 			public void updateScreenCallback()
- 			{
- 				DebugCulling.this.updateScreen();
- 			}
- 		};
- 
  		Qcommon.Init(new String[] { "$Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		this.re = Renderer.getDriver("jogl", ri);
  
  		re.Init(0, 0);
--- 70,78 ----
  	{
  
  		Qcommon.Init(new String[] { "$Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		this.re = Renderer.getDriver("jogl");
  
  		re.Init(0, 0);
***************
*** 318,322 ****
  
  		if (fov_x < 1 || fov_x > 179)
! 			ri.Sys_Error(Defines.ERR_DROP, "Bad fov: " + fov_x);
  
  		x = width / Math.tan(fov_x / 360 * Math.PI);
--- 212,216 ----
  
  		if (fov_x < 1 || fov_x > 179)
! 			Com.Error(Defines.ERR_DROP, "Bad fov: " + fov_x);
  
  		x = width / Math.tan(fov_x / 360 * Math.PI);

Index: TestRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestRenderer.java	15 Jul 2004 14:38:40 -0000	1.4
--- TestRenderer.java	16 Jul 2004 10:11:36 -0000	1.5
***************
*** 49,53 ****
  
  	refexport_t re;
- 	refimport_t ri;
  	viddef_t viddef;
  	int framecount = 0;
--- 49,52 ----
***************
*** 67,155 ****
  	void init() {
  
- 		// only for testing
- 		// a simple refimport_t implementation
- 		ri = new refimport_t() {
- 			public void Sys_Error(int err_level, String str) {
- 				Com.Error(err_level, str, null);
- 			}
- 
- 			public void Sys_Error(int err_level, String str, Vargs vargs) {
- 				Com.Error(err_level, str, vargs);
- 			}
- 
- 			public void Cmd_AddCommand(String name, xcommand_t cmd) {
- 				Cmd.AddCommand(name, cmd);
- 			}
- 
- 			public void Cmd_RemoveCommand(String name) {
- 				Cmd.RemoveCommand(name);
- 			}
- 
- 			public int Cmd_Argc() {
- 				return Cmd.Argc();
- 			}
- 
- 			public String Cmd_Argv(int i) {
- 				return Cmd.Argv(i);
- 			}
- 
- 			public void Cmd_ExecuteText(int exec_when, String text) {
- 				Cbuf.ExecuteText(exec_when, text);
- 			}
- 
- 			public void Con_Printf(int print_level, String str) {
- 				VID.Printf(print_level, str, null);
- 			}
- 
- 			public void Con_Printf(int print_level, String str, Vargs vargs) {
- 				VID.Printf(print_level, str, vargs);
- 			}
- 
- 			public byte[] FS_LoadFile(String name) {
- 				return FS.LoadFile(name);
- 			}
- 
- 			public int FS_FileLength(String name) {
- 				return FS.FileLength(name);
- 			}
- 			
- 			public void FS_FreeFile(byte[] buf) {
- 				FS.FreeFile(buf);
- 			}
- 
- 			public String FS_Gamedir() {
- 				return FS.Gamedir();
- 			}
- 
- 			public cvar_t Cvar_Get(String name, String value, int flags) {
- 				return Cvar.Get(name, value, flags);
- 			}
- 
- 			public cvar_t Cvar_Set(String name, String value) {
- 				return Cvar.Set(name, value);
- 			}
- 
- 			public void Cvar_SetValue(String name, float value) {
- 				Cvar.SetValue(name, value);
- 			}
- 
- 			public boolean Vid_GetModeInfo(Dimension dim, int mode) {
- 				return VID.GetModeInfo(dim, mode);
- 			}
- 
- 			public void Vid_MenuInit() {
- 				VID.MenuInit();
- 			}
- 
- 			public void Vid_NewWindow(int width, int height) {
- 				VID.NewWindow(width, height);
- 			}
- 
- 			public void updateScreenCallback() {
- 				TestRenderer.this.updateScreen();
- 			}
- 		};
- 
- 
  		Qcommon.Init(new String[] {"TestRenderer"});
  		// sehr wichtig !!!
--- 66,69 ----
***************
*** 159,163 ****
  		System.out.println("Registered Drivers: " + Arrays.asList(names));
  
! 		this.re = Renderer.getDriver("jogl", ri);
  
  		System.out.println("Use driver: " + re);
--- 73,77 ----
  		System.out.println("Registered Drivers: " + Arrays.asList(names));
  
! 		this.re = Renderer.getDriver("jogl");
  
  		System.out.println("Use driver: " + re);

Index: DancingQueens.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DancingQueens.java	15 Jul 2004 14:38:40 -0000	1.4
--- DancingQueens.java	16 Jul 2004 10:11:36 -0000	1.5
***************
*** 51,55 ****
  
  	refexport_t re;
- 	refimport_t ri;
  	viddef_t viddef;
  	int framecount = 0;
--- 51,54 ----
***************
*** 68,156 ****
  	void init() {
  
- 		// only for testing
- 		// a simple refimport_t implementation
- 		ri = new refimport_t() {
- 			public void Sys_Error(int err_level, String str) {
- 				Com.Error(err_level, str, null);
- 			}
- 
- 			public void Sys_Error(int err_level, String str, Vargs vargs) {
- 				Com.Error(err_level, str, vargs);
- 			}
- 
- 			public void Cmd_AddCommand(String name, xcommand_t cmd) {
- 				Cmd.AddCommand(name, cmd);
- 			}
- 
- 			public void Cmd_RemoveCommand(String name) {
- 				Cmd.RemoveCommand(name);
- 			}
- 
- 			public int Cmd_Argc() {
- 				return Cmd.Argc();
- 			}
- 
- 			public String Cmd_Argv(int i) {
- 				return Cmd.Argv(i);
- 			}
- 
- 			public void Cmd_ExecuteText(int exec_when, String text) {
- 				Cbuf.ExecuteText(exec_when, text);
- 			}
- 
- 			public void Con_Printf(int print_level, String str) {
- 				VID.Printf(print_level, str, null);
- 			}
- 
- 			public void Con_Printf(int print_level, String str, Vargs vargs) {
- 				VID.Printf(print_level, str, vargs);
- 			}
- 
- 			public byte[] FS_LoadFile(String name) {
- 				return FS.LoadFile(name);
- 			}
- 
- 			public int FS_FileLength(String name) {
- 				return FS.FileLength(name);
- 			}
- 			
- 			public void FS_FreeFile(byte[] buf) {
- 				FS.FreeFile(buf);
- 			}
- 
- 			public String FS_Gamedir() {
- 				return FS.Gamedir();
- 			}
- 
- 			public cvar_t Cvar_Get(String name, String value, int flags) {
- 				return Cvar.Get(name, value, flags);
- 			}
- 
- 			public cvar_t Cvar_Set(String name, String value) {
- 				return Cvar.Set(name, value);
- 			}
- 
- 			public void Cvar_SetValue(String name, float value) {
- 				Cvar.SetValue(name, value);
- 			}
- 
- 			public boolean Vid_GetModeInfo(Dimension dim, int mode) {
- 				return VID.GetModeInfo(dim, mode);
- 			}
- 
- 			public void Vid_MenuInit() {
- 				VID.MenuInit();
- 			}
- 
- 			public void Vid_NewWindow(int width, int height) {
- 				VID.NewWindow(width, height);
- 			}
- 
- 			public void updateScreenCallback() {
- 				DancingQueens.this.updateScreen();
- 			}
- 		};
- 
- 
  		Qcommon.Init(new String[] {"DancingQueens"});
  		// sehr wichtig !!!
--- 67,70 ----
***************
*** 160,164 ****
  		System.out.println("Registered Drivers: " + Arrays.asList(names));
  
! 		this.re = Renderer.getDriver("fastjogl", ri);
  
  		System.out.println("Use driver: " + re);
--- 74,78 ----
  		System.out.println("Registered Drivers: " + Arrays.asList(names));
  
! 		this.re = Renderer.getDriver("fastjogl");
  
  		System.out.println("Use driver: " + re);