From: Carsten W. <ca...@us...> - 2006-11-20 21:29:54
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fastj In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1243/src/jake2/render/fastj Modified Files: Tag: render-refactoring Warp.java Main.java Image.java Model.java Draw.java Log Message: change to public (RenderAPI) Index: Warp.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastj/Attic/Warp.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Warp.java 7 Oct 2006 20:02:07 -0000 1.1.2.1 --- Warp.java 20 Nov 2006 21:29:49 -0000 1.1.2.2 *************** *** 624,628 **** String[] suf = { "rt", "bk", "lf", "ft", "up", "dn" }; ! protected void R_SetSky(String name, float rotate, float[] axis) { assert (axis.length == 3) : "vec3_t bug"; int i; --- 624,628 ---- String[] suf = { "rt", "bk", "lf", "ft", "up", "dn" }; ! public void R_SetSky(String name, float rotate, float[] axis) { assert (axis.length == 3) : "vec3_t bug"; int i; Index: Main.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastj/Attic/Main.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Main.java 7 Oct 2006 20:02:07 -0000 1.1.2.1 --- Main.java 20 Nov 2006 21:29:49 -0000 1.1.2.2 *************** *** 918,922 **** @@@@@@@@@@@@@@@@@@@@@ */ ! protected void R_RenderFrame(refdef_t fd) { R_RenderView(fd); R_SetLightLevel(); --- 918,922 ---- @@@@@@@@@@@@@@@@@@@@@ */ ! public void R_RenderFrame(refdef_t fd) { R_RenderView(fd); R_SetLightLevel(); *************** *** 1075,1079 **** } ! protected boolean R_Init(int vid_xpos, int vid_ypos) { assert(Warp.SIN.length == 256) : "warpsin table bug"; --- 1075,1079 ---- } ! public boolean R_Init(int vid_xpos, int vid_ypos) { assert(Warp.SIN.length == 256) : "warpsin table bug"; *************** *** 1101,1105 **** } ! protected boolean R_Init2() { VID.MenuInit(); --- 1101,1105 ---- } ! public boolean R_Init2() { VID.MenuInit(); *************** *** 1301,1305 **** =============== */ ! protected void R_Shutdown() { Cmd.RemoveCommand("modellist"); Cmd.RemoveCommand("screenshot"); --- 1301,1305 ---- =============== */ ! public void R_Shutdown() { Cmd.RemoveCommand("modellist"); Cmd.RemoveCommand("screenshot"); *************** *** 1322,1326 **** @@@@@@@@@@@@@@@@@@@@@ */ ! protected void R_BeginFrame(float camera_separation) { gl_state.camera_separation = camera_separation; --- 1322,1326 ---- @@@@@@@@@@@@@@@@@@@@@ */ ! public void R_BeginFrame(float camera_separation) { gl_state.camera_separation = camera_separation; *************** *** 1437,1441 **** ============= */ ! protected void R_SetPalette(byte[] palette) { // 256 RGB values (768 bytes) // or null --- 1437,1441 ---- ============= */ ! public void R_SetPalette(byte[] palette) { // 256 RGB values (768 bytes) // or null Index: Image.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastj/Attic/Image.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Image.java 7 Oct 2006 20:02:07 -0000 1.1.2.1 --- Image.java 20 Nov 2006 21:29:49 -0000 1.1.2.2 *************** *** 1453,1457 **** * R_RegisterSkin */ ! protected image_t R_RegisterSkin(String name) { return GL_FindImage(name, it_skin); } --- 1453,1457 ---- * R_RegisterSkin */ ! public image_t R_RegisterSkin(String name) { return GL_FindImage(name, it_skin); } Index: Draw.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastj/Attic/Draw.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Draw.java 7 Oct 2006 20:02:07 -0000 1.1.2.1 --- Draw.java 20 Nov 2006 21:29:49 -0000 1.1.2.2 *************** *** 66,70 **** ================ */ ! protected void Draw_Char(int x, int y, int num) { num &= 255; --- 66,70 ---- ================ */ ! public void Draw_Char(int x, int y, int num) { num &= 255; *************** *** 101,105 **** ============= */ ! protected image_t Draw_FindPic(String name) { image_t image = null; String fullname; --- 101,105 ---- ============= */ ! public image_t Draw_FindPic(String name) { image_t image = null; String fullname; *************** *** 121,125 **** ============= */ ! protected void Draw_GetPicSize(Dimension dim, String pic) { image_t image = Draw_FindPic(pic); --- 121,125 ---- ============= */ ! public void Draw_GetPicSize(Dimension dim, String pic) { image_t image = Draw_FindPic(pic); *************** *** 133,137 **** ============= */ ! protected void Draw_StretchPic (int x, int y, int w, int h, String pic) { image_t image; --- 133,137 ---- ============= */ ! public void Draw_StretchPic (int x, int y, int w, int h, String pic) { image_t image; *************** *** 172,176 **** ============= */ ! protected void Draw_Pic(int x, int y, String pic) { image_t image; --- 172,176 ---- ============= */ ! public void Draw_Pic(int x, int y, String pic) { image_t image; *************** *** 213,217 **** ============= */ ! protected void Draw_TileClear(int x, int y, int w, int h, String pic) { image_t image; --- 213,217 ---- ============= */ ! public void Draw_TileClear(int x, int y, int w, int h, String pic) { image_t image; *************** *** 250,254 **** ============= */ ! protected void Draw_Fill(int x, int y, int w, int h, int colorIndex) { if ( colorIndex > 255) --- 250,254 ---- ============= */ ! public void Draw_Fill(int x, int y, int w, int h, int colorIndex) { if ( colorIndex > 255) *************** *** 284,288 **** ================ */ ! protected void Draw_FadeScreen() { gl.glEnable(GL_BLEND); gl.glDisable(GL_TEXTURE_2D); --- 284,288 ---- ================ */ ! public void Draw_FadeScreen() { gl.glEnable(GL_BLEND); gl.glDisable(GL_TEXTURE_2D); *************** *** 311,315 **** ============= */ ! protected void Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte[] data) { int i, j, trows; --- 311,315 ---- ============= */ ! public void Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte[] data) { int i, j, trows; Index: Model.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastj/Attic/Model.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Model.java 7 Oct 2006 20:02:07 -0000 1.1.2.1 --- Model.java 20 Nov 2006 21:29:49 -0000 1.1.2.2 *************** *** 1083,1087 **** * Specifies the model that will be used as the world @@@@@@@@@@@@@@@@@@@@@ */ ! protected void R_BeginRegistration(String model) { resetModelArrays(); // resetPolygonArrays(); --- 1083,1087 ---- * Specifies the model that will be used as the world @@@@@@@@@@@@@@@@@@@@@ */ ! public void R_BeginRegistration(String model) { resetModelArrays(); // resetPolygonArrays(); *************** *** 1110,1114 **** * @@@@@@@@@@@@@@@@@@@@@ */ ! protected model_t R_RegisterModel(String name) { model_t mod = null; int i; --- 1110,1114 ---- * @@@@@@@@@@@@@@@@@@@@@ */ ! public model_t R_RegisterModel(String name) { model_t mod = null; int i; *************** *** 1146,1150 **** * @@@@@@@@@@@@@@@@@@@@@ */ ! protected void R_EndRegistration() { model_t mod; --- 1146,1150 ---- * @@@@@@@@@@@@@@@@@@@@@ */ ! public void R_EndRegistration() { model_t mod; |