minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Fix texture atlas not being created correctly

pull/25/head
Perttu Ahola 2011-12-01 12:43:17 +02:00
parent 223a4f4741
commit 146be1f0b6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nodedef.cpp
View File

@ -216,7 +216,8 @@ void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
if(readU8(is) != 6) if(readU8(is) != 6)
throw SerializationError("unsupported tile count"); throw SerializationError("unsupported tile count");
for(u32 i=0; i<6; i++) for(u32 i=0; i<6; i++)
tname_tiles[i] = deSerializeString(is); setTexture(i, deSerializeString(is));
//tname_tiles[i] = deSerializeString(is);
tname_inventory = deSerializeString(is); tname_inventory = deSerializeString(is);
if(readU8(is) != CF_SPECIAL_COUNT) if(readU8(is) != CF_SPECIAL_COUNT)
throw SerializationError("unsupported CF_SPECIAL_COUNT"); throw SerializationError("unsupported CF_SPECIAL_COUNT");

6
src/tile.cpp
View File

@ -906,10 +906,14 @@ void TextureSource::buildMainAtlas(class IGameDef *gamedef)
for(u32 j=0; j<xwise_tiling; j++) for(u32 j=0; j<xwise_tiling; j++)
{ {
// Copy the copy to the atlas // Copy the copy to the atlas
img2->copyToWithAlpha(atlas_img, /*img2->copyToWithAlpha(atlas_img,
pos_in_atlas + v2s32(j*dim.Width,0), pos_in_atlas + v2s32(j*dim.Width,0),
core::rect<s32>(v2s32(0,0), dim), core::rect<s32>(v2s32(0,0), dim),
video::SColor(255,255,255,255), video::SColor(255,255,255,255),
NULL);*/
img2->copyTo(atlas_img,
pos_in_atlas + v2s32(j*dim.Width,0),
core::rect<s32>(v2s32(0,0), dim),
NULL); NULL);
} }