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

refactor: unglob std::shared_ptr

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:20:45 -06:00
parent 0dd1654dec
commit 67ceccf2d4
1065 changed files with 5754 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.Client/Rendering/EntityRenderers/ItemFrameRenderer.cpp
View File

@@ -23,11 +23,11 @@ void ItemFrameRenderer::registerTerrainTextures(IconRegister *iconRegister)
backTexture = iconRegister->registerIcon(L"itemframe_back");
}
void ItemFrameRenderer::render(shared_ptr<Entity> _itemframe, double x, double y, double z, float rot, float a)
void ItemFrameRenderer::render(std::shared_ptr<Entity> _itemframe, double x, double y, double z, float rot, float a)
{
// 4J - original version used generics and thus had an input parameter of type EnderCrystal rather than shared_ptr<Entity> we have here -
// 4J - original version used generics and thus had an input parameter of type EnderCrystal rather than std::shared_ptr<Entity> we have here -
// do some casting around instead
shared_ptr<ItemFrame> itemFrame = dynamic_pointer_cast<ItemFrame>(_itemframe);
std::shared_ptr<ItemFrame> itemFrame = dynamic_pointer_cast<ItemFrame>(_itemframe);
glPushMatrix();
float xOffs = (float) (itemFrame->x - x) - 0.5f;
@@ -47,7 +47,7 @@ void ItemFrameRenderer::render(shared_ptr<Entity> _itemframe, double x, double
}
void ItemFrameRenderer::drawFrame(shared_ptr<ItemFrame> itemFrame)
void ItemFrameRenderer::drawFrame(std::shared_ptr<ItemFrame> itemFrame)
{
Minecraft *pMinecraft=Minecraft::GetInstance();
@@ -102,14 +102,14 @@ void ItemFrameRenderer::drawFrame(shared_ptr<ItemFrame> itemFrame)
glPopMatrix();
}
void ItemFrameRenderer::drawItem(shared_ptr<ItemFrame> entity)
void ItemFrameRenderer::drawItem(std::shared_ptr<ItemFrame> entity)
{
Minecraft *pMinecraft=Minecraft::GetInstance();
shared_ptr<ItemInstance> instance = entity->getItem();
std::shared_ptr<ItemInstance> instance = entity->getItem();
if (instance == NULL) return;
shared_ptr<ItemEntity> itemEntity = shared_ptr<ItemEntity>(new ItemEntity(entity->level, 0, 0, 0, instance));
std::shared_ptr<ItemEntity> itemEntity = std::shared_ptr<ItemEntity>(new ItemEntity(entity->level, 0, 0, 0, instance));
itemEntity->getItem()->count = 1;
itemEntity->bobOffs = 0;
@@ -150,7 +150,7 @@ void ItemFrameRenderer::drawItem(shared_ptr<ItemFrame> entity)
t->vertexUV(0 - vo, 0 - vo, 0, 0, 0);
t->end();
shared_ptr<MapItemSavedData> data = Item::map->getSavedData(itemEntity->getItem(), entity->level);
std::shared_ptr<MapItemSavedData> data = Item::map->getSavedData(itemEntity->getItem(), entity->level);
if (data != NULL)
{
entityRenderDispatcher->itemInHandRenderer->minimap->render(nullptr, entityRenderDispatcher->textures, data, entity->entityId);