mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-12 16:00:32 +00:00
refactor: unglob std::wstring
This commit is contained in:
@@ -22,7 +22,7 @@ public:
|
||||
static const float RAD;
|
||||
|
||||
private:
|
||||
wstring id;
|
||||
std::wstring id;
|
||||
int xTexOffs, yTexOffs;
|
||||
boolean compiled;
|
||||
int list;
|
||||
@@ -31,12 +31,12 @@ private:
|
||||
public:
|
||||
void _init(); // 4J added
|
||||
ModelPart();
|
||||
ModelPart(Model *model, const wstring &id);
|
||||
ModelPart(Model *model, const std::wstring &id);
|
||||
ModelPart(Model *model);
|
||||
ModelPart(Model *model, int xTexOffs, int yTexOffs);
|
||||
|
||||
// MGH - had to add these for PS3, as calling constructors from others was only introduced in c++11 - https://en.wikipedia.org/wiki/C++11#Object_construction_improvement
|
||||
void construct(Model *model, const wstring &id);
|
||||
void construct(Model *model, const std::wstring &id);
|
||||
void construct(Model *model);
|
||||
void construct(Model *model, int xTexOffs, int yTexOffs);
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
ModelPart * retrieveChild(SKIN_BOX *pBox);
|
||||
ModelPart *mirror();
|
||||
ModelPart *texOffs(int xTexOffs, int yTexOffs);
|
||||
ModelPart *addBox(wstring id, float x0, float y0, float z0, int w, int h, int d);
|
||||
ModelPart *addBox(std::wstring id, float x0, float y0, float z0, int w, int h, int d);
|
||||
ModelPart *addBox(float x0, float y0, float z0, int w, int h, int d);
|
||||
ModelPart *addBoxWithMask(float x0, float y0, float z0, int w, int h, int d, int faceMask); // 4J added
|
||||
void addBox(float x0, float y0, float z0, int w, int h, int d, float g);
|
||||
|
||||
Reference in New Issue
Block a user