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

Use emissive FBX models for header bars

Browse source
This commit is contained in:
David Rowe 2017-09-23 11:56:42 +12:00
parent f53f8c14fc
commit bc5cd7415b
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -65,14 +65,18 @@ CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
}, },
PALETTE_HEADER_BAR_PROPERTIES = { PALETTE_HEADER_BAR_PROPERTIES = {
dimensions: UIT.dimensions.headerBar, 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
},
localPosition: { localPosition: {
x: 0, x: 0,
y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y - UIT.dimensions.headerBar.y / 2, y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y - UIT.dimensions.headerBar.y / 2,
z: UIT.dimensions.headerBar.z / 2 z: UIT.dimensions.headerBar.z / 2
}, },
localRotation: Quat.ZERO, localRotation: Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 }), // FBX model is in rotated coordinate system.
color: UIT.colors.blueHighlight,
alpha: 1.0, alpha: 1.0,
solid: true, solid: true,
ignoreRayIntersection: false, ignoreRayIntersection: false,
@ -479,7 +483,7 @@ CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
paletteHeaderHeadingOverlay = Overlays.addOverlay("cube", properties); paletteHeaderHeadingOverlay = Overlays.addOverlay("cube", properties);
properties = Object.clone(PALETTE_HEADER_BAR_PROPERTIES); properties = Object.clone(PALETTE_HEADER_BAR_PROPERTIES);
properties.parentID = paletteOriginOverlay; properties.parentID = paletteOriginOverlay;
paletteHeaderBarOverlay = Overlays.addOverlay("cube", properties); paletteHeaderBarOverlay = Overlays.addOverlay("model", properties);
properties = Object.clone(PALETTE_TITLE_PROPERTIES); properties = Object.clone(PALETTE_TITLE_PROPERTIES);
properties.parentID = paletteHeaderHeadingOverlay; properties.parentID = paletteHeaderHeadingOverlay;
properties.url = Script.resolvePath(properties.url); properties.url = Script.resolvePath(properties.url);

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

@ -111,10 +111,14 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
}, },
MENU_HEADER_BAR_PROPERTIES = { MENU_HEADER_BAR_PROPERTIES = {
dimensions: UIT.dimensions.headerBar, 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
},
localPosition: { x: 0, y: -UIT.dimensions.headerHeading.y / 2 - UIT.dimensions.headerBar.y / 2, z: 0 }, localPosition: { x: 0, y: -UIT.dimensions.headerHeading.y / 2 - UIT.dimensions.headerBar.y / 2, z: 0 },
localRotation: Quat.ZERO, localRotation: Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 }), // FBX model is in rotated coordinate system.
color: UIT.colors.greenHighlight,
alpha: 1.0, alpha: 1.0,
solid: true, solid: true,
ignoreRayIntersection: true, ignoreRayIntersection: true,
@ -3371,7 +3375,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
menuHeaderHeadingOverlay = Overlays.addOverlay("cube", properties); menuHeaderHeadingOverlay = Overlays.addOverlay("cube", properties);
properties = Object.clone(MENU_HEADER_BAR_PROPERTIES); properties = Object.clone(MENU_HEADER_BAR_PROPERTIES);
properties.parentID = menuHeaderHeadingOverlay; properties.parentID = menuHeaderHeadingOverlay;
menuHeaderBarOverlay = Overlays.addOverlay("cube", properties); menuHeaderBarOverlay = Overlays.addOverlay("model", properties);
// Heading content. // Heading content.
properties = Object.clone(MENU_HEADER_BACK_PROPERTIES); properties = Object.clone(MENU_HEADER_BACK_PROPERTIES);