line segment intersector added; line segment selection interaction added

Author: vicrucann

src/libSGControls/CMakeLists.txt

@@ -26,6 +26,7 @@ set (libSGControls_SRCS
     EditEntityCommand.cpp
     StrokeIntersector.h
     StrokeIntersector.cpp
+    Entity2DIntersector.h
     LineIntersector.h
     LineIntersector.cpp
     PolyLineIntersector.h

src/libSGControls/Entity2DIntersector.h

@@ -0,0 +1,152 @@
+#ifndef ENTITY2DINTERSECTOR_H
+#define ENTITY2DINTERSECTOR_H
+
+#include <vector>
+
+#include <osg/ref_ptr>
+#include <osgUtil/LineSegmentIntersector>
+
+#include "Utilities.h"
+
+// TODO: instead of using intersectors for each entity type, use this one with
+// provided template, e.g. entity::Stroke, entity::Photo, etc.
+
+template <typename EntityType>
+class Entity2DIntersector : public osgUtil::LineSegmentIntersector
+{
+public:
+    Entity2DIntersector()
+        : osgUtil::LineSegmentIntersector(MODEL, 0.f, 0.f)
+        , m_offset(0.05f)
+    {
+        m_hitIndices.clear();
+    }
+
+    Entity2DIntersector(const osg::Vec3& start, const osg::Vec3& end)
+        : osgUtil::LineSegmentIntersector(start, end)
+        , m_offset(0.05f)
+    {
+        m_hitIndices.clear();
+    }
+
+    Entity2DIntersector(CoordinateFrame cf, double x, double y)
+        : osgUtil::LineSegmentIntersector(cf, x, y)
+        , m_offset(0.05f)
+    {
+        m_hitIndices.clear();
+    }
+
+    Entity2DIntersector(CoordinateFrame cf, const osg::Vec3d& start, const osg::Vec3d& end)
+        : osgUtil::LineSegmentIntersector(cf, start, end)
+        , m_offset(0.05f)
+    {
+        m_hitIndices.clear();
+    }
+
+    void setOffset(float offset)
+    {
+        m_offset = offset;
+    }
+
+    float getOffset() const
+    {
+        return m_offset;
+    }
+
+    void getHitIndices(int& first, int& last) const
+    {
+        if (m_hitIndices.empty()){
+            first = -1;
+            last = -1;
+        }
+        else {
+            first = m_hitIndices.front();
+            last = m_hitIndices.back();
+        }
+    }
+
+    virtual Intersector* clone( osgUtil::IntersectionVisitor& iv )
+    {
+        if ( _coordinateFrame==MODEL && iv.getModelMatrix()==0 )
+        {
+            osg::ref_ptr<Entity2DIntersector> cloned = new Entity2DIntersector( _start, _end );
+            cloned->_parent = this;
+            cloned->m_offset = m_offset;
+            return cloned.release();
+        }
+
+        osg::Matrix matrix;
+        switch ( _coordinateFrame )
+        {
+        case WINDOW:
+            if (iv.getWindowMatrix()) matrix.preMult( *iv.getWindowMatrix() );
+            if (iv.getProjectionMatrix()) matrix.preMult( *iv.getProjectionMatrix() );
+            if (iv.getViewMatrix()) matrix.preMult( *iv.getViewMatrix() );
+            if (iv.getModelMatrix()) matrix.preMult( *iv.getModelMatrix() );
+            break;
+        case PROJECTION:
+            if (iv.getProjectionMatrix()) matrix.preMult( *iv.getProjectionMatrix() );
+            if (iv.getViewMatrix()) matrix.preMult( *iv.getViewMatrix() );
+            if (iv.getModelMatrix()) matrix.preMult( *iv.getModelMatrix() );
+            break;
+        case VIEW:
+            if (iv.getViewMatrix()) matrix.preMult( *iv.getViewMatrix() );
+            if (iv.getModelMatrix()) matrix.preMult( *iv.getModelMatrix() );
+            break;
+        case MODEL:
+            if (iv.getModelMatrix()) matrix = *iv.getModelMatrix();
+            break;
+        }
+
+        osg::Matrix inverse = osg::Matrix::inverse(matrix);
+        osg::ref_ptr<Entity2DIntersector> cloned = new Entity2DIntersector( _start*inverse, _end*inverse );
+        cloned->_parent = this;
+        cloned->m_offset = m_offset;
+        return cloned.release();
+    }
+
+    virtual void intersect( osgUtil::IntersectionVisitor& iv, osg::Drawable* drawable )
+    {
+        osg::BoundingBox bb = drawable->getBoundingBox();
+        bb.xMin() -= m_offset; bb.xMax() += m_offset;
+        bb.yMin() -= m_offset; bb.yMax() += m_offset;
+        bb.zMin() -= m_offset; bb.zMax() += m_offset;
+
+        osg::Vec3d s(_start), e(_end);
+        if (!intersectAndClip(s, e, bb)) return;
+        if (iv.getDoDummyTraversal()) return;
+
+        EntityType* geometry = dynamic_cast<EntityType*>(drawable->asGeometry());
+        if (geometry)
+        {
+            osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray());
+            if (!vertices) return;
+
+            for (unsigned int i=1; i<vertices->size(); ++i)
+            {
+
+                double distance = Utilities::getSkewLinesDistance(s,e,(*vertices)[i], (*vertices)[i-1]);
+
+                if (m_offset<distance) continue;
+
+                Intersection hit;
+                hit.ratio = distance;
+                hit.nodePath = iv.getNodePath();
+                hit.drawable = drawable;
+                hit.matrix = iv.getModelMatrix();
+                hit.localIntersectionPoint = (*vertices)[i];
+                m_hitIndices.push_back(i);
+                insertIntersection(hit);
+            }
+        }
+    }
+
+protected:
+    virtual ~Entity2DIntersector(){}
+
+private:
+    float m_offset;
+    std::vector<unsigned int> m_hitIndices;
+};
+
+#endif // ENTITY2DINTERSECTOR_H

