diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
| commit | 108bf5b2424da06aa2e1735ffd10a2b713834db8 (patch) | |
| tree | af0918a6a266aa7e6ee1d8129df6d5ef9fc4f8ab /assetFactory | |
| parent | Remove more use of legacy types and unnecessary pointers from selectable inte... (diff) | |
| parent | Remove Position3D from RailVehicle (diff) | |
| download | ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.bz2 ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.xz ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.zip | |
Merge branch 'template-types'
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/faceController.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/faceController.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp index d045b3c..10a0c1e 100644 --- a/assetFactory/faceController.cpp +++ b/assetFactory/faceController.cpp @@ -90,7 +90,7 @@ FaceController::split( const size_t nextIdx = (curIdx + 1) % vertexRelations.size(); const auto ¤t = vertexRelations[curIdx], next = vertexRelations[nextIdx]; if (GeometricPlane::isIntersect(current.second, next.second)) { - const auto ray = Ray::fromPoints(mesh.point(current.first), mesh.point(next.first)); + const auto ray = RayFactory::fromPoints(mesh.point(current.first), mesh.point(next.first)); const auto intersect = split.getRayIntersectPosition(ray); assert(intersect); const auto newv = mesh.add_vertex(intersect->position); diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h index fb89d25..e940640 100644 --- a/assetFactory/faceController.h +++ b/assetFactory/faceController.h @@ -11,7 +11,7 @@ class FaceController : public Mutation, public Style, public Persistence::Persistable { public: - class Split : public Persistable, public GeometricPlane { + class Split : public Persistable, public GeometricPlaneT<RelativePosition3D> { public: std::string id; |