Merge pull request #34 from envire/osgviz

Use osgviz
rock-core · Feb 18, 2019 · e714abd · e714abd
2 parents e55574a + f2d2ab8
commit e714abd
Show file tree

Hide file tree

Showing 15 changed files with 621 additions and 786 deletions.
diff --git a/manifest.xml b/manifest.xml
@@ -12,5 +12,6 @@
     <depend package="qt4-opengl" />
     <depend package="boost" />
     <depend package="base/cmake" />
+    <depend package="gui/osgviz" />
     <!--    <depend package="qt-designer" /> !-->
 </package>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,7 +19,6 @@ rock_library(vizkit3d
         ${PROPERTY_BROWSER_RESOURCES} 
     MOC
         Vizkit3DPlugin.cpp 
-        PickHandler.cpp
         Vizkit3DWidget.cpp
         QVizkitMainWindow.cpp
         qtpropertybrowser/qteditorfactory.cpp
@@ -44,15 +43,15 @@ rock_library(vizkit3d
         Vizkit3DPlugin.hpp
         Vizkit3DWidget.hpp
         QVizkitMainWindow.hpp
-        PickHandler.hpp
         ColorConversionHelper.hpp
         CoordinateFrame.hpp
         EnvPluginBase.hpp
         DefaultManipulator.hpp
         ${HEADERS_EXTRA}
     LIBS ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY}
     DEPS_CMAKE OpenGL
-    DEPS_PKGCONFIG openscenegraph openscenegraph-osgQt ${DEPS_EXTRA})
+    DEPS_PKGCONFIG openscenegraph openscenegraph-osgQt osgViz
+                   PrimitivesFactory ManipulationClickHandler ${DEPS_EXTRA})
 
 rock_library(vizkitwidgetloader
     MOC QVizkitWidgetLoader.cpp

diff --git a/src/ConnexionPlugin.cpp b/src/ConnexionPlugin.cpp
diff --git a/src/ConnexionPlugin.h b/src/ConnexionPlugin.h
diff --git a/src/NodeLink.cpp b/src/NodeLink.cpp
@@ -1,6 +1,9 @@
 #include "NodeLink.hpp"
+#include <osgViz/windows/EventHandlers/NullClickObject.h>
+
 
 #include <osg/Point>
+#include <osgViz/Object.h>
 #include <assert.h>
 #include <iostream>
 #include <stdexcept>
@@ -52,7 +55,7 @@ namespace vizkit
     ::osg::Node* NodeLink::create(::osg::Node *node1, ::osg::Node *node2, const ::osg::Vec4 &color)
     {
         assert(node1 && node2);
-
+        osgviz::Object* object = new osgviz::NullClickObject(); //click events should not propagate through nodelinks
         ::osg::Geode* geode = new ::osg::Geode();
         geode->setName(node2->getName());
         ::osg::Geometry* geometry = new ::osg::Geometry();
@@ -89,6 +92,8 @@ namespace vizkit
 
         NodeCallback *callback = new NodeCallback(node1,node2);
         geode->setUpdateCallback(callback);
-        return (::osg::Node*)geode;
+        object->addChild(geode);
+
+        return (::osg::Node*)object;
     }
 }