Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 16:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More corrections

Browse source
This commit is contained in:
luiscuenca 2017-11-07 20:25:24 -07:00
parent 536bf6f81d
commit 8c5f97f3d1
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/raypick/LaserPointerManager.cpp
View file

@ -113,9 +113,9 @@ void LaserPointerManager::setIncludeItems(const QUuid& uid, const QVector<QUuid>
} }
} }
void LaserPointerManager::setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay) const { void LaserPointerManager::setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay, const glm::mat4& offsetMat) const {
auto laserPointer = find(uid); auto laserPointer = find(uid);
if (laserPointer) { if (laserPointer) {
laserPointer->setLockEndUUID(objectID, isOverlay); laserPointer->setLockEndUUID(objectID, isOverlay, offsetMat);
} }
} }

2
interface/src/raypick/LaserPointerManager.h
View file

@ -39,7 +39,7 @@ public:
void setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignoreEntities) const; void setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignoreEntities) const;
void setIncludeItems(const QUuid& uid, const QVector<QUuid>& includeEntities) const; void setIncludeItems(const QUuid& uid, const QVector<QUuid>& includeEntities) const;
void setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay) const; void setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay, const glm::mat4& offsetMat = glm::mat4()) const;
void update(); void update();

1
interface/src/ui/overlays/Line3DOverlay.cpp
View file

@ -12,7 +12,6 @@
#include <GeometryCache.h> #include <GeometryCache.h>
#include <RegisteredMetaTypes.h> #include <RegisteredMetaTypes.h>
#include <Application.h>
#include "AbstractViewStateInterface.h" #include "AbstractViewStateInterface.h"