Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 10:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gltf serializer compilation

Browse Source
This commit is contained in:
Thomas Krijnen
2020-04-03 14:23:23 +02:00
parent 63b9b7baa7
commit 47b2da6082
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/GltfSerializer.cpp
+17 -10
View File
@@ -78,29 +78,32 @@ void GltfSerializer::writeHeader() {
json_["materials"] = json::array(); json_["materials"] = json::array();
} }
int GltfSerializer::writeMaterial(const IfcGeom::Material& style) { int GltfSerializer::writeMaterial(const ifcopenshell::geometry::taxonomy::style& style) {
auto it = materials_.find(style.name()); // @todo is it safe to always dereference this optional?
const std::string& name = *style.name;
auto it = materials_.find(name);
if (it != materials_.end()) { if (it != materials_.end()) {
return it->second; return it->second;
} }
int idx = json_["materials"].size(); int idx = json_["materials"].size();
materials_[style.name()] = idx; materials_[name] = idx;
std::array<double, 4> base; std::array<double, 4> base;
base.fill(1.0); base.fill(1.0);
if (style.hasDiffuse()) { if (style.diffuse) {
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
base[i] = style.diffuse()[i]; base[i] = style.diffuse->components[i];
} }
} }
if (style.hasTransparency()) { if (style.transparency) {
base[3] = 1. - style.transparency(); base[3] = 1. - *style.transparency;
} }
json_["materials"].push_back({ {"pbrMetallicRoughness", {{"baseColorFactor", base}, {"metallicFactor", 0}}} }); json_["materials"].push_back({ {"pbrMetallicRoughness", {{"baseColorFactor", base}, {"metallicFactor", 0}}} });
if (style.hasTransparency() && style.transparency() > 1.e-9) { if (style.transparency && *style.transparency > 1.e-9) {
json_["materials"].back()["alphaMode"] = "BLEND"; json_["materials"].back()["alphaMode"] = "BLEND";
} }
@@ -157,14 +160,17 @@ size_t write_accessor(json& j, std::ofstream& ofs, It begin, It end) {
return j["accessors"].size() - 1; return j["accessors"].size() - 1;
} }
void GltfSerializer::write(const IfcGeom::TriangulationElement<real_t>* o) { void GltfSerializer::write(const ifcopenshell::geometry::TriangulationElement* o) {
if (o->geometry().material_ids().empty()) { if (o->geometry().material_ids().empty()) {
return; return;
} }
node_array_.push_back(json_["nodes"].size()); node_array_.push_back(json_["nodes"].size());
const std::vector<double>& m = o->transformation().matrix().data(); const double* m = o->transformation().data().components.data();
// @todo verify
// nb: note that this contains the Y-UP transform as well. // nb: note that this contains the Y-UP transform as well.
const std::array<double, 16> matrix_flat = { const std::array<double, 16> matrix_flat = {
m[0], m[ 2], -m[ 1], 0, m[0], m[ 2], -m[ 1], 0,
@@ -172,6 +178,7 @@ void GltfSerializer::write(const IfcGeom::TriangulationElement<real_t>* o) {
m[6], m[ 8], -m[ 7], 0, m[6], m[ 8], -m[ 7], 0,
m[9], m[11], -m[10], 1 m[9], m[11], -m[10], 1
}; };
static const std::array<double, 16> identity_matrix = {1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1}; static const std::array<double, 16> identity_matrix = {1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1};
json node; json node;
src/serializers/GltfSerializer.h
+3 -3
View File
@@ -36,14 +36,14 @@ private:
std::map<std::string, int> materials_, meshes_; std::map<std::string, int> materials_, meshes_;
json json_, node_array_; json json_, node_array_;
int writeMaterial(const IfcGeom::Material& style); int writeMaterial(const ifcopenshell::geometry::taxonomy::style& style);
public: public:
GltfSerializer(const std::string& filename, const SerializerSettings& settings); GltfSerializer(const std::string& filename, const SerializerSettings& settings);
virtual ~GltfSerializer(); virtual ~GltfSerializer();
bool ready(); bool ready();
void writeHeader(); void writeHeader();
void write(const IfcGeom::TriangulationElement<real_t>* o); void write(const ifcopenshell::geometry::TriangulationElement* o);
void write(const IfcGeom::NativeElement<real_t>* /*o*/) {} void write(const ifcopenshell::geometry::NativeElement* /*o*/) {}
void finalize(); void finalize();
bool isTesselated() const { return true; } bool isTesselated() const { return true; }
void setUnitNameAndMagnitude(const std::string& /*name*/, float /*magnitude*/) {} void setUnitNameAndMagnitude(const std::string& /*name*/, float /*magnitude*/) {}