tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-07-28 01:54:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

split out palette management, preparing for custom palette support .

Browse source
This commit is contained in:
Zero Fanker 2024-05-13 21:37:30 -04:00
parent fb64321a28
commit 981059c2b4
6 changed files with 645 additions and 655 deletions
Download patch file Download diff file Expand all files Collapse all files

95
MissionEditorPackLib/MissionEditorPackLib.cpp
View file

@ -25,6 +25,7 @@ struct IUnknown;
#include <map>
#include <vector>
#include <optional>
#include "mix_file.h"
#include "cc_file.h"
@ -1934,46 +1935,78 @@ namespace FSunPackLib
return TRUE;
}
bool loadTSPaletteRaw(Cpal_file& pal, const std::string& szPalette)
{
return open_read(pal, szPalette) == 0;
}
bool loadTSPaletteFromMix(Cpal_file& pal, const std::string& szPalette, HMIXFILE hPaletteOwner)
{
if (szPalette[0] == '_' && szPalette[1] == 'I' && szPalette[2] == 'D') {
char id[256];
strcpy_s(id, &szPalette[3]);
int iId = atoi(id);
return pal.open(iId, mixfiles[hPaletteOwner - 1]) == 0;
}
return pal.open(szPalette, mixfiles[hPaletteOwner - 1]) == 0;
}
std::optional<Cpal_file> loadTSPalette(const std::string& szPalette, HMIXFILE hPaletteOwner)
{
Cpal_file pal;
if (hPaletteOwner == NULL) {
if (!loadTSPaletteRaw(pal, szPalette)) {
return std::nullopt;
}
} else {
if (!loadTSPaletteFromMix(pal, szPalette, hPaletteOwner)) {
return std::nullopt;
}
}
if (!pal.is_open()) {
return std::nullopt;
}
return pal;
}
bool LoadTSPalette(RGBTRIPLE* ret, const std::string& szPalette, HMIXFILE hPaletteOwner)
{
if (ret == nullptr) {
return false;
}
auto&& palRet = loadTSPalette(szPalette, hPaletteOwner);
if (!palRet.has_value()) {
return false;
}
auto&& pal = palRet.value();
auto const paldata = reinterpret_cast<const RGBTRIPLE*>(pal.get_data());
memcpy(ret, paldata, 768);
convert_palet_18_to_24(reinterpret_cast<t_palet_entry*>(ret));
pal.close();
return true;
}
bool LoadTSPalette(RGBTRIPLE* ret, LPCSTR szPalette, HMIXFILE hPaletteOwner)
{
return LoadTSPalette(ret, std::string(szPalette), hPaletteOwner);
}
HTSPALETTE LoadTSPalette(const std::string& szPalette, HMIXFILE hPaletteOwner)
{
Cpal_file pal;
RGBTRIPLE* paldata;
if (dwPalCount > 255)
if (dwPalCount > 255) {
return NULL;
if (hPaletteOwner == NULL) {
if (open_read(pal, szPalette))
return NULL;
} else {
if (szPalette[0] == '_' && szPalette[1] == 'I' && szPalette[2] == 'D') {
char id[256];
strcpy_s(id, &szPalette[3]);
int iId = atoi(id);
if (pal.open(iId, mixfiles[hPaletteOwner - 1]))
return NULL;
} else {
if (pal.open(szPalette, mixfiles[hPaletteOwner - 1]) != 0)
return NULL;
}
}
if (!pal.is_open())
t_palet buffer;
if (!LoadTSPalette(reinterpret_cast<RGBTRIPLE*>(buffer), szPalette, hPaletteOwner)) {
return NULL;
dwPalCount++;
paldata = (RGBTRIPLE*)pal.get_data();
//t_palet t_p;
memcpy(ts_palettes[dwPalCount - 1], paldata, 768);
bFirstConv[dwPalCount - 1] = TRUE;
convert_palet_18_to_24(ts_palettes[dwPalCount - 1]);
pal.close();
}
memcpy(ts_palettes[dwPalCount], buffer, 768);
bFirstConv[dwPalCount] = TRUE;
dwPalCount++;// HTSPALETTE is always internal `index+1`
return dwPalCount;
}
HTSPALETTE LoadTSPalette(LPCSTR szPalette, HMIXFILE hPaletteOwner)

11
MissionEditorPackLib/MissionEditorPackLib.h
View file

@ -35,10 +35,10 @@ typedef DWORD HTSPALETTE;
struct SHPHEADER
{
__int16 zero;
__int16 cx;
__int16 cy;
__int16 c_images;
__int16 zero;// type
__int16 cx;// width
__int16 cy;// height
__int16 c_images;// count
};
struct SHPIMAGEHEADER
@ -199,10 +199,11 @@ namespace FSunPackLib
BOOL LoadSHPImage(int startIndex, int wantedNum, BYTE** lpPics);
BOOL LoadSHPImage(int iImageIndex, std::vector<BYTE>& pic);
bool LoadTSPalette(RGBTRIPLE* ret, const std::string& szPalette, HMIXFILE hPaletteOwner = NULL);
bool LoadTSPalette(RGBTRIPLE* ret, LPCSTR szPalette, HMIXFILE hPaletteOwner = NULL);
HTSPALETTE LoadTSPalette(LPCSTR szPalette, HMIXFILE hPaletteOwner);
HTSPALETTE LoadTSPalette(const std::string& szPalette, HMIXFILE hPaletteOwner);
BOOL SetTSPaletteEntry(HTSPALETTE hPalette, BYTE bIndex, RGBTRIPLE* rgb, RGBTRIPLE* orig);