Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-06 02:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore the original dimensions of the bubble.

Browse source 
There was a "scale" property on the original 3d overlay that was used in this script or scale the dimensions.
But it seems that the "scale" property was not doing anything. 
When I moved this script to Local Entities, I had to multiply the dimensions with their respective scale and the result was badly streched. (clearly, based on the texture deformation, it was not wished. In addition that Hifi release it as functional ignoring that the scale was doing nothing.)
This fix just remove that scaling added assuming that it was working. 
Now it is it was before V8.
This commit is contained in:
Alezia Kurdis 2023-07-07 21:42:45 -04:00 committed by GitHub
parent 0d383c7855
commit bd3e2cd725
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/bubble.js
View file

@ -25,9 +25,9 @@
"type": "Model",
"modelURL": Script.resolvePath("assets/models/Bubble-v14.fbx"), // If you'd like to change the model, modify this line (and the dimensions below)
"dimensions": {
"x": MyAvatar.sensorToWorldScale * 2,
"y": (0.75 * MyAvatar.sensorToWorldScale) * ((MyAvatar.scale * 0.5) + 0.5),
"z": MyAvatar.sensorToWorldScale * 2
"x": MyAvatar.sensorToWorldScale,
"y": (0.75 * MyAvatar.sensorToWorldScale),
"z": MyAvatar.sensorToWorldScale
},
"position": { "x": MyAvatar.position.x, "y": -MyAvatar.scale * 2 + MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE, "z": MyAvatar.position.z },
"rotation": Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({"x": 0.0, "y": 180.0, "z": 0.0})),
@ -90,9 +90,9 @@
Entities.editEntity(bubbleOverlay, {
"dimensions": {
"x": MyAvatar.sensorToWorldScale * 2,
"y": (0.75 * MyAvatar.sensorToWorldScale) * ((MyAvatar.scale * 0.5) + 0.5),
"z": MyAvatar.sensorToWorldScale * 2
"x": MyAvatar.sensorToWorldScale,
"y": 0.75 * MyAvatar.sensorToWorldScale,
"z": MyAvatar.sensorToWorldScale
},
"position": {
"x": MyAvatar.position.x,
@ -127,9 +127,9 @@
if (delay < BUBBLE_RAISE_ANIMATION_DURATION_MS) {
Entities.editEntity(bubbleOverlay, {
"dimensions": {
"x": MyAvatar.sensorToWorldScale * 2,
"y": (0.75 * MyAvatar.sensorToWorldScale) * ((1 - ((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)) * MyAvatar.scale * 0.5 + 0.5),
"z": MyAvatar.sensorToWorldScale * 2
"x": MyAvatar.sensorToWorldScale,
"y": (0.75 * MyAvatar.sensorToWorldScale) * (1 - ((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)),
"z": MyAvatar.sensorToWorldScale
},
// Quickly raise the bubble from the ground up
"position": {
@ -143,9 +143,9 @@
// Keep the bubble in place for a couple seconds
Entities.editEntity(bubbleOverlay, {
"dimensions": {
"x": MyAvatar.sensorToWorldScale * 2,
"y": (0.75 * MyAvatar.sensorToWorldScale) * ((MyAvatar.scale * 0.5) + 0.5),
"z": MyAvatar.sensorToWorldScale * 2
"x": MyAvatar.sensorToWorldScale,
"y": 0.75 * MyAvatar.sensorToWorldScale,
"z": MyAvatar.sensorToWorldScale
},
"position": {
"x": MyAvatar.position.x,