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

Merge pull request #15870 from RebeccaStankus/webTablet

Browse source 
BUGZ 887 Error in Webtablet.js
This commit is contained in:
Gayathri 2019-07-02 16:43:13 -07:00 committed by GitHub
commit 1e4e8b41cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script-archive/example/ui/MyEnergyBar.js
View file

@ -33,14 +33,14 @@ var bar = Overlays.addOverlay("text", {
// Takes an energy value between 0 and 1 and sets energy bar width appropriately // Takes an energy value between 0 and 1 and sets energy bar width appropriately
function setEnergy(energy) { function setEnergy(energy) {
energy = clamp(energy, 0, 1); energy = hifiClamp(energy, 0, 1);
var barWidth = totalWidth * energy; var barWidth = totalWidth * energy;
var color = energy <= lowEnergyThreshold ? lowEnergyColor: energyColor; var color = energy <= lowEnergyThreshold ? lowEnergyColor: energyColor;
Overlays.editOverlay(bar, { width: barWidth, backgroundColor: color}); Overlays.editOverlay(bar, { width: barWidth, backgroundColor: color});
} }
function update() { function update() {
currentEnergy = clamp(MyAvatar.energy, 0, 1); currentEnergy = hifiClamp(MyAvatar.energy, 0, 1);
setEnergy(currentEnergy); setEnergy(currentEnergy);
} }

4
script-archive/example/ui/energyBar.js
View file

@ -45,14 +45,14 @@ var bar = Overlays.addOverlay("text", {
// Takes an energy value between 0 and 1 and sets energy bar width appropriately // Takes an energy value between 0 and 1 and sets energy bar width appropriately
function setEnergy(energy) { function setEnergy(energy) {
energy = clamp(energy, 0, 1); energy = hifiClamp(energy, 0, 1);
var barWidth = totalWidth * energy; var barWidth = totalWidth * energy;
var color = energy <= lowEnergyThreshold ? lowEnergyColor: energyColor; var color = energy <= lowEnergyThreshold ? lowEnergyColor: energyColor;
Overlays.editOverlay(bar, { width: barWidth, backgroundColor: color}); Overlays.editOverlay(bar, { width: barWidth, backgroundColor: color});
} }
function update() { function update() {
currentEnergy = clamp(MyAvatar.energy, 0, 1); currentEnergy = hifiClamp(MyAvatar.energy, 0, 1);
setEnergy(currentEnergy); setEnergy(currentEnergy);
} }

10
scripts/simplifiedUI/system/libraries/WebTablet.js
View file

@ -10,9 +10,9 @@
/* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script, /* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script,
Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */ Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */
Script.include(Script.resolvePath("../libraries/utils.js")); Script.include(Script.resolvePath("utils.js"));
Script.include(Script.resolvePath("../libraries/controllers.js")); Script.include(Script.resolvePath("controllers.js"));
Script.include(Script.resolvePath("../libraries/Xform.js")); Script.include(Script.resolvePath("Xform.js"));
var Y_AXIS = {x: 0, y: 1, z: 0}; var Y_AXIS = {x: 0, y: 1, z: 0};
var X_AXIS = {x: 1, y: 0, z: 0}; var X_AXIS = {x: 1, y: 0, z: 0};
@ -380,8 +380,8 @@ WebTablet.prototype.calculateWorldAttitudeRelativeToCamera = function (windowPos
var TABLET_TEXEL_PADDING = {x: 60, y: 90}; var TABLET_TEXEL_PADDING = {x: 60, y: 90};
var X_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().x / 2) + TABLET_TEXEL_PADDING.x); var X_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().x / 2) + TABLET_TEXEL_PADDING.x);
var Y_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().y / 2) + TABLET_TEXEL_PADDING.y); var Y_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().y / 2) + TABLET_TEXEL_PADDING.y);
windowPos.x = clamp(windowPos.x, X_CLAMP, Window.innerWidth - X_CLAMP); windowPos.x = hifiClamp(windowPos.x, X_CLAMP, Window.innerWidth - X_CLAMP);
windowPos.y = clamp(windowPos.y, Y_CLAMP, Window.innerHeight - Y_CLAMP); windowPos.y = hifiClamp(windowPos.y, Y_CLAMP, Window.innerHeight - Y_CLAMP);
var fov = (Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW) * (Math.PI / 180); var fov = (Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW) * (Math.PI / 180);

4
scripts/simplifiedUI/system/libraries/utils.js
View file

@ -340,8 +340,8 @@ calculateHandSizeRatio = function() {
return handSizeRatio; return handSizeRatio;
} }
clamp = function(val, min, max){ hifiClamp = function(val, min, max) {
return Math.max(min, Math.min(max, val)) return Math.max(min, Math.min(max, val));
} }
// flattens an array of arrays into a single array // flattens an array of arrays into a single array

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

@ -10,9 +10,9 @@
/* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script, /* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script,
Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */ Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */
Script.include(Script.resolvePath("../libraries/utils.js")); Script.include(Script.resolvePath("utils.js"));
Script.include(Script.resolvePath("../libraries/controllers.js")); Script.include(Script.resolvePath("controllers.js"));
Script.include(Script.resolvePath("../libraries/Xform.js")); Script.include(Script.resolvePath("Xform.js"));
var Y_AXIS = {x: 0, y: 1, z: 0}; var Y_AXIS = {x: 0, y: 1, z: 0};
var X_AXIS = {x: 1, y: 0, z: 0}; var X_AXIS = {x: 1, y: 0, z: 0};
@ -380,8 +380,8 @@ WebTablet.prototype.calculateWorldAttitudeRelativeToCamera = function (windowPos
var TABLET_TEXEL_PADDING = {x: 60, y: 90}; var TABLET_TEXEL_PADDING = {x: 60, y: 90};
var X_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().x / 2) + TABLET_TEXEL_PADDING.x); var X_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().x / 2) + TABLET_TEXEL_PADDING.x);
var Y_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().y / 2) + TABLET_TEXEL_PADDING.y); var Y_CLAMP = (DESKTOP_TABLET_SCALE / 100) * ((this.getTabletTextureResolution().y / 2) + TABLET_TEXEL_PADDING.y);
windowPos.x = clamp(windowPos.x, X_CLAMP, Window.innerWidth - X_CLAMP); windowPos.x = hifiClamp(windowPos.x, X_CLAMP, Window.innerWidth - X_CLAMP);
windowPos.y = clamp(windowPos.y, Y_CLAMP, Window.innerHeight - Y_CLAMP); windowPos.y = hifiClamp(windowPos.y, Y_CLAMP, Window.innerHeight - Y_CLAMP);
var fov = (Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW) * (Math.PI / 180); var fov = (Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW) * (Math.PI / 180);

4
scripts/system/libraries/utils.js
View file

@ -340,8 +340,8 @@ calculateHandSizeRatio = function() {
return handSizeRatio; return handSizeRatio;
} }
clamp = function(val, min, max){ hifiClamp = function(val, min, max) {
return Math.max(min, Math.min(max, val)) return Math.max(min, Math.min(max, val));
} }
// flattens an array of arrays into a single array // flattens an array of arrays into a single array