summaryrefslogtreecommitdiff
path: root/assetFactory
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-06-01 14:02:42 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2024-06-01 14:02:42 +0100
commit519ebadf219ef3b6b75dd84842ef5b56589c4c3b (patch)
tree591fa2783d4d579325662da42dcdbb7fb9f55d74 /assetFactory
parentFix setting of pedantic warnings (diff)
downloadilt-519ebadf219ef3b6b75dd84842ef5b56589c4c3b.tar.bz2
ilt-519ebadf219ef3b6b75dd84842ef5b56589c4c3b.tar.xz
ilt-519ebadf219ef3b6b75dd84842ef5b56589c4c3b.zip
Remove conflicting glm::vec operators
% and %= already exist and abusing them for simplifying perspective multiplication was always a bad idea. Here they just become named functions.
Diffstat (limited to 'assetFactory')
-rw-r--r--assetFactory/faceController.cpp2
-rw-r--r--assetFactory/use.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 10a0c1e..3f75b38 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -53,7 +53,7 @@ FaceController::extrude(ModelFactoryMesh & mesh, const std::string & faceName, O
// create new vertices
const auto vertices
= baseVertices * [&mesh, mutation = getMatrix(), centre = mesh.calc_face_centroid(faceHandle)](auto && v) {
- return mesh.add_vertex(centre + ((mesh.point(v) - centre) % mutation));
+ return mesh.add_vertex(centre + perspectiveMultiply((mesh.point(v) - centre), mutation));
};
// get new faces names
const auto vertexCount = baseVertices.size();
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index d5ea39d..42bc703 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -15,7 +15,7 @@ Use::createMesh(ModelFactoryMesh & mesh, Scale3D levelOfDetailFactor) const
const auto fvr = mesh.fv_range(f.second);
for (const auto & v : fvr) {
if (!vs.contains(v)) {
- mesh.point(v) %= m;
+ perspectiveApply(mesh.point(v), m);
vs.insert(v);
}
}