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

reordering - nodeboxes

This commit is contained in:
Capricornus 2017-07-08 13:45:10 +02:00 committed by darkrose
parent 8c5a6c0702
commit 4012698444
5 changed files with 146 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/content_mapnode.cpp
View File

@ -1049,14 +1049,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_side.png", "glass.png", "glass_pane_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1082,14 +1075,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png", "glass_pane_blue_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1116,14 +1102,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_green_side.png", "glass.png^glass_pane_green_side.png", "glass_pane_green_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1150,14 +1129,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png", "glass_pane_orange_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1184,14 +1156,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png", "glass_pane_purple_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1218,14 +1183,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_red_side.png", "glass.png^glass_pane_red_side.png", "glass_pane_red_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1252,14 +1210,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png", "glass_pane_yellow_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1286,14 +1237,7 @@ void content_mapnode_init(bool repeat)
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.5*BS,
-0.05*BS,
0.5*BS,
0.5*BS,
0.05*BS
));
content_nodebox_glass_pane(f);
f->setInventoryTextureNodeBox(i,"glass_pane_black_side.png", "glass.png^glass_pane_black_side.png", "glass_pane_black_side.png");
f->type = CMT_GLASS;
f->dig_time = 0.15;
@ -1745,38 +1689,7 @@ void content_mapnode_init(bool repeat)
f->type = CMT_DIRT;
f->pressure_type = CST_CRUSHABLE;
f->dig_time = 0.3;
f->setNodeBox(core::aabbox3d<f32>(
-0.3125*BS,
-0.5*BS,
-0.3125*BS,
0.3125*BS,
0.125*BS,
0.3125*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.25*BS,
0.125*BS,
-0.25*BS,
0.25*BS,
0.5*BS,
0.25*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.0625*BS,
0.3125*BS,
-0.375*BS,
0.*BS,
0.375*BS,
-0.25*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.0625*BS,
-0.0625*BS,
0.5*BS,
0.*BS,
0.*BS
));
content_nodebox_snowman(f);
f->setInventoryTextureNodeBox(i,"snow.png", "snow.png", "snow.png");
{
content_t r[9] = {

41
src/content_mapnode_plants.cpp
View File

@ -744,46 +744,7 @@ void content_mapnode_plants(bool repeat)
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->extra_dug_item = std::string("CraftItem2 ") + itos (CONTENT_CRAFTITEM_MUSH) + " 1";
f->extra_dug_item_rarity = 10;
f->setNodeBox(core::aabbox3d<f32>(
-0.4375*BS,
-0.5*BS,
-0.4375*BS,
0.4375*BS,
0.5*BS,
0.4375*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.5*BS,
0.3125*BS,
-0.5*BS,
-0.4375*BS,
0.375*BS,
-0.4375*BS
));
f->addNodeBox(core::aabbox3d<f32>(
0.4375*BS,
0.125*BS,
0.4375*BS,
0.5*BS,
0.1875*BS,
0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
0.4375*BS,
-0.1875*BS,
-0.5*BS,
0.5*BS,
-0.125*BS,
-0.4375*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.5*BS,
-0.375*BS,
0.4375*BS,
-0.4375*BS,
-0.3125*BS,
0.5*BS
));
content_nodebox_cactus(f);
f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png");
f->type = CMT_WOOD;
f->dig_time = 0.75;

95
src/content_mapnode_special.cpp
View File

@ -218,9 +218,7 @@ void content_mapnode_special(bool repeat)
r[7] = CONTENT_CRAFTITEM_JUNGLE_PLANK;
crafting::setRecipe(r,CONTENT_RAIL,15);
}
f->setNodeBox(core::aabbox3d<f32>(
-0.5*BS,-0.5*BS,-0.5*BS,0.5*BS,-0.375*BS,0.5*BS
));
content_nodebox_rail(f);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
@ -518,18 +516,7 @@ void content_mapnode_special(bool repeat)
f->dig_time = 0.5;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
f->setNodeBox(core::aabbox3d<f32>(
-0.4375*BS,-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
0.3125*BS,-0.5*BS,0.3125*BS,0.4375*BS,0.5*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,-0.25*BS,0.375*BS,0.3125*BS,-0.1875*BS,0.4375*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,0.25*BS,0.375*BS,0.3125*BS,0.3125*BS,0.4375*BS
));
content_nodebox_ladder_wall(f);
f->setInventoryTextureNodeBox(i,"ladder.png","ladder.png","ladder.png");
{
u16 r[9] = {
@ -577,18 +564,7 @@ void content_mapnode_special(bool repeat)
f->dig_time = 0.5;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
f->setNodeBox(core::aabbox3d<f32>(
-0.4375*BS,-0.5*BS,-0.5*BS,-0.3125*BS,-0.3125*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
0.3125*BS,-0.5*BS,-0.5*BS,0.4375*BS,-0.3125*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,-0.4375*BS,-0.3125*BS,0.3125*BS,-0.375*BS,-0.25*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,-0.4375*BS,0.1875*BS,0.3125*BS,-0.375*BS,0.25*BS
));
content_nodebox_ladder_floor(f);
i = CONTENT_LADDER_ROOF;
f = &content_features(i);
@ -611,18 +587,7 @@ void content_mapnode_special(bool repeat)
f->dig_time = 0.5;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
f->setNodeBox(core::aabbox3d<f32>(
-0.4375*BS,0.3125*BS,-0.5*BS,-0.3125*BS,0.5*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
0.3125*BS,0.3125*BS,-0.5*BS,0.4375*BS,0.5*BS,0.5*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,0.375*BS,-0.3125*BS,0.3125*BS,0.4375*BS,-0.25*BS
));
f->addNodeBox(core::aabbox3d<f32>(
-0.3125*BS,0.375*BS,0.1875*BS,0.3125*BS,0.4375*BS,0.25*BS
));
content_nodebox_ladder_roof(f);
i = CONTENT_BORDERSTONE;
f = &content_features(i);
@ -1101,18 +1066,7 @@ void content_mapnode_special(bool repeat)
f->sunlight_propagates = true;
f->air_equivalent = true;
f->rotate_tile_with_nodebox = true;
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.4375*BS,0.5*BS,0.3125*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.375*BS,-0.125*BS,0.5*BS,0.4375*BS,0.125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.0625*BS,-0.5*BS,0.0625*BS,0.125*BS,-0.4375*BS
));
content_nodebox_chest(f);
f->setInventoryTextureNodeBox(i,"wood.png^chests_top.png", "wood.png^chests_front.png", "wood.png^chests_side.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if (f->initial_metadata == NULL)
@ -1146,18 +1100,7 @@ void content_mapnode_special(bool repeat)
f->sunlight_propagates = true;
f->air_equivalent = true;
f->rotate_tile_with_nodebox = true;
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.4375*BS,0.5*BS,0.3125*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.375*BS,-0.125*BS,0.5*BS,0.4375*BS,0.125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.0625*BS,-0.5*BS,0.0625*BS,0.125*BS,-0.4375*BS
));
content_nodebox_chest(f);
f->setInventoryTextureNodeBox(i,"pine.png^chests_top.png", "pine.png^chests_front.png", "pine.png^chests_side.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if (f->initial_metadata == NULL)
@ -1191,18 +1134,7 @@ void content_mapnode_special(bool repeat)
f->sunlight_propagates = true;
f->air_equivalent = true;
f->rotate_tile_with_nodebox = true;
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.4375*BS,0.5*BS,0.3125*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.375*BS,-0.125*BS,0.5*BS,0.4375*BS,0.125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.0625*BS,-0.5*BS,0.0625*BS,0.125*BS,-0.4375*BS
));
content_nodebox_chest(f);
f->setInventoryTextureNodeBox(i,"junglewood.png^chests_top.png", "junglewood.png^chests_front.png", "junglewood.png^chests_side.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if (f->initial_metadata == NULL)
@ -1236,18 +1168,7 @@ void content_mapnode_special(bool repeat)
f->sunlight_propagates = true;
f->air_equivalent = true;
f->rotate_tile_with_nodebox = true;
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.4375*BS,0.5*BS,0.3125*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.375*BS,-0.125*BS,0.5*BS,0.4375*BS,0.125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.0625*BS,-0.5*BS,0.0625*BS,0.125*BS,-0.4375*BS
));
content_nodebox_chest(f);
f->setInventoryTextureNodeBox(i,"applewood.png^chests_top.png", "applewood.png^chests_front.png", "applewood.png^chests_side.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
if (f->initial_metadata == NULL)

120
src/content_nodebox.cpp
View File

@ -2217,3 +2217,123 @@ void content_nodebox_activelockedcrusher(ContentFeatures *f)
-0.375*BS,-0.0625*BS,-0.0625*BS,0.375*BS,0.0625*BS,0.0625*BS
));
}
void content_nodebox_cactus(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.4375*BS,-0.5*BS,-0.4375*BS,0.4375*BS,0.5*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.5*BS,-0.4375*BS,0.375*BS,-0.4375*BS
));
f->addNodeBox(NodeBox(
0.4375*BS,0.125*BS,0.4375*BS,0.5*BS,0.1875*BS,0.5*BS
));
f->addNodeBox(NodeBox(
0.4375*BS,-0.1875*BS,-0.5*BS,0.5*BS,-0.125*BS,-0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,-0.375*BS,0.4375*BS,-0.4375*BS,-0.3125*BS,0.5*BS
));
}
void content_nodebox_ladder_wall(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.4375*BS,-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.5*BS
));
f->addNodeBox(NodeBox(
0.3125*BS,-0.5*BS,0.3125*BS,0.4375*BS,0.5*BS,0.5*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,-0.25*BS,0.375*BS,0.3125*BS,-0.1875*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,0.25*BS,0.375*BS,0.3125*BS,0.3125*BS,0.4375*BS
));
}
void content_nodebox_ladder_floor(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.4375*BS,-0.5*BS,-0.5*BS,-0.3125*BS,-0.3125*BS,0.5*BS
));
f->addNodeBox(NodeBox(
0.3125*BS,-0.5*BS,-0.5*BS,0.4375*BS,-0.3125*BS,0.5*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,-0.4375*BS,-0.3125*BS,0.3125*BS,-0.375*BS,-0.25*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,-0.4375*BS,0.1875*BS,0.3125*BS,-0.375*BS,0.25*BS
));
}
void content_nodebox_ladder_roof(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.4375*BS,0.3125*BS,-0.5*BS,-0.3125*BS,0.5*BS,0.5*BS
));
f->addNodeBox(NodeBox(
0.3125*BS,0.3125*BS,-0.5*BS,0.4375*BS,0.5*BS,0.5*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,0.375*BS,-0.3125*BS,0.3125*BS,0.4375*BS,-0.25*BS
));
f->addNodeBox(NodeBox(
-0.3125*BS,0.375*BS,0.1875*BS,0.3125*BS,0.4375*BS,0.25*BS
));
}
void content_nodebox_rail(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.5*BS,0.5*BS,-0.375*BS,0.5*BS
));
}
void content_nodebox_chest(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.4375*BS,0.5*BS,0.3125*BS,0.4375*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.375*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,0.375*BS,-0.125*BS,0.5*BS,0.4375*BS,0.125*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,-0.0625*BS,-0.5*BS,0.0625*BS,0.125*BS,-0.4375*BS
));
}
void content_nodebox_glass_pane(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.5*BS,-0.5*BS,-0.05*BS,0.5*BS,0.5*BS,0.05*BS
));
}
void content_nodebox_snowman(ContentFeatures *f)
{
f->setNodeBox(NodeBox(
-0.3125*BS,-0.5*BS,-0.3125*BS,0.3125*BS,0.125*BS,0.3125*BS
));
f->addNodeBox(NodeBox(
-0.25*BS,0.125*BS,-0.25*BS,0.25*BS,0.5*BS,0.25*BS
));
f->addNodeBox(NodeBox(
-0.0625*BS,0.3125*BS,-0.375*BS,0.*BS,0.375*BS,-0.25*BS
));
f->addNodeBox(NodeBox(
-0.5*BS,-0.0625*BS,-0.0625*BS,0.5*BS,0.*BS,0.*BS
));
}

8
src/content_nodebox.h
View File

@ -94,5 +94,13 @@ void content_nodebox_crusher(ContentFeatures *f);
void content_nodebox_activecrusher(ContentFeatures *f);
void content_nodebox_lockedcrusher(ContentFeatures *f);
void content_nodebox_activelockedcrusher(ContentFeatures *f);
void content_nodebox_cactus(ContentFeatures *f);
void content_nodebox_ladder_wall(ContentFeatures *f);
void content_nodebox_ladder_floor(ContentFeatures *f);
void content_nodebox_ladder_roof(ContentFeatures *f);
void content_nodebox_rail(ContentFeatures *f);
void content_nodebox_chest(ContentFeatures *f);
void content_nodebox_glass_pane(ContentFeatures *f);
void content_nodebox_snowman(ContentFeatures *f);
#endif