you can now (try to) play in maps you don't have, and models you don't have are shown...

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 497d7f719b58dd5fd9b5c8127d0afd4a443d94fb..8b3d697a230eb380a1d7c786f2222ac131d73d80 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -1,52 +1,21 @@
 
 #include "quakedef.h"
 
-void LoadSky_f(void);
-
 cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
-
-static char skyworldname[1024];
-rtexture_t *solidskytexture;
-rtexture_t *alphaskytexture;
-static qboolean skyavailable_quake;
-static qboolean skyavailable_box;
-static rtexturepool_t *skytexturepool;
-
+qboolean skyavailable_quake;
+qboolean skyavailable_box;
 int skyrendernow;
 int skyrendermasked;
 
-static void r_sky_start(void)
-{
-       skytexturepool = R_AllocTexturePool();
-       solidskytexture = NULL;
-       alphaskytexture = NULL;
-}
-
-static void r_sky_shutdown(void)
-{
-       R_FreeTexturePool(&skytexturepool);
-       solidskytexture = NULL;
-       alphaskytexture = NULL;
-}
-
-int R_SetSkyBox(char *sky);
-
-static void r_sky_newmap(void)
-{
-       skyavailable_quake = false;
-       if (!strcmp(skyworldname, cl.worldmodel->name))
-               skyavailable_quake = true;
-}
-
-void R_Sky_Init(void)
-{
-       Cmd_AddCommand ("loadsky", &LoadSky_f);
-       Cvar_RegisterVariable (&r_sky);
-       R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
-}
-
+static rtexture_t *solidskytexture;
+static rtexture_t *alphaskytexture;
 static int skyrendersphere;
 static int skyrenderbox;
+static rtexturepool_t *skytexturepool;
+static char skyname[256];
+static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
+static rtexture_t *skyboxside[6];
+int R_SetSkyBox(char *sky);
 
 void R_SkyStartFrame(void)
 {
@@ -66,15 +35,11 @@ void R_SkyStartFrame(void)
        }
 }
 
-static char skyname[256];
-
 /*
 ==================
 R_SetSkyBox
 ==================
 */
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-static rtexture_t *skyboxside[6];
 int R_SetSkyBox(char *sky)
 {
        int i;
@@ -157,20 +122,20 @@ static void R_SkyBox(void)
        rmeshbufferinfo_t m;
 
 #define R_SkyBoxPolyVec(i,s,t,x,y,z) \
-       m.vertex[i * 4 + 0] = (x) * 16.0f + r_origin[0];\
-       m.vertex[i * 4 + 1] = (y) * 16.0f + r_origin[1];\
-       m.vertex[i * 4 + 2] = (z) * 16.0f + r_origin[2];\
+       m.vertex[i * 4 + 0] = (x) * 16.0f;\
+       m.vertex[i * 4 + 1] = (y) * 16.0f;\
+       m.vertex[i * 4 + 2] = (z) * 16.0f;\
        m.texcoords[0][i * 2 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
        m.texcoords[0][i * 2 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
        m.depthdisable = true; // don't modify or read zbuffer
        m.numtriangles = 2;
        m.numverts = 4;
        m.tex[0] = R_GetTexture(skyboxside[3]); // front
+       Matrix4x4_CreateTranslate(&m.matrix, r_origin[0], r_origin[1], r_origin[2]);
        if (R_Mesh_Draw_GetBuffer(&m, false))
        {
                memcpy(m.index, skyboxindex, sizeof(int[6]));
@@ -182,6 +147,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1,  1, -1, -1);
                R_SkyBoxPolyVec(2, 0, 1,  1,  1, -1);
                R_SkyBoxPolyVec(3, 0, 0,  1,  1,  1);
+               R_Mesh_Render();
        }
        m.tex[0] = R_GetTexture(skyboxside[1]); // back
        if (R_Mesh_Draw_GetBuffer(&m, false))
@@ -195,6 +161,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1, -1,  1, -1);
                R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1);
                R_SkyBoxPolyVec(3, 0, 0, -1, -1,  1);
+               R_Mesh_Render();
        }
        m.tex[0] = R_GetTexture(skyboxside[0]); // right
        if (R_Mesh_Draw_GetBuffer(&m, false))
