Merge pull request #12661 from SamGondelman/android

Android: Stats, disable IK, reduce impact of InputRecorder

interface/resources/icons/+android/stats.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<path d="M45,40.3l-7.1-6.3c-0.7-0.7-1.7-0.9-2.6-0.8c2.3-2.9,3.6-6.4,3.6-10.3c0-9.9-7.9-17-16.9-17.1c-9.3,0-16.7,7.4-17,16.3
+	C4.7,32,12.6,39.6,21.9,39.7c4.2,0,8.1-1.5,11-4.1c-0.2,0.9,0.1,1.9,0.9,2.6l7.1,6.3c1.2,1.1,3,1.1,4.1-0.1c0.5-0.6,0.8-1.3,0.8-2
+	C45.9,41.6,45.6,40.8,45,40.3z M22.5,35.4c-7.3,0.3-13.2-5.5-13.2-12.8C9.2,15.8,14.9,10.1,21.9,10c7-0.1,12.8,5.6,12.8,12.7
+	C34.7,29.7,29.2,35.2,22.5,35.4z"/>
+<path d="M26.2,19.9c-0.5,1.2-0.9,2.4-1.3,3.5c-0.6,1.6-1.2,3.2-1.8,4.8c-0.3,0.8-0.8,1.2-1.6,1.2c-0.8,0-1.2-0.3-1.6-1.2
+	c-0.9-2.1-1.8-4.2-2.6-6.2c0-0.1-0.1-0.2-0.2-0.5c-0.3,0.5-0.6,0.9-0.8,1.4c-0.4,0.9-1.1,1.3-2.1,1.2c-0.6,0-1.2,0-1.8,0
+	c-0.9,0-1.5-0.6-1.5-1.4c-0.1-0.7,0.5-1.4,1.3-1.5c0.2,0,0.4-0.1,0.5-0.1c0.7,0.1,1.1-0.2,1.5-0.9c0.5-1,1.1-2,1.6-3
+	c0.3-0.6,0.8-1,1.6-1c0.7,0,1.2,0.5,1.5,1.1c0.8,1.8,1.6,3.7,2.3,5.5c0.1,0.2,0.1,0.3,0.3,0.6c0.2-0.6,0.4-1.1,0.6-1.6
+	c0.9-2.4,1.8-4.8,2.7-7.2c0.3-0.9,0.8-1.2,1.5-1.2c0.8,0,1.3,0.4,1.6,1.2c0.7,1.8,1.3,3.6,1.9,5.5c0.4,1,0.1,0.8,1.1,0.8
+	c0.4,0,0.8,0,1.1,0.1c0.7,0.2,1.2,0.8,1.1,1.6c-0.1,0.7-0.6,1.3-1.4,1.3c-1,0-2,0-3,0c-0.7,0-1.1-0.4-1.4-1.1
+	C27,22.1,26.6,21.1,26.2,19.9z"/>
+</svg>

interface/resources/qml/+android/StatText.qml

@@ -0,0 +1,9 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+
+Text {
+    color: "white";
+    style: Text.Outline;
+    styleColor: "black";
+    font.pixelSize: 15;
+}

interface/resources/qml/hifi/+android/StatsBar.qml

@@ -0,0 +1,71 @@
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.3
+import Qt.labs.settings 1.0
+import "../../styles-uit"
+import "../../controls-uit" as HifiControlsUit
+import "../../controls" as HifiControls
+import ".."
+
+Item {
+    id: bar
+    x:300
+    y:0
+    width: 300
+    height: 300
+    z: -1
+
+    signal sendToScript(var message);
+    signal windowClosed();
+    
+    property bool shown: true
+
+    onShownChanged: {
+        bar.visible = shown;
+    }
+
+	Rectangle {
+        anchors.fill : parent
+        color: "transparent"
+        Flow {
+            id: flowMain
+            spacing: 10
+            flow: Flow.TopToBottom
+            layoutDirection: Flow.TopToBottom
+            anchors.fill: parent
+            anchors.margins: 4
+        }
+    }
+
+    Component.onCompleted: {
+        // put on bottom
+        x = 300;
+        y = 0;
+        width = 300;
+        height = 300;
+    }
+    
+    function addButton(properties) {
+        var component = Qt.createComponent("button.qml");
+        if (component.status == Component.Ready) {
+            var button = component.createObject(flowMain);
+            // copy all properites to button
+            var keys = Object.keys(properties).forEach(function (key) {
+                button[key] = properties[key];
+            });
+            return button;
+        } else if( component.status == Component.Error) {
+            console.log("Load button errors " + component.errorString());
+        }
+    }
+
+    function urlHelper(src) {
+            if (src.match(/\bhttp/)) {
+                return src;
+            } else {
+                return "../../../" + src;
+            }
+        }
+
+}

