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

Added pillars, pillars' bases and capitals. (updated)

This commit is contained in:
Capricorn 2016-06-18 23:31:05 +02:00
parent 412a4704e5
commit 3a0c19f4f5
4 changed files with 1168 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1006
src/content_mapnode.cpp
View File

File diff suppressed because it is too large Load Diff

59
src/content_mapnode.h
View File

@ -102,7 +102,64 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_CHAIR_INNER 0x083
#define CONTENT_CHAIR_OUTER 0x084
#define CONTENT_JUNGLEFERN 0x085
// FREE 0x086-0x7F6
// columns
#define CONTENT_STONE_COLUMN_SQUARE 0x086
#define CONTENT_STONE_COLUMN_SQUARE_BASE 0x087
#define CONTENT_STONE_COLUMN_SQUARE_TOP 0x088
#define CONTENT_STONE_COLUMN_CROSS 0x089
#define CONTENT_STONE_COLUMN_CROSS_BASE 0x08A
#define CONTENT_STONE_COLUMN_CROSS_TOP 0x08B
#define CONTENT_LIMESTONE_COLUMN_SQUARE 0x08C
#define CONTENT_LIMESTONE_COLUMN_SQUARE_BASE 0x08D
#define CONTENT_LIMESTONE_COLUMN_SQUARE_TOP 0x08E
#define CONTENT_LIMESTONE_COLUMN_CROSS 0x08F
#define CONTENT_LIMESTONE_COLUMN_CROSS_BASE 0x090
#define CONTENT_LIMESTONE_COLUMN_CROSS_TOP 0x091
#define CONTENT_MARBLE_COLUMN_SQUARE 0x092
#define CONTENT_MARBLE_COLUMN_SQUARE_BASE 0x093
#define CONTENT_MARBLE_COLUMN_SQUARE_TOP 0x094
#define CONTENT_MARBLE_COLUMN_CROSS 0x095
#define CONTENT_MARBLE_COLUMN_CROSS_BASE 0x099
#define CONTENT_MARBLE_COLUMN_CROSS_TOP 0x09A
#define CONTENT_SANDSTONE_COLUMN_SQUARE 0x09B
#define CONTENT_SANDSTONE_COLUMN_SQUARE_BASE 0x09C
#define CONTENT_SANDSTONE_COLUMN_SQUARE_TOP 0x09D
#define CONTENT_SANDSTONE_COLUMN_CROSS 0x09E
#define CONTENT_SANDSTONE_COLUMN_CROSS_BASE 0x09F
#define CONTENT_SANDSTONE_COLUMN_CROSS_TOP 0x0A0
#define CONTENT_BRICK_COLUMN_SQUARE 0x0A1
#define CONTENT_BRICK_COLUMN_SQUARE_BASE 0x0A2
#define CONTENT_BRICK_COLUMN_SQUARE_TOP 0x0A3
#define CONTENT_BRICK_COLUMN_CROSS 0x0A4
#define CONTENT_BRICK_COLUMN_CROSS_BASE 0x0A5
#define CONTENT_BRICK_COLUMN_CROSS_TOP 0x0A6
#define CONTENT_WOOD_COLUMN_SQUARE 0x0A7
#define CONTENT_WOOD_COLUMN_SQUARE_BASE 0x0A8
#define CONTENT_WOOD_COLUMN_SQUARE_TOP 0x0A9
#define CONTENT_WOOD_COLUMN_CROSS 0x0AA
#define CONTENT_WOOD_COLUMN_CROSS_BASE 0x0AB
#define CONTENT_WOOD_COLUMN_CROSS_TOP 0x0AC
#define CONTENT_JUNGLEWOOD_COLUMN_SQUARE 0x0AD
#define CONTENT_JUNGLEWOOD_COLUMN_SQUARE_BASE 0x0AE
#define CONTENT_JUNGLEWOOD_COLUMN_SQUARE_TOP 0x0AF
#define CONTENT_JUNGLEWOOD_COLUMN_CROSS 0x0B0
#define CONTENT_JUNGLEWOOD_COLUMN_CROSS_BASE 0x0B1
#define CONTENT_JUNGLEWOOD_COLUMN_CROSS_TOP 0x0B2
#define CONTENT_WOOD_PINE_COLUMN_SQUARE 0x0B3
#define CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE 0x0B4
#define CONTENT_WOOD_PINE_COLUMN_SQUARE_TOP 0x0B5
#define CONTENT_WOOD_PINE_COLUMN_CROSS 0x0B6
#define CONTENT_WOOD_PINE_COLUMN_CROSS_BASE 0x0B7
#define CONTENT_WOOD_PINE_COLUMN_CROSS_TOP 0x0B8
#define CONTENT_ROUGHSTONE_COLUMN_SQUARE 0x0B9
#define CONTENT_ROUGHSTONE_COLUMN_SQUARE_BASE 0x0BA
#define CONTENT_ROUGHSTONE_COLUMN_SQUARE_TOP 0x0BB
#define CONTENT_ROUGHSTONE_COLUMN_CROSS 0x0BC
#define CONTENT_ROUGHSTONE_COLUMN_CROSS_BASE 0x0BD
#define CONTENT_ROUGHSTONE_COLUMN_CROSS_TOP 0x0BE
// FREE 0x0BF-0x7F6
#define CONTENT_LEAVES_SNOWY 0x7F7
#define CONTENT_TRIMMED_LEAVES_AUTUMN 0x7F8
#define CONTENT_TRIMMED_LEAVES_WINTER 0x7F9

