mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-25 13:06:08 +00:00
chore: format Minecraft.Client
This commit is contained in:
Tropical
@@ -17,232 +17,234 @@
|
||||
|
||||
const std::wstring TextureMap::NAME_MISSING_TEXTURE = L"missingno";
|
||||
|
||||
TextureMap::TextureMap(int type, const std::wstring &name, const std::wstring &path, BufferedImage *missingTexture, bool mipmap) : iconType(type), name(name), path(path), extension(L".png")
|
||||
{
|
||||
this->missingTexture = missingTexture;
|
||||
TextureMap::TextureMap(int type, const std::wstring& name,
|
||||
const std::wstring& path, BufferedImage* missingTexture,
|
||||
bool mipmap)
|
||||
: iconType(type), name(name), path(path), extension(L".png") {
|
||||
this->missingTexture = missingTexture;
|
||||
|
||||
// 4J Initialisers
|
||||
missingPosition = NULL;
|
||||
stitchResult = NULL;
|
||||
// 4J Initialisers
|
||||
missingPosition = NULL;
|
||||
stitchResult = NULL;
|
||||
|
||||
m_mipMap = mipmap;
|
||||
m_mipMap = mipmap;
|
||||
}
|
||||
|
||||
void TextureMap::stitch()
|
||||
{
|
||||
texturesToRegister.clear();
|
||||
void TextureMap::stitch() {
|
||||
texturesToRegister.clear();
|
||||
|
||||
if (iconType == Icon::TYPE_TERRAIN)
|
||||
{
|
||||
//for (Tile tile : Tile.tiles)
|
||||
for(unsigned int i = 0; i < Tile::TILE_NUM_COUNT; ++i)
|
||||
{
|
||||
if (Tile::tiles[i] != NULL)
|
||||
{
|
||||
Tile::tiles[i]->registerIcons(this);
|
||||
}
|
||||
}
|
||||
if (iconType == Icon::TYPE_TERRAIN) {
|
||||
// for (Tile tile : Tile.tiles)
|
||||
for (unsigned int i = 0; i < Tile::TILE_NUM_COUNT; ++i) {
|
||||
if (Tile::tiles[i] != NULL) {
|
||||
Tile::tiles[i]->registerIcons(this);
|
||||
}
|
||||
}
|
||||
|
||||
Minecraft::GetInstance()->levelRenderer->registerTextures(this);
|
||||
EntityRenderDispatcher::instance->registerTerrainTextures(this);
|
||||
}
|
||||
Minecraft::GetInstance()->levelRenderer->registerTextures(this);
|
||||
EntityRenderDispatcher::instance->registerTerrainTextures(this);
|
||||
}
|
||||
|
||||
//for (Item item : Item.items)
|
||||
for(unsigned int i = 0; i < Item::ITEM_NUM_COUNT; ++i)
|
||||
{
|
||||
Item *item = Item::items[i];
|
||||
if (item != NULL && item->getIconType() == iconType)
|
||||
{
|
||||
item->registerIcons(this);
|
||||
}
|
||||
}
|
||||
// for (Item item : Item.items)
|
||||
for (unsigned int i = 0; i < Item::ITEM_NUM_COUNT; ++i) {
|
||||
Item* item = Item::items[i];
|
||||
if (item != NULL && item->getIconType() == iconType) {
|
||||
item->registerIcons(this);
|
||||
}
|
||||
}
|
||||
|
||||
// Collection bucket for multiple frames per texture
|
||||
std::unordered_map<TextureHolder *, std::vector<Texture *> * > textures; // = new HashMap<TextureHolder, List<Texture>>();
|
||||
// Collection bucket for multiple frames per texture
|
||||
std::unordered_map<TextureHolder*, std::vector<Texture*>*>
|
||||
textures; // = new HashMap<TextureHolder, List<Texture>>();
|
||||
|
||||
Stitcher *stitcher = TextureManager::getInstance()->createStitcher(name);
|
||||
|
||||
for(AUTO_VAR(it,texturesByName.begin()); it != texturesByName.end(); ++it)
|
||||
{
|
||||
delete it->second;
|
||||
}
|
||||
texturesByName.clear();
|
||||
animatedTextures.clear();
|
||||
Stitcher* stitcher = TextureManager::getInstance()->createStitcher(name);
|
||||
|
||||
// Prep missing texture -- anything that has no resources will get pointed at this one
|
||||
Texture *missingTex = TextureManager::getInstance()->createTexture(NAME_MISSING_TEXTURE, Texture::TM_CONTAINER, missingTexture->getWidth(), missingTexture->getHeight(), Texture::WM_CLAMP, Texture::TFMT_RGBA, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, m_mipMap, missingTexture);
|
||||
TextureHolder *missingHolder = new TextureHolder(missingTex);
|
||||
for (AUTO_VAR(it, texturesByName.begin()); it != texturesByName.end();
|
||||
++it) {
|
||||
delete it->second;
|
||||
}
|
||||
texturesByName.clear();
|
||||
animatedTextures.clear();
|
||||
|
||||
stitcher->addTexture(missingHolder);
|
||||
std::vector<Texture *> *missingVec = new std::vector<Texture *>();
|
||||
missingVec->push_back(missingTex);
|
||||
textures.insert( std::unordered_map<TextureHolder *, std::vector<Texture *> * >::value_type( missingHolder, missingVec ));
|
||||
// Prep missing texture -- anything that has no resources will get pointed
|
||||
// at this one
|
||||
Texture* missingTex = TextureManager::getInstance()->createTexture(
|
||||
NAME_MISSING_TEXTURE, Texture::TM_CONTAINER, missingTexture->getWidth(),
|
||||
missingTexture->getHeight(), Texture::WM_CLAMP, Texture::TFMT_RGBA,
|
||||
Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, m_mipMap, missingTexture);
|
||||
TextureHolder* missingHolder = new TextureHolder(missingTex);
|
||||
|
||||
// Extract frames from textures and add them to the stitchers
|
||||
//for (final String name : texturesToRegister.keySet())
|
||||
for(AUTO_VAR(it, texturesToRegister.begin()); it != texturesToRegister.end(); ++it)
|
||||
{
|
||||
std::wstring name = it->first;
|
||||
stitcher->addTexture(missingHolder);
|
||||
std::vector<Texture*>* missingVec = new std::vector<Texture*>();
|
||||
missingVec->push_back(missingTex);
|
||||
textures.insert(
|
||||
std::unordered_map<TextureHolder*, std::vector<Texture*>*>::value_type(
|
||||
missingHolder, missingVec));
|
||||
|
||||
std::wstring filename = path + name + extension;
|
||||
// Extract frames from textures and add them to the stitchers
|
||||
// for (final String name : texturesToRegister.keySet())
|
||||
for (AUTO_VAR(it, texturesToRegister.begin());
|
||||
it != texturesToRegister.end(); ++it) {
|
||||
std::wstring name = it->first;
|
||||
|
||||
// TODO: [EB] Put the frames into a proper object, not this inside out hack
|
||||
std::vector<Texture *> *frames = TextureManager::getInstance()->createTextures(filename, m_mipMap);
|
||||
std::wstring filename = path + name + extension;
|
||||
|
||||
if (frames == NULL || frames->empty())
|
||||
{
|
||||
continue; // Couldn't load a texture, skip it
|
||||
}
|
||||
// TODO: [EB] Put the frames into a proper object, not this inside out
|
||||
// hack
|
||||
std::vector<Texture*>* frames =
|
||||
TextureManager::getInstance()->createTextures(filename, m_mipMap);
|
||||
|
||||
TextureHolder *holder = new TextureHolder(frames->at(0));
|
||||
stitcher->addTexture(holder);
|
||||
if (frames == NULL || frames->empty()) {
|
||||
continue; // Couldn't load a texture, skip it
|
||||
}
|
||||
|
||||
// Store frames
|
||||
textures.insert( std::unordered_map<TextureHolder *, std::vector<Texture *> * >::value_type( holder, frames ) );
|
||||
}
|
||||
TextureHolder* holder = new TextureHolder(frames->at(0));
|
||||
stitcher->addTexture(holder);
|
||||
|
||||
// Stitch!
|
||||
//try {
|
||||
stitcher->stitch();
|
||||
//} catch (StitcherException e) {
|
||||
// throw e;
|
||||
// TODO: [EB] Retry mechanism
|
||||
//}
|
||||
// Store frames
|
||||
textures.insert(
|
||||
std::unordered_map<TextureHolder*,
|
||||
std::vector<Texture*>*>::value_type(holder,
|
||||
frames));
|
||||
}
|
||||
|
||||
// Create the final image
|
||||
stitchResult = stitcher->constructTexture(m_mipMap);
|
||||
// Stitch!
|
||||
// try {
|
||||
stitcher->stitch();
|
||||
//} catch (StitcherException e) {
|
||||
// throw e;
|
||||
// TODO: [EB] Retry mechanism
|
||||
//}
|
||||
|
||||
// Extract all the final positions and store them
|
||||
AUTO_VAR(areas, stitcher->gatherAreas());
|
||||
//for (StitchSlot slot : stitcher.gatherAreas())
|
||||
for(AUTO_VAR(it, areas->begin()); it != areas->end(); ++it)
|
||||
{
|
||||
StitchSlot *slot = *it;
|
||||
TextureHolder *textureHolder = slot->getHolder();
|
||||
// Create the final image
|
||||
stitchResult = stitcher->constructTexture(m_mipMap);
|
||||
|
||||
Texture *texture = textureHolder->getTexture();
|
||||
std::wstring textureName = texture->getName();
|
||||
// Extract all the final positions and store them
|
||||
AUTO_VAR(areas, stitcher->gatherAreas());
|
||||
// for (StitchSlot slot : stitcher.gatherAreas())
|
||||
for (AUTO_VAR(it, areas->begin()); it != areas->end(); ++it) {
|
||||
StitchSlot* slot = *it;
|
||||
TextureHolder* textureHolder = slot->getHolder();
|
||||
|
||||
std::vector<Texture *> *frames = textures.find(textureHolder)->second;
|
||||
Texture* texture = textureHolder->getTexture();
|
||||
std::wstring textureName = texture->getName();
|
||||
|
||||
StitchedTexture *stored = NULL;
|
||||
|
||||
AUTO_VAR(itTex, texturesToRegister.find(textureName) );
|
||||
if(itTex != texturesToRegister.end() ) stored = itTex->second;
|
||||
std::vector<Texture*>* frames = textures.find(textureHolder)->second;
|
||||
|
||||
// [EB]: What is this code for? debug warnings for when during transition?
|
||||
bool missing = false;
|
||||
if (stored == NULL)
|
||||
{
|
||||
missing = true;
|
||||
stored = StitchedTexture::create(textureName);
|
||||
StitchedTexture* stored = NULL;
|
||||
|
||||
if (textureName.compare(NAME_MISSING_TEXTURE)!=0)
|
||||
{
|
||||
//Minecraft::getInstance()->getLogger().warning("Couldn't find premade icon for " + textureName + " doing " + name);
|
||||
AUTO_VAR(itTex, texturesToRegister.find(textureName));
|
||||
if (itTex != texturesToRegister.end()) stored = itTex->second;
|
||||
|
||||
// [EB]: What is this code for? debug warnings for when during
|
||||
// transition?
|
||||
bool missing = false;
|
||||
if (stored == NULL) {
|
||||
missing = true;
|
||||
stored = StitchedTexture::create(textureName);
|
||||
|
||||
if (textureName.compare(NAME_MISSING_TEXTURE) != 0) {
|
||||
// Minecraft::getInstance()->getLogger().warning("Couldn't find
|
||||
// premade icon for " + textureName + " doing " + name);
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
wprintf(L"Couldn't find premade icon for %ls doing %ls\n", textureName.c_str(), name.c_str() );
|
||||
wprintf(L"Couldn't find premade icon for %ls doing %ls\n",
|
||||
textureName.c_str(), name.c_str());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stored->init(stitchResult, frames, slot->getX(), slot->getY(), textureHolder->getTexture()->getWidth(), textureHolder->getTexture()->getHeight(), textureHolder->isRotated());
|
||||
stored->init(stitchResult, frames, slot->getX(), slot->getY(),
|
||||
textureHolder->getTexture()->getWidth(),
|
||||
textureHolder->getTexture()->getHeight(),
|
||||
textureHolder->isRotated());
|
||||
|
||||
texturesByName.insert( stringStitchedTextureMap::value_type(textureName, stored) );
|
||||
if (!missing) texturesToRegister.erase(textureName);
|
||||
texturesByName.insert(
|
||||
stringStitchedTextureMap::value_type(textureName, stored));
|
||||
if (!missing) texturesToRegister.erase(textureName);
|
||||
|
||||
if (frames->size() > 1)
|
||||
{
|
||||
animatedTextures.push_back(stored);
|
||||
if (frames->size() > 1) {
|
||||
animatedTextures.push_back(stored);
|
||||
|
||||
std::wstring animationDefinitionFile = textureName + L".txt";
|
||||
std::wstring animationDefinitionFile = textureName + L".txt";
|
||||
|
||||
TexturePack *texturePack = Minecraft::GetInstance()->skins->getSelected();
|
||||
bool requiresFallback = !texturePack->hasFile(L"\\" + textureName + L".png", false);
|
||||
//try {
|
||||
InputStream *fileStream = texturePack->getResource(L"\\" + path + animationDefinitionFile, requiresFallback);
|
||||
TexturePack* texturePack =
|
||||
Minecraft::GetInstance()->skins->getSelected();
|
||||
bool requiresFallback =
|
||||
!texturePack->hasFile(L"\\" + textureName + L".png", false);
|
||||
// try {
|
||||
InputStream* fileStream = texturePack->getResource(
|
||||
L"\\" + path + animationDefinitionFile, requiresFallback);
|
||||
|
||||
//Minecraft::getInstance()->getLogger().info("Found animation info for: " + animationDefinitionFile);
|
||||
// Minecraft::getInstance()->getLogger().info("Found animation info
|
||||
// for: " + animationDefinitionFile);
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
wprintf(L"Found animation info for: %ls\n", animationDefinitionFile.c_str() );
|
||||
wprintf(L"Found animation info for: %ls\n",
|
||||
animationDefinitionFile.c_str());
|
||||
#endif
|
||||
InputStreamReader isr(fileStream);
|
||||
BufferedReader br(&isr);
|
||||
stored->loadAnimationFrames(&br);
|
||||
delete fileStream;
|
||||
//} catch (IOException ignored) {
|
||||
//}
|
||||
}
|
||||
}
|
||||
delete areas;
|
||||
InputStreamReader isr(fileStream);
|
||||
BufferedReader br(&isr);
|
||||
stored->loadAnimationFrames(&br);
|
||||
delete fileStream;
|
||||
//} catch (IOException ignored) {
|
||||
//}
|
||||
}
|
||||
}
|
||||
delete areas;
|
||||
|
||||
missingPosition = texturesByName.find(NAME_MISSING_TEXTURE)->second;
|
||||
missingPosition = texturesByName.find(NAME_MISSING_TEXTURE)->second;
|
||||
|
||||
//for (StitchedTexture texture : texturesToRegister.values())
|
||||
for(AUTO_VAR(it, texturesToRegister.begin() ); it != texturesToRegister.end(); ++it)
|
||||
{
|
||||
StitchedTexture *texture = it->second;
|
||||
texture->replaceWith(missingPosition);
|
||||
}
|
||||
// for (StitchedTexture texture : texturesToRegister.values())
|
||||
for (AUTO_VAR(it, texturesToRegister.begin());
|
||||
it != texturesToRegister.end(); ++it) {
|
||||
StitchedTexture* texture = it->second;
|
||||
texture->replaceWith(missingPosition);
|
||||
}
|
||||
|
||||
stitchResult->writeAsPNG(L"debug.stitched_" + name + L".png");
|
||||
stitchResult->updateOnGPU();
|
||||
stitchResult->writeAsPNG(L"debug.stitched_" + name + L".png");
|
||||
stitchResult->updateOnGPU();
|
||||
}
|
||||
|
||||
StitchedTexture *TextureMap::getTexture(const std::wstring &name)
|
||||
{
|
||||
StitchedTexture *result = texturesByName.find(name)->second;
|
||||
if (result == NULL) result = missingPosition;
|
||||
return result;
|
||||
StitchedTexture* TextureMap::getTexture(const std::wstring& name) {
|
||||
StitchedTexture* result = texturesByName.find(name)->second;
|
||||
if (result == NULL) result = missingPosition;
|
||||
return result;
|
||||
}
|
||||
|
||||
void TextureMap::cycleAnimationFrames()
|
||||
{
|
||||
//for (StitchedTexture texture : animatedTextures)
|
||||
for(AUTO_VAR(it, animatedTextures.begin() ); it != animatedTextures.end(); ++it)
|
||||
{
|
||||
StitchedTexture *texture = *it;
|
||||
texture->cycleFrames();
|
||||
}
|
||||
void TextureMap::cycleAnimationFrames() {
|
||||
// for (StitchedTexture texture : animatedTextures)
|
||||
for (AUTO_VAR(it, animatedTextures.begin()); it != animatedTextures.end();
|
||||
++it) {
|
||||
StitchedTexture* texture = *it;
|
||||
texture->cycleFrames();
|
||||
}
|
||||
}
|
||||
|
||||
Texture *TextureMap::getStitchedTexture()
|
||||
{
|
||||
return stitchResult;
|
||||
}
|
||||
Texture* TextureMap::getStitchedTexture() { return stitchResult; }
|
||||
|
||||
// 4J Stu - register is a reserved keyword in C++
|
||||
Icon *TextureMap::registerIcon(const std::wstring &name)
|
||||
{
|
||||
if (name.empty())
|
||||
{
|
||||
app.DebugPrintf("Don't register NULL\n");
|
||||
Icon* TextureMap::registerIcon(const std::wstring& name) {
|
||||
if (name.empty()) {
|
||||
app.DebugPrintf("Don't register NULL\n");
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
__debugbreak();
|
||||
__debugbreak();
|
||||
#endif
|
||||
//new RuntimeException("Don't register null!").printStackTrace();
|
||||
}
|
||||
// new RuntimeException("Don't register null!").printStackTrace();
|
||||
}
|
||||
|
||||
// TODO: [EB]: Why do we allow multiple registrations?
|
||||
StitchedTexture *result = NULL;
|
||||
AUTO_VAR(it, texturesToRegister.find(name));
|
||||
if(it != texturesToRegister.end()) result = it->second;
|
||||
// TODO: [EB]: Why do we allow multiple registrations?
|
||||
StitchedTexture* result = NULL;
|
||||
AUTO_VAR(it, texturesToRegister.find(name));
|
||||
if (it != texturesToRegister.end()) result = it->second;
|
||||
|
||||
if (result == NULL)
|
||||
{
|
||||
result = StitchedTexture::create(name);
|
||||
texturesToRegister.insert( stringStitchedTextureMap::value_type(name, result) );
|
||||
}
|
||||
if (result == NULL) {
|
||||
result = StitchedTexture::create(name);
|
||||
texturesToRegister.insert(
|
||||
stringStitchedTextureMap::value_type(name, result));
|
||||
}
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
int TextureMap::getIconType()
|
||||
{
|
||||
return iconType;
|
||||
}
|
||||
int TextureMap::getIconType() { return iconType; }
|
||||
|
||||
Icon *TextureMap::getMissingIcon()
|
||||
{
|
||||
return missingPosition;
|
||||
}
|
||||
Icon* TextureMap::getMissingIcon() { return missingPosition; }
|
||||
Reference in New Issue
Block a user