@@ -208,6 +175,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1,  1,  1, -1);
                R_SkyBoxPolyVec(2, 0, 1, -1,  1, -1);
                R_SkyBoxPolyVec(3, 0, 0, -1,  1,  1);
+               R_Mesh_Render();
        }
        m.tex[0] = R_GetTexture(skyboxside[2]); // left
        if (R_Mesh_Draw_GetBuffer(&m, false))
@@ -221,6 +189,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1, -1, -1, -1);
                R_SkyBoxPolyVec(2, 0, 1,  1, -1, -1);
                R_SkyBoxPolyVec(3, 0, 0,  1, -1,  1);
+               R_Mesh_Render();
        }
        m.tex[0] = R_GetTexture(skyboxside[4]); // up
        if (R_Mesh_Draw_GetBuffer(&m, false))
@@ -234,6 +203,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1,  1,  1,  1);
                R_SkyBoxPolyVec(2, 0, 1, -1,  1,  1);
                R_SkyBoxPolyVec(3, 0, 0, -1, -1,  1);
+               R_Mesh_Render();
        }
        m.tex[0] = R_GetTexture(skyboxside[5]); // down
        if (R_Mesh_Draw_GetBuffer(&m, false))
@@ -247,6 +217,7 @@ static void R_SkyBox(void)
                R_SkyBoxPolyVec(1, 1, 1,  1, -1, -1);
                R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1);
                R_SkyBoxPolyVec(3, 0, 0, -1,  1, -1);
+               R_Mesh_Render();
        }
 }
 
@@ -311,9 +282,9 @@ static void skyspherearrays(float *v, float *t, float *c, float *source, float s
                c[3] = 1;
                t[0] = source[0] + s;
                t[1] = source[1] + s;
-               v[0] = source[2] + r_origin[0];
-               v[1] = source[3] + r_origin[1];
-               v[2] = source[4] + r_origin[2];
+               v[0] = source[2];
+               v[1] = source[3];
+               v[2] = source[4];
        }
 }
 
@@ -334,17 +305,18 @@ static void R_SkySphere(void)
        speedscale2 -= (int)speedscale2;
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
        m.depthdisable = true; // don't modify or read zbuffer
        m.numtriangles = skygridx*skygridy*2;
        m.numverts = skygridx1*skygridy1;
        m.tex[0] = R_GetTexture(solidskytexture);
+       Matrix4x4_CreateTranslate(&m.matrix, r_origin[0], r_origin[1], r_origin[2]);
        if (R_Mesh_Draw_GetBuffer(&m, false))
        {
                memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
                skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale, m.colorscale);
+               R_Mesh_Render();
        }
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
@@ -353,6 +325,7 @@ static void R_SkySphere(void)
        {
                memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
                skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale2, m.colorscale);
+               R_Mesh_Render();
        }
 }
 
@@ -397,7 +370,7 @@ void R_InitSky (qbyte *src, int bytesperpixel)
        qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4];
        unsigned trans[128*128], transpix, *rgba;
 
-       strcpy(skyworldname, loadmodel->name);
+       skyavailable_quake = true;
 
        // flush skytexturepool so we won't build up a leak from uploading textures multiple times
        R_FreeTexturePool(&skytexturepool);
@@ -465,3 +438,39 @@ void R_InitSky (qbyte *src, int bytesperpixel)
        alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
 }
 
+void R_ResetQuakeSky(void)
+{
+       skyavailable_quake = false;
+}
+
+void R_ResetSkyBox(void)
+{
+       skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
+       skyname[0] = 0;
+       skyavailable_box = false;
+}
+
+static void r_sky_start(void)
+{
+       skytexturepool = R_AllocTexturePool();
+       solidskytexture = NULL;
+       alphaskytexture = NULL;
+}
+
+static void r_sky_shutdown(void)
+{
+       R_FreeTexturePool(&skytexturepool);
+       solidskytexture = NULL;
+       alphaskytexture = NULL;
+}
+
+static void r_sky_newmap(void)
+{
+}
+
+void R_Sky_Init(void)
+{
+       Cmd_AddCommand ("loadsky", &LoadSky_f);
+       Cvar_RegisterVariable (&r_sky);
+       R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
+}