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

making requested changes

Browse source
This commit is contained in:
danteruiz 2019-03-07 10:27:16 -08:00
parent a0bd2f67ec
commit 9ca3805499
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/raypick/StylusPick.cpp
View file

@ -160,7 +160,7 @@ PickResultPointer StylusPick::getEntityIntersection(const StylusTip& pick) {
// TODO: Use the xz projection method for Sphere and Quad. // TODO: Use the xz projection method for Sphere and Quad.
if (entityType == EntityTypes::Gizmo) { if (entityType == EntityTypes::Gizmo) {
normal = entityRotation * Vectors::UNIT_NEG_Y; normal = entityRotation * Vectors::UNIT_Y;
} else { } else {
normal = entityRotation * Vectors::UNIT_Z; normal = entityRotation * Vectors::UNIT_Z;
} }

6
scripts/system/libraries/WebTablet.js
View file

@ -176,10 +176,10 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
this.homeButtonID = Overlays.addOverlay("circle3d", { this.homeButtonID = Overlays.addOverlay("circle3d", {
name: "homeButton", name: "homeButton",
localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET }, localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET },
localRotation: { x: 0, y: 1, z: 0, w: 0}, localRotation: Quat.fromVec3Degrees({ x: 180, y: 180, z: 0}),
dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim }, dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim },
solid: true, solid: true,
alpha: 0.0, alpha: 1.0,
visible: visible, visible: visible,
drawInFront: false, drawInFront: false,
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
@ -189,7 +189,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
this.homeButtonHighlightID = Overlays.addOverlay("circle3d", { this.homeButtonHighlightID = Overlays.addOverlay("circle3d", {
name: "homeButtonHighlight", name: "homeButtonHighlight",
localPosition: { x: -HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET }, localPosition: { x: -HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET },
localRotation: { x: 0, y: 1, z: 0, w: 0}, localRotation: { x: 0, y: -1, z: 0, w: 0},
dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim }, dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim },
color: {red: 255, green: 255, blue: 255}, color: {red: 255, green: 255, blue: 255},
solid: true, solid: true,