diff --git a/unpublishedScripts/marketplace/audienceApplauseMeter/applauseOmeter.js b/unpublishedScripts/marketplace/audienceApplauseMeter/applauseOmeter.js index 392bd941fe..f6225d1a13 100644 --- a/unpublishedScripts/marketplace/audienceApplauseMeter/applauseOmeter.js +++ b/unpublishedScripts/marketplace/audienceApplauseMeter/applauseOmeter.js @@ -3,22 +3,10 @@ // (function () { - var pivotID, needleID; + var thisEntityID; this.preload = function (entityID) { - - var children = Entities.getChildrenIDs(entityID); - var childZero = Entities.getEntityProperties(children[0]); - var childOne = Entities.getEntityProperties(children[1]); - var childZeroUserData = JSON.parse(Entities.getEntityProperties(children[0]).userData); - - if (childZeroUserData.name === "pivot") { - pivotID = childZero.id; - needleID = childOne.id; - } else { - pivotID = childOne.id; - needleID = childZero.id; - } + thisEntityID = entityID; }; var SCAN_RATE = 100; //ms @@ -70,10 +58,8 @@ // we have a range of 55 to -53 degrees for the needle var scaledDegrees = (norm / -.94) + 54.5; // shifting scale from 100 to 55 to -53 ish its more like -51 ; - Entities.editEntity(pivotID, { - localRotation: Quat.fromPitchYawRollDegrees(0, 0, scaledDegrees) - }); + Entities.setAbsoluteJointRotationInObjectFrame(thisEntityID, 0, Quat.fromPitchYawRollDegrees(0, 0, scaledDegrees)); } diff --git a/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeter.fbx b/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeter.fbx new file mode 100644 index 0000000000..4f9ae22b32 Binary files /dev/null and b/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeter.fbx differ diff --git a/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterNeedleTextured.fbx b/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterNeedleTextured.fbx deleted file mode 100644 index df67394830..0000000000 Binary files a/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterNeedleTextured.fbx and /dev/null differ diff --git a/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterTextured.fbx b/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterTextured.fbx deleted file mode 100644 index bcd7131126..0000000000 Binary files a/unpublishedScripts/marketplace/audienceApplauseMeter/models/applauseOmeterTextured.fbx and /dev/null differ diff --git a/unpublishedScripts/marketplace/audienceApplauseMeter/rezApplauseOmeter.js b/unpublishedScripts/marketplace/audienceApplauseMeter/rezApplauseOmeter.js index e988e32243..1d89861512 100644 --- a/unpublishedScripts/marketplace/audienceApplauseMeter/rezApplauseOmeter.js +++ b/unpublishedScripts/marketplace/audienceApplauseMeter/rezApplauseOmeter.js @@ -10,34 +10,15 @@ var meter = { stand: { type: 'Model', - modelURL: 'https://binaryrelay.com/files/public-docs/hifi/meter/applauseOmeterTextured.fbx', + modelURL: 'https://binaryrelay.com/files/public-docs/hifi/meter/applauseOmeter.fbx', lifetime: '3600', script: 'https://binaryrelay.com/files/public-docs/hifi/meter/applauseOmeter.js', position: Vec3.sum(pos, {x: 0, y: 2.0, z: 0}) - }, - pivot:{ - type:'Sphere', - parentID: '', - userData: '{"name":"pivot"}', - dimensions: {x: .05, y: .05, z: .05}, - lifetime: '3600', - position: Vec3.sum(pos, {x: 0, y: 3.385, z: 0.2}) - }, - needle: { - type: 'Model', - modelURL:'https://binaryrelay.com/files/public-docs/hifi/meter/applauseOmeterNeedleTextured.fbx', - parentID: '', - userData: '{"name":"needle"}', - dimensions: {x: .286, y: 1.12, z: .07}, - lifetime: '3600', - position: Vec3.sum(pos, {x: 0, y: 3.85, z: 0.2}) } + }; - meter.pivot.parentID = Entities.addEntity(meter.stand); - meter.needle.parentID = Entities.addEntity(meter.pivot); - Entities.addEntity(meter.needle); - + Entities.addEntity(meter.stand); })();