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

First pass at equip sphere animation

Browse source
This commit is contained in:
Anthony J. Thibault 2016-07-13 19:44:51 -07:00
parent f3ef2801b4
commit 66830a0538
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
scripts/system/controllers/handControllerGrab.js
View file

@ -78,8 +78,6 @@ var LINE_ENTITY_DIMENSIONS = {
var LINE_LENGTH = 500; var LINE_LENGTH = 500;
var PICK_MAX_DISTANCE = 500; // max length of pick-ray var PICK_MAX_DISTANCE = 500; // max length of pick-ray
var EQUIP_RADIUS_EMBIGGEN_FACTOR = 1.1;
// //
// near grabbing // near grabbing
// //
@ -404,7 +402,7 @@ EquipHotspotBuddy.prototype.clear = function () {
this.highlightedHotspots = []; this.highlightedHotspots = [];
}; };
EquipHotspotBuddy.prototype.highlightHotspot = function (hotspot) { EquipHotspotBuddy.prototype.highlightHotspot = function (hotspot) {
this.highlightedHotspots.push(hotspot); this.highlightedHotspots.push(hotspot.key);
}; };
EquipHotspotBuddy.prototype.updateHotspot = function (hotspot, timestamp) { EquipHotspotBuddy.prototype.updateHotspot = function (hotspot, timestamp) {
var overlayInfoSet = this.map[hotspot.key]; var overlayInfoSet = this.map[hotspot.key];
@ -415,6 +413,8 @@ EquipHotspotBuddy.prototype.updateHotspot = function (hotspot, timestamp) {
entityID: hotspot.entityID, entityID: hotspot.entityID,
localPosition: hotspot.localPosition, localPosition: hotspot.localPosition,
hotspot: hotspot, hotspot: hotspot,
currentSize: 0,
targetSize: 1,
overlays: [] overlays: []
}; };
@ -458,14 +458,38 @@ EquipHotspotBuddy.prototype.updateHotspots = function (hotspots, timestamp) {
this.highlightedHotspots = []; this.highlightedHotspots = [];
}; };
EquipHotspotBuddy.prototype.update = function (deltaTime, timestamp) { EquipHotspotBuddy.prototype.update = function (deltaTime, timestamp) {
var HIGHLIGHT_SIZE = 1.1;
var NORMAL_SIZE = 1.0;
var keys = Object.keys(this.map); var keys = Object.keys(this.map);
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
var overlayInfoSet = this.map[keys[i]]; var overlayInfoSet = this.map[keys[i]];
// TODO: figure out how to do animation.... fade in, fade out, highlight, un-highlight // this overlayInfo is highlighted.
if (this.highlightedHotspots.indexOf(keys[i]) != -1) {
overlayInfoSet.targetSize = HIGHLIGHT_SIZE;
} else {
overlayInfoSet.targetSize = NORMAL_SIZE;
}
// start to fade out this hotspot.
if (overlayInfoSet.timestamp != timestamp) { if (overlayInfoSet.timestamp != timestamp) {
// this is an old stale overlay, delete it! // because this item timestamp has expired, it might not be in the cache anymore....
entityPropertiesCache.addEntity(overlayInfoSet.entityID);
overlayInfoSet.targetSize = 0;
}
// animate the size.
var SIZE_TIMESCALE = 0.1;
var tau = deltaTime / SIZE_TIMESCALE;
if (tau > 1.0) {
tau = 1.0;
}
overlayInfoSet.currentSize += (overlayInfoSet.targetSize - overlayInfoSet.currentSize) * tau;
if (overlayInfoSet.timestamp != timestamp && overlayInfoSet.currentSize <= 0.05) {
// this is an old overlay, that has finished fading out, delete it!
overlayInfoSet.overlays.forEach(function (overlay) { overlayInfoSet.overlays.forEach(function (overlay) {
Overlays.deleteOverlay(overlay); Overlays.deleteOverlay(overlay);
}); });
@ -476,11 +500,13 @@ EquipHotspotBuddy.prototype.update = function (deltaTime, timestamp) {
var props = entityPropertiesCache.getProps(overlayInfoSet.entityID); var props = entityPropertiesCache.getProps(overlayInfoSet.entityID);
var entityXform = new Xform(props.rotation, props.position); var entityXform = new Xform(props.rotation, props.position);
var position = entityXform.xformPoint(overlayInfoSet.localPosition); var position = entityXform.xformPoint(overlayInfoSet.localPosition);
var alpha = overlayInfoSet.currentSize / HIGHLIGHT_SIZE; // AJT: TEMPORARY
overlayInfoSet.overlays.forEach(function (overlay) { overlayInfoSet.overlays.forEach(function (overlay) {
Overlays.editOverlay(overlay, { Overlays.editOverlay(overlay, {
position: position, position: position,
rotation: props.rotation rotation: props.rotation,
alpha: alpha // AJT: TEMPORARY
}); });
}); });
} }
@ -1042,7 +1068,9 @@ function MyController(hand) {
var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS); var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS);
equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp); equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp);
equipHotspotBuddy.highlightHotspot(potentialEquipHotspot); if (potentialEquipHotspot) {
equipHotspotBuddy.highlightHotspot(potentialEquipHotspot);
}
}; };
this.clearEquipHaptics = function () { this.clearEquipHaptics = function () {
@ -1438,7 +1466,9 @@ function MyController(hand) {
var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS); var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS);
equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp); equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp);
equipHotspotBuddy.highlightHotspot(potentialEquipHotspot); if (potentialEquipHotspot) {
equipHotspotBuddy.highlightHotspot(potentialEquipHotspot);
}
// search line visualizations // search line visualizations
if (USE_ENTITY_LINES_FOR_SEARCHING === true) { if (USE_ENTITY_LINES_FOR_SEARCHING === true) {