oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

updated brick textures pt1

This commit is contained in:
darkrose 2015-03-27 02:49:46 +10:00
parent 1433667759
commit dfc39f0d12
9 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/brick.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 170 B

BIN
data/textures/brick_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
data/textures/brick_stair_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

BIN
data/textures/brick_stair_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 B

BIN
data/textures/brick_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

7
src/content_mapblock.cpp
View File

@ -3488,6 +3488,13 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
v3f pos = intToFloat(p, BS);
s16 rot = n.getRotationAngle();
// remove rotation from the node, we'll do it ourselves
{
content_t c = n.getContent();
n.param1 = 0;
n.setContent(c);
}
TileSpec tiles[6];
NodeMetadata *meta = data->m_env->getMap().getNodeMetadata(p+blockpos_nodes);
for (int i=0; i<6; i++) {

6
src/content_mapnode.cpp
View File

@ -609,7 +609,11 @@ void content_mapnode_init(bool repeat)
f = &content_features(i);
f->description = wgettext("Brick");
f->setAllTextures("brick.png");
f->setInventoryTextureCube("brick.png", "brick.png", "brick.png");
f->setTexture(0,"brick_top.png");
f->setTexture(1,"brick_top.png^[transformR90");
f->setTexture(2,"brick_side.png");
f->setTexture(3,"brick_side.png");
f->setInventoryTextureCube("brick_top.png", "brick.png", "brick_side.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");

14
src/content_mapnode_slab.cpp
View File

@ -151,13 +151,17 @@ void content_mapnode_slab(bool repeat)
f = &content_features(i);
f->description = wgettext("Brick Slab");
f->setAllTextures("brick.png");
f->setTexture(0,"brick_top.png");
f->setTexture(1,"brick_top.png^[transformR90");
f->setTexture(2,"brick_side.png");
f->setTexture(3,"brick_side.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->special_alternate_node = CONTENT_BRICK;
content_nodebox_slab(f);
f->setInventoryTextureNodeBox(i,"brick.png", "brick.png", "brick.png");
f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png", "brick_side.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->suffocation_per_second = 0;
@ -493,14 +497,18 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_BRICK_SLAB_UD;
f = &content_features(i);
f->setAllTextures("brick.png");
f->setAllTextures("brick.png^[transformfy");
f->setTexture(0,"brick_top.png^[transformR90");
f->setTexture(1,"brick_top.png");
f->setTexture(2,"brick_side.png^[transformfy");
f->setTexture(3,"brick_side.png^[transformfy");
f->draw_type = CDT_SLABLIKE;
f->solidness = 0; // drawn separately, makes no faces
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->special_alternate_node = CONTENT_BRICK;
content_nodebox_slabud(f);
f->setInventoryTextureNodeBox(i,"brick.png", "brick.png", "brick.png");
f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png^[transformfy", "brick_side.png^[transformfy");
f->type = CMT_STONE;
f->hardness = 1.0;
f->suffocation_per_second = 0;

16
src/content_mapnode_stair.cpp
View File

@ -145,12 +145,17 @@ void content_mapnode_stair(bool repeat)
f->description = wgettext("Brick Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("brick.png");
f->setTexture(0,"brick_stair_top.png");
f->setTexture(1,"brick_top.png^[transformR90");
f->setTexture(2,"brick_side.png");
f->setTexture(3,"brick_side.png");
f->setTexture(5,"brick_stair_front.png");
f->draw_type = CDT_STAIRLIKE;
f->solidness = 0; // drawn separately, makes no faces
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
content_nodebox_stair(f);
f->setInventoryTextureNodeBox(i,"brick.png", "brick.png", "brick.png");
f->setInventoryTextureNodeBox(i,"brick_stair_top.png", "brick_stair_front.png", "brick_side.png");
f->type = CMT_STONE;
f->hardness = 1.0;
crafting::setStairRecipe(CONTENT_BRICK,CONTENT_BRICK_STAIR);
@ -266,13 +271,18 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_BRICK_STAIR_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("brick.png");
f->setAllTextures("brick.png^[transformfy");
f->setTexture(0,"brick_stair_top.png");
f->setTexture(1,"brick_top.png");
f->setTexture(2,"brick_side.png^[transformfy");
f->setTexture(3,"brick_side.png^[transformfy");
f->setTexture(5,"brick_stair_front.png^[transformfy");
f->draw_type = CDT_STAIRLIKE;
f->solidness = 0; // drawn separately, makes no faces
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
content_nodebox_stairud(f);
f->setInventoryTextureNodeBox(i,"brick.png", "brick.png", "brick.png");
f->setInventoryTextureNodeBox(i,"brick.png", "brick_front.png", "brick.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->suffocation_per_second = 0;