cleaned up nearly all of the externs in .c files (moved to appropriate .h files)

[xonotic/darkplaces.git] / gl_rmisc.c

diff --git a/gl_rmisc.c b/gl_rmisc.c
index 99ff6ecb7fe2fde8b2feebc72c4ffe350e489397..a4b675d1136d347e11ca17125ebc20b011cb7f21 100644 (file)
--- a/gl_rmisc.c
+++ b/gl_rmisc.c
@@ -22,41 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 
-
-/*
-==================
-R_InitTextures
-==================
-*/
-void   R_InitTextures (void)
-{
-       int             x,y, m;
-       byte    *dest;
-
-// create a simple checkerboard texture for the default
-       r_notexture_mip = Hunk_AllocName (sizeof(texture_t) + 16*16+8*8+4*4+2*2, "notexture");
-       
-       r_notexture_mip->width = r_notexture_mip->height = 16;
-       r_notexture_mip->offsets[0] = sizeof(texture_t);
-       r_notexture_mip->offsets[1] = r_notexture_mip->offsets[0] + 16*16;
-       r_notexture_mip->offsets[2] = r_notexture_mip->offsets[1] + 8*8;
-       r_notexture_mip->offsets[3] = r_notexture_mip->offsets[2] + 4*4;
-       r_notexture_mip->transparent = FALSE;
-       
-       for (m=0 ; m<4 ; m++)
-       {
-               dest = (byte *)r_notexture_mip + r_notexture_mip->offsets[m];
-               for (y=0 ; y< (16>>m) ; y++)
-                       for (x=0 ; x< (16>>m) ; x++)
-                       {
-                               if (  (y< (8>>m) ) ^ (x< (8>>m) ) )
-                                       *dest++ = 0;
-                               else
-                                       *dest++ = 0xff;
-                       }
-       }       
-}
-
 /*
 ===============
 R_Envmap_f
@@ -68,6 +33,9 @@ void R_Envmap_f (void)
 {
        byte    buffer[256*256*4];
 
+       if (!r_render.value)
+               return;
+
        glDrawBuffer  (GL_FRONT);
        glReadBuffer  (GL_FRONT);
        envmap = true;
@@ -125,11 +93,15 @@ void R_Envmap_f (void)
 
 void R_InitParticles (void);
 
-void gl_misc_start()
+void gl_misc_start(void)
+{
+}
+
+void gl_misc_shutdown(void)
 {
 }
 
-void gl_misc_shutdown()
+void gl_misc_newmap(void)
 {
 }
 
@@ -140,34 +112,20 @@ R_Init
 */
 void GL_Misc_Init (void)
 {      
-       Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);        
        Cmd_AddCommand ("envmap", R_Envmap_f);  
-       Cmd_AddCommand ("pointfile", R_ReadPointFile_f);        
-
-       Cvar_RegisterVariable (&r_drawentities);
-       Cvar_RegisterVariable (&r_drawviewmodel);
-       Cvar_RegisterVariable (&r_shadows);
-       Cvar_RegisterVariable (&r_wateralpha);
-       Cvar_RegisterVariable (&r_dynamic);
-       Cvar_RegisterVariable (&r_novis);
-       Cvar_RegisterVariable (&r_speeds);
-       Cvar_RegisterVariable (&r_waterripple); // LordHavoc: added waterripple
-
-       R_RegisterModule("GL_Misc", gl_misc_start, gl_misc_shutdown);
-}
+       Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);        
 
-//qboolean VID_Is8bit(void);
-//void GL_Upload8_EXT (byte *data, int width, int height,  qboolean mipmap, qboolean alpha);
+       R_RegisterModule("GL_Misc", gl_misc_start, gl_misc_shutdown, gl_misc_newmap);
+}
 
-void R_ClearParticles (void);
-void GL_BuildLightmaps (void);
+extern void R_ClearParticles (void);
+extern void GL_BuildLightmaps (void);
 
 /*
 ===============
 R_NewMap
 ===============
 */
-void SHOWLMP_clear();
 void R_NewMap (void)
 {
        int             i;
@@ -176,16 +134,11 @@ void R_NewMap (void)
                d_lightstylevalue[i] = 264;             // normal light value
 
        memset (&r_worldentity, 0, sizeof(r_worldentity));
-       r_worldentity.model = cl.worldmodel;
+       r_worldentity.render.model = cl.worldmodel;
        currententity = &r_worldentity;
 
-// clear out efrags in case the level hasn't been reloaded
-// FIXME: is this one short?
-       for (i=0 ; i<cl.worldmodel->numleafs ; i++)
-               cl.worldmodel->leafs[i].efrags = NULL;
-                       
        r_viewleaf = NULL;
-       R_ClearParticles ();
+       R_Modules_NewMap();
 
        GL_BuildLightmaps ();
 
@@ -197,7 +150,6 @@ void R_NewMap (void)
                        continue;
                if (!strncmp(cl.worldmodel->textures[i]->name,"sky",3) )
                        skytexturenum = i;
-               cl.worldmodel->textures[i]->texturechain = NULL;
        }
        SHOWLMP_clear();
 }
@@ -217,14 +169,16 @@ void R_TimeRefresh_f (void)
        float           start, stop, time;
 
        intimerefresh = 1;
-       start = Sys_FloatTime ();
-       for (i=0 ; i<128 ; i++)
+       start = Sys_DoubleTime ();
+       for (i = 0;i < 128;i++)
        {
+               r_refdef.viewangles[0] = 0;
                r_refdef.viewangles[1] = i/128.0*360.0;
+               r_refdef.viewangles[2] = 0;
                SCR_UpdateScreen();
        }
 
-       stop = Sys_FloatTime ();
+       stop = Sys_DoubleTime ();
        intimerefresh = 0;
        time = stop-start;
        Con_Printf ("%f seconds (%f fps)\n", time, 128/time);