Add OptiTrackPoint

trackpoint-app/CMakeLists.txt

@@ -18,6 +18,8 @@ SET(CMAKE_AUTORCC ON)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+ADD_COMPILE_DEFINITIONS(GL_SILENCE_DEPRECATION)
+
 # Qt
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/thirdparty/qt/install")
 FIND_PACKAGE(Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets REQUIRED NO_CMAKE_SYSTEM_PATH)
@@ -65,6 +67,7 @@ QT_ADD_EXECUTABLE(TrackpointApp
   src/PickHandler.cpp
   src/StoreHandler.cpp
   src/TrackPoint.cpp
+  src/OptiTrackPoint.cpp
   src/ThreeMFWriter.cpp
   src/OpenScadRenderer.cpp
   src/StringBasics.cpp

trackpoint-app/include/OptiTrackPoint.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "defaults.hpp"
+#include "TrackPoint.hpp"
+
+class OptiTrackPoint: TrackPoint {
+public:
+  OptiTrackPoint(const osg::Vec3 point, const osg::Vec3 normal, const double length = OPTITRACK_DEFAULT_LENGTH, const double radius = OPTITRACK_DEFAULT_RADIUS);
+  double getLength();
+  double getRadius();
+
+private:
+  double _length;
+  double _radius;
+};

trackpoint-app/include/TrackPoint.hpp

@@ -16,9 +16,9 @@ protected:
   osg::ref_ptr<osg::MatrixTransform> _translationGroup;
   osg::ref_ptr<osg::MatrixTransform> _rotationGroup;
   osg::ref_ptr<osg::MatrixTransform> _originFixGroup;
+  osg::Vec3 _trackOrigin;
 
 private:
   osg::Vec3 _origin;
   osg::Vec3 _normal;
-  osg::Vec3 _trackOrigin;
 };

trackpoint-app/src/OptiTrackPoint.cpp

@@ -0,0 +1,18 @@
+// Include own headers
+#include "OptiTrackPoint.hpp"
+
+OptiTrackPoint::OptiTrackPoint(const osg::Vec3 point, const osg::Vec3 normal, const double length, const double radius): TrackPoint(point, normal) {
+  _length = length;
+  _radius = radius;
+
+  osg::Vec3 shift = normal.operator*(10.0f);
+  _trackOrigin = shift.operator+(point);
+}
+
+double OptiTrackPoint::getLength() {
+  return _length;
+}
+
+double OptiTrackPoint::getRadius() {
+  return _radius;
+}

trackpoint-app/src/TrackPoint.cpp

@@ -11,7 +11,7 @@
 #include <osg/StateSet>
 
 TrackPoint::TrackPoint(osg::Vec3 point, osg::Vec3 normal) {
-  osg::ref_ptr<osg::Geode> geode = new osg::Geode;
+  /*osg::ref_ptr<osg::Geode> geode = new osg::Geode;
   osg::ref_ptr<osg::ShapeDrawable> cylinder = new osg::ShapeDrawable();
   cylinder->setShape(new osg::Cylinder(osg::Vec3(0.0f, 0.0f, 0.0f), 1.0f, 10.0f));
   cylinder->setColor(osg::Vec4(0.0f, 1.0f, 0.0f, 1.0f));
@@ -30,14 +30,10 @@ TrackPoint::TrackPoint(osg::Vec3 point, osg::Vec3 normal) {
 
   _translationGroup = new osg::MatrixTransform;
   _translationGroup->addChild(_originFixGroup.get());
-  _translationGroup->setMatrix(osg::Matrix::translate(point));
+  _translationGroup->setMatrix(osg::Matrix::translate(point));*/
 
   _origin = point;
   _normal = normal;
-
-  osg::Vec3 shift = normal.operator*(10.0f);
-  _trackOrigin = shift.operator+(point);
-  printf("TrackPoint is at %lf %lf %lf\n", _trackOrigin.x(), _trackOrigin.y(), _trackOrigin.z());
 }
 
 osg::ref_ptr<osg::MatrixTransform> TrackPoint::getUppermostRoot() {
@@ -49,8 +45,6 @@ osg::Vec3 TrackPoint::getTranslation() {
 }
 
 osg::Vec3 TrackPoint::getRotation() {
-  printf("YNorm: %lf %lf %lf\n", _normal.x(), _normal.y(), _normal.z());
-
   osg::Vec3 start = osg::Vec3(0.0f, 0.0f, 1.0f);
 
   // From https://en.wikipedia.org/wiki/Conversion_between_quaternions_and_Euler_angles