LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-24 20:30:45 +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
parent ac9f3cbca3
commit 7c95bfc0bd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Rendering/Chunk.cpp
+6 -6
View File
@@ -207,7 +207,7 @@ void Chunk::rebuild()
// unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line
// renderableTileEntities.clear();
vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
int r = 1;
@@ -574,12 +574,12 @@ void Chunk::rebuild()
// 4J - All these new things added to globalRenderableTileEntities
AUTO_VAR(endItRTE, renderableTileEntities.end());
for( vector<std::shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
for( std::vector<std::shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
{
oldTileEntities.erase(*it);
}
// 4J - oldTileEntities is now the removed items
vector<std::shared_ptr<TileEntity> >::iterator it = globalRenderableTileEntities->begin();
std::vector<std::shared_ptr<TileEntity> >::iterator it = globalRenderableTileEntities->begin();
while( it != globalRenderableTileEntities->end() )
{
if( oldTileEntities.find(*it) != oldTileEntities.end() )
@@ -659,7 +659,7 @@ void Chunk::rebuild_SPU()
// unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line
// renderableTileEntities.clear();
vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
// List<TileEntity> newTileEntities = new ArrayList<TileEntity>();
// newTileEntities.clear();
@@ -903,12 +903,12 @@ void Chunk::rebuild_SPU()
// 4J - All these new things added to globalRenderableTileEntities
AUTO_VAR(endItRTE, renderableTileEntities.end());
for( vector<std::shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
for( std::vector<std::shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
{
oldTileEntities.erase(*it);
}
// 4J - oldTileEntities is now the removed items
vector<std::shared_ptr<TileEntity> >::iterator it = globalRenderableTileEntities->begin();
std::vector<std::shared_ptr<TileEntity> >::iterator it = globalRenderableTileEntities->begin();
while( it != globalRenderableTileEntities->end() )
{
if( oldTileEntities.find(*it) != oldTileEntities.end() )
Minecraft.Client/Rendering/Chunk.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
int id;
//public:
// vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - removed
// std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - removed
private:
LevelRenderer::rteMap *globalRenderableTileEntities;
Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void PlayerRenderer::render(std::shared_ptr<Entity> _mob, double x, double y, do
}
// 4J-PB - any additional parts to turn on for this player (skin dependent)
vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
std::vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
//turn them on
if(pAdditionalModelParts!=NULL)
{
Minecraft.Client/Rendering/GameRenderer.cpp
+5 -5
View File
@@ -57,10 +57,10 @@ C4JThread* GameRenderer::m_updateThread;
C4JThread::EventArray* GameRenderer::m_updateEvents;
bool GameRenderer::nearThingsToDo = false;
bool GameRenderer::updateRunning = false;
vector<uint8_t *> GameRenderer::m_deleteStackByte;
vector<SparseLightStorage *> GameRenderer::m_deleteStackSparseLightStorage;
vector<CompressedTileStorage *> GameRenderer::m_deleteStackCompressedTileStorage;
vector<SparseDataStorage *> GameRenderer::m_deleteStackSparseDataStorage;
std::vector<uint8_t *> GameRenderer::m_deleteStackByte;
std::vector<SparseLightStorage *> GameRenderer::m_deleteStackSparseLightStorage;
std::vector<CompressedTileStorage *> GameRenderer::m_deleteStackCompressedTileStorage;
std::vector<SparseDataStorage *> GameRenderer::m_deleteStackSparseDataStorage;
#endif
CRITICAL_SECTION GameRenderer::m_csDeleteStack;
@@ -352,7 +352,7 @@ void GameRenderer::pick(float a)
Vec3 *to = from->add(b->x * range, b->y * range, b->z * range);
hovered = nullptr;
float overlap = 1;
vector<std::shared_ptr<Entity> > *objects = mc->level->getEntities(mc->cameraTargetPlayer, mc->cameraTargetPlayer->bb->expand(b->x * (range), b->y * (range), b->z * (range))->grow(overlap, overlap, overlap));
std::vector<std::shared_ptr<Entity> > *objects = mc->level->getEntities(mc->cameraTargetPlayer, mc->cameraTargetPlayer->bb->expand(b->x * (range), b->y * (range), b->z * (range))->grow(overlap, overlap, overlap));
double nearest = dist;
AUTO_VAR(itEnd, objects->end());
Minecraft.Client/Rendering/GameRenderer.h
+4 -4
View File
@@ -156,10 +156,10 @@ public:
static bool nearThingsToDo;
static bool updateRunning;
#endif
static vector<uint8_t *> m_deleteStackByte;
static vector<SparseLightStorage *> m_deleteStackSparseLightStorage;
static vector<CompressedTileStorage *> m_deleteStackCompressedTileStorage;
static vector<SparseDataStorage *> m_deleteStackSparseDataStorage;
static std::vector<uint8_t *> m_deleteStackByte;
static std::vector<SparseLightStorage *> m_deleteStackSparseLightStorage;
static std::vector<CompressedTileStorage *> m_deleteStackCompressedTileStorage;
static std::vector<SparseDataStorage *> m_deleteStackSparseDataStorage;
static CRITICAL_SECTION m_csDeleteStack;
static void AddForDelete(uint8_t *deleteThis);
static void AddForDelete(SparseLightStorage *deleteThis);
Minecraft.Client/Rendering/LevelRenderer.cpp
+2 -2
View File
@@ -442,7 +442,7 @@ void LevelRenderer::allChanged(int playerIndex)
}
chunks[playerIndex] = ClipChunkArray(xChunks * yChunks * zChunks);
// sortedChunks[playerIndex] = new vector<Chunk *>(xChunks * yChunks * zChunks); // 4J - removed - not sorting our chunks anymore
// sortedChunks[playerIndex] = new std::vector<Chunk *>(xChunks * yChunks * zChunks); // 4J - removed - not sorting our chunks anymore
int id = 0;
int count = 0;
@@ -520,7 +520,7 @@ void LevelRenderer::renderEntities(Vec3 *cam, Culler *culler, float a)
mc->gameRenderer->turnOnLightLayer(a); // 4J - brought forward from 1.8.2
vector<std::shared_ptr<Entity> > entities = level[playerIndex]->getAllEntities();
std::vector<std::shared_ptr<Entity> > entities = level[playerIndex]->getAllEntities();
totalEntities = (int)entities.size();
AUTO_VAR(itEndGE, level[playerIndex]->globalEntities.end());
Minecraft.Client/Rendering/LevelRenderer.h
+5 -5
View File
@@ -120,18 +120,18 @@ public:
void destroyTileProgress(int id, int x, int y, int z, int progress);
void registerTextures(IconRegister *iconRegister);
typedef std::unordered_map<int, vector<std::shared_ptr<TileEntity> >, IntKeyHash, IntKeyEq> rteMap;
typedef std::unordered_map<int, std::vector<std::shared_ptr<TileEntity> >, IntKeyHash, IntKeyEq> rteMap;
private:
// debug
int m_freezeticks; // used to freeze the clouds
// 4J - this block of declarations was scattered round the code but have gathered everything into one place
rteMap renderableTileEntities; // 4J - changed - was vector<std::shared_ptr<TileEntity>, now hashed by chunk so we can find them
rteMap renderableTileEntities; // 4J - changed - was std::vector<std::shared_ptr<TileEntity>, now hashed by chunk so we can find them
CRITICAL_SECTION m_csRenderableTileEntities;
MultiPlayerLevel *level[4]; // 4J - now one per player
Textures *textures;
// vector<Chunk *> *sortedChunks[4]; // 4J - removed - not sorting our chunks anymore
// std::vector<Chunk *> *sortedChunks[4]; // 4J - removed - not sorting our chunks anymore
ClipChunkArray chunks[4]; // 4J - now one per player
int lastPlayerCount[4]; // 4J - added
int xChunks, yChunks, zChunks;
@@ -149,7 +149,7 @@ private:
int renderedEntities;
int culledEntities;
int chunkFixOffs;
vector<Chunk *> _renderChunks;
std::vector<Chunk *> _renderChunks;
int frame;
int repeatList;
double xOld[4]; // 4J - now one per player
@@ -189,7 +189,7 @@ public:
~RecentTile();
};
CRITICAL_SECTION m_csDestroyedTiles;
vector<RecentTile *> m_destroyedTiles;
std::vector<RecentTile *> m_destroyedTiles;
public:
void destroyingTileAt( Level *level, int x, int y, int z ); // For game to let this manager know that a tile is about to be destroyed (must be called before it actually is)
void updatedChunkAt( Level * level, int x, int y, int z, int veryNearCount ); // For chunk rebuilding to inform the manager that a chunk (a 16x16x16 tile render chunk) has been updated
Minecraft.Client/Rendering/Minimap.cpp
+2 -2
View File
@@ -147,12 +147,12 @@ void Minimap::render(std::shared_ptr<Player> player, Textures *textures, std::sh
AUTO_VAR(itEnd, data->decorations.end());
#ifdef _LARGE_WORLDS
vector<MapItemSavedData::MapDecoration *> m_edgeIcons;
std::vector<MapItemSavedData::MapDecoration *> m_edgeIcons;
#endif
// 4J-PB - stack the map icons
float fIconZ=-0.04f;// 4J - moved to -0.04 (was -0.02) to stop z fighting
for( vector<MapItemSavedData::MapDecoration *>::iterator it = data->decorations.begin(); it != itEnd; it++ )
for( std::vector<MapItemSavedData::MapDecoration *>::iterator it = data->decorations.begin(); it != itEnd; it++ )
{
MapItemSavedData::MapDecoration *dec = *it;
Minecraft.Client/Rendering/Models/Model.h
+1 -1
View File
@@ -12,7 +12,7 @@ class Model
public:
float attackTime;
bool riding;
vector<ModelPart *> cubes;
std::vector<ModelPart *> cubes;
bool young;
std::unordered_map<std::wstring, TexOffs * > mappedTexOffs;
int texWidth;
Minecraft.Client/Rendering/Particles/GuiParticles.h
+1 -1
View File
@@ -8,7 +8,7 @@ using namespace std;
class GuiParticles : public GuiComponent
{
private:
vector<GuiParticle *> particles;
std::vector<GuiParticle *> particles;
Minecraft *mc;
public: