Skip to content

Commit

Permalink
add xcom SCR, palette import (JASC-PAL), plt color label
Browse files Browse the repository at this point in the history
  • Loading branch information
@counter185
counter185 committed Sep 16, 2024
1 parent 43a1c44 commit 763cf05
Show file tree
Hide file tree
Showing 7 changed files with 183 additions and 76 deletions.
82 changes: 79 additions & 3 deletions freesprite/FileIO.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1620,18 +1620,18 @@ Layer* readXComBDY(PlatformNativePathString path, uint64_t seek)
uint8_t pixel;
fread(&pixel, 1, 1, f);
for (int x = 0; x < 257 - a; x++) {
*(pxd++) = pixel;
*(pxd++) = (uint32_t)pixel;
if (pxd >= end) {
reachedImageEnd = true;
break;
}
}
}
else {
for (int x = 0; x < a+1; x++) {
for (uint32_t x = 0; x < a+1; x++) {
uint8_t pixel;
fread(&pixel, 1, 1, f);
*(pxd++) = pal2[pixel * 3];
*(pxd++) = (uint32_t)pixel;
if (pxd >= end) {
reachedImageEnd = true;
break;
Expand All @@ -1645,6 +1645,24 @@ Layer* readXComBDY(PlatformNativePathString path, uint64_t seek)
return NULL;
}

Layer* readXComSCR(PlatformNativePathString path, uint64_t seek)
{
FILE* f = platformOpenFile(path, PlatformFileModeRB);
if (f != NULL) {
LayerPalettized* ret = new LayerPalettized(320, 200);
uint32_t* pxd = (uint32_t*)ret->pixelData;
ret->palette = g_palettes[PALETTE_DEFAULT];
for (int x = 0; x < 320 * 200; x++) {
uint8_t pixel;
fread(&pixel, 1, 1, f);
pxd[x] = pixel;
}
fclose(f);
return ret;
}
return NULL;
}

MainEditor* readOpenRaster(PlatformNativePathString path)
{
FILE* f = platformOpenFile(path, PlatformFileModeRB);
Expand Down Expand Up @@ -2543,6 +2561,64 @@ public class VoidspriteImage {{\n\
return false;
}

std::pair<bool, std::vector<uint32_t>> readPltVOIDPLT(PlatformNativePathString name)
{
FILE* f = platformOpenFile(name, PlatformFileModeRB);
if (f != NULL) {
char header[7];
fread(header, 7, 1, f);
if (memcmp(header, "VOIDPLT", 7) == 0) {
uint8_t fileversion;
fread(&fileversion, 1, 1, f);
if (fileversion == 1) {
std::vector<uint32_t> newPalette;
uint32_t count;
fread(&count, 1, 4, f);
for (int x = 0; x < count; x++) {
uint32_t col;
fread(&col, 1, 4, f);
newPalette.push_back(col);
}
fclose(f);
return { true, newPalette };
}
else {
g_addNotification(ErrorNotification("Error", "Unsupported VOIDPLT file version"));
}
}
else {
g_addNotification(ErrorNotification("Error", "Invalid palette file"));
}
fclose(f);
}
return { false, {} };
}

std::pair<bool, std::vector<uint32_t>> readPltJASCPAL(PlatformNativePathString name)
{
std::ifstream f(name, std::ios::in);
if (f.is_open()) {
std::vector<uint32_t> newPalette;
std::string line;
std::getline(f, line);
if (line.substr(0, 8) == "JASC-PAL") {
f >> line;
//should be 0100
int count;
f >> count;
for (int x = 0; x < count; x++) {
int r, g, b;
f >> r >> g >> b;
newPalette.push_back((0xff << 24) | (r << 16) | (g << 8) | b);
}
f.close();
return { true, newPalette };
}
f.close();
}
return { false, {} };
}

bool writeHTMLBase64(PlatformNativePathString path, Layer* data)
{
if (data->isPalettized) {
Expand Down
111 changes: 74 additions & 37 deletions freesprite/FileIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Layer* readMSP(PlatformNativePathString path, uint64_t seek = 0);
Layer* readMarioPaintSRM(PlatformNativePathString path, uint64_t seek = 0);
Layer* readXComSPK(PlatformNativePathString path, uint64_t seek = 0);
Layer* readXComBDY(PlatformNativePathString path, uint64_t seek = 0);
Layer* readXComSCR(PlatformNativePathString path, uint64_t seek = 0);
MainEditor* readOpenRaster(PlatformNativePathString path);
MainEditor* readVOIDSN(PlatformNativePathString path);

Expand All @@ -55,6 +56,9 @@ bool writePythonNPArray(PlatformNativePathString path, Layer* data);
bool writeHTMLBase64(PlatformNativePathString path, Layer* data);
bool writeJavaBufferedImage(PlatformNativePathString path, Layer* data);

std::pair<bool, std::vector<uint32_t>> readPltVOIDPLT(PlatformNativePathString name);
std::pair<bool, std::vector<uint32_t>> readPltJASCPAL(PlatformNativePathString name);

struct FileSessionImportNPath {
std::string name;
std::string extension;
Expand Down Expand Up @@ -83,28 +87,16 @@ struct FileImportUTF8Path {
};
};

struct FileExportMultiLayerNPath {
std::string name;
std::string extension;
bool (*exportFunction)(PlatformNativePathString, MainEditor*);
int exportFormats = FORMAT_RGB;
bool (*canExport)(Layer*) =
[](Layer* p) {
return true;
};
};
struct FileExportFlatNPath {
std::string name;
std::string extension;
bool (*exportFunction)(PlatformNativePathString, Layer*);
int exportFormats = FORMAT_RGB;
bool (*canExport)(Layer*) =
[](Layer* p) {
return true;
};
class FileOperation {
public:
virtual std::string name() { return _name; }
virtual std::string extension() { return _extension; }
protected:
std::string _name = "Palette type";
std::string _extension = "";
};

class FileExporter {
class FileExporter : public FileOperation {

public:
static FileExporter* sessionExporter(std::string name, std::string extension, bool (*exportFunction)(PlatformNativePathString, MainEditor*), int formatflags = FORMAT_RGB, bool (*canExport)(MainEditor*) = NULL) {
Expand All @@ -129,8 +121,6 @@ class FileExporter {
}

virtual int formatFlags() { return _formatFlags; }
virtual std::string name() { return _name; }
virtual std::string extension() { return _extension; }
virtual bool exportsWholeSession() { return _isSessionExporter; }
virtual bool canExport(void* data) {
if (exportsWholeSession()) {
Expand All @@ -149,8 +139,6 @@ class FileExporter {
}
}
protected:
std::string _name = "File type (library)";
std::string _extension = "";
int _formatFlags = FORMAT_RGB;
bool _isSessionExporter = false;

Expand All @@ -160,24 +148,60 @@ class FileExporter {
bool (*_flatExportFunction)(PlatformNativePathString, Layer*) = NULL;
bool (*_flatCheckExportFunction)(Layer*) = NULL;
};
class PaletteImporter : public FileOperation {
public:
static PaletteImporter* paletteImporter(std::string name, std::string extension, std::pair<bool, std::vector<uint32_t>>(*importFunction)(PlatformNativePathString), bool (*canImport)(PlatformNativePathString) = NULL) {
PaletteImporter* ret = new PaletteImporter();
ret->_name = name;
ret->_extension = extension;
ret->_importFunction = importFunction;
ret->_canImport = canImport;
return ret;
}

virtual bool canImport(PlatformNativePathString path) {
return _canImport != NULL ? _canImport(path) : true;
}
virtual std::pair<bool, std::vector<uint32_t>> importPalette(PlatformNativePathString path) {
return _importFunction(path);
};
protected:
std::pair<bool, std::vector<uint32_t>> (*_importFunction)(PlatformNativePathString) = NULL;
bool (*_canImport)(PlatformNativePathString) = NULL;
};

inline std::vector<FileExporter*> g_fileExporters;
inline std::vector<FileExporter*> g_palettizedFileExporters;

inline std::vector<PaletteImporter*> g_paletteImporters;

inline void g_setupIO() {
g_fileExporters.push_back(FileExporter::sessionExporter("voidsprite Session version 3", ".voidsn", &writeVOIDSNv3));
g_fileExporters.push_back(FileExporter::sessionExporter("voidsprite Session version 2", ".voidsnv2", &writeVOIDSNv2));
g_fileExporters.push_back(FileExporter::sessionExporter("OpenRaster", ".ora", &writeOpenRaster));

g_fileExporters.push_back(FileExporter::flatExporter("PNG (libpng)", ".png", &writePNG, FORMAT_RGB | FORMAT_PALETTIZED));
g_fileExporters.push_back(FileExporter::flatExporter("RPG2000/2003 XYZ (voidsprite custom)", ".xyz", &writeXYZ, FORMAT_RGB | FORMAT_PALETTIZED));
g_fileExporters.push_back(FileExporter::flatExporter("RPG2000/2003 XYZ", ".xyz", &writeXYZ, FORMAT_RGB | FORMAT_PALETTIZED));
g_fileExporters.push_back(FileExporter::flatExporter("BMP (EasyBMP)", ".bmp", &writeBMP));
g_fileExporters.push_back(FileExporter::flatExporter("TGA (voidsprite custom)", ".tga", &writeTGA));
g_fileExporters.push_back(FileExporter::flatExporter("TGA", ".tga", &writeTGA));
g_fileExporters.push_back(FileExporter::flatExporter("CaveStory PBM (EasyBMP)", ".pbm", &writeCaveStoryPBM));
g_fileExporters.push_back(FileExporter::flatExporter("C Header (voidsprite custom)", ".h", &writeCHeader));
g_fileExporters.push_back(FileExporter::flatExporter("Python NumPy array (voidsprite custom)", ".py", &writePythonNPArray));
g_fileExporters.push_back(FileExporter::flatExporter("C Header", ".h", &writeCHeader));
g_fileExporters.push_back(FileExporter::flatExporter("Python NumPy array", ".py", &writePythonNPArray));
g_fileExporters.push_back(FileExporter::flatExporter("HTML Base64 image (base64)", ".html", &writeHTMLBase64));
g_fileExporters.push_back(FileExporter::flatExporter("Java Buffered Image (voidsprite custom)", ".java", &writeJavaBufferedImage));
g_fileExporters.push_back(FileExporter::flatExporter("Java Buffered Image", ".java", &writeJavaBufferedImage));

g_paletteImporters.push_back(PaletteImporter::paletteImporter("voidsprite palette", ".voidplt", &readPltVOIDPLT));
g_paletteImporters.push_back(PaletteImporter::paletteImporter("JASC-PAL palette", ".pal", &readPltJASCPAL,
[](PlatformNativePathString path) {
FILE* f = platformOpenFile(path, PlatformFileModeRB);
char headerBytes[9];
memset(headerBytes, 0, 9);
fread(headerBytes, 8, 1, f);
fclose(f);
return std::string(headerBytes) == "JASC-PAL";
}));



for (auto& exporter : g_fileExporters) {
if (exporter->formatFlags() & FORMAT_PALETTIZED) {
Expand Down Expand Up @@ -223,34 +247,47 @@ inline std::vector<FileImportNPath> g_fileImportersNPaths = {
}
},
{
"RPG2000/2003 XYZ (voidsprite custom)", ".xyz", &readXYZ
"RPG2000/2003 XYZ", ".xyz", &readXYZ
},
{
"Atrophy Engine AETEX v1/v2 (SDL_Image:tga, DDS[fallthrough])", ".aetex", &readAETEX
},
{
"Wii/GC TPL (voidsprite custom)", ".tpl", &readWiiGCTPL
"Wii/GC TPL", ".tpl", &readWiiGCTPL
},
{
"NES: dump CHR-ROM (voidsprite custom)", ".nes", &readNES
"NES: dump CHR-ROM", ".nes", &readNES
},
{
"DDS (ddspp+s3tc open source+voidsprite custom)", ".dds", &readDDS
},
{
"VTF (voidsprite custom)", ".vtf", &readVTF
"VTF", ".vtf", &readVTF
},
{
"MSP", ".msp", &readMSP
},
{
"MSP (voidsprite custom)", ".msp", &readMSP
"Mario Paint save file", ".srm", &readMarioPaintSRM
},
{
"Mario Paint save file (voidsprite custom)", ".srm", &readMarioPaintSRM
"X-Com SPK file", ".spk", &readXComSPK
},
{
"X-Com SPK file (voidsprite custom)", ".spk", &readXComSPK
"X-Com BDY file", ".bdy", &readXComBDY
},
{
"X-Com BDY file (voidsprite custom)", ".bdy", &readXComBDY
"X-Com SCR file", ".scr", &readXComSCR,
[](PlatformNativePathString path) {
FILE* f = platformOpenFile(path, PlatformFileModeRB);
//check if file isn't an exe
char c[2];
fread(c, 2, 1, f);
fseek(f, 0, SEEK_END);
uint64_t len = ftell(f);
fclose(f);
return !(c[0] == 'M' && c[1] == 'Z') || len == (320 * 200);
}
}
};

Expand Down
Loading

0 comments on commit 763cf05

Please sign in to comment.