diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-21 00:45:14 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-21 00:45:14 +0200 |
| commit | c57637b4c39319e0c0d5d80d0ae2884aec66d691 (patch) | |
| tree | 72ba35937c701ec32d07bba3b6dde6fb2a9f2bc0 /src/mapblock.cpp | |
| parent | f5ff378dd02431cdcf658b210509b170ea2135d1 (diff) | |
| download | minetest-c57637b4c39319e0c0d5d80d0ae2884aec66d691.tar.xz | |
Temporary commit; lots of test code and stuff
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index a1e3c6694..d489ec8ac 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -822,7 +822,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) if(dir == v3s16(0,1,0)) vertices[i].Pos.rotateXZBy(-45); - vertices[i].Pos += intToFloat(p + getPosRelative()); + vertices[i].Pos += intToFloat(p + getPosRelative(), BS); } // Set material @@ -1066,7 +1066,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) if(dir == v3s16(1,0,-0)) vertices[j].Pos.rotateXZBy(-90); - vertices[j].Pos += intToFloat(p + getPosRelative()); + vertices[j].Pos += intToFloat(p + getPosRelative(), BS); } u16 indices[] = {0,1,2,2,3,0}; @@ -1105,7 +1105,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) //vertices[i].Pos.Y += neighbor_levels[v3s16(0,0,0)]; s32 j = corner_resolve[i]; vertices[i].Pos.Y += corner_levels[j]; - vertices[i].Pos += intToFloat(p + getPosRelative()); + vertices[i].Pos += intToFloat(p + getPosRelative(), BS); } u16 indices[] = {0,1,2,2,3,0}; @@ -1155,7 +1155,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) for(s32 i=0; i<4; i++) { vertices[i].Pos.Y += (-0.5+node_water_level)*BS; - vertices[i].Pos += intToFloat(p + getPosRelative()); + vertices[i].Pos += intToFloat(p + getPosRelative(), BS); } u16 indices[] = {0,1,2,2,3,0}; @@ -1222,7 +1222,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) for(u16 i=0; i<4; i++) { - vertices[i].Pos += intToFloat(p + getPosRelative()); + vertices[i].Pos += intToFloat(p + getPosRelative(), BS); } u16 indices[] = {0,1,2,2,3,0}; @@ -1596,7 +1596,7 @@ void MapBlock::stepObjects(float dtime, bool server, u32 daynight_ratio) if(getNode(p).d == CONTENT_AIR && getNode(p).getLightBlend(daynight_ratio) <= 11) { - RatObject *obj = new RatObject(NULL, -1, intToFloat(p)); + RatObject *obj = new RatObject(NULL, -1, intToFloat(p, BS)); addObject(obj); } } |