From 4d62c532f57eb0ea974c92bb0016ae56a2b5d011 Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 3 Nov 2015 15:35:13 -0800 Subject: [PATCH 1/2] Removing dead config files --- .../resources/controllers/mapping-config.json | 24 ----------- .../resources/controllers/mapping-test0.json | 36 ---------------- .../resources/controllers/standard-old.json | 43 ------------------- 3 files changed, 103 deletions(-) delete mode 100644 interface/resources/controllers/mapping-config.json delete mode 100644 interface/resources/controllers/mapping-test0.json delete mode 100644 interface/resources/controllers/standard-old.json diff --git a/interface/resources/controllers/mapping-config.json b/interface/resources/controllers/mapping-config.json deleted file mode 100644 index 2ccd216c2f..0000000000 --- a/interface/resources/controllers/mapping-config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "Full Mapping config including the standard hydra and gamepad and one more thing", - "mappings": [ - { "src": "./mapping-hydra.json" }, - { "src": "./mapping-xbox.json" }, - { - "name": "example mapping for standard to js function", - "channels": [ { - "from": "Standard.B", - "to": { - "type":"js", - "function": "function(value){ print(\"Standard.B = \" + value );}" - } - }, { - "from": "Standard.B", - "to": { - "type":"js", - "src": "http://www.theNextBigThing.com/hifiInputSignalHandler.js" - } - } - ] - } - ] -} diff --git a/interface/resources/controllers/mapping-test0.json b/interface/resources/controllers/mapping-test0.json deleted file mode 100644 index 5232c97f19..0000000000 --- a/interface/resources/controllers/mapping-test0.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "example mapping from Standard to actions", - "channels": [ { - "from": "Standard.LY", - "filters": [ { - "type": "clamp", - "min": 0, - "max": 1 - } - ], - "to": "Actions.Forward" - }, { - "from": "Standard.LY", - "filters": [ { - "type": "clamp", - "min": -1, - "max": 0 - }, { - "type": "invert" - } - ], - "to": "Actions.Backward" - }, { - "from": "Standard.LX", - "filters": [ { - "type": "scale", - "scale": 2.0 - } - ], - "to": "Actions.Yaw" - }, { - "from": "Standard.A", - "to": "Actions.Action0" - } - ] -} \ No newline at end of file diff --git a/interface/resources/controllers/standard-old.json b/interface/resources/controllers/standard-old.json deleted file mode 100644 index b662e5394d..0000000000 --- a/interface/resources/controllers/standard-old.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "Standard to Action", - "channels": [ - { "from": "Standard.LY", "to": "Actions.TranslateZ" }, - { "from": "Standard.LX", "to": "Actions.TranslateX" }, - { "from": "Standard.RX", "to": "Actions.Yaw" }, - { "from": "Standard.RY", "to": "Actions.Pitch" }, - { - "from": "Standard.DU", - "to": "Actions.LONGITUDINAL_FORWARD", - "filters": [ { "type": "scale", "scale": 0.5 } ] - }, - { - "from": "Standard.DD", - "to": "Actions.LONGITUDINAL_BACKWARD", - "filters": [ { "type": "scale", "scale": 0.5 } ] - }, - { - "from": "Standard.DR", - "to": "Actions.LATERAL_RIGHT", - "filters": [ { "type": "scale", "scale": 0.5 } ] - }, - { - "from": "Standard.DL", - "to": "Actions.LATERAL_LEFT", - "filters": [ { "type": "scale", "scale": 0.5 } ] - }, - { "from": "Standard.Y", "to": "Actions.VERTICAL_UP" }, - { "from": "Standard.X", "to": "Actions.VERTICAL_DOWN" }, - { - "from": "Standard.RT", - "to": "Actions.BOOM_IN", - "filters": [ { "type": "scale", "scale": 0.1 } ] - }, - { - "from": "Standard.LT", - "to": "Actions.BOOM_OUT", - "filters": [ { "type": "scale", "scale": 0.1 } ] - }, - { "from": "Standard.LeftHand", "to": "Actions.LEFT_HAND" }, - { "from": "Standard.RightHand", "to": "Actions.RIGHT_HAND" } - ] -} From 57bc2f3093dc6ebe47233ad91a2af53fdcedb18d Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 3 Nov 2015 15:37:36 -0800 Subject: [PATCH 2/2] Removing dead js files --- examples/controllers/controllerMappings.js | 101 --------------------- 1 file changed, 101 deletions(-) delete mode 100644 examples/controllers/controllerMappings.js diff --git a/examples/controllers/controllerMappings.js b/examples/controllers/controllerMappings.js deleted file mode 100644 index 3848f62096..0000000000 --- a/examples/controllers/controllerMappings.js +++ /dev/null @@ -1,101 +0,0 @@ - -// -// controllerScriptingExamples.js -// examples -// -// Created by Sam Gondelman on 6/2/15 -// Copyright 2015 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 -// - -// Assumes you only have the default keyboard connected - -/*myFirstMapping = function() { -return { - "name": "example", - "channels": [ - { "from": "Keyboard.W", "to": "Actions.LONGITUDINAL_FORWARD" }, - { "from": "Keyboard.S", "to": "Actions.LONGITUDINAL_BACKWARD" }, - - { "from": "Keyboard.Left", "to": "Actions.LATERAL_LEFT" }, - { "from": "Keyboard.Right", "to": "Actions.LATERAL_RIGHT" }, - - { "from": "Keyboard.A", "to": "Actions.YAW_LEFT" }, - { "from": "Keyboard.D", "to": "Actions.YAW_RIGHT" }, - - { "from": "Keyboard.C", "to": "Actions.VERTICAL_DOWN" }, - { "from": "Keyboard.E", "to": "Actions.VERTICAL_UP" }, - { - "from": "Standard.LX", - "filters": [ { - "type": "scale", - "params": [2.0], - } - ], - "to": "Actions.LATERAL_LEFT", - }, { - "from": "Keyboard.B", - "to": "Actions.Yaw" - } - ] -} -} -*/ -mySecondMapping = function() { -return { - "name": "example2", - "channels": [ - { "from": "Standard.LY", "to": "Actions.TranslateZ" }, - { "from": "Standard.LX", "to": "Actions.Yaw" }, - ] -} -} - -//Script.include('mapping-test0.json'); -/*var myFirstMappingJSON = myFirstMapping(); -print('myFirstMappingJSON' + JSON.stringify(myFirstMappingJSON)); - -var mapping = Controller.parseMapping(JSON.stringify(myFirstMappingJSON)); - - -Controller.enableMapping("example3"); - -var mySecondMappingJSON = mySecondMapping(); -print('mySecondMappingJSON' + JSON.stringify(mySecondMappingJSON)); - -var mapping2 = Controller.parseMapping(JSON.stringify(mySecondMappingJSON)); -mapping2.enable(); - -Controller.enableMapping("example2"); -*/ -var mapping3 = Controller.loadMapping(Script.resolvePath("example3.json")); -Controller.enableMapping("example3"); - -/* -Object.keys(Controller.Standard).forEach(function (input) { - print("Controller.Standard." + input + ":" + Controller.Standard[input]); -}); - -Object.keys(Controller.Hardware).forEach(function (deviceName) { - Object.keys(Controller.Hardware[deviceName]).forEach(function (input) { - print("Controller.Hardware." + deviceName + "." + input + ":" + Controller.Hardware[deviceName][input]); - }); -}); - -Object.keys(Controller.Actions).forEach(function (actionName) { - print("Controller.Actions." + actionName + ":" + Controller.Actions[actionName]); -}); -*/ - - -Controller.hardwareChanged.connect(function () { - print("hardwareChanged ---------------------------------------------------"); - Object.keys(Controller.Hardware).forEach(function (deviceName) { - Object.keys(Controller.Hardware[deviceName]).forEach(function (input) { - print("Controller.Hardware." + deviceName + "." + input + ":" + Controller.Hardware[deviceName][input]); - }); - }); - print("-------------------------------------------------------------------"); -}); \ No newline at end of file