Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

brick texture updates pt4

This commit is contained in:
darkrose 2015-03-28 18:48:26 +10:00
parent dfed368df0
commit 1288521991
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 680 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 698 B

34
src/content_mapblock.cpp
View File

@ -3833,6 +3833,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
v3f pos = intToFloat(p, BS);
bool urot = (n.getContent() >= CONTENT_SLAB_STAIR_UD_MIN && n.getContent() <= CONTENT_SLAB_STAIR_UD_MAX);
float tex_v = 0.;
// flip lighting
if (urot) {
video::SColor col = c[0];
@ -3853,6 +3854,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
col = c[10];
c[10] = c[11];
c[11] = col;
tex_v = 0.5;
}
video::S3DVertex vertices[6][4] = {
{ // up
@ -3866,25 +3868,25 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
video::S3DVertex(0.5*BS,-0.5*BS,0.5*BS, 0,-1,0, c[6], 1.,1.),
video::S3DVertex(-0.5*BS,-0.5*BS,0.5*BS, 0,-1,0, c[7], 0.,1.)
},{ // right
video::S3DVertex(0.5*BS,0.,-0.5*BS, 1,0,0, c[2], 0.,0.),
video::S3DVertex(0.5*BS,0.,0.5*BS, 1,0,0, c[1], 1.,0.),
video::S3DVertex(0.5*BS,-0.5*BS,0.5*BS, 1,0,0, c[6], 1.,.5),
video::S3DVertex(0.5*BS,-0.5*BS,-0.5*BS, 1,0,0, c[5], 0.,.5)
video::S3DVertex(0.5*BS,0.,-0.5*BS, 1,0,0, c[2], 0.,0.+tex_v),
video::S3DVertex(0.5*BS,0.,0.5*BS, 1,0,0, c[1], 1.,0.+tex_v),
video::S3DVertex(0.5*BS,-0.5*BS,0.5*BS, 1,0,0, c[6], 1.,.5+tex_v),
video::S3DVertex(0.5*BS,-0.5*BS,-0.5*BS, 1,0,0, c[5], 0.,.5+tex_v)
},{ // left
video::S3DVertex(-0.5*BS,0.,0.5*BS, -1,0,0, c[0], 0.,0.),
video::S3DVertex(-0.5*BS,0.,-0.5*BS, -1,0,0, c[3], 1.,0.),
video::S3DVertex(-0.5*BS,-0.5*BS,-0.5*BS, -1,0,0, c[4], 1.,.5),
video::S3DVertex(-0.5*BS,-0.5*BS,0.5*BS, -1,0,0, c[7], 0.,.5)
video::S3DVertex(-0.5*BS,0.,0.5*BS, -1,0,0, c[0], 0.,0.+tex_v),
video::S3DVertex(-0.5*BS,0.,-0.5*BS, -1,0,0, c[3], 1.,0.+tex_v),
video::S3DVertex(-0.5*BS,-0.5*BS,-0.5*BS, -1,0,0, c[4], 1.,.5+tex_v),
video::S3DVertex(-0.5*BS,-0.5*BS,0.5*BS, -1,0,0, c[7], 0.,.5+tex_v)
},{ // back
video::S3DVertex(0.5*BS,0.,0.5*BS, 0,0,1, c[1], 0.,0.),
video::S3DVertex(-0.5*BS,0.,0.5*BS, 0,0,1, c[0], 1.,0.),
video::S3DVertex(-0.5*BS,-0.5*BS,0.5*BS, 0,0,1, c[7], 1.,.5),
video::S3DVertex(0.5*BS,-0.5*BS,0.5*BS, 0,0,1, c[6], 0.,.5)
video::S3DVertex(0.5*BS,0.,0.5*BS, 0,0,1, c[1], 0.,0.+tex_v),
video::S3DVertex(-0.5*BS,0.,0.5*BS, 0,0,1, c[0], 1.,0.+tex_v),
video::S3DVertex(-0.5*BS,-0.5*BS,0.5*BS, 0,0,1, c[7], 1.,.5+tex_v),
video::S3DVertex(0.5*BS,-0.5*BS,0.5*BS, 0,0,1, c[6], 0.,.5+tex_v)
},{ // front
video::S3DVertex(-0.5*BS,0.,-0.5*BS, 0,0,-1, c[3], 0.,0.),
video::S3DVertex(0.5*BS,0.,-0.5*BS, 0,0,-1, c[2], 1.,0.),
video::S3DVertex(0.5*BS,-0.5*BS,-0.5*BS, 0,0,-1, c[5], 1.,.5),
video::S3DVertex(-0.5*BS,-0.5*BS,-0.5*BS, 0,0,-1, c[4], 0.,.5)
video::S3DVertex(-0.5*BS,0.,-0.5*BS, 0,0,-1, c[3], 0.,0.+tex_v),
video::S3DVertex(0.5*BS,0.,-0.5*BS, 0,0,-1, c[2], 1.,0.+tex_v),
video::S3DVertex(0.5*BS,-0.5*BS,-0.5*BS, 0,0,-1, c[5], 1.,.5+tex_v),
video::S3DVertex(-0.5*BS,-0.5*BS,-0.5*BS, 0,0,-1, c[4], 0.,.5+tex_v)
}
};
u16 indices[6] = {0,1,2,2,3,0};

6
src/content_mapnode_slab.cpp
View File

@ -151,8 +151,8 @@ 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(0,"brick_slab_top.png");
f->setTexture(1,"brick_bottom.png");
f->setTexture(2,"brick_side.png");
f->setTexture(3,"brick_side.png");
f->draw_type = CDT_NODEBOX;
@ -498,7 +498,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_BRICK_SLAB_UD;
f = &content_features(i);
f->setAllTextures("brick.png^[transformfy");
f->setTexture(0,"brick_top.png^[transformR90");
f->setTexture(0,"brick_slab_bottom.png");
f->setTexture(1,"brick_top.png");
f->setTexture(2,"brick_side.png^[transformfy");
f->setTexture(3,"brick_side.png^[transformfy");

2
src/content_mapnode_stair.cpp
View File

@ -146,7 +146,7 @@ void content_mapnode_stair(bool repeat)
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(1,"brick_bottom.png");
f->setTexture(2,"brick_side.png");
f->setTexture(3,"brick_side.png");
f->setTexture(5,"brick_stair_front.png");