LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-28 08:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:58:11 -06:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.Client/Textures/Stitching/TextureMap.cpp
View File

@@ -58,7 +58,7 @@ void TextureMap::stitch()
}
// Collection bucket for multiple frames per texture
std::unordered_map<TextureHolder *, vector<Texture *> * > textures; // = new HashMap<TextureHolder, List<Texture>>();
std::unordered_map<TextureHolder *, std::vector<Texture *> * > textures; // = new HashMap<TextureHolder, List<Texture>>();
Stitcher *stitcher = TextureManager::getInstance()->createStitcher(name);
@@ -74,9 +74,9 @@ void TextureMap::stitch()
TextureHolder *missingHolder = new TextureHolder(missingTex);
stitcher->addTexture(missingHolder);
vector<Texture *> *missingVec = new vector<Texture *>();
std::vector<Texture *> *missingVec = new std::vector<Texture *>();
missingVec->push_back(missingTex);
textures.insert( std::unordered_map<TextureHolder *, vector<Texture *> * >::value_type( missingHolder, missingVec ));
textures.insert( std::unordered_map<TextureHolder *, std::vector<Texture *> * >::value_type( missingHolder, missingVec ));
// Extract frames from textures and add them to the stitchers
//for (final String name : texturesToRegister.keySet())
@@ -87,7 +87,7 @@ void TextureMap::stitch()
std::wstring filename = path + name + extension;
// TODO: [EB] Put the frames into a proper object, not this inside out hack
vector<Texture *> *frames = TextureManager::getInstance()->createTextures(filename, m_mipMap);
std::vector<Texture *> *frames = TextureManager::getInstance()->createTextures(filename, m_mipMap);
if (frames == NULL || frames->empty())
{
@@ -98,7 +98,7 @@ void TextureMap::stitch()
stitcher->addTexture(holder);
// Store frames
textures.insert( std::unordered_map<TextureHolder *, vector<Texture *> * >::value_type( holder, frames ) );
textures.insert( std::unordered_map<TextureHolder *, std::vector<Texture *> * >::value_type( holder, frames ) );
}
// Stitch!
@@ -123,7 +123,7 @@ void TextureMap::stitch()
Texture *texture = textureHolder->getTexture();
std::wstring textureName = texture->getName();
vector<Texture *> *frames = textures.find(textureHolder)->second;
std::vector<Texture *> *frames = textures.find(textureHolder)->second;
StitchedTexture *stored = NULL;