Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 15:05:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change identifier to org.overte

Browse source
This commit is contained in:
Julian Groß 2022-08-19 23:24:58 +02:00 committed by ksuprynowicz
parent 712563ea63
commit 90b0b1eb45
9 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/SetPackagingParameters.cmake
View file

@ -188,7 +188,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(INTERFACE_SHORTCUT_NAME "Overte") set(INTERFACE_SHORTCUT_NAME "Overte")
set(CONSOLE_SHORTCUT_NAME "Console") set(CONSOLE_SHORTCUT_NAME "Console")
set(SANDBOX_SHORTCUT_NAME "Server") set(SANDBOX_SHORTCUT_NAME "Server")
set(APP_USER_MODEL_ID "com.overte.console") set(APP_USER_MODEL_ID "org.overte.console")
else () else ()
set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}") set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}")
set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}") set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")

6
interface/CMakeLists.txt
View file

@ -123,12 +123,12 @@ if (APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME "Overte") set(MACOSX_BUNDLE_BUNDLE_NAME "Overte")
if (PRODUCTION_BUILD) if (PRODUCTION_BUILD)
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface)
else () else ()
if (DEV_BUILD) if (DEV_BUILD)
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-dev) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-dev)
elseif (PR_BUILD) elseif (PR_BUILD)
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-pr) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-pr)
endif () endif ()
endif () endif ()

2
interface/src/SpeechRecognizer.h
View file

@ -82,7 +82,7 @@ signals:
* return turnRate; * return turnRate;
* } * }
* *
* var MAPPING_NAME = "com.overte.controllers.example.speechRecognizer"; * var MAPPING_NAME = "org.overte.controllers.example.speechRecognizer";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(getTurnRate).to(Controller.Actions.Yaw); * mapping.from(getTurnRate).to(Controller.Actions.Yaw);

6
libraries/controllers/src/controllers/ScriptingInterface.h
View file

