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

Use emissive FBX model for highlighted Tools menu header

Browse source
This commit is contained in:
David Rowe 2017-09-23 14:20:53 +12:00
parent bc5cd7415b
commit 8976befaeb
4 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/vr-edit/assets/gray-header.fbx Normal file
View file

Binary file not shown.

BIN
scripts/vr-edit/assets/green-header.fbx Normal file
View file

Binary file not shown.

14
scripts/vr-edit/modules/createPalette.js
View file

@ -50,14 +50,14 @@ CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
},
PALETTE_HEADER_HEADING_PROPERTIES = {
dimensions: UIT.dimensions.headerHeading,
url: Script.resolvePath("../assets/gray-header.fbx"),
dimensions: UIT.dimensions.headerHeading, // Model is in rotated coordinate system but can override.
localPosition: {
x: 0,
y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y / 2,
z: UIT.dimensions.headerHeading.z / 2
},
localRotation: Quat.ZERO,
color: UIT.colors.baseGray,
alpha: 1.0,
solid: true,
ignoreRayIntersection: false,
@ -66,17 +66,13 @@ CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
PALETTE_HEADER_BAR_PROPERTIES = {
url: Script.resolvePath("../assets/blue-header-bar.fbx"),
dimensions: { // FBX model is in rotated coordinate system.
x: UIT.dimensions.headerBar.z,
y: UIT.dimensions.headerBar.x,
z: UIT.dimensions.headerBar.y
},
dimensions: UIT.dimensions.headerBar, // Model is in rotated coordinate system but can override.
localPosition: {
x: 0,
y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y - UIT.dimensions.headerBar.y / 2,
z: UIT.dimensions.headerBar.z / 2
},
localRotation: Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 }), // FBX model is in rotated coordinate system.
localRotation: Quat.ZERO,
alpha: 1.0,
solid: true,
ignoreRayIntersection: false,
@ -480,7 +476,7 @@ CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
// Header.
properties = Object.clone(PALETTE_HEADER_HEADING_PROPERTIES);
properties.parentID = paletteOriginOverlay;
paletteHeaderHeadingOverlay = Overlays.addOverlay("cube", properties);
paletteHeaderHeadingOverlay = Overlays.addOverlay("model", properties);
properties = Object.clone(PALETTE_HEADER_BAR_PROPERTIES);
properties.parentID = paletteOriginOverlay;
paletteHeaderBarOverlay = Overlays.addOverlay("model", properties);

21
scripts/vr-edit/modules/toolsMenu.js
View file

@ -100,10 +100,11 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
},
MENU_HEADER_HEADING_PROPERTIES = {
dimensions: UIT.dimensions.headerHeading,
url: Script.resolvePath("../assets/gray-header.fbx"),
highlightURL: Script.resolvePath("../assets/green-header.fbx"),
dimensions: UIT.dimensions.headerHeading, // Model is in rotated coordinate system but can override.
localPosition: { x: 0, y: UIT.dimensions.headerBar.y / 2, z: -MENU_HEADER_HOVER_OFFSET.z / 2 },
localRotation: Quat.ZERO,
color: UIT.colors.baseGray,
alpha: 1.0,
solid: true,
ignoreRayIntersection: true,
@ -112,13 +113,9 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
MENU_HEADER_BAR_PROPERTIES = {
url: Script.resolvePath("../assets/green-header-bar.fbx"),
dimensions: { // FBX model is in rotated coordinate system.
x: UIT.dimensions.headerBar.z,
y: UIT.dimensions.headerBar.x,
z: UIT.dimensions.headerBar.y
},
dimensions: UIT.dimensions.headerBar, // Model is in rotated coordinate system but can override.
localPosition: { x: 0, y: -UIT.dimensions.headerHeading.y / 2 - UIT.dimensions.headerBar.y / 2, z: 0 },
localRotation: Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 }), // FBX model is in rotated coordinate system.
localRotation: Quat.ZERO,
alpha: 1.0,
solid: true,
ignoreRayIntersection: true,
@ -2894,8 +2891,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
if (isTriggerClicked && !wasTriggerClicked) {
// Lower and unhighlight heading; go back to Tools menu.
Overlays.editOverlay(menuHeaderHeadingOverlay, {
url: MENU_HEADER_HEADING_PROPERTIES.url,
localPosition: MENU_HEADER_HEADING_PROPERTIES.localPosition,
color: UIT.colors.baseGray,
emissive: false
});
isOptionsHeadingRaised = false;
@ -2904,8 +2901,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
// Hover heading.
Feedback.play(otherSide, Feedback.HOVER_BUTTON);
Overlays.editOverlay(menuHeaderHeadingOverlay, {
url: MENU_HEADER_HEADING_PROPERTIES.highlightURL,
localPosition: Vec3.sum(MENU_HEADER_HEADING_PROPERTIES.localPosition, MENU_HEADER_HOVER_OFFSET),
color: UIT.colors.greenHighlight,
emissive: true // TODO: This has no effect.
});
Overlays.editOverlay(menuHeaderBackOverlay, {
@ -2924,8 +2921,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
if (isOptionsHeadingRaised) {
// Unhover heading.
Overlays.editOverlay(menuHeaderHeadingOverlay, {
url: MENU_HEADER_HEADING_PROPERTIES.url,
localPosition: MENU_HEADER_HEADING_PROPERTIES.localPosition,
color: UIT.colors.baseGray,
emissive: false
});
Overlays.editOverlay(menuHeaderBackOverlay, {
@ -3372,7 +3369,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
menuHeaderOverlay = Overlays.addOverlay("cube", properties);
properties = Object.clone(MENU_HEADER_HEADING_PROPERTIES);
properties.parentID = menuHeaderOverlay;
menuHeaderHeadingOverlay = Overlays.addOverlay("cube", properties);
menuHeaderHeadingOverlay = Overlays.addOverlay("model", properties);
properties = Object.clone(MENU_HEADER_BAR_PROPERTIES);
properties.parentID = menuHeaderHeadingOverlay;
menuHeaderBarOverlay = Overlays.addOverlay("model", properties);