Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-02-22 13:54:46 -08:00
parent 54b21abf02
commit 3f7a2eb10a
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/depthReticle.js
View file

@ -6,24 +6,27 @@ Script.update.connect(function(deltaTime) {
var timeSinceLastDepthCheck = Date.now() - lastDepthCheckTime;
if (timeSinceLastDepthCheck > TIME_BETWEEN_DEPTH_CHECKS) {
var reticlePosition = Reticle.position;
var pickRay = Camera.computePickRay(reticlePosition.x, reticlePosition.y);
var result = Overlays.findRayIntersection(pickRay);
if (!result.intersects) {
result = Entities.findRayIntersection(pickRay, true);
}
if (result.intersects) {
// + JSON.stringify(result)
print("something hovered!! result.distance:" +result.distance);
Vec3.print("something hovered!! result.intersection:", result.intersection);
Reticle.setDepth(result.distance);
// first check the 2D Overlays
if (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(reticlePosition)) {
print("intersecting with 2D overlay...");
Reticle.setDepth(1.0);
} else {
Reticle.setDepth(100.0);
print("NO INTERSECTION...");
var pointAt2D = Reticle.position;
var pointAt3D = HMD.worldPointFromOverlay(pointAt2D);
}
var pickRay = Camera.computePickRay(reticlePosition.x, reticlePosition.y);
var result = Overlays.findRayIntersection(pickRay);
if (!result.intersects) {
result = Entities.findRayIntersection(pickRay, true);
}
if (result.intersects) {
// + JSON.stringify(result)
print("something hovered!! result.distance:" +result.distance);
Vec3.print("something hovered!! result.intersection:", result.intersection);
Reticle.setDepth(result.distance);
} else {
Reticle.setDepth(100.0);
print("NO INTERSECTION...");
}
}
}
});

9
interface/src/ui/ApplicationCompositor.h
View file

@ -105,6 +105,9 @@ public:
bool shouldCaptureMouse() const;
/// if the reticle is pointing to a system overlay (a dialog box for example) then the function returns true otherwise false
bool isReticlePointingAtSystemOverlay() const { return _reticleOverQml; }
private:
void displayOverlayTextureStereo(RenderArgs* renderArgs, float aspectRatio, float fov);
@ -154,6 +157,8 @@ private:
QPointF _lastKnownRealMouse;
bool _ignoreMouseMove { false };
bool _reticleOverQml { false };
ReticleInterface* _reticleInterface;
};
@ -165,6 +170,7 @@ class ReticleInterface : public QObject {
Q_PROPERTY(float depth READ getDepth WRITE setDepth)
Q_PROPERTY(glm::vec2 maximumPosition READ getMaximumPosition)
Q_PROPERTY(bool mouseCaptured READ isMouseCaptured)
Q_PROPERTY(bool pointingAtSystemOverlay READ isPointingAtSystemOverlay)
public:
ReticleInterface(ApplicationCompositor* outer) : QObject(outer), _compositor(outer) {}
@ -182,6 +188,9 @@ public:
Q_INVOKABLE glm::vec2 getMaximumPosition() { return _compositor->getReticleMaximumPosition(); }
Q_INVOKABLE bool isPointingAtSystemOverlay() { return _compositor->isReticlePointingAtSystemOverlay(); }
private:
ApplicationCompositor* _compositor;
};