@ -276,7 +276,7 @@ namespace controller {
* by {@link Uuid(0).generate|Uuid.generate} is used. * by {@link Uuid(0).generate|Uuid.generate} is used.
* @returns {MappingObject} A controller mapping object. * @returns {MappingObject} A controller mapping object.
* @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption> * @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
@ -311,7 +311,7 @@ namespace controller {
* @returns {MappingObject} A controller mapping object. * @returns {MappingObject} A controller mapping object.
* @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption> * @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
* var mappingJSON = { * var mappingJSON = {
* "name": "com.overte.controllers.example.jsonMapping", * "name": "org.overte.controllers.example.jsonMapping",
* "channels": [ * "channels": [
* { "from": "Standard.RT", "to": "Actions.TranslateY" } * { "from": "Standard.RT", "to": "Actions.TranslateY" }
* ] * ]
@ -463,7 +463,7 @@ namespace controller {
* {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs. * {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs.
* @function Controller.captureMouseEvents * @function Controller.captureMouseEvents
* @example <caption>Disable Controller.Hardware.Keyboard mouse events for a short period.</caption> * @example <caption>Disable Controller.Hardware.Keyboard mouse events for a short period.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) { * mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) {
* print("Mouse x = " + x); * print("Mouse x = " + x);

4
libraries/controllers/src/controllers/impl/MappingBuilderProxy.h
View file

@ -71,7 +71,7 @@ class UserInputMapper;
* @property {Controller.MappingJSONRoute[]} channels - An array of routes. * @property {Controller.MappingJSONRoute[]} channels - An array of routes.
* @example <caption>A simple mapping JSON that makes the right trigger move your avatar up after a dead zone.</caption> * @example <caption>A simple mapping JSON that makes the right trigger move your avatar up after a dead zone.</caption>
* { * {
* "name": "com.overte.controllers.example.jsonMapping", * "name": "org.overte.controllers.example.jsonMapping",
* "channels": [ * "channels": [
* { * {
* "from": "Standard.RT", * "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 * @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 <code>source2 - source1</code>. * value passed to the route is the combined value of <code>source2 - source1</code>.
* @example <caption>Make the Oculus Touch triggers move your avatar up and down.</caption> * @example <caption>Make the Oculus Touch triggers move your avatar up and down.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping * mapping
* .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT) * .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT)

26
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
View file

@ -90,7 +90,7 @@ class RouteBuilderProxy : public QObject {
* an in-line function definition. * an in-line function definition.
* *
* @example <caption>Make the right trigger move your avatar up.</caption> * @example <caption>Make the right trigger move your avatar up.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
@ -105,7 +105,7 @@ class RouteBuilderProxy : public QObject {
* print("Trigger value: " + value); * 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); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(Controller.Standard.RT).to(onRightTrigger); * mapping.from(Controller.Standard.RT).to(onRightTrigger);
@ -124,7 +124,7 @@ class RouteBuilderProxy : public QObject {
* otherwise it is disabled. * otherwise it is disabled.
* @returns {RouteObject} The <code>RouteObject</code> with debug output enabled or disabled. * @returns {RouteObject} The <code>RouteObject</code> with debug output enabled or disabled.
* @example <caption>Write debug information to the program log for a right trigger mapping.</caption> * @example <caption>Write debug information to the program log for a right trigger mapping.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(Controller.Standard.RT).debug().to(function (value) { * mapping.from(Controller.Standard.RT).debug().to(function (value) {
@ -175,7 +175,7 @@ class RouteBuilderProxy : public QObject {
* calls.</p> * calls.</p>
* @returns {RouteObject} The <code>RouteObject</code> with the condition added. * @returns {RouteObject} The <code>RouteObject</code> with the condition added.
* @example <caption>Process the right trigger differently in HMD and desktop modes.</caption> * @example <caption>Process the right trigger differently in HMD and desktop modes.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* // Processed only if in HMD mode. * // Processed only if in HMD mode.
@ -203,7 +203,7 @@ class RouteBuilderProxy : public QObject {
* @param {number} max - The maximum value to pass through. * @param {number} max - The maximum value to pass through.
* @returns {RouteObject} The route object with the clamp filter added. * @returns {RouteObject} The route object with the clamp filter added.
* @example <caption>Clamp right trigger values to between 0.3 and 0.7.</caption> * @example <caption>Clamp right trigger values to between 0.3 and 0.7.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) { * mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) {
* print("Value: " + 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 <code>1</code>. * @param {number} max - When the input value rises above this value the output value changes to <code>1</code>.
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Round the right joystick forward/back values to 0 or 1 with hysteresis.</caption> * @example <caption>Round the right joystick forward/back values to 0 or 1 with hysteresis.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RY).peek().to(function (value) { * mapping.from(Controller.Standard.RY).peek().to(function (value) {
* print("Raw value: " + value); // 0.0 - 1.0. * 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. * @param {number} interval - The interval between sending values, in seconds.
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Send right trigger values every half second.</caption> * @example <caption>Send right trigger values every half second.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) { * mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) {
* print("Value: " + value); * print("Value: " + value);
@ -266,7 +266,7 @@ class RouteBuilderProxy : public QObject {
* @param {number} multiplier - The scale to multiply the value by. * @param {number} multiplier - The scale to multiply the value by.
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Scale the value of the right joystick forward/back values by 10.</caption> * @example <caption>Scale the value of the right joystick forward/back values by 10.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.LY).to(function (value) { * mapping.from(Controller.Standard.LY).to(function (value) {
* print("L value: " + value); // -1.0 to 1.0 values. * print("L value: " + value); // -1.0 to 1.0 values.
@ -288,7 +288,7 @@ class RouteBuilderProxy : public QObject {
* @function RouteObject#invert * @function RouteObject#invert
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Invert the value of the right joystick forward/back values.</caption> * @example <caption>Invert the value of the right joystick forward/back values.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.LY).to(function (value) { * mapping.from(Controller.Standard.LY).to(function (value) {
* print("L value: " + value); // -1.0 to 1.0 values, forward to back. * 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. * negative of this value is used.
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Apply a dead-zone to the right joystick forward/back values.</caption> * @example <caption>Apply a dead-zone to the right joystick forward/back values.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) { * mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) {
* print("Value: " + value); // 0.0 - 1.0 values once outside the dead-zone. * print("Value: " + value); // 0.0 - 1.0 values once outside the dead-zone.
@ -334,7 +334,7 @@ class RouteBuilderProxy : public QObject {
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Round the right joystick forward/back values to <code>-1</code>, <code>0</code>, or * @example <caption>Round the right joystick forward/back values to <code>-1</code>, <code>0</code>, or
* <code>1</code>.</caption> * <code>1</code>.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) { * mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) {
* print("Value: " + value); // -1, 0, or 1 * print("Value: " + value); // -1, 0, or 1
@ -353,7 +353,7 @@ class RouteBuilderProxy : public QObject {
* @function RouteObject#constrainToPositiveInteger * @function RouteObject#constrainToPositiveInteger
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Round the right joystick forward/back values to <code>0</code> or <code>1</code>.</caption> * @example <caption>Round the right joystick forward/back values to <code>0</code> or <code>1</code>.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) { * mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) {
* print("Value: " + value); // 0, or 1 * print("Value: " + value); // 0, or 1
@ -436,7 +436,7 @@ class RouteBuilderProxy : public QObject {
* @function RouteObject#logicalNot * @function RouteObject#logicalNot
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied. * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
* @example <caption>Logical NOT of LSTouch value.</caption> * @example <caption>Logical NOT of LSTouch value.</caption>
* var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
* var mapping = Controller.newMapping(MAPPING_NAME); * var mapping = Controller.newMapping(MAPPING_NAME);
* *
* mapping.from(Controller.Standard.RSTouch).peek().to(function (value) { * mapping.from(Controller.Standard.RSTouch).peek().to(function (value) {

8
libraries/networking/src/MessagesClient.h
View file

@ -64,7 +64,7 @@ public:
* from an assignment client script it is received only by that same assignment client script.</p> * from an assignment client script it is received only by that same assignment client script.</p>
* @example <caption>Send and receive a message.</caption> * @example <caption>Send and receive a message.</caption>
* // Receiving script. * // Receiving script.
* var channelName = "com.overte.example.messages-example"; * var channelName = "org.overte.example.messages-example";
* *
* function onMessageReceived(channel, message, sender, localOnly) { * function onMessageReceived(channel, message, sender, localOnly) {
* print("Message received:"); * print("Message received:");
@ -84,7 +84,7 @@ public:
* *
* *
* // Sending script. * // Sending script.
* var channelName = "com.overte.example.messages-example"; * var channelName = "org.overte.example.messages-example";
* var message = "Hello"; * var message = "Hello";
* Messages.sendMessage(channelName, message); * Messages.sendMessage(channelName, message);
*/ */
@ -112,7 +112,7 @@ public:
* from an assignment client script it is received only by that same assignment client script.</p> * from an assignment client script it is received only by that same assignment client script.</p>
* @example <caption>Send and receive data.</caption> * @example <caption>Send and receive data.</caption>
* // Receiving script. * // Receiving script.
* var channelName = "com.overte.example.messages-example"; * var channelName = "org.overte.example.messages-example";
* *
* function onDataReceived(channel, data, sender, localOnly) { * function onDataReceived(channel, data, sender, localOnly) {
* var int8data = new Int8Array(data); * var int8data = new Int8Array(data);
@ -140,7 +140,7 @@ public:
* *
* *
* // Sending script. * // 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]); * var int8data = new Int8Array([1, 1, 2, 3, 5, 8, 13]);
* Messages.sendData(channelName, int8data.buffer); * Messages.sendData(channelName, int8data.buffer);
*/ */

2
server-console/packager.js
View file

@ -32,7 +32,7 @@ var FULL_NAME = argv.client_only ? "Overte Console" : "Overte Sandbox";
// setup per OS options // setup per OS options
if (osType == "Darwin") { 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 options["name"] = SHORT_NAME
} else if (osType == "Windows_NT") { } else if (osType == "Windows_NT") {
options["version-string"] = { options["version-string"] = {

8
server-console/src/modules/hf-app.js
View file

@ -35,7 +35,7 @@ exports.getBuildInfo = function() {
buildNumber: "0", buildNumber: "0",
stableBuild: "0", stableBuild: "0",
organization: "Overte - dev", organization: "Overte - dev",
appUserModelId: "com.overte.console" appUserModelId: "org.overte.console"
}; };
var buildInfo = DEFAULT_BUILD_INFO; 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 // do this as a workaround for app translocation on osx, which makes
// it nearly impossible to find the interface executable // 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') { if (buildInfo.releaseType == 'PR') {
bundle_id = 'com.overte.interface-pr'; bundle_id = 'org.overte.interface-pr';
} else if (buildInfo.releaseType == 'PRODUCTION') { } else if (buildInfo.releaseType == 'PRODUCTION') {
bundle_id = 'com.overte.interface'; bundle_id = 'org.overte.interface';
} }
childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url); childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url);
} else { } else {