From 90b0b1eb458d1e15da53156b807737b6ed4911c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Fri, 19 Aug 2022 23:24:58 +0200 Subject: [PATCH] Change identifier to org.overte --- cmake/macros/SetPackagingParameters.cmake | 2 +- interface/CMakeLists.txt | 6 ++--- interface/src/SpeechRecognizer.h | 2 +- .../src/controllers/ScriptingInterface.h | 6 ++--- .../controllers/impl/MappingBuilderProxy.h | 4 +-- .../src/controllers/impl/RouteBuilderProxy.h | 26 +++++++++---------- libraries/networking/src/MessagesClient.h | 8 +++--- server-console/packager.js | 2 +- server-console/src/modules/hf-app.js | 8 +++--- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 027300439b..0ae25f6651 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -188,7 +188,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_SHORTCUT_NAME "Overte") set(CONSOLE_SHORTCUT_NAME "Console") set(SANDBOX_SHORTCUT_NAME "Server") - set(APP_USER_MODEL_ID "com.overte.console") + set(APP_USER_MODEL_ID "org.overte.console") else () set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}") set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}") diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 52d9894ec7..90c32ed2b7 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -123,12 +123,12 @@ if (APPLE) set(MACOSX_BUNDLE_BUNDLE_NAME "Overte") if (PRODUCTION_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface) + set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface) else () if (DEV_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-dev) + set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-dev) elseif (PR_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-pr) + set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-pr) endif () endif () diff --git a/interface/src/SpeechRecognizer.h b/interface/src/SpeechRecognizer.h index be6a1aa296..4901bae031 100644 --- a/interface/src/SpeechRecognizer.h +++ b/interface/src/SpeechRecognizer.h @@ -82,7 +82,7 @@ signals: * return turnRate; * } * - * var MAPPING_NAME = "com.overte.controllers.example.speechRecognizer"; + * var MAPPING_NAME = "org.overte.controllers.example.speechRecognizer"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(getTurnRate).to(Controller.Actions.Yaw); diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index 7da9a4e57f..ac109b41ce 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -276,7 +276,7 @@ namespace controller { * by {@link Uuid(0).generate|Uuid.generate} is used. * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); @@ -311,7 +311,7 @@ namespace controller { * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. * var mappingJSON = { - * "name": "com.overte.controllers.example.jsonMapping", + * "name": "org.overte.controllers.example.jsonMapping", * "channels": [ * { "from": "Standard.RT", "to": "Actions.TranslateY" } * ] @@ -463,7 +463,7 @@ namespace controller { * {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs. * @function Controller.captureMouseEvents * @example Disable Controller.Hardware.Keyboard mouse events for a short period. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) { * print("Mouse x = " + x); diff --git a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h index aeb4480a92..4c1a6faa51 100644 --- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h +++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h @@ -71,7 +71,7 @@ class UserInputMapper; * @property {Controller.MappingJSONRoute[]} channels - An array of routes. * @example A simple mapping JSON that makes the right trigger move your avatar up after a dead zone. * { - * "name": "com.overte.controllers.example.jsonMapping", + * "name": "org.overte.controllers.example.jsonMapping", * "channels": [ * { * "from": "Standard.RT", @@ -176,7 +176,7 @@ public: * @returns {RouteObject} A route ready for mapping to an action or function using {@link RouteObject} methods. The data * value passed to the route is the combined value of source2 - source1. * @example Make the Oculus Touch triggers move your avatar up and down. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping * .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT) diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h index 86338fae9a..88f20d218a 100644 --- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h +++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h @@ -90,7 +90,7 @@ class RouteBuilderProxy : public QObject { * an in-line function definition. * * @example Make the right trigger move your avatar up. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); @@ -105,7 +105,7 @@ class RouteBuilderProxy : public QObject { * print("Trigger value: " + value); * } * - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(onRightTrigger); @@ -124,7 +124,7 @@ class RouteBuilderProxy : public QObject { * otherwise it is disabled. * @returns {RouteObject} The RouteObject with debug output enabled or disabled. * @example Write debug information to the program log for a right trigger mapping. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).debug().to(function (value) { @@ -175,7 +175,7 @@ class RouteBuilderProxy : public QObject { * calls.

* @returns {RouteObject} The RouteObject with the condition added. * @example Process the right trigger differently in HMD and desktop modes. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * // Processed only if in HMD mode. @@ -203,7 +203,7 @@ class RouteBuilderProxy : public QObject { * @param {number} max - The maximum value to pass through. * @returns {RouteObject} The route object with the clamp filter added. * @example Clamp right trigger values to between 0.3 and 0.7. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) { * print("Value: " + value); @@ -225,7 +225,7 @@ class RouteBuilderProxy : public QObject { * @param {number} max - When the input value rises above this value the output value changes to 1. * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to 0 or 1 with hysteresis. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).peek().to(function (value) { * print("Raw value: " + value); // 0.0 - 1.0. @@ -247,7 +247,7 @@ class RouteBuilderProxy : public QObject { * @param {number} interval - The interval between sending values, in seconds. * @returns {RouteObject} The RouteObject with the filter applied. * @example Send right trigger values every half second. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) { * print("Value: " + value); @@ -266,7 +266,7 @@ class RouteBuilderProxy : public QObject { * @param {number} multiplier - The scale to multiply the value by. * @returns {RouteObject} The RouteObject with the filter applied. * @example Scale the value of the right joystick forward/back values by 10. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.LY).to(function (value) { * print("L value: " + value); // -1.0 to 1.0 values. @@ -288,7 +288,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#invert * @returns {RouteObject} The RouteObject with the filter applied. * @example Invert the value of the right joystick forward/back values. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.LY).to(function (value) { * print("L value: " + value); // -1.0 to 1.0 values, forward to back. @@ -313,7 +313,7 @@ class RouteBuilderProxy : public QObject { * negative of this value is used. * @returns {RouteObject} The RouteObject with the filter applied. * @example Apply a dead-zone to the right joystick forward/back values. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) { * print("Value: " + value); // 0.0 - 1.0 values once outside the dead-zone. @@ -334,7 +334,7 @@ class RouteBuilderProxy : public QObject { * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to -1, 0, or * 1. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) { * print("Value: " + value); // -1, 0, or 1 @@ -353,7 +353,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#constrainToPositiveInteger * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to 0 or 1. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) { * print("Value: " + value); // 0, or 1 @@ -436,7 +436,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#logicalNot * @returns {RouteObject} The RouteObject with the filter applied. * @example Logical NOT of LSTouch value. - * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; + * var MAPPING_NAME = "org.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RSTouch).peek().to(function (value) { diff --git a/libraries/networking/src/MessagesClient.h b/libraries/networking/src/MessagesClient.h index 524025176d..2f45cbe9a3 100644 --- a/libraries/networking/src/MessagesClient.h +++ b/libraries/networking/src/MessagesClient.h @@ -64,7 +64,7 @@ public: * from an assignment client script it is received only by that same assignment client script.

* @example Send and receive a message. * // Receiving script. - * var channelName = "com.overte.example.messages-example"; + * var channelName = "org.overte.example.messages-example"; * * function onMessageReceived(channel, message, sender, localOnly) { * print("Message received:"); @@ -84,7 +84,7 @@ public: * * * // Sending script. - * var channelName = "com.overte.example.messages-example"; + * var channelName = "org.overte.example.messages-example"; * var message = "Hello"; * Messages.sendMessage(channelName, message); */ @@ -112,7 +112,7 @@ public: * from an assignment client script it is received only by that same assignment client script.

* @example Send and receive data. * // Receiving script. - * var channelName = "com.overte.example.messages-example"; + * var channelName = "org.overte.example.messages-example"; * * function onDataReceived(channel, data, sender, localOnly) { * var int8data = new Int8Array(data); @@ -140,7 +140,7 @@ public: * * * // Sending script. - * var channelName = "com.overte.example.messages-example"; + * var channelName = "org.overte.example.messages-example"; * var int8data = new Int8Array([1, 1, 2, 3, 5, 8, 13]); * Messages.sendData(channelName, int8data.buffer); */ diff --git a/server-console/packager.js b/server-console/packager.js index 9259af6085..cd4cb9828f 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -32,7 +32,7 @@ var FULL_NAME = argv.client_only ? "Overte Console" : "Overte Sandbox"; // setup per OS options if (osType == "Darwin") { - options["app-bundle-id"] = "com.overte.server-console" + (argv.production ? "" : "-dev") + options["app-bundle-id"] = "org.overte.server-console" + (argv.production ? "" : "-dev") options["name"] = SHORT_NAME } else if (osType == "Windows_NT") { options["version-string"] = { diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js index 4caa01b61a..1cddbfec11 100644 --- a/server-console/src/modules/hf-app.js +++ b/server-console/src/modules/hf-app.js @@ -35,7 +35,7 @@ exports.getBuildInfo = function() { buildNumber: "0", stableBuild: "0", organization: "Overte - dev", - appUserModelId: "com.overte.console" + appUserModelId: "org.overte.console" }; var buildInfo = DEFAULT_BUILD_INFO; @@ -63,11 +63,11 @@ exports.startInterface = function(url) { // do this as a workaround for app translocation on osx, which makes // it nearly impossible to find the interface executable - var bundle_id = 'com.overte.interface-dev'; + var bundle_id = 'org.overte.interface-dev'; if (buildInfo.releaseType == 'PR') { - bundle_id = 'com.overte.interface-pr'; + bundle_id = 'org.overte.interface-pr'; } else if (buildInfo.releaseType == 'PRODUCTION') { - bundle_id = 'com.overte.interface'; + bundle_id = 'org.overte.interface'; } childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url); } else {