Proceed with merge

This commit is contained in:
Thomas Krijnen
2023-03-21 20:15:01 +01:00
parent cfb0eda067
commit c78b2893de
194 changed files with 105325 additions and 7785 deletions
+2 -2
View File
@@ -23,7 +23,7 @@
#ifdef WITH_GLTF
#include "../serializers/serializers_api.h"
#include "../ifcgeom_schema_agnostic/GeometrySerializer.h"
#include "../ifcgeom/GeometrySerializer.h"
#include <nlohmann/json.hpp>
using json = nlohmann::json;
@@ -37,7 +37,7 @@ private:
std::map<std::string, int> materials_, meshes_;
json json_, node_array_;
int writeMaterial(const IfcGeom::Material& style);
int writeMaterial(const ifcopenshell::geometry::taxonomy::style& style);
public:
GltfSerializer(const std::string& filename, const SerializerSettings& settings);
virtual ~GltfSerializer();