Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Draw items as 2D images (instead of meshes) when possible

master
sfan5 2021-03-30 21:50:39 +02:00 committed by GitHub
parent 88d1fcfe23
commit 0d90ed6d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/client/hud.cpp
View File

@ -945,10 +945,16 @@ void drawItemStack(
return; return;
} }
const ItemDefinition &def = item.getDefinition(client->idef()); const static thread_local bool enable_animations =
ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client); g_settings->getBool("inventory_items_animations");
if (imesh && imesh->mesh) { const ItemDefinition &def = item.getDefinition(client->idef());
// Render as mesh if animated or no inventory image
if ((enable_animations && rotation_kind < IT_ROT_NONE) || def.inventory_image.empty()) {
ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
if (!imesh || !imesh->mesh)
return;
scene::IMesh *mesh = imesh->mesh; scene::IMesh *mesh = imesh->mesh;
driver->clearBuffers(video::ECBF_DEPTH); driver->clearBuffers(video::ECBF_DEPTH);
s32 delta = 0; s32 delta = 0;
@ -992,9 +998,6 @@ void drawItemStack(
core::matrix4 matrix; core::matrix4 matrix;
matrix.makeIdentity(); matrix.makeIdentity();
static thread_local bool enable_animations =
g_settings->getBool("inventory_items_animations");
if (enable_animations) { if (enable_animations) {
float timer_f = (float) delta / 5000.f; float timer_f = (float) delta / 5000.f;
matrix.setRotationDegrees(v3f( matrix.setRotationDegrees(v3f(
@ -1039,16 +1042,27 @@ void drawItemStack(
driver->setTransform(video::ETS_VIEW, oldViewMat); driver->setTransform(video::ETS_VIEW, oldViewMat);
driver->setTransform(video::ETS_PROJECTION, oldProjMat); driver->setTransform(video::ETS_PROJECTION, oldProjMat);
driver->setViewPort(oldViewPort); driver->setViewPort(oldViewPort);
} else { // Otherwise just draw as 2D
video::ITexture *texture = client->idef()->getInventoryTexture(def.name, client);
if (!texture)
return;
video::SColor color =
client->idef()->getItemstackColor(item, client);
const video::SColor colors[] = { color, color, color, color };
// draw the inventory_overlay draw2DImageFilterScaled(driver, texture, rect,
if (def.type == ITEM_NODE && def.inventory_image.empty() && core::rect<s32>({0, 0}, core::dimension2di(texture->getOriginalSize())),
!def.inventory_overlay.empty()) { clip, colors, true);
ITextureSource *tsrc = client->getTextureSource(); }
video::ITexture *overlay_texture = tsrc->getTexture(def.inventory_overlay);
core::dimension2d<u32> dimens = overlay_texture->getOriginalSize(); // draw the inventory_overlay
core::rect<s32> srcrect(0, 0, dimens.Width, dimens.Height); if (def.type == ITEM_NODE && def.inventory_image.empty() &&
draw2DImageFilterScaled(driver, overlay_texture, rect, srcrect, clip, 0, true); !def.inventory_overlay.empty()) {
} ITextureSource *tsrc = client->getTextureSource();
video::ITexture *overlay_texture = tsrc->getTexture(def.inventory_overlay);
core::dimension2d<u32> dimens = overlay_texture->getOriginalSize();
core::rect<s32> srcrect(0, 0, dimens.Width, dimens.Height);
draw2DImageFilterScaled(driver, overlay_texture, rect, srcrect, clip, 0, true);
} }
if (def.type == ITEM_TOOL && item.wear != 0) { if (def.type == ITEM_TOOL && item.wear != 0) {