static int skyrenderbox;
static rtexturepool_t *skytexturepool;
static char skyname[256];
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
+
+typedef struct suffixinfo_s
+{
+ char *suffix;
+ qboolean flipx, flipy, flipdiagonal;
+}
+suffixinfo_t;
+static suffixinfo_t suffix[2][6] =
+{
+ {
+ {"rt", false, false, false},
+ {"bk", false, false, false},
+ {"lf", false, false, false},
+ {"ft", false, false, false},
+ {"up", false, false, false},
+ {"dn", false, false, false},
+ },
+ {
+ {"px", false, true, true},
+ {"ny", false, false, false},
+ {"nx", true, false, true},
+ {"py", true, true, false},
+ {"pz", false, true, true},
+ {"nz", false, true, true}
+ }
+};
+
static rtexture_t *skyboxside[6];
void R_SkyStartFrame(void)
{
if (skyboxside[i])
R_FreeTexture(skyboxside[i]);
- skyboxside[i] = NULL;;
+ skyboxside[i] = NULL;
}
}
void R_LoadSkyBox(void)
{
- int i;
+ int i, j;
+ int indices[4] = {0,1,2,3};
char name[1024];
qbyte *image_rgba;
+ qbyte *temp;
R_UnloadSkyBox();
if (!skyname[0])
return;
- for (i = 0;i < 6;i++)
+
+ for (j=0; j<2; j++)
{
- if (snprintf(name, sizeof(name), "env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ for (i=0; i<6; i++)
+ {
+ if (snprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ {
+ if (snprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ {
+ if (snprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ {
+ if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ continue;
+ }
+ }
+ }
+ temp = 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);
+ Mem_Free(temp);
+ }
+
+ for (i=0; i<6; i++)
{
- if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ if (skyboxside[i] == NULL)
{
- Con_Printf ("Couldn't load env/%s%s or gfx/env/%s%s\n", skyname, suf[i], skyname, suf[i]);
- continue;
+ R_UnloadSkyBox();
+ break;
}
}
- skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
- Mem_Free(image_rgba);
+
+ if (skyboxside[0] != NULL)
+ return;
}
}
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", strlen(sky));
return false;
}
if (skyname[0])
Con_Printf("current sky: %s\n", skyname);
else
- Con_Printf("no skybox has been set\n");
+ Con_Print("no skybox has been set\n");
break;
case 2:
if (R_SetSkyBox(Cmd_Argv(1)))
if (skyname[0])
Con_Printf("skybox set to %s\n", skyname);
else
- Con_Printf("skybox disabled\n");
+ Con_Print("skybox disabled\n");
}
else
Con_Printf("failed to load skybox %s\n", Cmd_Argv(1));
break;
default:
- Con_Printf("usage: loadsky skyname\n");
+ Con_Print("usage: loadsky skyname\n");
break;
}
}
float skyboxvertex3f[6*4*3] =
{
// skyside[0]
- 16, 16, 16,
+ 16, -16, 16,
+ 16, -16, -16,
16, 16, -16,
- -16, 16, -16,
- -16, 16, 16,
+ 16, 16, 16,
// skyside[1]
- -16, 16, 16,
- -16, 16, -16,
- -16, -16, -16,
- -16, -16, 16,
- // skyside[2]
-16, -16, 16,
-16, -16, -16,
16, -16, -16,
16, -16, 16,
+ // skyside[2]
+ -16, 16, 16,
+ -16, 16, -16,
+ -16, -16, -16,
+ -16, -16, 16,
// skyside[3]
- 16, -16, 16,
- 16, -16, -16,
- 16, 16, -16,
16, 16, 16,
+ 16, 16, -16,
+ -16, 16, -16,
+ -16, 16, 16,
// skyside[4]
+ -16, -16, 16,
16, -16, 16,
16, 16, 16,
-16, 16, 16,
- -16, -16, 16,
// skyside[5]
- 16, 16, -16,
16, -16, -16,
-16, -16, -16,
- -16, 16, -16
+ -16, 16, -16,
+ 16, 16, -16
};
float skyboxtexcoord2f[6*4*2] =
{
// skyside[0]
- 1, 0,
- 1, 1,
- 0, 1,
0, 0,
- // skyside[1]
- 1, 0,
- 1, 1,
0, 1,
- 0, 0,
- // skyside[2]
- 1, 0,
1, 1,
- 0, 1,
- 0, 0,
- // skyside[3]
1, 0,
- 1, 1,
- 0, 1,
+ // skyside[1]
0, 0,
- // skyside[4]
- 1, 0,
+ 0, 1,
1, 1,
+ 1, 0,
+ // skyside[2]
+ 0, 0,
0, 1,
+ 1, 1,
+ 1, 0,
+ // skyside[3]
0, 0,
- // skyside[5]
+ 0, 1,
+ 1, 1,
1, 0,
+ // skyside[4]
+ 0, 0,
+ 0, 1,
1, 1,
+ 1, 0,
+ // skyside[5]
+ 0, 0,
0, 1,
- 0, 0
+ 1, 1,
+ 1, 0
};
int skyboxelements[6*2*3] =
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
GL_DepthTest(false); // don't modify or read zbuffer
- GL_VertexPointer(skyboxvertex3f);
+ m.pointer_vertex = skyboxvertex3f;
m.pointer_texcoord[0] = skyboxtexcoord2f;
+ GL_LockArrays(0, 6*4);
for (i = 0;i < 6;i++)
{
m.tex[0] = R_GetTexture(skyboxside[i]);
- R_Mesh_State_Texture(&m);
+ R_Mesh_State(&m);
R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
}
+ GL_LockArrays(0, 0);
}
#define skygridx 32
float speedscale;
static qboolean skysphereinitialized = false;
rmeshstate_t m;
- matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+ matrix4x4_t scroll1matrix, scroll2matrix;
if (!skysphereinitialized)
{
skysphereinitialized = true;
// scroll the lower cloud layer twice as fast (just like quake did)
Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * 2, speedscale * 2, 0);
- Matrix4x4_CreateIdentity(&identitymatrix);
- GL_VertexPointer(skysphere_vertex3f);
GL_Color(1, 1, 1, 1);
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
GL_DepthTest(false); // don't modify or read zbuffer
memset(&m, 0, sizeof(m));
+ m.pointer_vertex = skysphere_vertex3f;
m.tex[0] = R_GetTexture(solidskytexture);
m.pointer_texcoord[0] = skysphere_texcoord2f;
- R_Mesh_TextureMatrix(0, &scroll1matrix);
+ m.texmatrix[0] = scroll1matrix;
if (r_textureunits.integer >= 2)
{
// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
m.tex[1] = R_GetTexture(alphaskytexture);
m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
m.pointer_texcoord[1] = skysphere_texcoord2f;
- R_Mesh_State_Texture(&m);
- R_Mesh_TextureMatrix(1, &scroll2matrix);
+ m.texmatrix[1] = scroll2matrix;
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
- R_Mesh_TextureMatrix(1, &identitymatrix);
+ GL_LockArrays(0, 0);
}
else
{
// two pass
- R_Mesh_State_Texture(&m);
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+ GL_LockArrays(0, 0);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
m.tex[0] = R_GetTexture(alphaskytexture);
- R_Mesh_State_Texture(&m);
- R_Mesh_TextureMatrix(0, &scroll2matrix);
+ m.texmatrix[0] = scroll2matrix;
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+ GL_LockArrays(0, 0);
}
- R_Mesh_TextureMatrix(0, &identitymatrix);
}
void R_Sky(void)
// this modifies the depth buffer so we have to clear it afterward
//R_SkyRoom();
// clear the depthbuffer that was used while rendering the skyroom
- //qglClear(GL_DEPTH_BUFFER_BIT);
+ //GL_Clear(GL_DEPTH_BUFFER_BIT);
}
*/
}
projects / xonotic / darkplaces.git / blobdiff