瀏覽代碼

Fix compilation, fix normalize modifier

Johannes Kreutz 3 年之前
父節點
當前提交
d319891bbf
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      trackpoint-app/src/PickHandler.cpp
  2. 2 1
      trackpoint-app/src/TrackPointRenderer.cpp

+ 2 - 1
trackpoint-app/src/PickHandler.cpp

@@ -125,12 +125,13 @@ void PickHandler::moveTo(osg::Vec3f position) {
 }
 
 void PickHandler::rotateToNormalVector(osg::Vec3f normal) {
+  MainWindow::getInstance()->getEditWiget()->updateNormals(normal);
   osg::Vec3 modifier = MainWindow::getInstance()->getStore()->getNormalModifier();
   normal = normal.operator+(modifier);
+  normal.normalize();
   _selectionRotateGroup->setMatrix(osg::Matrix::rotate(osg::Vec3f(0.0f, 0.0f, 1.0f), normal));
   osg::Vec3f movementVector = normal.operator*(_optiTrackSteamVRLength / 2);
   _selectionMoveToEndGroup->setMatrix(osg::Matrix::translate(movementVector));
-  MainWindow::getInstance()->getEditWiget()->updateNormals(normal);
 }
 
 void PickHandler::updateRenderer() {

+ 2 - 1
trackpoint-app/src/TrackPointRenderer.cpp

@@ -2,7 +2,8 @@
 #include "TrackPointRenderer.hpp"
 
 // Include modules
-
+#include "OptiTrackPoint.hpp"
+#include "MainWindow.hpp"
 
 // Include dependencies