BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix visual_scale for NDT_PLANTLIKE being set too small

Browse Source
This commit is contained in:
Craig Robbins 2014-12-18 15:39:02 +10:00
parent f5211bbd59
commit 815876e709
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/content_mapblock.cpp
View File

@ -1162,15 +1162,16 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
u16 l = getInteriorLight(n, 1, nodedef); u16 l = getInteriorLight(n, 1, nodedef);
video::SColor c = MapBlock_LightColor(255, l, f.light_source); video::SColor c = MapBlock_LightColor(255, l, f.light_source);
float s = BS / 2; float s = BS / 2 * f.visual_scale;
for(u32 j = 0; j < 2; j++)
for (int j = 0; j < 2; j++)
{ {
video::S3DVertex vertices[4] = video::S3DVertex vertices[4] =
{ {
video::S3DVertex(-s,-s, 0, 0,0,0, c, 0,1), video::S3DVertex(-s,-BS/2, 0, 0,0,0, c, 0,1),
video::S3DVertex( s,-s, 0, 0,0,0, c, 1,1), video::S3DVertex( s,-BS/2, 0, 0,0,0, c, 1,1),
video::S3DVertex( s, s, 0, 0,0,0, c, 1,0), video::S3DVertex( s,-BS/2 + s*2,0, 0,0,0, c, 1,0),
video::S3DVertex(-s, s, 0, 0,0,0, c, 0,0), video::S3DVertex(-s,-BS/2 + s*2,0, 0,0,0, c, 0,0),
}; };
if(j == 0) if(j == 0)
@ -1184,10 +1185,11 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
vertices[i].Pos.rotateXZBy(-44 + n.param2 * 2); vertices[i].Pos.rotateXZBy(-44 + n.param2 * 2);
} }
for(u16 i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
vertices[i].Pos *= f.visual_scale; vertices[i].Pos *= f.visual_scale;
vertices[i].Pos.Y -= s * (1 - f.visual_scale); if (f.visual_scale < 1)
vertices[i].Pos.Y -= BS/2 * (1 - f.visual_scale);
vertices[i].Pos += intToFloat(p, BS); vertices[i].Pos += intToFloat(p, BS);
} }