Changeset 1045 for cpp/frams/_demos/geometry/geometrytestutils.cpp

Timestamp:

12/11/20 20:23:42 (4 years ago)

Author:

oriona

Message:

Part of GeometryTestUtils? functions moved to GeometryUtils?.

File:

• cpp/frams/_demos/geometry/geometrytestutils.cpp (modified) (3 diffs)

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -4 +4 @@
 
 #include "geometrytestutils.h"
-
 #include "../genotypeloader.h"
 #include "frams/genetics/preconfigured.h"
 #include <common/virtfile/stdiofile.h>
 #include <common/loggers/loggertostdout.h>
+#include <frams/model/geometry/geometryutils.h>
 #include <math.h>
 #include <stdio.h>
@@ -99 +99 @@
 
         Part *part = model.addNewPart(Part::Shape(shape));
-        GeometryTestUtils::randomizePositionScaleAndOrient(part);
+        GeometryUtils::randomizePositionScaleAndOrient(part);
 
         model.close();
@@ -233 +233 @@
 }
 
-void GeometryTestUtils::addAnchorToModel(Model &model)
-{
-        Part *part = model.addNewPart(Part::SHAPE_ELLIPSOID);
-
-        part->p = Pt3D(0);
-        part->scale = Pt3D(0.1);
-        part->vcolor = Pt3D(1.0, 0.0, 1.0);
-
-        addAxesToModel(Pt3D(0.5), Orient(Orient_1), Pt3D(0.0), model);
-}
-
-void GeometryTestUtils::addPointToModel(const Pt3D &markerLocation, Model &model)
-{
-        Part *anchor = model.getPart(0);
-        Part *part = model.addNewPart(Part::SHAPE_ELLIPSOID);
-
-        part->p = Pt3D(markerLocation);
-        part->scale = Pt3D(0.05);
-        part->vcolor = Pt3D(1.0, 1.0, 0.0);
-
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-}
-
-void GeometryTestUtils::addAxesToModel(const Pt3D &sizes, const Orient &axes, const Pt3D &center,
-        Model &model)
-{
-        Part *anchor = model.getPart(0);
-        Part *part;
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(sizes.x, 0.05, 0.05);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(1.0, 0.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(0.05, sizes.y, 0.05);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(0.0, 1.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(0.05, 0.05, sizes.z);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(0.0, 0.0, 1.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-}
-
-void GeometryTestUtils::mergeModels(Model &target, Model &source)
-{
-        Part *targetAnchor = target.getPart(0);
-        Part *sourceAnchor = source.getPart(0);
-
-        target.moveElementsFrom(source);
-
-        target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_FIXED);
-}
-
-double frand(double from, double width)
-{
-        return from + width * ((rand() % 10000) / 10000.0);
-}
-
-void GeometryTestUtils::randomizePositionScaleAndOrient(Part *part)
-{
-        part->p = Pt3D(frand(1.5, 1.0), frand(1.5, 1.0), frand(1.5, 1.0));
-        part->scale = Pt3D(frand(0.1, 0.9), frand(0.1, 0.9), frand(0.1, 0.9));
-        part->setRot(Pt3D(frand(0.0, M_PI), frand(0.0, M_PI), frand(0.0, M_PI)));
-}
-
 void GeometryTestUtils::describePart(const Part *part, FILE *output)
 {