From c19debe92ce0eb509cd5c3596b7f858e40424451 Mon Sep 17 00:00:00 2001 From: Carsten Weisse Date: Fri, 16 Jul 2004 10:11:36 +0000 Subject: refimport_t deleted --- test/jake2/render/DancingQueens.java | 90 +-------------------------- test/jake2/render/DebugCulling.java | 114 ++--------------------------------- test/jake2/render/TestMap.java | 112 +--------------------------------- test/jake2/render/TestRenderer.java | 90 +-------------------------- 4 files changed, 11 insertions(+), 395 deletions(-) (limited to 'test/jake2/render') diff --git a/test/jake2/render/DancingQueens.java b/test/jake2/render/DancingQueens.java index c59c509..a95891f 100644 --- a/test/jake2/render/DancingQueens.java +++ b/test/jake2/render/DancingQueens.java @@ -2,7 +2,7 @@ * DancingQueens.java * Copyright (C) 2003 * - * $Id: DancingQueens.java,v 1.4 2004-07-15 14:38:40 hzi Exp $ + * $Id: DancingQueens.java,v 1.5 2004-07-16 10:11:36 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -50,7 +50,6 @@ public class DancingQueens String[] args; refexport_t re; - refimport_t ri; viddef_t viddef; int framecount = 0; @@ -67,91 +66,6 @@ public class DancingQueens 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 !!! VID.Shutdown(); @@ -159,7 +73,7 @@ public class DancingQueens String[] names = Renderer.getDriverNames(); System.out.println("Registered Drivers: " + Arrays.asList(names)); - this.re = Renderer.getDriver("fastjogl", ri); + this.re = Renderer.getDriver("fastjogl"); System.out.println("Use driver: " + re); System.out.println(); diff --git a/test/jake2/render/DebugCulling.java b/test/jake2/render/DebugCulling.java index 8782ce9..1cf6793 100644 --- a/test/jake2/render/DebugCulling.java +++ b/test/jake2/render/DebugCulling.java @@ -2,7 +2,7 @@ * DebugCulling.java * Copyright (C) 2003 * - * $Id: DebugCulling.java,v 1.2 2004-07-15 14:38:40 hzi Exp $ + * $Id: DebugCulling.java,v 1.3 2004-07-16 10:11:36 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -50,7 +50,6 @@ public class DebugCulling String[] args; refexport_t re; - refimport_t ri; viddef_t viddef; int framecount = 0; @@ -70,116 +69,11 @@ public class DebugCulling 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() - { - DebugCulling.this.updateScreen(); - } - }; - - Qcommon.Init(new String[] { "$Id: DebugCulling.java,v 1.2 2004-07-15 14:38:40 hzi Exp $" }); + Qcommon.Init(new String[] { "$Id: DebugCulling.java,v 1.3 2004-07-16 10:11:36 cawe Exp $" }); // sehr wichtig !!! VID.Shutdown(); - this.re = Renderer.getDriver("jogl", ri); + this.re = Renderer.getDriver("jogl"); re.Init(0, 0); @@ -317,7 +211,7 @@ public class DebugCulling double x; if (fov_x < 1 || fov_x > 179) - ri.Sys_Error(Defines.ERR_DROP, "Bad fov: " + fov_x); + Com.Error(Defines.ERR_DROP, "Bad fov: " + fov_x); x = width / Math.tan(fov_x / 360 * Math.PI); diff --git a/test/jake2/render/TestMap.java b/test/jake2/render/TestMap.java index 71207b9..c8cfb76 100644 --- a/test/jake2/render/TestMap.java +++ b/test/jake2/render/TestMap.java @@ -2,7 +2,7 @@ * TestMap.java * Copyright (C) 2003 * - * $Id: TestMap.java,v 1.4 2004-07-15 14:38:40 hzi Exp $ + * $Id: TestMap.java,v 1.5 2004-07-16 10:11:36 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -53,7 +53,6 @@ public class TestMap String[] args; refexport_t re; - refimport_t ri; viddef_t viddef; int framecount = 0; @@ -73,116 +72,11 @@ public class TestMap 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() - { - TestMap.this.updateScreen(); - } - }; - - Qcommon.Init(new String[] { "TestMap $Id: TestMap.java,v 1.4 2004-07-15 14:38:40 hzi Exp $" }); + Qcommon.Init(new String[] { "TestMap $Id: TestMap.java,v 1.5 2004-07-16 10:11:36 cawe Exp $" }); // sehr wichtig !!! VID.Shutdown(); - this.re = Renderer.getDriver("jogl", ri); + this.re = Renderer.getDriver("jogl"); re.Init(0, 0); diff --git a/test/jake2/render/TestRenderer.java b/test/jake2/render/TestRenderer.java index 62ffc7c..8388b20 100644 --- a/test/jake2/render/TestRenderer.java +++ b/test/jake2/render/TestRenderer.java @@ -2,7 +2,7 @@ * TestRenderer.java * Copyright (C) 2003 * - * $Id: TestRenderer.java,v 1.4 2004-07-15 14:38:40 hzi Exp $ + * $Id: TestRenderer.java,v 1.5 2004-07-16 10:11:36 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -48,7 +48,6 @@ public class TestRenderer { String[] args; refexport_t re; - refimport_t ri; viddef_t viddef; int framecount = 0; static int testnr = 0; @@ -66,91 +65,6 @@ public class TestRenderer { 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 !!! VID.Shutdown(); @@ -158,7 +72,7 @@ public class TestRenderer { String[] names = Renderer.getDriverNames(); System.out.println("Registered Drivers: " + Arrays.asList(names)); - this.re = Renderer.getDriver("jogl", ri); + this.re = Renderer.getDriver("jogl"); System.out.println("Use driver: " + re); System.out.println(); -- cgit v1.2.3