Implement TextureUtil and improve Block::staticCtor (#90)

* Implement `TextureUtil`, Improve `Block::staticCtor`

* Update Block.cpp

* linter

* Update Font.h

Author: Bagietas

data/mcswitch_functions.csv

@@ -23890,10 +23890,10 @@ Address,Quality,Size,Name
 0x000000710034f2a4,U,000072,_ZN14MappedRegistryI16ResourceLocationPK10SoundEventNSt3__14hashIS0_EENS4_8equal_toIS0_EENS5_IS3_EENS7_IS3_EEEC_gen2
 0x000000710034f2ec,U,042176,_ZN11SoundEvents10staticCtorEv
 0x00000071003597ac,U,000164,
-0x0000007100359850,U,000096,registerSound__11SoundEventsSFRCQ2_3std78basic_string__tm__58_wQ2_3std20char_traits__tm__2_wQ2_3std18allocator__tm__2_w
+0x0000007100359850,U,000096,_ZN11SoundEvents13registerSoundERKNSt3__112basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE
 0x00000071003598b0,U,000116,
 0x0000007100359924,U,001192,_ZN9SoundType10StaticCtorEv
-0x0000007100359dcc,U,000024,
+0x0000007100359dcc,U,000024,_ZN9SoundTypeC1EffPK10SoundEventS2_S2_S2_S2_
 0x0000007100359de4,U,000008,
 0x0000007100359dec,U,000008,
 0x0000007100359df4,U,000008,
@@ -39061,9 +39061,9 @@ Address,Quality,Size,Name
 0x00000071005f571c,U,000396,
 0x00000071005f58a8,U,000116,
 0x00000071005f591c,U,000236,
-0x00000071005f5a08,U,000408,_Z11CreateFileAPKcjjPvjji
+0x00000071005f5a08,U,000408,_Z11CreateFileAPKcjjPvjjS1_
 0x00000071005f5ba0,U,000008,_Z12GetLastErrorv
-0x00000071005f5ba8,U,000064,_Z11GetFileSizeiPj
+0x00000071005f5ba8,U,000064,_Z11GetFileSizePN2nn2fs10FileHandleEPj
 0x00000071005f5be8,U,000168,_Z8ReadFileiPvjPjP11_OVERLAPPED
 0x00000071005f5c90,U,000156,_ZN20CConsoleMinecraftApp14FatalLoadErrorEPKwz
 0x00000071005f5d2c,U,000024,_Z11CloseHandlei
@@ -45820,19 +45820,19 @@ Address,Quality,Size,Name
 0x00000071007810d0,U,000012,
 0x00000071007810dc,U,000020,
 0x00000071007810f0,U,000020,
-0x0000007100781104,U,000080,_ZN11TextureUtil10decodeJpegEPviPiS1_
-0x0000007100781154,U,000308,_ZN11TextureUtil26insertZlibAlphaChannelDataEPviiPvi
-0x0000007100781288,U,000024,TextureUtil__ByteFlipRGBAToARGB
-0x00000071007812a0,U,000204,TextureUtil__LoadTextureData
-0x000000710078136c,U,000104,_ZN8StbiFile3eofEPv
+0x0000007100781104,O,000080,_ZN11TextureUtil10decodeJpegEPviPiS1_
+0x0000007100781154,M,000308,_ZN11TextureUtil26insertZlibAlphaChannelDataEPviiS0_i
+0x0000007100781288,O,000024,_ZN11TextureUtil18ByteFlipRGBAToARGBERj
+0x00000071007812a0,O,000204,_ZN11TextureUtil15LoadTextureDataEPKcPiS2_PS2_
+0x000000710078136c,O,000104,_ZN8StbiFile4readEPvPci
 0x00000071007813d4,U,000076,_ZN8StbiFile4skipEPvi
-0x0000007100781420,U,000060,_ZN8StbiFile4readEPvPci
-0x000000710078145c,U,000100,
-0x00000071007814c0,U,000016,
-0x00000071007814d0,U,000004,GetFileSize
-0x00000071007814d4,U,000188,ProcessLoadedTextureData
-0x0000007100781590,U,000020,CloseHandle_thunk
-0x00000071007815a4,U,000076,TextureUtil::LoadTextureData
+0x0000007100781420,M,000060,_ZN8StbiFile3eofEPv
+0x000000710078145c,O,000100,_ZN8StbiFile10CreateFileEPKc
+0x00000071007814c0,O,000016,_ZN8StbiFile11IsValidFileEv
+0x00000071007814d0,O,000004,_ZN8StbiFile3GetEv
+0x00000071007814d4,O,000188,_Z24ProcessLoadedTextureDataPhPiS0_PS0_
+0x0000007100781590,O,000020,_ZN8StbiFile9CloseFileEv
+0x00000071007815a4,O,000076,_ZN11TextureUtil15LoadTextureDataEPhjPiS1_PS1_
 0x00000071007815f0,O,000660,_ZL15stbi__load_mainP13stbi__contextPiS1_S1_iP17stbi__result_infoi
 0x0000007100781884,O,000184,_ZL21stbi__convert_16_to_8Ptiii
 0x000000710078193c,O,000092,_ZL15stbi__jpeg_testP13stbi__context

src/4JLibraries_Source/NX/Render/TextureUtil.cpp

@@ -0,0 +1,133 @@
+#include "NX/Render/TextureUtil.h"
+
+#include "DecompUtils.h"
+#include "java/io/File.h"
+#include "zlib.h"
+#include <cstring>
+
+#define STB_IMAGE_IMPLEMENTATION
+#define STBI_ASSERT(x)
+#include "stb_image.h"
+
+void TextureUtil::ByteFlipRGBAToARGB(unsigned int& pixel) {
+    pixel = (pixel & 0xFF00FF00) | (pixel & 0x000000FF) << 16 | (pixel & 0x00FF0000) >> 16;
+}
+
+void TextureUtil::decodeJpeg(void* buffer, int len, int* x, int* y) {
+    int _x, _y, channelsCount;
+    if (stbi_load_from_memory((const stbi_uc*)buffer, len, &_x, &_y, &channelsCount, 4)) {
+        *x = _x;
+        *y = _y;
+    }
+}
+
+// NON_MATCHING: I don't understand the graphic shit too much so this is shitty impl
+void TextureUtil::insertZlibAlphaChannelData(void* data, int width, int height, void* sourceData,
+                                             int sourceLen) {
+    unsigned long decompressedSize = width * height;
+    unsigned char* alphaData = new unsigned char[decompressedSize];
+
+    bool success = false;
+
+    if (!uncompress(alphaData, &decompressedSize, (unsigned char*)sourceData, sourceLen)) {
+        if (width > 0 && height > 0)
+            success = true;
+    }
+
+    if (success) {
+        unsigned char* currentAlphaPixel = alphaData;
+        unsigned char* currentColorRow = (unsigned char*)data;
+
+        for (int y = 0; y < height; ++y) {
+            unsigned char* currentColorPixel = currentColorRow;
+
+            for (int x = 0; x < width; ++x) {
+                unsigned char alphaValue = *currentAlphaPixel;
+
+                float alphaFactor = (float)alphaValue / 255.0f;
+
+                float blue = (float)currentColorPixel[0];
+                float green = (float)currentColorPixel[1];
+                float red = (float)currentColorPixel[2];
+
+                currentColorPixel[0] = (unsigned char)decomp_fminf(blue / alphaFactor, 255.0f);
+                currentColorPixel[1] = (unsigned char)decomp_fminf(green / alphaFactor, 255.0f);
+                currentColorPixel[2] = (unsigned char)decomp_fminf(red / alphaFactor, 255.0f);
+
+                currentColorPixel[3] = alphaValue;
+
+                currentColorPixel += 4;
+                currentAlphaPixel++;
+            }
+            currentColorRow += width;
+        }
+    }
+
+    delete[] alphaData;
+}
+
+int ProcessLoadedTextureData(unsigned char* data, int* x, int* y, int** pixels) {
+    if (!data)
+        return -1;
+    size_t size = (*x) * (*y) * 4;
+    unsigned int* ptr = (unsigned int*)malloc(size);
+
+    *pixels = (int*)ptr;
+    memcpy(ptr, data, size);
+
+    stbi_image_free(data);
+
+    if ((*x) * (*y) >= 1) {
+        unsigned int* pixel = (unsigned int*)*pixels;
+        for (int i = 0; i < (*x) * (*y); i++) {
+            TextureUtil::ByteFlipRGBAToARGB(*(pixel++));
+        }
+    }
+    return 0;
+}
+
+static stbi_io_callbacks sCallbacks;
+int TextureUtil::LoadTextureData(const char* fileName, int* x, int* y, int** pixels) {
+    sCallbacks.read = StbiFile::read;
+    sCallbacks.skip = StbiFile::skip;
+    sCallbacks.eof = StbiFile::eof;
+
+    StbiFile file;
+    file.CreateFile(fileName);
+
+    int result;
+    if (file.IsValidFile()) {
+        int channels = 0;
+        unsigned char* data = stbi_load_from_callbacks(&sCallbacks, file.Get(), x, y, &channels, 4);
+        result = ProcessLoadedTextureData(data, x, y, pixels);
+    } else {
+        result = -1;
+    }
+
+    file.CloseFile();
+    return result;
+}
+
+int TextureUtil::LoadTextureData(unsigned char* data, unsigned int len, int* x, int* y, int** pixels) {
+    int channels = 0;
+    unsigned char* stbi_data = stbi_load_from_memory(data, len, x, y, &channels, 4);
+    return ProcessLoadedTextureData(stbi_data, x, y, pixels);
+}
+
+int StbiFile::read(void* user, char* data, int size) {
+    unsigned int dataRead = 0;
+    StbiFile* file = StbiFile::fromUser(user);
+    if ((ReadFile(file->mFileHandle, data, size, &dataRead, nullptr) & 0x80000000) != 0) {
+        return -1;
+    }
+    file->mDataRead += dataRead;
+    return dataRead;
+}
+
+// this one requires nn sdk symbol which I wont't bother to get
+// void StbiFile::skip(void* user, int n) {}
+
+// NON_MATCHING: some weird stuff is going on here, but logic should be the same though
+int StbiFile::eof(void* user) {
+    return StbiFile::fromUser(user)->mFileSize <= StbiFile::fromUser(user)->mDataRead;
+}

src/4JLibraries_Source/NX/Render/TextureUtil.h

@@ -0,0 +1,62 @@
+#pragma once
+
+#include "java/io/File.h"
+#include "net/minecraft/world/ArrayWithLength.h"
+#include "nn/fs/fs_types.h"
+#include "stb_image.h"
+
+// this class is not part of Minecraft.Client nor Minecraft.World so I put it here, if you find any assert or
+// anything move this
+class TextureUtil {
+public:
+    static void ByteFlipRGBAToARGB(unsigned int& pixel);
+
+    // non existant on Switch, symbol from WiiU
+    // static int generateTextureId();
+    // static void releaseTextureId(int id);
+    // static void bind(int id);
+    // static void prepareImage(int, int, int, int);
+    // static void prepareImage(int, int, int);
+    // static void anaglyph(int);
+    // static void anaglyph(arrayWithLength<int>);
+    // static void copyToBuffer(arrayWithLength<int>, int, int);
+    // static void uploadImageChunked(int, arrayWithLength<int>, int, int, int, int, bool, bool, bool);
+    // static void uploadImage(int, arrayWithLength<int>, int, int);
+
+    static void decodeJpeg(void* buffer, int len, int* x, int* y);
+    static void insertZlibAlphaChannelData(void* data, int width, int height, void* sourceData,
+                                           int sourceLen);
+    static int LoadTextureData(const char* fileName, int* x, int* y, int** pixels);
+    static int LoadTextureData(unsigned char* data, unsigned int len, int* x, int* y, int** pixels);
+};
+
+class StbiFile {
+public:
+    static int read(void* user, char* data, int size);
+    static void skip(void* user, int n);
+    static int eof(void* user);
+
+    static StbiFile* fromUser(void* user);
+
+    // those 4 names are completly made-up; I don't even know if they should be part of StbiFile
+    void CreateFile(const char* fileName) {
+        this->mDataRead = 0;
+        this->mFileHandle = CreateFileA(fileName, 0x80000000, 0, nullptr, 3, 0x80, 0);
+
+        this->mFileSize
+            = this->mFileHandle == (nn::fs::FileHandle*)-1 ? 0 : GetFileSize(this->mFileHandle, nullptr);
+    }
+
+    void CloseFile() {
+        if (this->mFileHandle != (nn::fs::FileHandle*)-1)
+            CloseHandle(this->mFileHandle);
+    }
+
+    bool IsValidFile() { return this->mFileHandle != (nn::fs::FileHandle*)-1; }
+
+    StbiFile* Get() { return this; }
+
+    nn::fs::FileHandle* mFileHandle;
+    int mFileSize;
+    int mDataRead;
+};

src/DecompUtils.h

@@ -0,0 +1,13 @@
+#pragma once
+
+// this can be depracated if musl is fixed
+
+inline __attribute__((__always_inline__)) float decomp_fmax(float x, float y) {
+    __asm__("fmaxnm %s0, %s1, %s2" : "=w"(x) : "w"(x), "w"(y));
+    return x;
+}
+
+inline __attribute__((__always_inline__)) float decomp_fminf(float x, float y) {
+    __asm__("fminnm %s0, %s1, %s2" : "=w"(x) : "w"(x), "w"(y));
+    return x;
+}

src/Minecraft.Client/net/minecraft/client/gui/Font.h

@@ -6,9 +6,14 @@ class Options;
 class Textures;
 class ResourceLocation;
 class BufferBuilder;
+class Random;
 
 class Font {
 public:
+    static ResourceLocation sDefaultFontRsrc;
+    static ResourceLocation sAlternateFontRsrc;
+    static unsigned short sDefaultText[644];
+
     Font(Options*, const std::wstring&, Textures*, bool, ResourceLocation*, int, int, int, int,
          unsigned short* renderList);
     void cacheCharacter(int);
@@ -19,8 +24,18 @@ class Font {
     std::wstring sanitize(const std::wstring&, bool);
     int width(const std::wstring&);
 
-    static ResourceLocation sDefaultFontRsrc;
-    static ResourceLocation sAlternateFontRsrc;
-    unsigned char padding[0xE8];
-    static unsigned short sDefaultText[644];
+    void* font0;
+    void* mCachedCharacters;
+    char gap10[8];
+    Random* mRandom;
+    char gap20[128];
+    Textures* mTextures;
+    void* qwordA8;
+    uint16_t wordB0;
+    int mHorizontalCharsCount;
+    int mVerticalCharsCount;
+    int mCharWidth;
+    int mCharHeight;
+    ResourceLocation* mFontTextureResourceLoc;
+    char filler[22];
 };

src/Minecraft.Client/net/minecraft/client/renderer/TextureUtil.cpp

@@ -196,4 +196,6 @@ class GlStateManager {
     static void disableState(int state);
     static void enableState(int state);
     static TexGenCoord* getTexGen(GlStateManager::TexGen coord);
+    static int genTexture();
+    static void deleteTexture(int texture);
 };

src/Minecraft.Client/net/minecraft/client/renderer/TextureUtil.h

@@ -10,6 +10,13 @@ class Vec3i;
 
 class Direction : public StringRepresentable {
 public:
+    class Plane : public Predicate<const Direction*> {
+    public:
+        static Plane* HORIZONTAL;
+        static Plane* VERTICAL;
+
+        Plane();
+    };
     class AxisDirection {
     public:
         static AxisDirection* POSITIVE;

src/Minecraft.Client/net/minecraft/client/renderer/platform/GlStateManager.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "nn/fs/fs_types.h"
 #include <string>
 #include <vector>
 
@@ -50,7 +51,9 @@ bool isDirectory(const std::wstring&);
 bool FindFirstFileA(const char*, _WIN32_FIND_DATAA*);
 std::wstring filenametowstring(const char*);
 bool FindNextFileA(int, _WIN32_FIND_DATAA*);
-bool CloseHandle(int);
-bool CreateFileA(const char*, unsigned int, unsigned int, void*, unsigned int, unsigned int, int);
-bool GetFileSize(int, unsigned int*);
-bool ReadFile(int, void*, unsigned int, unsigned int*, _OVERLAPPED*);
+bool CloseHandle(nn::fs::FileHandle*);
+// NOTE: this function declaration may be wrong as it seems that last argument differs with WiiU declaration
+nn::fs::FileHandle* CreateFileA(const char*, unsigned int, unsigned int, void*, unsigned int, unsigned int,
+                                void*);
+int GetFileSize(nn::fs::FileHandle*, unsigned int*);
+int ReadFile(nn::fs::FileHandle*, void*, unsigned int, unsigned int*, _OVERLAPPED*);