redstrate/prism
Archived
1
Fork 0
Code Activity

Add normal map importing to model compiler

Browse source
This commit is contained in:
Joshua Goins 2022-02-08 10:18:31 -05:00
parent 9ee41d01b6
commit b94a82b1e1
20 changed files with 54 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/materials/DefaultMaterial.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.6000000238418579,"y":0.6000000238418579,"z":0.6000000238418579}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.6000000238418579,"y":0.6000000238418579,"z":0.6000000238418579}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/kamen_zid.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/kamen_zid_parapet.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/kamen_zid_prozor.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/pod.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/mramor6x6.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7094119787216187,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/mramor6x6.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7094119787216187,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/pod_rub.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/pod_tepih.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":1.0,"y":0.11999999731779099,"z":0.10000000149011612}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":1.0,"y":0.11999999731779099,"z":0.10000000149011612}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/rozeta.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/sprljci.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.784313976764679,"y":0.784313976764679,"z":0.784313976764679}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.784313976764679,"y":0.784313976764679,"z":0.784313976764679}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/staklo.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/staklo_crveno.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.44117599725723267,"y":0.10392200201749802,"z":0.04901999980211258}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.44117599725723267,"y":0.10392200201749802,"z":0.04901999980211258}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/staklo_plavo.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/staklo_zeleno.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/staklo_zuto.material
View file

@ -1 +1 @@
{"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3} {"color":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/stupovi.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/KAMEN-stup.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

2
data/materials/zid_vani.material
View file

@ -1 +1 @@
{"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"version":3} {"color":{"asset_value":"textures/kamen.png","float_value":0.0,"name":"","type":2,"value":{"x":0.7341179847717285,"y":0.7305880188941956,"z":0.6741179823875427}},"normal":{"asset_value":"","float_value":0.0,"name":"","type":0,"value":{"x":0.0,"y":0.0,"z":0.0}},"version":3}

BIN
data/models/sibenik.model
View file

Binary file not shown.

1
engine/asset/include/asset_types.hpp
View file

@ -42,6 +42,7 @@ struct MaterialProperty {
class Material : public Asset { class Material : public Asset {
public: public:
MaterialProperty colorProperty; MaterialProperty colorProperty;
MaterialProperty normalProperty;
float metallic = 0.0f; float metallic = 0.0f;
float roughness = 0.5f; float roughness = 0.5f;

36
engine/asset/src/asset.cpp
View file

@ -266,15 +266,24 @@ std::unique_ptr<Material> load_material(const prism::path path) {
return mat; return mat;
} }
auto property = j["color"]; const auto loadProperty = [](nlohmann::json property) -> MaterialProperty {
mat->colorProperty.value = property["value"]; MaterialProperty p;
mat->colorProperty.float_value = property["float_value"]; p.value = property["value"];
mat->colorProperty.type = property["type"]; p.float_value = property["float_value"];
p.type = property["type"];
if(!property["asset_value"].get<std::string>().empty()) { if(!property["asset_value"].get<std::string>().empty()) {
mat->colorProperty.value_tex = assetm->get<Texture>(prism::app_domain / property["asset_value"].get<std::string>()); p.value_tex = assetm->get<Texture>(prism::app_domain / property["asset_value"].get<std::string>());
} }
return p;
};
mat->colorProperty = loadProperty(j["color"]);
if(j.contains("normal"))
mat->normalProperty = loadProperty(j["normal"]);
return mat; return mat;
} }
@ -285,14 +294,19 @@ void save_material(Material* material, const prism::path path) {
nlohmann::json j; nlohmann::json j;
j["version"] = 3; j["version"] = 3;
const auto save_property = [](MaterialProperty& property) -> nlohmann::json {
nlohmann::json p; nlohmann::json p;
p["name"] = material->colorProperty.name; p["name"] = property.name;
p["value"] = material->colorProperty.value; p["value"] = property.value;
p["asset_value"] = material->colorProperty.value_tex ? material->colorProperty.value_tex->path : ""; p["asset_value"] = property.value_tex ? property.value_tex->path : "";
p["float_value"] = material->colorProperty.float_value; p["float_value"] = property.float_value;
p["type"] = material->colorProperty.type; p["type"] = property.type;
j["color"] = p; return p;
};
j["color"] = save_property(material->colorProperty);
j["normal"] = save_property(material->normalProperty);
std::ofstream out(path); std::ofstream out(path);
out << j; out << j;

8
tools/modelcompiler/src/modeleditor.cpp
View file

@ -436,6 +436,14 @@ void ModelEditor::compile_model() {
mat.colorProperty.type = DataType::AssetTexture; mat.colorProperty.type = DataType::AssetTexture;
} }
aiString normal_path;
if(aiReturn_SUCCESS == aiGetMaterialTexture(sc->mMaterials[i], aiTextureType_NORMALS, 0, &normal_path)) {
mat.normalProperty.type = DataType::AssetTexture;
mat.normalProperty.value_tex.handle = new Texture();
mat.normalProperty.value_tex->path = std::string("textures/") + normal_path.C_Str();
mat.normalProperty.type = DataType::AssetTexture;
}
save_material(&mat, path); save_material(&mat, path);
} }
} }