mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-23 13:55:46 +00:00
chore: format Minecraft.Client
This commit is contained in:
Tropical
@@ -6,355 +6,275 @@
|
||||
#include "StitchedTexture.h"
|
||||
#include "../TextureManager.h"
|
||||
|
||||
StitchedTexture *StitchedTexture::create(const std::wstring &name)
|
||||
{
|
||||
// TODO: Generalize?
|
||||
if (name.compare(L"clock") == 0)
|
||||
{
|
||||
return new ClockTexture();
|
||||
}
|
||||
else if (name.compare(L"compass") == 0)
|
||||
{
|
||||
return new CompassTexture();
|
||||
}
|
||||
else
|
||||
{
|
||||
return new StitchedTexture(name);
|
||||
}
|
||||
StitchedTexture* StitchedTexture::create(const std::wstring& name) {
|
||||
// TODO: Generalize?
|
||||
if (name.compare(L"clock") == 0) {
|
||||
return new ClockTexture();
|
||||
} else if (name.compare(L"compass") == 0) {
|
||||
return new CompassTexture();
|
||||
} else {
|
||||
return new StitchedTexture(name);
|
||||
}
|
||||
}
|
||||
|
||||
StitchedTexture::StitchedTexture(const std::wstring &name) : name(name)
|
||||
{
|
||||
// 4J Initialisers
|
||||
source = NULL;
|
||||
rotated = false;
|
||||
x = 0;
|
||||
y = 0;
|
||||
width = 0;
|
||||
height = 0;
|
||||
u0 = 0.0f;
|
||||
u1 = 0.0f;
|
||||
v0 = 0.0f;
|
||||
v1 = 0.0f;
|
||||
widthTranslation = 0.0f;
|
||||
heightTranslation = 0.0f;
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
frameOverride = NULL;
|
||||
flags = 0;
|
||||
frames = NULL;
|
||||
StitchedTexture::StitchedTexture(const std::wstring& name) : name(name) {
|
||||
// 4J Initialisers
|
||||
source = NULL;
|
||||
rotated = false;
|
||||
x = 0;
|
||||
y = 0;
|
||||
width = 0;
|
||||
height = 0;
|
||||
u0 = 0.0f;
|
||||
u1 = 0.0f;
|
||||
v0 = 0.0f;
|
||||
v1 = 0.0f;
|
||||
widthTranslation = 0.0f;
|
||||
heightTranslation = 0.0f;
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
frameOverride = NULL;
|
||||
flags = 0;
|
||||
frames = NULL;
|
||||
}
|
||||
|
||||
void StitchedTexture::freeFrameTextures()
|
||||
{
|
||||
if( frames )
|
||||
{
|
||||
for(AUTO_VAR(it, frames->begin()); it != frames->end(); ++it)
|
||||
{
|
||||
TextureManager::getInstance()->unregisterTexture(L"", *it);
|
||||
delete *it;
|
||||
}
|
||||
delete frames;
|
||||
}
|
||||
void StitchedTexture::freeFrameTextures() {
|
||||
if (frames) {
|
||||
for (AUTO_VAR(it, frames->begin()); it != frames->end(); ++it) {
|
||||
TextureManager::getInstance()->unregisterTexture(L"", *it);
|
||||
delete *it;
|
||||
}
|
||||
delete frames;
|
||||
}
|
||||
}
|
||||
|
||||
StitchedTexture::~StitchedTexture()
|
||||
{
|
||||
// 4jcraft, added null check
|
||||
// the constructor does not allocate the frames vector.
|
||||
// in some scenarios the destructor/delete is called
|
||||
// without ever calling ::init()
|
||||
if(frames) {
|
||||
for(AUTO_VAR(it, frames->begin()); it != frames->end(); ++it)
|
||||
{
|
||||
delete *it;
|
||||
}
|
||||
delete frames;
|
||||
}
|
||||
StitchedTexture::~StitchedTexture() {
|
||||
// 4jcraft, added null check
|
||||
// the constructor does not allocate the frames vector.
|
||||
// in some scenarios the destructor/delete is called
|
||||
// without ever calling ::init()
|
||||
if (frames) {
|
||||
for (AUTO_VAR(it, frames->begin()); it != frames->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete frames;
|
||||
}
|
||||
}
|
||||
|
||||
void StitchedTexture::initUVs(float U0, float V0, float U1, float V1)
|
||||
{
|
||||
u0 = U0;
|
||||
u1 = U1;
|
||||
v0 = V0;
|
||||
v1 = V1;
|
||||
void StitchedTexture::initUVs(float U0, float V0, float U1, float V1) {
|
||||
u0 = U0;
|
||||
u1 = U1;
|
||||
v0 = V0;
|
||||
v1 = V1;
|
||||
}
|
||||
|
||||
void StitchedTexture::init(Texture *source, std::vector<Texture *> *frames, int x, int y, int width, int height, bool rotated)
|
||||
{
|
||||
this->source = source;
|
||||
this->frames = frames;
|
||||
frame = -1; // Force an update of animated textures
|
||||
this->x = x;
|
||||
this->y = y;
|
||||
this->width = width;
|
||||
this->height = height;
|
||||
this->rotated = rotated;
|
||||
void StitchedTexture::init(Texture* source, std::vector<Texture*>* frames,
|
||||
int x, int y, int width, int height, bool rotated) {
|
||||
this->source = source;
|
||||
this->frames = frames;
|
||||
frame = -1; // Force an update of animated textures
|
||||
this->x = x;
|
||||
this->y = y;
|
||||
this->width = width;
|
||||
this->height = height;
|
||||
this->rotated = rotated;
|
||||
|
||||
float marginX = 0.0f; //0.01f / source->getWidth();
|
||||
float marginY = 0.0f; //0.01f / source->getHeight();
|
||||
float marginX = 0.0f; // 0.01f / source->getWidth();
|
||||
float marginY = 0.0f; // 0.01f / source->getHeight();
|
||||
|
||||
this->u0 = x / (float) source->getWidth() + marginX;
|
||||
this->u1 = (x + width) / (float) source->getWidth() - marginX;
|
||||
this->v0 = y / (float) source->getHeight() + marginY;
|
||||
this->v1 = (y + height) / (float) source->getHeight() - marginY;
|
||||
this->u0 = x / (float)source->getWidth() + marginX;
|
||||
this->u1 = (x + width) / (float)source->getWidth() - marginX;
|
||||
this->v0 = y / (float)source->getHeight() + marginY;
|
||||
this->v1 = (y + height) / (float)source->getHeight() - marginY;
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
bool addBreakpoint = false;
|
||||
if(addBreakpoint)
|
||||
{
|
||||
printf("\nTreeTop\n");
|
||||
printf("u0 = %f\n", u0);
|
||||
printf("u1 = %f\n", u1);
|
||||
printf("v0 = %f\n", v0);
|
||||
printf("v1 = %f\n", v1);
|
||||
printf("\n\n");
|
||||
}
|
||||
bool addBreakpoint = false;
|
||||
if (addBreakpoint) {
|
||||
printf("\nTreeTop\n");
|
||||
printf("u0 = %f\n", u0);
|
||||
printf("u1 = %f\n", u1);
|
||||
printf("v0 = %f\n", v0);
|
||||
printf("v1 = %f\n", v1);
|
||||
printf("\n\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
this->widthTranslation = width / (float) SharedConstants::WORLD_RESOLUTION;
|
||||
this->heightTranslation = height / (float) SharedConstants::WORLD_RESOLUTION;
|
||||
this->widthTranslation = width / (float)SharedConstants::WORLD_RESOLUTION;
|
||||
this->heightTranslation = height / (float)SharedConstants::WORLD_RESOLUTION;
|
||||
}
|
||||
|
||||
void StitchedTexture::replaceWith(StitchedTexture *texture)
|
||||
{
|
||||
init(texture->source, texture->frames, texture->x, texture->y, texture->width, texture->height, texture->rotated);
|
||||
void StitchedTexture::replaceWith(StitchedTexture* texture) {
|
||||
init(texture->source, texture->frames, texture->x, texture->y,
|
||||
texture->width, texture->height, texture->rotated);
|
||||
}
|
||||
|
||||
int StitchedTexture::getX() const
|
||||
{
|
||||
return x;
|
||||
int StitchedTexture::getX() const { return x; }
|
||||
|
||||
int StitchedTexture::getY() const { return y; }
|
||||
|
||||
int StitchedTexture::getWidth() const { return width; }
|
||||
|
||||
int StitchedTexture::getHeight() const { return height; }
|
||||
|
||||
static const float UVAdjust = (1.0f / 16.0f) / 256.0f;
|
||||
|
||||
float StitchedTexture::getU0(bool adjust /*=false*/) const {
|
||||
return adjust ? (u0 + UVAdjust) : u0;
|
||||
}
|
||||
|
||||
int StitchedTexture::getY() const
|
||||
{
|
||||
return y;
|
||||
float StitchedTexture::getU1(bool adjust /*=false*/) const {
|
||||
return adjust ? (u1 - UVAdjust) : u1;
|
||||
}
|
||||
|
||||
int StitchedTexture::getWidth() const
|
||||
{
|
||||
return width;
|
||||
float StitchedTexture::getU(double offset, bool adjust /*=false*/) const {
|
||||
float diff = getU1(adjust) - getU0(adjust);
|
||||
return getU0(adjust) +
|
||||
(diff * ((float)offset / SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
int StitchedTexture::getHeight() const
|
||||
{
|
||||
return height;
|
||||
float StitchedTexture::getV0(bool adjust /*=false*/) const {
|
||||
return adjust ? (v0 + UVAdjust) : v0;
|
||||
}
|
||||
|
||||
static const float UVAdjust = (1.0f/16.0f)/256.0f;
|
||||
|
||||
float StitchedTexture::getU0(bool adjust/*=false*/) const
|
||||
{
|
||||
return adjust ? ( u0 + UVAdjust ) : u0;
|
||||
float StitchedTexture::getV1(bool adjust /*=false*/) const {
|
||||
return adjust ? (v1 - UVAdjust) : v1;
|
||||
}
|
||||
|
||||
float StitchedTexture::getU1(bool adjust/*=false*/) const
|
||||
{
|
||||
return adjust ? ( u1 - UVAdjust ) : u1;
|
||||
float StitchedTexture::getV(double offset, bool adjust /*=false*/) const {
|
||||
float diff = getV1(adjust) - getV0(adjust);
|
||||
return getV0(adjust) +
|
||||
(diff * ((float)offset / SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
float StitchedTexture::getU(double offset, bool adjust/*=false*/) const
|
||||
{
|
||||
float diff = getU1(adjust) - getU0(adjust);
|
||||
return getU0(adjust) + (diff * ((float) offset / SharedConstants::WORLD_RESOLUTION));
|
||||
std::wstring StitchedTexture::getName() const { return name; }
|
||||
|
||||
int StitchedTexture::getSourceWidth() const { return source->getWidth(); }
|
||||
|
||||
int StitchedTexture::getSourceHeight() const { return source->getHeight(); }
|
||||
|
||||
void StitchedTexture::cycleFrames() {
|
||||
if (frameOverride != NULL) {
|
||||
std::pair<int, int> current = frameOverride->at(frame);
|
||||
subFrame++;
|
||||
if (subFrame >= current.second) {
|
||||
int oldFrame = current.first;
|
||||
frame = (frame + 1) % frameOverride->size();
|
||||
subFrame = 0;
|
||||
|
||||
current = frameOverride->at(frame);
|
||||
int newFrame = current.first;
|
||||
if (oldFrame != newFrame && newFrame >= 0 &&
|
||||
newFrame < frames->size()) {
|
||||
source->blit(x, y, frames->at(newFrame), rotated);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
int oldFrame = frame;
|
||||
frame = (frame + 1) % frames->size();
|
||||
|
||||
if (oldFrame != frame) {
|
||||
source->blit(x, y, frames->at(this->frame), rotated);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
float StitchedTexture::getV0(bool adjust/*=false*/) const
|
||||
{
|
||||
return adjust ? ( v0 + UVAdjust ) : v0;
|
||||
}
|
||||
Texture* StitchedTexture::getSource() { return source; }
|
||||
|
||||
float StitchedTexture::getV1(bool adjust/*=false*/) const
|
||||
{
|
||||
return adjust ? ( v1 - UVAdjust ) : v1;
|
||||
}
|
||||
Texture* StitchedTexture::getFrame(int i) { return frames->at(i); }
|
||||
|
||||
float StitchedTexture::getV(double offset, bool adjust/*=false*/) const
|
||||
{
|
||||
float diff = getV1(adjust) - getV0(adjust);
|
||||
return getV0(adjust) + (diff * ((float) offset / SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
std::wstring StitchedTexture::getName() const
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
int StitchedTexture::getSourceWidth() const
|
||||
{
|
||||
return source->getWidth();
|
||||
}
|
||||
|
||||
int StitchedTexture::getSourceHeight() const
|
||||
{
|
||||
return source->getHeight();
|
||||
}
|
||||
|
||||
void StitchedTexture::cycleFrames()
|
||||
{
|
||||
if (frameOverride != NULL)
|
||||
{
|
||||
std::pair<int, int> current = frameOverride->at(frame);
|
||||
subFrame++;
|
||||
if (subFrame >= current.second)
|
||||
{
|
||||
int oldFrame = current.first;
|
||||
frame = (frame + 1) % frameOverride->size();
|
||||
subFrame = 0;
|
||||
|
||||
current = frameOverride->at(frame);
|
||||
int newFrame = current.first;
|
||||
if (oldFrame != newFrame && newFrame >= 0 && newFrame < frames->size())
|
||||
{
|
||||
source->blit(x, y, frames->at(newFrame), rotated);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
int oldFrame = frame;
|
||||
frame = (frame + 1) % frames->size();
|
||||
|
||||
if (oldFrame != frame)
|
||||
{
|
||||
source->blit(x, y, frames->at(this->frame), rotated);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Texture *StitchedTexture::getSource()
|
||||
{
|
||||
return source;
|
||||
}
|
||||
|
||||
Texture *StitchedTexture::getFrame(int i)
|
||||
{
|
||||
return frames->at(i);
|
||||
}
|
||||
|
||||
int StitchedTexture::getFrames()
|
||||
{
|
||||
return frames?frames->size():0;
|
||||
}
|
||||
int StitchedTexture::getFrames() { return frames ? frames->size() : 0; }
|
||||
|
||||
/**
|
||||
* Loads animation frames from a file with the syntax, <code>
|
||||
* 0,1,2,3,
|
||||
* 4*10,5*10,
|
||||
* 4*10,3,2,1,
|
||||
* 0
|
||||
* </code> or similar
|
||||
*
|
||||
* @param bufferedReader
|
||||
*/
|
||||
void StitchedTexture::loadAnimationFrames(BufferedReader *bufferedReader)
|
||||
{
|
||||
if(frameOverride != NULL)
|
||||
{
|
||||
delete frameOverride;
|
||||
frameOverride = NULL;
|
||||
}
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
* Loads animation frames from a file with the syntax, <code>
|
||||
* 0,1,2,3,
|
||||
* 4*10,5*10,
|
||||
* 4*10,3,2,1,
|
||||
* 0
|
||||
* </code> or similar
|
||||
*
|
||||
* @param bufferedReader
|
||||
*/
|
||||
void StitchedTexture::loadAnimationFrames(BufferedReader* bufferedReader) {
|
||||
if (frameOverride != NULL) {
|
||||
delete frameOverride;
|
||||
frameOverride = NULL;
|
||||
}
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
|
||||
intPairVector *results = new intPairVector();
|
||||
intPairVector* results = new intPairVector();
|
||||
|
||||
//try {
|
||||
std::wstring line = bufferedReader->readLine();
|
||||
while (!line.empty())
|
||||
{
|
||||
line = trimString(line);
|
||||
if (line.length() > 0)
|
||||
{
|
||||
std::vector<std::wstring> tokens = stringSplit(line, L',');
|
||||
//for (String token : tokens)
|
||||
for(AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it)
|
||||
{
|
||||
std::wstring token = *it;
|
||||
int multiPos = token.find_first_of('*');
|
||||
if (multiPos > 0)
|
||||
{
|
||||
int frame = _fromString<int>(token.substr(0, multiPos));
|
||||
int count = _fromString<int>(token.substr(multiPos + 1));
|
||||
results->push_back( intPairVector::value_type(frame, count));
|
||||
}
|
||||
else
|
||||
{
|
||||
int tokenVal = _fromString<int>(token);
|
||||
results->push_back( intPairVector::value_type(tokenVal, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
line = bufferedReader->readLine();
|
||||
}
|
||||
//} catch (Exception e) {
|
||||
// System.err.println("Failed to read animation info for " + name + ": " + e.getMessage());
|
||||
//}
|
||||
// try {
|
||||
std::wstring line = bufferedReader->readLine();
|
||||
while (!line.empty()) {
|
||||
line = trimString(line);
|
||||
if (line.length() > 0) {
|
||||
std::vector<std::wstring> tokens = stringSplit(line, L',');
|
||||
// for (String token : tokens)
|
||||
for (AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it) {
|
||||
std::wstring token = *it;
|
||||
int multiPos = token.find_first_of('*');
|
||||
if (multiPos > 0) {
|
||||
int frame = _fromString<int>(token.substr(0, multiPos));
|
||||
int count = _fromString<int>(token.substr(multiPos + 1));
|
||||
results->push_back(intPairVector::value_type(frame, count));
|
||||
} else {
|
||||
int tokenVal = _fromString<int>(token);
|
||||
results->push_back(intPairVector::value_type(tokenVal, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
line = bufferedReader->readLine();
|
||||
}
|
||||
//} catch (Exception e) {
|
||||
// System.err.println("Failed to read animation info for " + name + ": " +
|
||||
//e.getMessage());
|
||||
//}
|
||||
|
||||
if (!results->empty() && results->size() < (SharedConstants::TICKS_PER_SECOND * 30))
|
||||
{
|
||||
frameOverride = results;
|
||||
}
|
||||
else
|
||||
{
|
||||
delete results;
|
||||
}
|
||||
if (!results->empty() &&
|
||||
results->size() < (SharedConstants::TICKS_PER_SECOND * 30)) {
|
||||
frameOverride = results;
|
||||
} else {
|
||||
delete results;
|
||||
}
|
||||
}
|
||||
|
||||
void StitchedTexture::loadAnimationFrames(const std::wstring &string)
|
||||
{
|
||||
if(frameOverride != NULL)
|
||||
{
|
||||
delete frameOverride;
|
||||
frameOverride = NULL;
|
||||
}
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
void StitchedTexture::loadAnimationFrames(const std::wstring& string) {
|
||||
if (frameOverride != NULL) {
|
||||
delete frameOverride;
|
||||
frameOverride = NULL;
|
||||
}
|
||||
frame = 0;
|
||||
subFrame = 0;
|
||||
|
||||
intPairVector *results = new intPairVector();
|
||||
intPairVector* results = new intPairVector();
|
||||
|
||||
std::vector<std::wstring> tokens = stringSplit(trimString(string), L',');
|
||||
//for (String token : tokens)
|
||||
for(AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it)
|
||||
{
|
||||
std::wstring token = trimString(*it);
|
||||
int multiPos = token.find_first_of('*');
|
||||
if (multiPos > 0)
|
||||
{
|
||||
int frame = _fromString<int>(token.substr(0, multiPos));
|
||||
int count = _fromString<int>(token.substr(multiPos + 1));
|
||||
results->push_back( intPairVector::value_type(frame, count));
|
||||
}
|
||||
else if(!token.empty())
|
||||
{
|
||||
int tokenVal = _fromString<int>(token);
|
||||
results->push_back( intPairVector::value_type(tokenVal, 1));
|
||||
}
|
||||
}
|
||||
std::vector<std::wstring> tokens = stringSplit(trimString(string), L',');
|
||||
// for (String token : tokens)
|
||||
for (AUTO_VAR(it, tokens.begin()); it != tokens.end(); ++it) {
|
||||
std::wstring token = trimString(*it);
|
||||
int multiPos = token.find_first_of('*');
|
||||
if (multiPos > 0) {
|
||||
int frame = _fromString<int>(token.substr(0, multiPos));
|
||||
int count = _fromString<int>(token.substr(multiPos + 1));
|
||||
results->push_back(intPairVector::value_type(frame, count));
|
||||
} else if (!token.empty()) {
|
||||
int tokenVal = _fromString<int>(token);
|
||||
results->push_back(intPairVector::value_type(tokenVal, 1));
|
||||
}
|
||||
}
|
||||
|
||||
if (!results->empty() && results->size() < (SharedConstants::TICKS_PER_SECOND * 30))
|
||||
{
|
||||
frameOverride = results;
|
||||
}
|
||||
else
|
||||
{
|
||||
delete results;
|
||||
}
|
||||
if (!results->empty() &&
|
||||
results->size() < (SharedConstants::TICKS_PER_SECOND * 30)) {
|
||||
frameOverride = results;
|
||||
} else {
|
||||
delete results;
|
||||
}
|
||||
}
|
||||
|
||||
void StitchedTexture::setFlags(int flags)
|
||||
{
|
||||
this->flags = flags;
|
||||
}
|
||||
void StitchedTexture::setFlags(int flags) { this->flags = flags; }
|
||||
|
||||
int StitchedTexture::getFlags() const
|
||||
{
|
||||
return this->flags;
|
||||
}
|
||||
int StitchedTexture::getFlags() const { return this->flags; }
|
||||
|
||||
bool StitchedTexture::hasOwnData()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
bool StitchedTexture::hasOwnData() { return true; }
|
||||
|
||||
Reference in New Issue
Block a user