mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-26 20:30:52 +00:00
refactor: unglob std::wstring
This commit is contained in:
@@ -10,18 +10,18 @@ class BufferedImage;
|
||||
class TextureMap : public IconRegister
|
||||
{
|
||||
public:
|
||||
static const wstring NAME_MISSING_TEXTURE;
|
||||
static const std::wstring NAME_MISSING_TEXTURE;
|
||||
|
||||
private:
|
||||
const int iconType;
|
||||
|
||||
const wstring name;
|
||||
const wstring path;
|
||||
const wstring extension;
|
||||
const std::wstring name;
|
||||
const std::wstring path;
|
||||
const std::wstring extension;
|
||||
|
||||
bool m_mipMap;
|
||||
|
||||
typedef std::unordered_map<wstring, StitchedTexture *> stringStitchedTextureMap;
|
||||
typedef std::unordered_map<std::wstring, StitchedTexture *> stringStitchedTextureMap;
|
||||
stringStitchedTextureMap texturesByName; // = new HashMap<String, StitchedTexture>();
|
||||
BufferedImage *missingTexture; // = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
|
||||
StitchedTexture *missingPosition;
|
||||
@@ -31,15 +31,15 @@ private:
|
||||
stringStitchedTextureMap texturesToRegister; // = new HashMap<String, StitchedTexture>();
|
||||
|
||||
public:
|
||||
TextureMap(int type, const wstring &name, const wstring &path, BufferedImage *missingTexture, bool mipMap = false);
|
||||
TextureMap(int type, const std::wstring &name, const std::wstring &path, BufferedImage *missingTexture, bool mipMap = false);
|
||||
|
||||
void stitch();
|
||||
StitchedTexture *getTexture(const wstring &name);
|
||||
StitchedTexture *getTexture(const std::wstring &name);
|
||||
void cycleAnimationFrames();
|
||||
Texture *getStitchedTexture();
|
||||
|
||||
// 4J Stu - register is a reserved keyword in C++
|
||||
Icon *registerIcon(const wstring &name);
|
||||
Icon *registerIcon(const std::wstring &name);
|
||||
|
||||
int getIconType();
|
||||
Icon *getMissingIcon();
|
||||
|
||||
Reference in New Issue
Block a user