98
src/content_nodebox.cpp
View File

@ -1840,3 +1840,101 @@ void content_nodebox_table(ContentFeatures *f)
-0.25*BS,-0.375*BS,-0.3125*BS,0.25*BS,-0.28125*BS,-0.28125*BS
));
}
void content_nodebox_column_square(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.25*BS,-0.5*BS,-0.25*BS,0.25*BS,0.5*BS,0.25*BS
));
}
void content_nodebox_column_square_base(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.375*BS,-0.5*BS,-0.375*BS,0.375*BS,-0.375*BS,0.375*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,-0.25*BS,-0.25*BS,0.25*BS,0.5*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,-0.375*BS,-0.3125*BS,0.3125*BS,-0.25*BS,0.3125*BS
));
}
void content_nodebox_column_square_top(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.375*BS,0.375*BS,-0.375*BS,0.375*BS,0.5*BS,0.375*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,-0.5*BS,-0.25*BS,0.25*BS,0.25*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,0.25*BS,-0.3125*BS,0.3125*BS,0.375*BS,0.3125*BS
));
}
void content_nodebox_column_cross(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.1875*BS,-0.5*BS,-0.1875*BS,0.1875*BS,0.5*BS,0.1875*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.5*BS,-0.25*BS,0.0625*BS,0.5*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,-0.5*BS,-0.0625*BS,0.25*BS,0.5*BS,0.0625*BS
));
}
void content_nodebox_column_cross_base(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.375*BS,-0.5*BS,-0.375*BS,0.375*BS,-0.375*BS,0.375*BS
));
f->addNodeBox(NodeBox(
-0.1875*BS,-0.25*BS,-0.1875*BS,0.1875*BS,0.5*BS,0.1875*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,-0.375*BS,-0.3125*BS,0.3125*BS,-0.25*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.25*BS,-0.25*BS,0.0625*BS,0.5*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,-0.25*BS,-0.0625*BS,0.25*BS,0.5*BS,0.0625*BS
));
}
void content_nodebox_column_cross_top(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.375*BS,0.375*BS,-0.375*BS,0.375*BS,0.5*BS,0.375*BS
));
f->addNodeBox(NodeBox(
-0.1875*BS,-0.5*BS,-0.1875*BS,0.1875*BS,0.25*BS,0.1875*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,0.25*BS,-0.3125*BS,0.3125*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.5*BS,-0.25*BS,0.0625*BS,0.25*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,-0.5*BS,-0.0625*BS,0.25*BS,0.25*BS,0.0625*BS
));
}

6
src/content_nodebox.h
View File

@ -79,5 +79,11 @@ void content_nodebox_chair_endr(ContentFeatures *f);
void content_nodebox_chair_inner(ContentFeatures *f);
void content_nodebox_chair_outer(ContentFeatures *f);
void content_nodebox_table(ContentFeatures *f);
void content_nodebox_column_square(ContentFeatures *f);
void content_nodebox_column_square_base(ContentFeatures *f);
void content_nodebox_column_square_top(ContentFeatures *f);
void content_nodebox_column_cross(ContentFeatures *f);
void content_nodebox_column_cross_base(ContentFeatures *f);
void content_nodebox_column_cross_top(ContentFeatures *f);
#endif