voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added hash-comments, customfaces introduced

Browse source
This commit is contained in:
A-lex-Ra 2024-01-08 12:36:04 +06:00
parent f53e45486c
commit 82851fec83
6 changed files with 105 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/content/ContentLoader.cpp
View file

@ -85,13 +85,18 @@ Block* ContentLoader::loadBlock(std::string name, fs::path file) {
if (root->has("texture")) {
std::string texture;
root->str("texture", texture);
for (uint i = 0; i < 6; i++)
for (uint i = 0; i < 6; i++) {
def->textureFaces[i] = texture;
}
} else if (root->has("texture-faces")) {
json::JArray* texarr = root->arr("texture-faces");
for (uint i = 0; i < 6; i++) {
def->textureFaces[i] = texarr->str(i);
}
for (uint i = 6; i < texarr->values.size(); i++)
{
def->textureMoreFaces.push_back(texarr->str(i));
}
}
// block model
@ -99,6 +104,16 @@ Block* ContentLoader::loadBlock(std::string name, fs::path file) {
root->str("model", model);
if (model == "block") def->model = BlockModel::block;
else if (model == "aabb") def->model = BlockModel::aabb;
else if (model == "custom") {
def->model = BlockModel::customfaces;
json::JArray* pointarr = root->arr("faces-points");
for (uint i = 0; i < pointarr->values.size(); i+=3)
{
def->customfacesPoints.push_back(glm::vec3(pointarr->num(i),
pointarr->num(i+1),
pointarr->num(i + 2)));
}
}
else if (model == "X") def->model = BlockModel::xsprite;
else if (model == "none") def->model = BlockModel::none;
else {