Skip to content

Commit 6934eb0

Browse files
lamure point cloud rendering plugin and desktop navigation mode added
1 parent 7387b49 commit 6934eb0

428 files changed

Lines changed: 141081 additions & 76 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/OpenCOVER/cover/coVRNavigationManager.cpp

Lines changed: 236 additions & 72 deletions
Large diffs are not rendered by default.

src/OpenCOVER/cover/coVRNavigationManager.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ class COVEREXPORT coVRNavigationManager: public ui::Owner
8181
NavOther=-1,
8282
NavNone,
8383
XForm,
84+
Point,
85+
PointRotate,
86+
PointTranslate,
8487
Scale,
8588
Fly,
8689
Glide,
@@ -183,6 +186,9 @@ class COVEREXPORT coVRNavigationManager: public ui::Owner
183186
void startFly();
184187
void doFly();
185188
void stopFly();
189+
void stopPointNav();
190+
void doPointNav();
191+
void startPointNav();
186192
void doMouseFly();
187193
void doMouseXform();
188194
void doMouseScale();
@@ -296,7 +302,7 @@ class COVEREXPORT coVRNavigationManager: public ui::Owner
296302
float x0, y0, relx0, rely0;
297303
float oldRotx, newRotx, oldRoty, newRoty;
298304
float modifiedVSize, modifiedHSize, yValViewer, yValObject;
299-
osg::Vec3 transRel;
305+
float transXRel, transYRel, transZRel;
300306
float originX, originY;
301307

302308
int wiiFlag;
@@ -351,11 +357,11 @@ class COVEREXPORT coVRNavigationManager: public ui::Owner
351357
vrui::coRowMenu *nameMenu_;
352358
vrui::coButtonMenuItem *nameButton_;
353359
ui::Menu *navMenu_ = nullptr;
354-
ui::Action *m_viewAll=nullptr, *m_resetView=nullptr, *m_viewVisible=nullptr;
360+
ui::Action *m_viewAll=nullptr, *m_resetView=nullptr;
355361
ui::Group *navModes_ = nullptr;
356362
ui::ButtonGroup *navGroup_ = nullptr;
357363
ui::Button *noNavButton_=nullptr;
358-
ui::Button *xformButton_=nullptr, *scaleButton_=nullptr, *flyButton_=nullptr, *walkButton_=nullptr, *driveButton_=nullptr;
364+
ui::Button *xformButton_=nullptr,*pointButton_ = nullptr, *scaleButton_=nullptr, *flyButton_=nullptr, *walkButton_=nullptr, *driveButton_=nullptr;
359365
ui::Button *xformRotButton_=nullptr, *xformTransButton_=nullptr, *selectButton_=nullptr, *showNameButton_=nullptr;
360366
ui::Button *selectInteractButton_=nullptr;
361367
ui::Button *measureButton_=nullptr, *traverseInteractorButton_=nullptr;
@@ -378,7 +384,7 @@ class COVEREXPORT coVRNavigationManager: public ui::Owner
378384
void initMenu();
379385
void initShowName();
380386
void initMeasure();
381-
387+
382388
osg::Vec3 getCenter() const;
383389
void centerView();
384390
osg::Vec3 mouseNavCenter;

src/OpenCOVER/plugins/hlrs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@ ADD_SUBDIRECTORY(Vineyard)
5555
ADD_SUBDIRECTORY(Shapefiles)
5656
ADD_SUBDIRECTORY(JAKA)
5757
ADD_SUBDIRECTORY(TacxFTMS)
58+
ADD_SUBDIRECTORY(LamurePointCloud)
5859

0 commit comments

Comments
 (0)