Merge branch 'master' of https://github.com/highfidelity/hifi into brown

interface/src/ui/overlays/Web3DOverlay.cpp

@@ -225,10 +225,6 @@ void Web3DOverlay::setMaxFPS(uint8_t maxFPS) {
 }
 
 void Web3DOverlay::render(RenderArgs* args) {
-    if (!_visible || !getParentVisible()) {
-        return;
-    }
-
     QOpenGLContext * currentContext = QOpenGLContext::currentContext();
     QSurface * currentSurface = currentContext->surface();
     if (!_webSurface) {
@@ -282,6 +278,10 @@ void Web3DOverlay::render(RenderArgs* args) {
         _webSurface->resize(QSize(_resolution.x, _resolution.y));
     }
 
+    if (!_visible || !getParentVisible()) {
+        return;
+    }
+
     vec2 halfSize = getSize() / 2.0f;
     vec4 color(toGlm(getColor()), getAlpha());
 

libraries/avatars-renderer/src/avatars-renderer/Head.cpp

@@ -202,6 +202,13 @@ void Head::calculateMouthShapes(float deltaTime) {
     float trailingAudioJawOpenRatio = (100.0f - deltaTime * NORMAL_HZ) / 100.0f; // --> 0.99 at 60 Hz
     _trailingAudioJawOpen = glm::mix(_trailingAudioJawOpen, _audioJawOpen, trailingAudioJawOpenRatio);
 
+    // truncate _mouthTime when mouth goes quiet to prevent floating point error on increment
+    const float SILENT_TRAILING_JAW_OPEN = 0.0002f;
+    const float MAX_SILENT_MOUTH_TIME = 10.0f;
+    if (_trailingAudioJawOpen < SILENT_TRAILING_JAW_OPEN && _mouthTime > MAX_SILENT_MOUTH_TIME) {
+        _mouthTime = 0.0f;
+    }
+
     // Advance time at a rate proportional to loudness, and move the mouth shapes through
     // a cycle at differing speeds to create a continuous random blend of shapes.
     _mouthTime += sqrtf(_averageLoudness) * TIMESTEP_CONSTANT * deltaTimeRatio;

libraries/controllers/src/controllers/InputRecorder.cpp

@@ -22,20 +22,20 @@
 
 #include <BuildInfo.h>
 #include <GLMHelpers.h>
- 
+
 QString SAVE_DIRECTORY = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + BuildInfo::MODIFIED_ORGANIZATION + "/" + BuildInfo::INTERFACE_NAME + "/hifi-input-recordings/";
 QString FILE_PREFIX_NAME = "input-recording-";
 QString COMPRESS_EXTENSION = ".tar.gz";
 namespace controller {
-    
+
     QJsonObject poseToJsonObject(const Pose pose) {
         QJsonObject newPose;
-        
+
         QJsonArray translation;
         translation.append(pose.translation.x);
         translation.append(pose.translation.y);
         translation.append(pose.translation.z);
-        
+
         QJsonArray rotation;
         rotation.append(pose.rotation.x);
         rotation.append(pose.rotation.y);
@@ -69,7 +69,7 @@ namespace controller {
         QJsonArray angularVelocity = object["angularVelocity"].toArray();
 
         pose.valid = object["valid"].toBool();
-        
+
         pose.translation.x = translation[0].toDouble();
         pose.translation.y = translation[1].toDouble();
         pose.translation.z = translation[2].toDouble();
@@ -89,13 +89,13 @@ namespace controller {
 
         return pose;
     }
-        
+
 
     void exportToFile(QJsonObject& object) {
         if (!QDir(SAVE_DIRECTORY).exists()) {
             QDir().mkdir(SAVE_DIRECTORY);
         }
-        
+
         QString timeStamp = QDateTime::currentDateTime().toString(Qt::ISODate);
         timeStamp.replace(":", "-");
         QString fileName = SAVE_DIRECTORY + FILE_PREFIX_NAME + timeStamp + COMPRESS_EXTENSION;
@@ -124,7 +124,7 @@ namespace controller {
         status = true;
         return object;
     }
- 
+
     InputRecorder::InputRecorder() {}
 
     InputRecorder::~InputRecorder() {}
@@ -195,16 +195,16 @@ namespace controller {
              _framesRecorded = data["frameCount"].toInt();
              QJsonArray actionArrayList = data["actionList"].toArray();
              QJsonArray poseArrayList = data["poseList"].toArray();
-             
+
              for (int actionIndex = 0; actionIndex < actionArrayList.size(); actionIndex++) {
                  QJsonArray actionState = actionArrayList[actionIndex].toArray();
                  for (int index = 0; index < actionState.size(); index++) {
-                     _currentFrameActions[index] = actionState[index].toInt();
+                     _currentFrameActions[index] = actionState[index].toDouble();
                  }
                  _actionStateList.push_back(_currentFrameActions);
                  _currentFrameActions = ActionStates(toInt(Action::NUM_ACTIONS));
              }
-             
+
              for (int poseIndex = 0; poseIndex < poseArrayList.size(); poseIndex++) {
                  QJsonArray poseState = poseArrayList[poseIndex].toArray();
                  for (int index = 0; index < poseState.size(); index++) {
@@ -250,13 +250,13 @@ namespace controller {
             for(auto& channel : _currentFramePoses) {
                 channel = Pose();
             }
-            
+
             for(auto& channel : _currentFrameActions) {
                 channel = 0.0f;
             }
         }
     }
-    
+
     float InputRecorder::getActionState(controller::Action action) {
         if (_actionStateList.size() > 0 ) {
             return _actionStateList[_playCount][toInt(action)];

scripts/system/libraries/WebTablet.js

@@ -96,7 +96,7 @@ function calcSpawnInfo(hand, height) {
  * @param hand [number] -1 indicates no hand, Controller.Standard.RightHand or Controller.Standard.LeftHand
  * @param clientOnly [bool] true indicates tablet model is only visible to client.
  */
-WebTablet = function (url, width, dpi, hand, clientOnly, location) {
+WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
 
     var _this = this;
 
@@ -107,6 +107,8 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location) {
     this.depth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
     this.landscape = false;
 
+    visible = visible === true;
+
     if (dpi) {
         this.dpi = dpi;
     } else {
@@ -125,7 +127,8 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location) {
             "grabbableKey": {"grabbable": true}
         }),
         dimensions: this.getDimensions(),
-        parentID: AVATAR_SELF_ID
+        parentID: AVATAR_SELF_ID,
+        visible: visible
     };
 
     // compute position, rotation & parentJointIndex of the tablet
@@ -158,7 +161,8 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location) {
         parentID: this.tabletEntityID,
         parentJointIndex: -1,
         showKeyboardFocusHighlight: false,
-        isAA: HMD.active
+        isAA: HMD.active,
+        visible: visible
     });
 
     var HOME_BUTTON_Y_OFFSET = (this.height / 2) - (this.height / 20);
@@ -168,7 +172,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location) {
         localRotation: {x: 0, y: 1, z: 0, w: 0},
         dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor},
         alpha: 0.0,
-        visible: true,
+        visible: visible,
         drawInFront: false,
         parentID: this.tabletEntityID,
         parentJointIndex: -1

scripts/system/libraries/entitySelectionTool.js

@@ -3,6 +3,7 @@
 //  examples
 //
 //  Created by Brad hefta-Gaub on 10/1/14.
+//    Modified by Daniela Fontes @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  This script implements a class useful for building tools for editing entities.
@@ -2592,6 +2593,16 @@ SelectionDisplay = (function() {
     // pivot - point to use as a pivot
     // offset - the position of the overlay tool relative to the selections center position
     var makeStretchTool = function(stretchMode, direction, pivot, offset, customOnMove) {
+        //  directionFor3DStretch - direction and pivot for 3D stretch
+        //  distanceFor3DStretch - distance from the intersection point and the handController 
+        //     used to increase the scale taking into account the distance to the object
+        //    DISTANCE_INFLUENCE_THRESHOLD - constant that holds the minimum distance where the 
+        //     distance to the object will influence the stretch/resize/scale
+        var directionFor3DStretch = getDirectionsFor3DStretch(stretchMode);
+        var distanceFor3DStretch = 0;
+        var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
+        
+        
         var signs = {
             x: direction.x < 0 ? -1 : (direction.x > 0 ? 1 : 0),
             y: direction.y < 0 ? -1 : (direction.y > 0 ? 1 : 0),
@@ -2603,18 +2614,23 @@ SelectionDisplay = (function() {
             y: Math.abs(direction.y) > 0 ? 1 : 0,
             z: Math.abs(direction.z) > 0 ? 1 : 0,
         };
+        
+        
 
         var numDimensions = mask.x + mask.y + mask.z;
 
         var planeNormal = null;
         var lastPick = null;
+        var lastPick3D = null;
         var initialPosition = null;
         var initialDimensions = null;
         var initialIntersection = null;
         var initialProperties = null;
         var registrationPoint = null;
         var deltaPivot = null;
+        var deltaPivot3D = null;
         var pickRayPosition = null;
+        var pickRayPosition3D = null;
         var rotation = null;
 
         var onBegin = function(event) {
@@ -2652,8 +2668,20 @@ SelectionDisplay = (function() {
 
             // Scaled offset in world coordinates
             var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP);
+            
             pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
-
+            
+            if (directionFor3DStretch) {
+                // pivot, offset and pickPlanePosition for 3D manipulation
+                var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch));
+                deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);
+                
+                var scaledOffsetWorld3D = vec3Mult(initialDimensions, 
+                    Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), 
+                    centeredRP));
+                
+                pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
+            }
             var start = null;
             var end = null;
             if (numDimensions == 1 && mask.x) {
@@ -2754,12 +2782,25 @@ SelectionDisplay = (function() {
                     };
                 }
             }
+            
             planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
             var pickRay = generalComputePickRay(event.x, event.y);
             lastPick = rayPlaneIntersection(pickRay,
                 pickRayPosition,
                 planeNormal);
-
+                
+            var planeNormal3D = {
+                x: 0,
+                y: 0,
+                z: 0
+            };
+            if (directionFor3DStretch) {
+                lastPick3D = rayPlaneIntersection(pickRay,
+                    pickRayPosition3D,
+                    planeNormal3D);
+                distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
+            }
+        
             SelectionManager.saveProperties();
         };
 
@@ -2790,24 +2831,50 @@ SelectionDisplay = (function() {
                 dimensions = SelectionManager.worldDimensions;
                 rotation = SelectionManager.worldRotation;
             }
+            
+            var localDeltaPivot = deltaPivot;
+            var localSigns = signs;
 
             var pickRay = generalComputePickRay(event.x, event.y);
-            newPick = rayPlaneIntersection(pickRay,
+            
+            // Are we using handControllers or Mouse - only relevant for 3D tools
+            var controllerPose = getControllerWorldLocation(activeHand, true);
+            if (HMD.isHMDAvailable() 
+                && HMD.isHandControllerAvailable() && controllerPose.valid && that.triggered && directionFor3DStretch) {
+                localDeltaPivot = deltaPivot3D;
+
+                newPick = pickRay.origin;
+            
+                var vector = Vec3.subtract(newPick, lastPick3D);
+                
+                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
+            
+                if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
+                    // Range of Motion
+                    vector = Vec3.multiply(distanceFor3DStretch , vector);
+                }
+                
+                localSigns = directionFor3DStretch;
+                
+            } else {
+                newPick = rayPlaneIntersection(pickRay,
                 pickRayPosition,
                 planeNormal);
-            var vector = Vec3.subtract(newPick, lastPick);
+                var vector = Vec3.subtract(newPick, lastPick);
 
-            vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-
-            vector = vec3Mult(mask, vector);
+                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
 
+                vector = vec3Mult(mask, vector);
+                
+            }
+            
             if (customOnMove) {
-                var change = Vec3.multiply(-1, vec3Mult(signs, vector));
+                var change = Vec3.multiply(-1, vec3Mult(localSigns, vector));
                 customOnMove(vector, change);
             } else {
                 vector = grid.snapToSpacing(vector);
 
-                var changeInDimensions = Vec3.multiply(-1, vec3Mult(signs, vector));
+                var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
                 var newDimensions;
                 if (proportional) {
                     var absX = Math.abs(changeInDimensions.x);
@@ -2829,37 +2896,39 @@ SelectionDisplay = (function() {
                 } else {
                     newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
                 }
-
-                newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
-                newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
-                newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
-
-                var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(deltaPivot, changeInDimensions));
-                var newPosition = Vec3.sum(initialPosition, changeInPosition);
-
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    Entities.editEntity(SelectionManager.selections[i], {
-                        position: newPosition,
-                        dimensions: newDimensions,
-                    });
-                }
-
-                var wantDebug = false;
-                if (wantDebug) {
-                    print(stretchMode);
-                    //Vec3.print("        newIntersection:", newIntersection);
-                    Vec3.print("                 vector:", vector);
-                    //Vec3.print("           oldPOS:", oldPOS);
-                    //Vec3.print("                newPOS:", newPOS);
-                    Vec3.print("            changeInDimensions:", changeInDimensions);
-                    Vec3.print("                 newDimensions:", newDimensions);
-
-                    Vec3.print("              changeInPosition:", changeInPosition);
-                    Vec3.print("                   newPosition:", newPosition);
-                }
-
-                SelectionManager._update();
             }
+        
+        
+            newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
+            newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
+            newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
+
+            var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
+            var newPosition = Vec3.sum(initialPosition, changeInPosition);
+
+            for (var i = 0; i < SelectionManager.selections.length; i++) {
+                Entities.editEntity(SelectionManager.selections[i], {
+                    position: newPosition,
+                    dimensions: newDimensions,
+                });
+            }
+            
+
+            var wantDebug = false;
+            if (wantDebug) {
+                print(stretchMode);
+                //Vec3.print("        newIntersection:", newIntersection);
+                Vec3.print("                 vector:", vector);
+                //Vec3.print("           oldPOS:", oldPOS);
+                //Vec3.print("                newPOS:", newPOS);
+                Vec3.print("            changeInDimensions:", changeInDimensions);
+                Vec3.print("                 newDimensions:", newDimensions);
+
+                Vec3.print("              changeInPosition:", changeInPosition);
+                Vec3.print("                   newPosition:", newPosition);
+            }
+
+            SelectionManager._update();
 
         };
 
@@ -2870,6 +2939,75 @@ SelectionDisplay = (function() {
             onEnd: onEnd
         };
     };
+    
+    // Direction for the stretch tool when using hand controller
+    var directionsFor3DGrab = {
+        LBN: {
+            x: 1,
+            y: 1,
+            z: 1
+        },
+        RBN: {
+            x: -1,
+            y: 1,
+            z: 1
+        },
+        LBF: {
+            x: 1,
+            y: 1,
+            z: -1
+        },
+        RBF: {
+            x: -1,
+            y: 1,
+            z: -1
+        },
+        LTN: {
+            x: 1,
+            y: -1,
+            z: 1
+        },
+        RTN: {
+            x: -1,
+            y: -1,
+            z: 1
+        },
+        LTF: {
+            x: 1,
+            y: -1,
+            z: -1
+        },
+        RTF: {
+            x: -1,
+            y: -1,
+            z: -1
+        }
+    };
+    
+    // Returns a vector with directions for the stretch tool in 3D using hand controllers
+    function getDirectionsFor3DStretch(mode) {
+        if (mode === "STRETCH_LBN") {
+            return directionsFor3DGrab.LBN;
+        } else if (mode === "STRETCH_RBN") {
+            return directionsFor3DGrab.RBN;
+        } else if (mode === "STRETCH_LBF") {
+            return directionsFor3DGrab.LBF;
+        } else if (mode === "STRETCH_RBF") {
+            return directionsFor3DGrab.RBF;
+        } else if (mode === "STRETCH_LTN") {
+            return directionsFor3DGrab.LTN;
+        } else if (mode === "STRETCH_RTN") {
+            return directionsFor3DGrab.RTN;
+        } else if (mode === "STRETCH_LTF") {
+            return directionsFor3DGrab.LTF;
+        } else if (mode === "STRETCH_RTF") {
+            return directionsFor3DGrab.RTF;
+        } else {
+            return null;
+        }
+    }
+    
+    
 
     function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) {
         if (!pivot) {

scripts/system/snapshot.js

@@ -111,7 +111,7 @@ function onMessage(message) {
         case 'openSettings':
             if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
                 || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
-                Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "General Preferences");
+                Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
             } else {
                 tablet.loadQMLOnTop("TabletGeneralPreferences.qml");
             }

scripts/system/tablet-ui/tabletUI.js

@@ -92,7 +92,7 @@
         tabletScalePercentage = getTabletScalePercentageFromSettings();
         UIWebTablet = new WebTablet("qml/hifi/tablet/TabletRoot.qml",
                                     DEFAULT_WIDTH * (tabletScalePercentage / 100),
-                                    null, activeHand, true);
+                                    null, activeHand, true, null, false);
         UIWebTablet.register();
         HMD.tabletID = UIWebTablet.tabletEntityID;
         HMD.homeButtonID = UIWebTablet.homeButtonID;

unpublishedScripts/marketplace/audienceApplauseMeter/applauseOmeter.js

@@ -0,0 +1,70 @@
+//
+// Created by Alan-Michael Moody on 5/2/2017
+//
+
+(function () {
+    var thisEntityID;
+
+    this.preload = function (entityID) {
+        thisEntityID = entityID;
+    };
+
+    var SCAN_RATE = 100; //ms
+    var REFERENCE_FRAME_COUNT = 30;
+    var MAX_AUDIO_THRESHOLD = 16000;
+
+    var framePool = [];
+
+    function scanEngine() {
+        var avatarLoudnessPool = [];
+
+        function average(a) {
+            var sum = 0;
+            var total = a.length;
+            for (var i = 0; i < total; i++) {
+                sum += a[i];
+            }
+            return Math.round(sum / total);
+        }
+
+        function audioClamp(input) {
+            if (input > MAX_AUDIO_THRESHOLD) return MAX_AUDIO_THRESHOLD;
+            return input;
+        }
+
+
+        var avatars = AvatarList.getAvatarIdentifiers();
+        avatars.forEach(function (id) {
+            var avatar = AvatarList.getAvatar(id);
+            avatarLoudnessPool.push(audioClamp(Math.round(avatar.audioLoudness)));
+
+        });
+
+
+        framePool.push(average(avatarLoudnessPool));
+        if (framePool.length >= REFERENCE_FRAME_COUNT) {
+            framePool.shift();
+        }
+
+        function normalizedAverage(a) {
+            a = a.map(function (v) {
+                return Math.round(( 100 / MAX_AUDIO_THRESHOLD ) * v);
+            });
+            return average(a);
+        }
+
+        var norm = normalizedAverage(framePool);
+
+        // 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.setAbsoluteJointRotationInObjectFrame(thisEntityID, 0, Quat.fromPitchYawRollDegrees(0, 0, scaledDegrees));
+
+    }
+
+    Script.setInterval(function () {
+        scanEngine();
+    }, SCAN_RATE);
+
+});

unpublishedScripts/marketplace/audienceApplauseMeter/bakedTextMeter.js

@@ -0,0 +1,79 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+(function () {
+    var barID;
+
+    this.preload = function (entityID) {
+        var children = Entities.getChildrenIDs(entityID);
+        var childZero = Entities.getEntityProperties(children[0]);
+        barID = childZero.id;
+    };
+
+    var SCAN_RATE = 100; //ms
+    var REFERENCE_FRAME_COUNT = 30;
+    var MAX_AUDIO_THRESHOLD = 16000;
+
+    var framePool = [];
+
+    function scanEngine() {
+        var avatarLoudnessPool = [];
+
+        function average(a) {
+            var sum = 0;
+            var total = a.length;
+            for (var i = 0; i < total; i++) {
+                sum += a[i];
+            }
+            return Math.round(sum / total);
+        }
+
+        function audioClamp(input) {
+            if (input > MAX_AUDIO_THRESHOLD) return MAX_AUDIO_THRESHOLD;
+            return input;
+        }
+
+
+        var avatars = AvatarList.getAvatarIdentifiers();
+        avatars.forEach(function (id) {
+            var avatar = AvatarList.getAvatar(id);
+            avatarLoudnessPool.push(audioClamp(Math.round(avatar.audioLoudness)));
+        });
+
+
+        framePool.push(average(avatarLoudnessPool));
+        if (framePool.length >= REFERENCE_FRAME_COUNT) {
+            framePool.shift();
+        }
+
+        function normalizedAverage(a) {
+            a = a.map(function (v) {
+                return Math.round(( 100 / MAX_AUDIO_THRESHOLD ) * v);
+            });
+            return average(a);
+        }
+
+        var norm = normalizedAverage(framePool);
+
+
+        var barProperties = Entities.getEntityProperties(barID);
+
+        var colorShift = 2.55 * norm; //shifting the scale to 0 - 255
+        var xShift = norm / 52; // changing scale from 0-100 to 0-1.9 ish
+        var normShift = xShift - 0.88; //shifting local displacement (-0.88)
+        var halfShift = xShift / 2;
+        Entities.editEntity(barID, {
+            dimensions: {x: xShift, y: barProperties.dimensions.y, z: barProperties.dimensions.z},
+            localPosition: {x: normShift - (halfShift), y: -0.0625, z: -0.015},
+            color: {red: colorShift, green: barProperties.color.green, blue: barProperties.color.blue}
+        });
+
+
+    }
+
+    Script.setInterval(function () {
+        scanEngine();
+    }, SCAN_RATE);
+
+});

unpublishedScripts/marketplace/audienceApplauseMeter/meter.js

@@ -0,0 +1,92 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+(function () {
+    var barID, textID;
+
+    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 === "bar") {
+            barID = childZero.id;
+            textID = childOne.id;
+        } else {
+            barID = childOne.id;
+            textID = childZero.id;
+        }
+    };
+
+    var SCAN_RATE = 100; //ms
+    var REFERENCE_FRAME_COUNT = 30;
+    var MAX_AUDIO_THRESHOLD = 16000;
+
+    var framePool = [];
+
+    function scanEngine() {
+        var avatarLoudnessPool = [];
+
+        function average(a) {
+            var sum = 0;
+            var total = a.length;
+            for (var i = 0; i < total; i++) {
+                sum += a[i];
+            }
+            return Math.round(sum / total);
+        }
+
+        function audioClamp(input) {
+            if (input > MAX_AUDIO_THRESHOLD) return MAX_AUDIO_THRESHOLD;
+            return input;
+        }
+
+
+        var avatars = AvatarList.getAvatarIdentifiers();
+        avatars.forEach(function (id) {
+            var avatar = AvatarList.getAvatar(id);
+            avatarLoudnessPool.push(audioClamp(Math.round(avatar.audioLoudness)));
+
+        });
+
+
+        framePool.push(average(avatarLoudnessPool));
+        if (framePool.length >= REFERENCE_FRAME_COUNT) {
+            framePool.shift();
+        }
+
+        function normalizedAverage(a) {
+            a = a.map(function (v) {
+                return Math.round(( 100 / MAX_AUDIO_THRESHOLD ) * v);
+            });
+            return average(a);
+        }
+
+        var norm = normalizedAverage(framePool);
+
+        Entities.editEntity(textID, {text: "Loudness: % " + norm});
+
+        var barProperties = Entities.getEntityProperties(barID);
+
+
+        var colorShift = 2.55 * norm; //shifting the scale to 0 - 255
+        var xShift = norm / 100; // changing scale from 0-100 to 0-1
+        var normShift = xShift - .5; //shifting scale form 0-1 to -.5 to .5
+        var halfShift = xShift / 2 ;
+        Entities.editEntity(barID, {
+            dimensions: {x: xShift, y: barProperties.dimensions.y, z: barProperties.dimensions.z},
+            localPosition: {x: normShift - (halfShift), y: 0, z: 0.1},
+            color: {red: colorShift, green: barProperties.color.green, blue: barProperties.color.blue}
+        });
+
+
+    }
+
+    Script.setInterval(function () {
+        scanEngine();
+    }, SCAN_RATE);
+
+});

unpublishedScripts/marketplace/audienceApplauseMeter/rezApplauseOmeter.js

@@ -0,0 +1,24 @@
+//
+// Created by Alan-Michael Moody on 5/2/2017
+//
+
+'use strict';
+
+(function () {
+    var pos = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
+
+    var meter = {
+        stand: {
+            type: 'Model',
+            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})
+        }
+
+    };
+
+
+    Entities.addEntity(meter.stand);
+
+})();

unpublishedScripts/marketplace/audienceApplauseMeter/rezMeter.js

@@ -0,0 +1,67 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+"use strict";
+
+(function () { // BEGIN LOCAL_SCOPE
+    var pos = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
+
+    var graph = {
+        background: {
+            type: "Box",
+            dimensions: {x: 1, y: 1, z: .1},
+            color: {
+                red: 128,
+                green: 128,
+                blue: 128
+            },
+            lifetime: "3600",
+            script: "https://binaryrelay.com/files/public-docs/hifi/meter/basic/meter.js",
+            position: pos
+        },
+        bar: {
+            type: "Box",
+            parentID: "",
+            userData: '{"name":"bar"}',
+            dimensions: {x: .05, y: .25, z: .1},
+            color: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            lifetime: "3600",
+            position: Vec3.sum(pos, {x: -0.495, y: 0, z: 0.1})
+        },
+        displayText: {
+            type: "Text",
+            parentID: "",
+            userData: '{"name":"displayText"}',
+            text: "Loudness: % ",
+            textColor: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            backgroundColor: {
+                red: 128,
+                green: 128,
+                blue: 128
+            },
+            visible: 0.5,
+            dimensions: {x: 0.70, y: 0.15, z: 0.1},
+            lifetime: "3600",
+            position: Vec3.sum(pos, {x: 0, y: 0.4, z: 0.06})
+        }
+    };
+
+    var background = Entities.addEntity(graph.background);
+
+    graph.bar.parentID = background;
+    graph.displayText.parentID = background;
+
+    var bar = Entities.addEntity(graph.bar);
+    var displayText = Entities.addEntity(graph.displayText);
+
+
+})(); // END LOCAL_SCOPE

unpublishedScripts/marketplace/audienceApplauseMeter/rezPlasticMeter.js

@@ -0,0 +1,43 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+"use strict";
+
+(function () {
+    var pos = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
+
+    var graph = {
+        background: {
+            type: "Model",
+            modelURL: "https://binaryrelay.com/files/public-docs/hifi/meter/plastic/meter-plastic.fbx",
+            color: {
+                red: 128,
+                green: 128,
+                blue: 128
+            },
+            lifetime: "3600",
+            script: "https://binaryrelay.com/files/public-docs/hifi/meter/plastic/meter.js",
+            position: pos
+        },
+        bar: {
+            type: "Box",
+            parentID: "",
+            userData: '{"name":"bar"}',
+            dimensions: {x: .05, y: .245, z: .07},
+            color: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            lifetime: "3600",
+            position: Vec3.sum(pos, {x: -0.90, y: 0, z: -0.15})
+        }
+    };
+
+
+    graph.bar.parentID = Entities.addEntity(graph.background);
+    Entities.addEntity(graph.bar);
+
+
+})();

unpublishedScripts/marketplace/audienceApplauseMeter/rezTextEntityMeter.js

@@ -0,0 +1,67 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+"use strict";
+
+(function () {
+    var pos = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
+
+    var graph = {
+        background: {
+            type: "Model",
+            modelURL: "https://binaryrelay.com/files/public-docs/hifi/meter/text-entity/meter-text-entity.fbx",
+            color: {
+                red: 128,
+                green: 128,
+                blue: 128
+            },
+            lifetime: "3600",
+            script: "https://binaryrelay.com/files/public-docs/hifi/meter/text-entity/meter.js",
+            position: pos
+        },
+        bar: {
+            type: "Box",
+            parentID: "",
+            userData: '{"name":"bar"}',
+            dimensions: {x: .05, y: .245, z: .07},
+            color: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            lifetime: "3600",
+            position: Vec3.sum(pos, {x: -0.88, y: 0, z: -0.15})
+        },
+        displayText: {
+            type: "Text",
+            parentID: "",
+            userData: '{"name":"displayText"}',
+            text: "Make Some Noise:",
+            textColor: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            backgroundColor: {
+                red: 255,
+                green: 255,
+                blue: 255
+            },
+            dimensions: {x: .82, y: 0.115, z: 0.15},
+            lifetime: "3600",
+            lineHeight: .08,
+            position: Vec3.sum(pos, {x: -0.2, y: 0.175, z: -0.035})
+        }
+    };
+
+    var background = Entities.addEntity(graph.background);
+
+    graph.bar.parentID = background;
+    graph.displayText.parentID = background;
+
+    var bar = Entities.addEntity(graph.bar);
+    var displayText = Entities.addEntity(graph.displayText);
+
+
+})();

unpublishedScripts/marketplace/audienceApplauseMeter/rezWoodMeter.js

@@ -0,0 +1,42 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+"use strict";
+
+(function () {
+    var pos = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
+
+    var graph = {
+        background: {
+            type: "Model",
+            modelURL: "https://binaryrelay.com/files/public-docs/hifi/meter/wood/meter-wood.fbx",
+            color: {
+                red: 128,
+                green: 128,
+                blue: 128
+            },
+            lifetime: "3600",
+            script: "https://binaryrelay.com/files/public-docs/hifi/meter/wood/meter.js",
+            position: pos
+        },
+        bar: {
+            type: "Box",
+            parentID: "",
+            userData: '{"name":"bar"}',
+            dimensions: {x: .05, y: .245, z: .07},
+            color: {
+                red: 0,
+                green: 0,
+                blue: 0
+            },
+            lifetime: "3600",
+            position: Vec3.sum(pos, {x: -0.88, y: 0, z: -0.15})
+        }
+    };
+
+    graph.bar.parentID = Entities.addEntity(graph.background);
+    Entities.addEntity(graph.bar);
+
+
+})();

unpublishedScripts/marketplace/audienceApplauseMeter/textEntityMeter.js

@@ -0,0 +1,89 @@
+//
+// Created by Alan-Michael Moody on 4/17/2017
+//
+
+(function () {
+    var barID, textID, originalText;
+
+    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 === "bar") {
+            barID = childZero.id;
+            textID = childOne.id;
+            originalText = childOne.text
+        } else {
+            barID = childOne.id;
+            textID = childZero.id;
+            originalText = childZero.text;
+        }
+    };
+
+    var SCAN_RATE = 100; //ms
+    var REFERENCE_FRAME_COUNT = 30;
+    var MAX_AUDIO_THRESHOLD = 16000;
+
+    var framePool = [];
+
+    function scanEngine() {
+        var avatarLoudnessPool = [];
+
+        function average(a) {
+            var sum = 0;
+            var total = a.length;
+            for (var i = 0; i < total; i++) {
+                sum += a[i];
+            }
+            return Math.round(sum / total);
+        }
+
+        function audioClamp(input) {
+            if (input > MAX_AUDIO_THRESHOLD) return MAX_AUDIO_THRESHOLD;
+            return input;
+        }
+
+
+        var avatars = AvatarList.getAvatarIdentifiers();
+        avatars.forEach(function (id) {
+            var avatar = AvatarList.getAvatar(id);
+            avatarLoudnessPool.push(audioClamp(Math.round(avatar.audioLoudness)));
+        });
+
+
+        framePool.push(average(avatarLoudnessPool));
+        if (framePool.length >= REFERENCE_FRAME_COUNT) {
+            framePool.shift();
+        }
+
+        function normalizedAverage(a) {
+            a = a.map(function (v) {
+                return Math.round(( 100 / MAX_AUDIO_THRESHOLD ) * v);
+            });
+            return average(a);
+        }
+
+        var norm = normalizedAverage(framePool);
+        Entities.editEntity(textID, {text: originalText + " % " + norm});
+
+        var barProperties = Entities.getEntityProperties(barID);
+
+        var colorShift = 2.55 * norm; //shifting the scale to 0 - 255
+        var xShift = norm / 52; // changing scale from 0-100 to 0-1.9 ish
+        var normShift = xShift - 0.88; //shifting local displacement (-0.88)
+        var halfShift = xShift / 2;
+        Entities.editEntity(barID, {
+            dimensions: {x: xShift, y: barProperties.dimensions.y, z: barProperties.dimensions.z},
+            localPosition: {x: normShift - ( halfShift ), y: -0.0625, z: -0.015},
+            color: {red: colorShift, green: barProperties.color.green, blue: barProperties.color.blue}
+        });
+    }
+
+    Script.setInterval(function () {
+        scanEngine();
+    }, SCAN_RATE);
+
+});