X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sky.c;h=e7e5b30bb046a9dcca63d74279bfeda91bcd278d;hb=018792046effbf5f5743d6ef9569f6c3a2480ae9;hp=fa9c0df2e5dcef4de198efb8048cc46522198c2f;hpb=0e38741a94d0a28e659fb3a87eaa7c9464f5cb8d;p=xonotic%2Fdarkplaces.git diff --git a/r_sky.c b/r_sky.c index fa9c0df2..e7e5b30b 100644 --- a/r_sky.c +++ b/r_sky.c @@ -3,16 +3,16 @@ #include "image.h" // FIXME: fix skybox after vid_restart -cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"}; -cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1"}; -cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2"}; +cvar_t r_sky = {CVAR_SAVE, "r_sky", "1", "enables sky rendering (black otherwise)"}; +cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"}; +cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"}; int skyrendernow; int skyrendermasked; static int skyrendersphere; static int skyrenderbox; static rtexturepool_t *skytexturepool; -static char skyname[256]; +static char skyname[MAX_QPATH]; typedef struct suffixinfo_s { @@ -56,11 +56,11 @@ void R_SkyStartFrame(void) skyrendersphere = false; skyrenderbox = false; skyrendermasked = false; - if (r_sky.integer && !fogenabled) + if (r_sky.integer && !r_refdef.fogenabled) { if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5]) skyrenderbox = true; - else if (r_refdef.worldmodel->brush.solidskytexture) + else if (r_refdef.worldmodel && r_refdef.worldmodel->brush.solidskytexture) skyrendersphere = true; // for depth-masked sky, render the sky on the first sky surface encountered skyrendernow = true; @@ -84,18 +84,18 @@ void R_UnloadSkyBox(void) } } -void R_LoadSkyBox(void) +int R_LoadSkyBox(void) { int i, j, success; int indices[4] = {0,1,2,3}; - char name[1024]; - qbyte *image_rgba; - qbyte *temp; + char name[MAX_INPUTLINE]; + unsigned char *image_rgba; + unsigned char *temp; R_UnloadSkyBox(); if (!skyname[0]) - return; + return true; for (j=0; j<3; j++) { @@ -113,7 +113,7 @@ void R_LoadSkyBox(void) } } } - temp = Mem_Alloc(tempmempool, image_width*image_height*4); + temp = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4); Image_CopyMux (temp, image_rgba, image_width, image_height, suffix[j][i].flipx, suffix[j][i].flipy, suffix[j][i].flipdiagonal, 4, 4, indices); skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, temp, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL); Mem_Free(image_rgba); @@ -126,7 +126,9 @@ void R_LoadSkyBox(void) } if (j == 3) - Con_Printf ("Failed to load %s as skybox\n", skyname); + return false; + + return true; } int R_SetSkyBox(const char *sky) @@ -136,17 +138,13 @@ int R_SetSkyBox(const char *sky) if (strlen(sky) > 1000) { - Con_Printf("sky name too long (%i, max is 1000)\n", strlen(sky)); + Con_Printf("sky name too long (%i, max is 1000)\n", (int)strlen(sky)); return false; } - strcpy(skyname, sky); - - R_LoadSkyBox(); + strlcpy(skyname, sky, sizeof(skyname)); - if (!skyname[0]) - return true; - return false; + return R_LoadSkyBox(); } // LordHavoc: added LoadSky console command @@ -270,20 +268,21 @@ int skyboxelements[6*2*3] = static void R_SkyBox(void) { int i; - rmeshstate_t m; - GL_Color(1, 1, 1, 1); - memset(&m, 0, sizeof(m)); + // FIXME: fixed function path can't properly handle r_view.colorscale > 1 + GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1); GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(false); + GL_DepthRange(0, 1); GL_DepthTest(false); // don't modify or read zbuffer - m.pointer_vertex = skyboxvertex3f; - m.pointer_texcoord[0] = skyboxtexcoord2f; + R_Mesh_VertexPointer(skyboxvertex3f, 0, 0); + R_Mesh_ColorPointer(NULL, 0, 0); + R_Mesh_ResetTextureState(); + R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0); GL_LockArrays(0, 6*4); for (i = 0;i < 6;i++) { - m.tex[0] = R_GetTexture(skyboxside[i]); - R_Mesh_State(&m); - R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6); + R_Mesh_TexBind(0, R_GetTexture(skyboxside[i])); + R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0); } GL_LockArrays(0, 0); } @@ -350,7 +349,6 @@ static void R_SkySphere(void) { float speedscale; static qboolean skysphereinitialized = false; - rmeshstate_t m; matrix4x4_t scroll1matrix, scroll2matrix; if (!skysphereinitialized) { @@ -369,41 +367,40 @@ static void R_SkySphere(void) speedscale -= (int)speedscale; Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0); - GL_Color(1, 1, 1, 1); + // FIXME: fixed function path can't properly handle r_view.colorscale > 1 + GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1); GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(true); + GL_DepthRange(0, 1); GL_DepthTest(false); // don't modify or read zbuffer - memset(&m, 0, sizeof(m)); - m.pointer_vertex = skysphere_vertex3f; - m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.solidskytexture); - m.pointer_texcoord[0] = skysphere_texcoord2f; - m.texmatrix[0] = scroll1matrix; - if (r_textureunits.integer >= 2) + R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0); + R_Mesh_ColorPointer(NULL, 0, 0); + R_Mesh_ResetTextureState(); + R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture)); + R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0); + R_Mesh_TexMatrix(0, &scroll1matrix); + if (r_textureunits.integer >= 2 && r_view.colorscale == 1) { // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer - m.tex[1] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture); - m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL; - m.pointer_texcoord[1] = skysphere_texcoord2f; - m.texmatrix[1] = scroll2matrix; - R_Mesh_State(&m); + R_Mesh_TexBind(1, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture)); + R_Mesh_TexCombine(1, gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL, GL_MODULATE, 1, 1); + R_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f, 0, 0); + R_Mesh_TexMatrix(1, &scroll2matrix); GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0); GL_LockArrays(0, 0); } else { // two pass - R_Mesh_State(&m); GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); - GL_LockArrays(0, 0); + R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture); - m.texmatrix[0] = scroll2matrix; - R_Mesh_State(&m); + R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture)); + R_Mesh_TexMatrix(0, &scroll2matrix); GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0); GL_LockArrays(0, 0); } } @@ -413,7 +410,7 @@ void R_Sky(void) matrix4x4_t skymatrix; if (skyrendermasked) { - Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]); + Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]); R_Mesh_Matrix(&skymatrix); if (skyrendersphere) { @@ -434,6 +431,9 @@ void R_Sky(void) //GL_Clear(GL_DEPTH_BUFFER_BIT); } */ + GL_DepthRange(0, 1); + GL_DepthTest(true); + GL_DepthMask(true); } } @@ -465,7 +465,7 @@ static void r_sky_newmap(void) void R_Sky_Init(void) { - Cmd_AddCommand ("loadsky", &LoadSky_f); + Cmd_AddCommand ("loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)"); Cvar_RegisterVariable (&r_sky); Cvar_RegisterVariable (&r_skyscroll1); Cvar_RegisterVariable (&r_skyscroll2);