Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 02:35:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed sliders

Browse source
This commit is contained in:
Seiji Emery 2015-08-28 15:43:55 -07:00
parent 202f68be58
commit d9ea2ae27b
2 changed files with 62 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
examples/example/entities/platform.js
View file

@ -16,7 +16,12 @@
// UI and debug console implemented using uiwidgets / 2d overlays // UI and debug console implemented using uiwidgets / 2d overlays
Script.include("../../libraries/uiwidgets.js"); Script.include("../../libraries/uiwidgets.js");
if (typeof(UI) === 'undefined') { // backup link in case the user downloaded this somewhere if (typeof(UI) === 'undefined') { // backup link in case the user downloaded this somewhere
print("Missing library script -- loading from public.highfidelity.io");
Script.include('http://public.highfidelity.io/scripts/libraries/uiwidgets.js'); Script.include('http://public.highfidelity.io/scripts/libraries/uiwidgets.js');
if (typeof(UI) === 'undefined') {
print("Cannot load UIWidgets library -- check your internet connection", COLORS.RED);
throw new Error("Could not load uiwidgets.js");
}
} }
// Platform script // Platform script
@ -890,7 +895,7 @@ var PLATFORM_SHAPE_DIMENSIONS_RANGE = [ 0.001, 2.0 ]; // axis-aligned entity dim
}); });
this.boxes = []; this.boxes = [];
} }
}).call(this); })();
// UI // UI
(function () { (function () {
@ -1145,15 +1150,7 @@ var CATCH_ERRORS_FROM_EVENT_UPDATES = false;
// Update // Update
this.update = function (dt) { this.update = function (dt) {
checkScreenDimensions(); checkScreenDimensions();
var pos = getTargetPlatformPosition(); var pos = getTargetPlatformPosition();
// if (Math.abs(pos.y - lastHeight) * dt > MAX_ACCELERATION_THRESHOLD) {
// // User likely teleported
// logMessage("Height rebuild (" +
// "(" + Math.abs(pos.y - lastHeight) + " * " + dt + " = " + (Math.abs(pos.y - lastHeight) * dt) + ")" +
// " > " + MAX_ACCELERATION_THRESHOLD + ")");
// platform.updateHeight(pos.y);
// }
platform.update(dt, getTargetPlatformPosition(), platform.getRadius()); platform.update(dt, getTargetPlatformPosition(), platform.getRadius());
} }
@ -1182,9 +1179,9 @@ var CATCH_ERRORS_FROM_EVENT_UPDATES = false;
function init () { function init () {
logMessage("initializing..."); logMessage("initializing...");
this.initPlatform(); this.initPlatform();
Script.update.connect(this.update); Script.update.connect(this.update);
Script.scriptEnding.connect(this.teardown); Script.scriptEnding.connect(this.teardown);

99
examples/libraries/uiwidgets.js
View file

@ -28,13 +28,10 @@ if (this.Vec2 == undefined) {
return new Vec2(v.x, v.y); return new Vec2(v.x, v.y);
} }
} else if (this.Vec2.clone == undefined) { } else if (this.Vec2.clone == undefined) {
print("Vec2 exists; adding Vec2.clone");
this.Vec2.clone = function (v) { this.Vec2.clone = function (v) {
return { 'x': v.x || 0.0, 'y': v.y || 0.0 }; return { 'x': v.x || 0.0, 'y': v.y || 0.0 };
} }
} else { } else {}
print("Vec2...?");
}
})(); })();
var Rect = function (xmin, ymin, xmax, ymax) { var Rect = function (xmin, ymin, xmax, ymax) {
@ -566,46 +563,51 @@ var Slider = UI.Slider = function (properties) {
this.slider = new Box(properties.slider); this.slider = new Box(properties.slider);
this.slider.parent = this; this.slider.parent = this;
var updateSliderPos = function (event, widget) { var clickOffset = { x: 0.0, y: 0.0 }; // offset relative to slider knob
var rx = Math.max(event.x * 1.0 - widget.position.x - widget.slider.width * 0.5, 0.0); var widget = this;
var updateDrag = function (event) {
var rx = Math.max(event.x * 1.0 - widget.position.x - clickOffset.x, 0.0);
var width = Math.max(widget.width - widget.slider.width - widget.padding.x * 2.0, 0.0); var width = Math.max(widget.width - widget.slider.width - widget.padding.x * 2.0, 0.0);
var v = Math.min(rx, width) / (width || 1); var v = Math.min(rx, width) / (width || 1);
widget.value = widget.minValue + ( // print("dragging slider: rx = " + rx + ", width = " + width + ", v = " + v);
widget.maxValue - widget.minValue) * v;
widget.value = widget.minValue + (widget.maxValue - widget.minValue) * v;
widget.onValueChanged(widget.value); widget.onValueChanged(widget.value);
UI.updateLayout(); UI.updateLayout();
} }
var startDrag = function (event) {
// calculate position of slider knob
var x0 = widget.position.x + widget.padding.x;
var width = (widget.width - widget.slider.width - widget.padding.x * 2.0);
var normalizedValue = (widget.value - widget.minValue) / (widget.maxValue - widget.minValue)
var widget = this; var sliderX = x0 + normalizedValue * width;
this.addAction('onMouseDown', function (event) { var sliderWidth = widget.slider.width;
sliderRel.x = sliderRel.y = 0.0;
// sliderRel.x = widget.slider.width * 0.5;
// sliderRel.y = widget.slider.height * 0.5;
updateSliderPos(event, widget);
// hack if (event.x >= sliderX && event.x <= sliderX + sliderWidth) {
ui.clickedWidget = ui.draggedWidget = widget.slider; // print("Start drag -- on slider knob");
}); clickOffset.x = event.x - sliderX;
} else if (event.x >= x0 && event.x <= x0 + width) {
// print("Start drag -- on slider bar");
clickOffset.x = sliderWidth * 0.5;
} else {
clickOffset.x = 0.0;
// print("Start drag -- out of bounds!");
// print("event.x = " + event.x);
// print("x0 = " + x0 + ", x1 = " + (x0 + width) + " (width = " + width + ")");
// print("s0 = " + sliderX + ", s1 = " + (sliderX + sliderWidth) + "(slider width = " + sliderWidth + ")");
// print("widget = " + widget);
// print("widget.slider = " + widget.slider);
// print("widget.width = " + widget.width + ", widget.slider.width = " + widget.slider.width);
}
updateDrag(event);
}
var sliderRel = {}; this.addAction('onMouseDown', startDrag);
this.slider.addAction('onMouseDown', function (event) { this.addAction('onDragBegin', updateDrag);
sliderRel.x = widget.slider.position.x - event.x; this.addAction('onDragUpdate', updateDrag);
sliderRel.y = widget.slider.position.y - event.y; this.slider.actions = this.actions;
event.x += sliderRel.x;
event.y += sliderRel.y;
updateSliderPos(event, widget);
});
this.slider.addAction('onDragBegin', function (event) {
event.x += sliderRel.x;
event.y += sliderRel.y;
updateSliderPos(event, widget);
})
this.slider.addAction('onDragUpdate', function (event) {
event.x += sliderRel.x;
event.y += sliderRel.y;
updateSliderPos(event, widget);
})
}; };
Slider.prototype = new Box(); Slider.prototype = new Box();
Slider.prototype.constructor = Slider; Slider.prototype.constructor = Slider;
@ -947,16 +949,25 @@ var dispatchEvent = function (action, event, widget) {
} }
} }
function hasAction (widget, action) {
// print("widget = " + widget);
// print("action = " + action);
// if (widget) {
// print("widget.actions[<action>] = " + widget.actions[action]);
// print("widget.parent = " + widget.parent);
// }
return widget && (widget.actions[action] || hasAction(widget.parent, action));
}
UI.handleMouseMove = function (event, canStartDrag) { UI.handleMouseMove = function (event, canStartDrag) {
if (canStartDrag === undefined) // if (canStartDrag === undefined)
if (arguments.length < 2)
canStartDrag = true; canStartDrag = true;
// print("mouse moved x = " + event.x + ", y = " + event.y); // print("mouse moved x = " + event.x + ", y = " + event.y);
var focused = getFocusedWidget(event); var focused = getFocusedWidget(event);
// print("got focus: " + focused); if (!ui.draggedWidget && ui.clickedWidget && hasAction(ui.clickedWidget, 'onDragBegin')) {
if (canStartDrag && !ui.draggedWidget && ui.clickedWidget && ui.clickedWidget.actions['onDragBegin']) {
ui.draggedWidget = ui.clickedWidget; ui.draggedWidget = ui.clickedWidget;
dispatchEvent('onDragBegin', event, ui.draggedWidget); dispatchEvent('onDragBegin', event, ui.draggedWidget);
} else if (ui.draggedWidget) { } else if (ui.draggedWidget) {
@ -980,26 +991,24 @@ UI.handleMousePress = function (event) {
} }
UI.handleMouseDoublePress = function (event) { UI.handleMouseDoublePress = function (event) {
// print("DOUBLE CLICK!");
var focused = getFocusedWidget(event); var focused = getFocusedWidget(event);
UI.handleMouseMove(event); UI.handleMouseMove(event);
if (focused) { if (focused) {
// print("dispatched onDoubleClick");
dispatchEvent('onDoubleClick', event, focused); dispatchEvent('onDoubleClick', event, focused);
} }
} }
UI.handleMouseRelease = function (event) { UI.handleMouseRelease = function (event) {
// print("Mouse released");
if (ui.draggedWidget) { if (ui.draggedWidget) {
dispatchEvent('onDragEnd', event, ui.draggedWidget); dispatchEvent('onDragEnd', event, ui.draggedWidget);
} else { } else {
UI.handleMouseMove(event, false); var clicked = ui.clickedWidget;
ui.clickedWidget = null;
UI.handleMouseMove(event);
if (ui.focusedWidget) { if (ui.focusedWidget) {
dispatchEvent('onMouseUp', event, ui.focusedWidget); dispatchEvent('onMouseUp', event, ui.focusedWidget);
if (ui.clickedWidget == ui.focusedWidget) { if (clicked == ui.focusedWidget) {
dispatchEvent('onClick', event, ui.focusedWidget); dispatchEvent('onClick', event, ui.focusedWidget);
} }
} }