Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Model overlay dimensions fixes

Browse source 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
This commit is contained in:
Anthony J. Thibault 2016-07-08 11:36:43 -07:00
parent 0d454cd45e
commit 1ec3472230
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -43,12 +43,14 @@ ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) :
void ModelOverlay::update(float deltatime) {
if (_updateModel) {
_updateModel = false;
_model->setSnapModelToCenter(true);
_model->setScale(getDimensions());
_model->setRotation(getRotation());
_model->setTranslation(getPosition());
_model->setURL(_url);
// dimensions are ALWAYS scale to fit.
_model->setScaleToFit(true, getDimensions());
_model->simulate(deltatime, true);
} else {
_model->simulate(deltatime);
@ -87,26 +89,15 @@ void ModelOverlay::render(RenderArgs* args) {
void ModelOverlay::setProperties(const QVariantMap& properties) {
auto position = getPosition();
auto rotation = getRotation();
auto scale = getDimensions();
Volume3DOverlay::setProperties(properties);
if (position != getPosition() || rotation != getRotation()) {
_updateModel = true;
}
if (scale != getDimensions()) {
auto newScale = getDimensions();
if (newScale.x <= 0 || newScale.y <= 0 || newScale.z <= 0) {
setDimensions(scale);
} else {
QMetaObject::invokeMethod(_model.get(), "setScaleToFit", Qt::AutoConnection,
Q_ARG(const bool&, true),
Q_ARG(const glm::vec3&, getDimensions()));
_updateModel = true;
}
}
_updateModel = true;
auto urlValue = properties["url"];
if (urlValue.isValid() && urlValue.canConvert<QString>()) {
_url = urlValue.toString();

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

@ -26,6 +26,8 @@ var WANT_DEBUG_SEARCH_NAME = null;
// these tune time-averaging and "on" value for analog trigger
//
var SPARK_MODEL_SCALE_FACTOR = 0.75;
var TRIGGER_SMOOTH_RATIO = 0.1; // Time averaging of trigger - 0.0 disables smoothing
var TRIGGER_ON_VALUE = 0.4; // Squeezed just enough to activate search or near grab
var TRIGGER_GRAB_VALUE = 0.85; // Squeezed far enough to complete distant grab
@ -72,7 +74,6 @@ var LINE_ENTITY_DIMENSIONS = {
var LINE_LENGTH = 500;
var PICK_MAX_DISTANCE = 500; // max length of pick-ray
var EQUIP_RADIUS_TO_MODEL_SCALE_FACTOR = 0.75;
var EQUIP_RADIUS_EMBIGGEN_FACTOR = 1.1;
//
@ -929,7 +930,7 @@ function MyController(hand) {
url: "http://hifi-content.s3.amazonaws.com/alan/dev/Equip-Spark.fbx",
position: hotspot.worldPosition,
rotation: {x: 0, y: 0, z: 0, w: 1},
dimensions: (hotspot.radius / EQUIP_RADIUS) * EQUIP_RADIUS_TO_MODEL_SCALE_FACTOR,
dimensions: hotspot.radius * 2 * SPARK_MODEL_SCALE_FACTOR,
ignoreRayIntersection: true
}));
@ -938,7 +939,7 @@ function MyController(hand) {
url: "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx",
position: hotspot.worldPosition,
rotation: {x: 0, y: 0, z: 0, w: 1},
dimensions: (hotspot.radius / EQUIP_RADIUS) * EQUIP_RADIUS_TO_MODEL_SCALE_FACTOR * 0.5,
dimensions: hotspot.radius * 2,
ignoreRayIntersection: true
}));
@ -950,7 +951,7 @@ function MyController(hand) {
this.updateOverlayInfoSet = function (overlayInfoSet, timestamp, potentialEquipHotspot) {
overlayInfoSet.timestamp = timestamp;
var radius = (overlayInfoSet.hotspot.radius / EQUIP_RADIUS) * EQUIP_RADIUS_TO_MODEL_SCALE_FACTOR;
var radius = overlayInfoSet.hotspot.radius;
// embiggen the overlays if it maches the potentialEquipHotspot
if (potentialEquipHotspot && overlayInfoSet.entityID == potentialEquipHotspot.entityID &&
@ -966,14 +967,14 @@ function MyController(hand) {
Overlays.editOverlay(overlayInfoSet.overlays[0], {
position: position,
rotation: props.rotation,
dimensions: radius
dimensions: radius * 2 * SPARK_MODEL_SCALE_FACTOR
});
// fresnel sphere
Overlays.editOverlay(overlayInfoSet.overlays[1], {
position: position,
rotation: props.rotation,
dimensions: radius * 0.5 // HACK to adjust sphere size...
dimensions: radius * 2
});
};