src/libSGControls/EventHandler.cpp

@@ -1337,6 +1337,15 @@ void EventHandler::doSelectEntity(const osgGA::GUIEventAdapter &ea, osgGA::GUIAc
             if (stroke) canvas->addEntitySelected(stroke);
         }
 
+        Entity2DIntersector<entity::LineSegment>::Intersection result_segment;
+        bool inter_segment = this->getIntersection< Entity2DIntersector<entity::LineSegment>::Intersection,
+                Entity2DIntersector<entity::LineSegment> >(ea, aa, cher::MASK_CANVAS_IN, result_segment);
+        if (inter_segment){
+            entity::LineSegment* segment = this->getEntity2D<entity::LineSegment>(result_segment);
+            if (segment)
+                canvas->addEntitySelected(segment);
+        }
+
         /* if some entities were selected, go into edit-frame mode for canvas frame */
         if (ea.getEventType() == osgGA::GUIEventAdapter::RELEASE){
             canvas->updateFrame(m_scene->getCanvasPrevious());

src/libSGControls/EventHandler.h

@@ -26,6 +26,7 @@
 #include "UserScene.h"
 #include "RootScene.h"
 #include "StrokeIntersector.h"
+#include "Entity2DIntersector.h"
 #include "LineIntersector.h"
 #include "PolyLineIntersector.h"
 #include "PointIntersector.h"
@@ -142,6 +143,12 @@ class EventHandler : public osgGA::GUIEventHandler {
     /*! A method to obtain entity::Stroke type from intersection result. */
     entity::Stroke*     getStroke(const StrokeIntersector::Intersection& result);
 
+    template <typename EntityType>
+    EntityType*         getEntity2D(const Entity2DIntersector<entity::Entity2D>::Intersection& result)
+    {
+        return dynamic_cast<EntityType*>(result.drawable.get());
+    }
+
     /*! A method to obtain entity::Canvas type from intersection result. */
     entity::Canvas*     getCanvas(const osgUtil::LineSegmentIntersector::Intersection& result);
 

src/libSGEntities/Canvas.cpp

@@ -575,6 +575,9 @@ void entity::Canvas::addEntitySelected(Entity2D *entity)
     case cher::ENTITY_PHOTO:
         m_selectedGroup.addEntity(entity, m_geodePhotos.get());
         break;
+    case cher::ENTITY_LINESEGMENT:
+        m_selectedGroup.addEntity(entity, m_geodeLineSegments.get());
+        break;
     default:
         break;
     }

src/libSGEntities/UserScene.cpp

@@ -1336,7 +1336,8 @@ void entity::UserScene::linesegmentFinish(QUndoStack *stack)
         Q_CHECK_PTR(segment_clone.get());
         if (segment_clone->copyFrom(segment)){
             segment_clone->redefineToShape();
-            fur::AddLineSegmentCommand* cmd = new fur::AddLineSegmentCommand(this, segment_clone);
+            // TODO: replace add stroke, photo and polygon with add entity command
+            fur::AddEntityCommand* cmd = new fur::AddEntityCommand(this, segment_clone);
             Q_CHECK_PTR(cmd);
             stack->push(cmd);
         }