Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-20 12:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

gltf_serializer: refactor proj code into a separate call

Browse Source
This commit is contained in:
Andrej730
2026-08-19 20:10:10 +05:00
parent f78b380b71
commit 335d571854
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/gltf_serializer.cpp
+11 -3
View File
@@ -508,7 +508,7 @@ void gltf_serializer::finalize() {
}
namespace {
void normalize(std::array<double, 3>& v) {
[[maybe_unused]] void normalize(std::array<double, 3>& v) {
auto l = std::sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
v[0] /= l;
@@ -516,13 +516,13 @@ namespace {
v[2] /= l;
}
void cross(const std::array<double, 3>& v1, const std::array<double, 3>& v2, std::array<double, 3>& result) {
[[maybe_unused]] void cross(const std::array<double, 3>& v1, const std::array<double, 3>& v2, std::array<double, 3>& result) {
result[0] = v1[1] * v2[2] - v1[2] * v2[1];
result[1] = v1[2] * v2[0] - v1[0] * v2[2];
result[2] = v1[0] * v2[1] - v1[1] * v2[0];
}
void proj_log(void* data, int, const char* c) {
[[maybe_unused]] void proj_log(void* data, int, const char* c) {
auto logger = static_cast<ifcopenshell::logger*>(data);
if (logger) {
logger->error("SER", 1, "PROJ: " + std::string(c));
@@ -627,6 +627,14 @@ void gltf_serializer::setFile(ifcopenshell::file& f) {
}
}
setup_georeferencing(crs_epsg, eastings_northings_elevation, crs_x_axis);
}
void gltf_serializer::setup_georeferencing(
[[maybe_unused]] const std::optional<std::string>& crs_epsg,
[[maybe_unused]] const std::optional<std::array<double, 3>>& eastings_northings_elevation,
[[maybe_unused]] std::optional<std::array<double, 3>> crs_x_axis)
{
#ifdef WITH_PROJ
if (crs_epsg) {
src/serializers/gltf_serializer.h
+4
View File
@@ -42,6 +42,10 @@ private:
std::vector<size_t> roots_;
int writeMaterial(const ifcopenshell::geom::taxonomy::style::ptr style);
void setup_georeferencing(
const std::optional<std::string>& crs_epsg,
const std::optional<std::array<double, 3>>& eastings_northings_elevation,
std::optional<std::array<double, 3>> crs_x_axis);
public:
gltf_serializer(const std::string& filename, const ifcopenshell::geom::settings& settings, ifcopenshell::logger* logger = nullptr);
virtual ~gltf_serializer();