Changed the preprocessor directives

Signed-off-by: Patryk Skowroński <[email protected]>
OpenChemistry · Jul 5, 2023 · 7cc4d16 · 7cc4d16
1 parent c6922cd
commit 7cc4d16
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp
@@ -12,10 +12,7 @@
 #include "renderingdialog.h"
 #include "tooltipfilter.h"
 #include "viewfactory.h"
-
-#ifdef _3DCONNEXION
 #include "tdxcontroller.h"
-#endif
 
 #include <avogadro/core/elements.h>
 #include <avogadro/io/cjsonformat.h>

diff --git a/avogadro/menubuilder.h b/avogadro/menubuilder.h
@@ -62,12 +62,10 @@ class MenuBuilder : public QObject
    */
   void print();
 
-  #ifdef _3DCONNEXION
   /**
    * @brief Get the map of string to action lists.
    */
   const QMap<QString, QList<QAction*>> &getMenuActions() const { return m_menuActions; };
-  #endif
 
 private:
   /** A map of string to action lists. */

diff --git a/avogadro/tdxcontroller.cpp b/avogadro/tdxcontroller.cpp
@@ -423,10 +423,16 @@ long Avogadro::TDxController::GetHitLookAt(navlib::point_t &position) const
     origin = transform * Eigen::Vector4f(0., 0., 0., 1.);
     origin /= origin.w();
 
-    distance = m_pGLRenderer->scene().getHitDistance(
-      Eigen::Vector3f(origin.x(), origin.y(), origin.z()),
-      Eigen::Vector3f(m_lookDirection.x, m_lookDirection.y, m_lookDirection.z),
-      rayLength);
+	auto rayOrigin = Eigen::Vector3f(origin.x(), origin.y(), origin.z());
+	auto rayDirection = Eigen::Vector3f(m_lookDirection.x,
+		                                m_lookDirection.y,
+		                                m_lookDirection.z);
+
+	distance = m_pGLRenderer->hit(
+      rayOrigin,
+      rayOrigin + rayLength * rayDirection,
+      rayDirection);
+
   } else {
 
     Eigen::Vector4f originBuffer = Eigen::Vector4f::Zero();
@@ -439,12 +445,15 @@ long Avogadro::TDxController::GetHitLookAt(navlib::point_t &position) const
       originBuffer = transform * Eigen::Vector4f(x, y, 0., 1.);
       originBuffer /= originBuffer.w();
 
-      float buffer = m_pGLRenderer->scene().getHitDistance(
-        Eigen::Vector3f(originBuffer.x(), originBuffer.y(), originBuffer.z()),
-        Eigen::Vector3f(m_lookDirection.x,
-						m_lookDirection.y,
-                        m_lookDirection.z),
-		rayLength);
+	  auto rayOrigin = Eigen::Vector3f(originBuffer.x(), originBuffer.y(), originBuffer.z());
+      auto rayDirection = Eigen::Vector3f(m_lookDirection.x,
+                                          m_lookDirection.y,
+                                          m_lookDirection.z);
+
+      float buffer = m_pGLRenderer->hit(
+		  rayOrigin,
+		  rayOrigin + rayLength * rayDirection, 
+		  rayDirection);
 
       if (buffer > 0.0f && buffer < distance) {
         origin = originBuffer;

diff --git a/avogadro/tdxcontroller.h b/avogadro/tdxcontroller.h
@@ -3,7 +3,10 @@
   This source code is released under the 3-Clause BSD License, (see "LICENSE").
 ******************************************************************************/
 
-#pragma once
+#ifdef _3DCONNEXION
+#ifndef AVOGADRO_TDXCONTROLLER_H 
+#define AVOGADRO_TDXCONTROLLER_H
+
 #include <SpaceMouse/CImage.hpp>
 #include <SpaceMouse/CNavigation3D.hpp>
 
@@ -153,5 +156,7 @@ class TDxController : private TDx::SpaceMouse::Navigation3D::CNavigation3D, priv
   virtual long SetActiveCommand(std::string commandId) override;
   virtual long SetTransaction(long value) override;
 };
+}
 
-}
+#endif // ! AVOGADRO_TDXCONTROLLER_H
+#endif //  _3DCONNEXION