From c3703ded953326823c5a0941881d23f3f136f88d Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 15 Nov 2011 21:13:22 +0200 Subject: [PATCH] Fix NDT_PLANTLIKE scaling to always keep the bottom at ground level --- src/content_mapblock.cpp | 10 ++++++---- src/content_mapnode.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 3950c83c..fd2a30ba 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -789,13 +789,15 @@ void mapblock_mesh_generate_special(MeshMakeData *data, { video::S3DVertex vertices[4] = { - video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c, + video::S3DVertex(-BS/2*f.visual_scale,-BS/2,0, 0,0,0, c, pa_papyrus.x0(), pa_papyrus.y1()), - video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c, + video::S3DVertex( BS/2*f.visual_scale,-BS/2,0, 0,0,0, c, pa_papyrus.x1(), pa_papyrus.y1()), - video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, + video::S3DVertex( BS/2*f.visual_scale, + -BS/2 + f.visual_scale*BS,0, 0,0,0, c, pa_papyrus.x1(), pa_papyrus.y0()), - video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c, + video::S3DVertex(-BS/2*f.visual_scale, + -BS/2 + f.visual_scale*BS,0, 0,0,0, c, pa_papyrus.x0(), pa_papyrus.y0()), }; diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 1ef3fe0d..e2cf5701 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -266,7 +266,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) i = CONTENT_JUNGLEGRASS; f = nodemgr->getModifiable(i); f->drawtype = NDT_PLANTLIKE; - f->visual_scale = 1.6; + f->visual_scale = 1.3; f->setAllTextures("junglegrass.png"); f->setInventoryTexture("junglegrass.png"); f->light_propagates = true;