libraries/animation/src/AnimInverseKinematics.cpp

@@ -882,6 +882,11 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut, const AnimPoseVec& underPoses) {
+#ifdef Q_OS_ANDROID
+    // disable IK on android
+    return underPoses;
+#endif
+
     // allows solutionSource to be overridden by an animVar
     auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);
 

libraries/controllers/src/controllers/UserInputMapper.cpp

@@ -73,7 +73,8 @@ void UserInputMapper::registerDevice(InputDevice::Pointer device) {
 
     qCDebug(controllers) << "Registered input device <" << device->getName() << "> deviceID = " << deviceID;
 
-    for (const auto& inputMapping : device->getAvailableInputs()) {
+    auto inputs = device->getAvailableInputs();
+    for (const auto& inputMapping : inputs) {
         const auto& input = inputMapping.first;
         // Ignore aliases
         if (_endpointsByInput.count(input)) {
@@ -126,7 +127,8 @@ void UserInputMapper::removeDevice(int deviceID) {
         _mappingsByDevice.erase(mappingsEntry);
     }
 
-    for (const auto& inputMapping : device->getAvailableInputs()) {
+    auto inputs = device->getAvailableInputs();
+    for (const auto& inputMapping : inputs) {
         const auto& input = inputMapping.first;
         auto endpoint = _endpointsByInput.find(input);
         if (endpoint != _endpointsByInput.end()) {
@@ -171,7 +173,7 @@ InputDevice::Pointer UserInputMapper::getDevice(const Input& input) {
     }
 }
 
-QString UserInputMapper::getDeviceName(uint16 deviceID) { 
+QString UserInputMapper::getDeviceName(uint16 deviceID) {
     Locker locker(_lock);
     if (_registeredDevices.find(deviceID) != _registeredDevices.end()) {
         return _registeredDevices[deviceID]->_name;
@@ -181,7 +183,7 @@ QString UserInputMapper::getDeviceName(uint16 deviceID) {
 
 int UserInputMapper::findDevice(QString name) const {
     Locker locker(_lock);
-    for (auto device : _registeredDevices) {
+    for (const auto& device : _registeredDevices) {
         if (device.second->_name == name) {
             return device.first;
         }
@@ -192,7 +194,7 @@ int UserInputMapper::findDevice(QString name) const {
 QVector<QString> UserInputMapper::getDeviceNames() {
     Locker locker(_lock);
     QVector<QString> result;
-    for (auto device : _registeredDevices) {
+    for (const auto& device : _registeredDevices) {
         QString deviceName = device.second->_name.split(" (")[0];
         result << deviceName;
     }
@@ -218,7 +220,7 @@ Input UserInputMapper::findDeviceInput(const QString& inputName) const {
             const auto& device = _registeredDevices.at(deviceID);
             auto deviceInputs = device->getAvailableInputs();
 
-            for (auto input : deviceInputs) {
+            for (const auto& input : deviceInputs) {
                 if (input.second == inputName) {
                     return input.first;
                 }
@@ -321,7 +323,8 @@ QVector<Action> UserInputMapper::getAllActions() const {
 
 QString UserInputMapper::getActionName(Action action) const {
     Locker locker(_lock);
-    for (auto actionPair : getActionInputs()) {
+    auto inputs = getActionInputs();
+    for (const auto& actionPair : inputs) {
         if (actionPair.first.channel == toInt(action)) {
             return actionPair.second;
         }
@@ -331,18 +334,20 @@ QString UserInputMapper::getActionName(Action action) const {
 
 QString UserInputMapper::getStandardPoseName(uint16_t pose) {
     Locker locker(_lock);
-    for (auto posePair : getStandardInputs()) {
+    auto inputs = getStandardInputs();
+    for (const auto& posePair : inputs) {
         if (posePair.first.channel == pose && posePair.first.getType() == ChannelType::POSE) {
             return posePair.second;
         }
     }
     return QString();
-}    
+}
 
 QVector<QString> UserInputMapper::getActionNames() const {
     Locker locker(_lock);
     QVector<QString> result;
-    for (auto actionPair : getActionInputs()) {
+    auto inputs = getActionInputs();
+    for (const auto& actionPair : inputs) {
         result << actionPair.second;
     }
     return result;
@@ -357,7 +362,7 @@ Pose UserInputMapper::getPoseState(Action action) const {
 bool UserInputMapper::triggerHapticPulse(float strength, float duration, controller::Hand hand) {
     Locker locker(_lock);
     bool toReturn = false;
-    for (auto device : _registeredDevices) {
+    for (const auto& device : _registeredDevices) {
         toReturn = toReturn || device.second->triggerHapticPulse(strength, duration, hand);
     }
     return toReturn;
@@ -469,7 +474,7 @@ void UserInputMapper::runMappings() {
     if (debugRoutes) {
         qCDebug(controllers) << "Beginning mapping frame";
     }
-    for (auto endpointEntry : this->_endpointsByInput) {
+    for (const auto& endpointEntry : _endpointsByInput) {
         endpointEntry.second->reset();
     }
 
@@ -542,9 +547,9 @@ bool UserInputMapper::applyRoute(const Route::Pointer& route, bool force) {
     }
 
 
-    // Most endpoints can only be read once (though a given mapping can route them to 
+    // Most endpoints can only be read once (though a given mapping can route them to
     // multiple places).  Consider... If the default is to wire the A button to JUMP
-    // and someone else wires it to CONTEXT_MENU, I don't want both to occur when 
+    // and someone else wires it to CONTEXT_MENU, I don't want both to occur when
     // I press the button.  The exception is if I'm wiring a control back to itself
     // in order to adjust my interface, like inverting the Y axis on an analog stick
     if (!route->peek && !source->readable()) {
@@ -897,7 +902,8 @@ Conditional::Pointer UserInputMapper::parseConditional(const QJsonValue& value)
     if (value.isArray()) {
         // Support "when" : [ "GamePad.RB", "GamePad.LB" ]
         Conditional::List children;
-        for (auto arrayItem : value.toArray()) {
+        auto array = value.toArray();
+        for (const auto& arrayItem : array) {
             Conditional::Pointer childConditional = parseConditional(arrayItem);
             if (!childConditional) {
                 return Conditional::Pointer();
@@ -908,7 +914,7 @@ Conditional::Pointer UserInputMapper::parseConditional(const QJsonValue& value)
     } else if (value.isString()) {
         // Support "when" : "GamePad.RB"
         auto conditionalToken = value.toString();
-        
+
         // Detect for modifier case (Not...)
         QString conditionalModifier;
         const QString JSON_CONDITIONAL_MODIFIER_NOT("!");
@@ -943,12 +949,12 @@ Filter::Pointer UserInputMapper::parseFilter(const QJsonValue& value) {
         result = Filter::getFactory().create(value.toString());
     } else if (value.isObject()) {
         result = Filter::parse(value.toObject());
-    } 
+    }
 
     if (!result) {
         qWarning() << "Invalid filter definition " << value;
     }
-      
+
     return result;
 }
 
@@ -960,7 +966,7 @@ Filter::List UserInputMapper::parseFilters(const QJsonValue& value) {
     if (value.isArray()) {
         Filter::List result;
         auto filtersArray = value.toArray();
-        for (auto filterValue : filtersArray) {
+        for (const auto& filterValue : filtersArray) {
             Filter::Pointer filter = parseFilter(filterValue);
             if (!filter) {
                 return Filter::List();
@@ -968,7 +974,7 @@ Filter::List UserInputMapper::parseFilters(const QJsonValue& value) {
             result.push_back(filter);
         }
         return result;
-    } 
+    }
 
     Filter::Pointer filter = parseFilter(value);
     if (!filter) {
@@ -980,7 +986,8 @@ Filter::List UserInputMapper::parseFilters(const QJsonValue& value) {
 Endpoint::Pointer UserInputMapper::parseDestination(const QJsonValue& value) {
     if (value.isArray()) {
         ArrayEndpoint::Pointer result = std::make_shared<ArrayEndpoint>();
-        for (auto arrayItem : value.toArray()) {
+        auto array = value.toArray();
+        for (const auto& arrayItem : array) {
             Endpoint::Pointer destination = parseEndpoint(arrayItem);
             if (!destination) {
                 return Endpoint::Pointer();
@@ -988,14 +995,14 @@ Endpoint::Pointer UserInputMapper::parseDestination(const QJsonValue& value) {
             result->_children.push_back(destination);
         }
         return result;
-    } 
-    
+    }
+
     return parseEndpoint(value);
 }
 
 Endpoint::Pointer UserInputMapper::parseAxis(const QJsonValue& value) {
     if (value.isObject()) {
-        auto object = value.toObject();     
+        auto object = value.toObject();
         if (object.contains("makeAxis")) {
             auto axisValue = object.value("makeAxis");
             if (axisValue.isArray()) {
@@ -1017,7 +1024,8 @@ Endpoint::Pointer UserInputMapper::parseAxis(const QJsonValue& value) {
 Endpoint::Pointer UserInputMapper::parseAny(const QJsonValue& value) {
     if (value.isArray()) {
         Endpoint::List children;
-        for (auto arrayItem : value.toArray()) {
+        auto array = value.toArray();
+        for (const auto& arrayItem : array) {
             Endpoint::Pointer destination = parseEndpoint(arrayItem);
             if (!destination) {
                 return Endpoint::Pointer();
@@ -1162,7 +1170,7 @@ Mapping::Pointer UserInputMapper::parseMapping(const QString& json) {
 
 template <typename T>
 bool hasDebuggableRoute(const T& routes) {
-    for (auto route : routes) {
+    for (const auto& route : routes) {
         if (route->debug) {
             return true;
         }
@@ -1174,7 +1182,7 @@ bool hasDebuggableRoute(const T& routes) {
 void UserInputMapper::enableMapping(const Mapping::Pointer& mapping) {
     Locker locker(_lock);
     // New routes for a device get injected IN FRONT of existing routes.  Routes
-    // are processed in order so this ensures that the standard -> action processing 
+    // are processed in order so this ensures that the standard -> action processing
     // takes place after all of the hardware -> standard or hardware -> action processing
     // because standard -> action is the first set of routes added.
     Route::List standardRoutes = mapping->routes;

libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp

@@ -16,11 +16,14 @@
 using namespace controller;
 
 void ActionEndpoint::apply(float newValue, const Pointer& source) {
-    InputRecorder* inputRecorder = InputRecorder::getInstance();
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    QString actionName = userInputMapper->getActionName(Action(_input.getChannel()));
-    if(inputRecorder->isPlayingback()) {
-        newValue = inputRecorder->getActionState(actionName);
+    InputRecorder* inputRecorder = InputRecorder::getInstance();
+    QString actionName;
+    if (inputRecorder->isPlayingback() || inputRecorder->isRecording()) {
+        actionName = userInputMapper->getActionName(Action(_input.getChannel()));
+        if (inputRecorder->isPlayingback()) {
+            newValue = inputRecorder->getActionState(actionName);
+        }
     }
     
     _currentValue += newValue;
@@ -32,10 +35,12 @@ void ActionEndpoint::apply(float newValue, const Pointer& source) {
 
 void ActionEndpoint::apply(const Pose& value, const Pointer& source) {
     _currentPose = value;
-    InputRecorder* inputRecorder = InputRecorder::getInstance();
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    QString actionName = userInputMapper->getActionName(Action(_input.getChannel()));
-    inputRecorder->setActionState(actionName, _currentPose);
+    InputRecorder* inputRecorder = InputRecorder::getInstance();
+    if (inputRecorder->isRecording()) {
+        QString actionName = userInputMapper->getActionName(Action(_input.getChannel()));
+        inputRecorder->setActionState(actionName, _currentPose);
+    }
     
     if (!_currentPose.isValid()) {
         return;

scripts/+android/defaultScripts.js

@@ -16,7 +16,8 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/+android/touchscreenvirtualpad.js",
     "system/+android/bottombar.js",
     "system/+android/audio.js" ,
-    "system/+android/modes.js"/*,
+    "system/+android/modes.js",
+    "system/+android/stats.js"/*,
     "system/away.js",
     "system/controllers/controllerDisplayManager.js",
     "system/controllers/handControllerGrabAndroid.js",

scripts/system/+android/stats.js

@@ -0,0 +1,39 @@
+"use strict";
+//
+//  stats.js
+//  scripts/system/
+//
+//  Created by Sam Gondelman on 3/14/18
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function() { // BEGIN LOCAL_SCOPE
+
+var statsbar;
+var statsButton;
+
+function init() {
+    statsbar = new QmlFragment({
+        qml: "hifi/StatsBar.qml"
+    });
+
+    statsButton = statsbar.addButton({
+        icon: "icons/stats.svg",
+        activeIcon: "icons/stats.svg",
+        textSize: 45,
+        bgOpacity: 0.0,
+        activeBgOpacity: 0.0,
+        bgColor: "#FFFFFF",
+        text: "STATS"
+    });
+    statsButton.clicked.connect(function() {
+        Menu.triggerOption("Stats");
+    });
+}
+
+init();
+
+}()); // END LOCAL_SCOPE