hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

HD Remaster Terrain tiles now go into the cache.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-24 19:53:54 -07:00
parent e5a55f777e
commit 84bedab275
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/TEXCACHE.CPP
+2 -2
View File
@@ -4,8 +4,8 @@
#include "FUNCTION.H"
#include "TEXCACHE.H"
#define CACHE_HEADER_FILENAME "cache/cache_header_v1.vhdr"
#define CACHE_DATA_FILERNAME "cache/cache_data_v1.vdata"
#define CACHE_HEADER_FILENAME "cache/cache_header_v2.vhdr"
#define CACHE_DATA_FILERNAME "cache/cache_data_v2.vdata"
TexCache texCache;
code/REDALERT/WINSTUB.CPP
+10 -10
View File
@@ -176,7 +176,7 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
// Check to see if we can load a generated image first.
// We only generate images that need a houseid
if (houseid >= 0) {
{
if (Image_LoadFromCache(image, generatedName, houseid, animid, frameId, hash)) {
return true;
}
@@ -191,10 +191,8 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
return false;
}
bool swapBGR = false;
if (strstr(name, ".TGA") || strstr(name, ".tga")) {
iluFlipImage();
swapBGR = true;
}
ILuint Width, Height, Bpp;
@@ -213,18 +211,20 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
RenderTeamPalette(&Data[i * 4], *houseColors[houseid]);
}
}
else if (Bpp == 4) {
for (int i = 0; i < Width * Height; i++) {
byte b = Data[(i * 4) + 2];
Data[(i * 4) + 2] = Data[(i * 4) + 0];
Data[(i * 4) + 0] = b;
}
}
GLuint texture;
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
if (Bpp == 4) {
if (swapBGR) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Width, Height, 0, GL_BGRA, GL_UNSIGNED_BYTE, Data);
}
else {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Width, Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, Data);
}
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Width, Height, 0, GL_BGRA, GL_UNSIGNED_BYTE, Data);
}
else if (Bpp == 3) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Width, Height, 0, GL_RGB, GL_UNSIGNED_BYTE, Data);
@@ -252,7 +252,7 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
//image->buffer[houseid][animid] = new unsigned char[Width * Height * Bpp];
//memcpy(image->buffer[houseid][animid], Data, Width * Height * Bpp);
if (Bpp == 4 && houseid >= 0) {
if (Bpp == 4) {
texCache.AddImage(generatedName, Width, Height, Bpp, Data);
Console_Printf("Writing %s to cache %s\n", image->name, name);
Sleep(0);