Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use local paths rather than remote URLs

Browse source
This commit is contained in:
Andrew Meadows 2016-04-26 11:21:11 -07:00
parent 3d1abf8fb1
commit 3a9cde8510
15 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/default/attachedEntitiesManager.js
View file

@ -27,7 +27,6 @@ var SHOW_TOOL_BAR = false;
// tool bar // tool bar
if (SHOW_TOOL_BAR) { if (SHOW_TOOL_BAR) {
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var BUTTON_SIZE = 32; var BUTTON_SIZE = 32;
var PADDING = 3; var PADDING = 3;
Script.include(["libraries/toolBars.js"]); Script.include(["libraries/toolBars.js"]);

2
scripts/default/away.js
View file

@ -269,4 +269,4 @@ Script.scriptEnding.connect(function () {
Controller.disableMapping(eventMappingName); Controller.disableMapping(eventMappingName);
Controller.mousePressEvent.disconnect(goActive); Controller.mousePressEvent.disconnect(goActive);
Controller.keyPressEvent.disconnect(maybeGoActive); Controller.keyPressEvent.disconnect(maybeGoActive);
}); });

2
scripts/default/controllers/grab.js
View file

@ -11,7 +11,7 @@
// //
/*global print, Mouse, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */ /*global print, Mouse, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
Script.include("libraries/utils.js"); Script.include("../libraries/utils.js");
// objects that appear smaller than this can't be grabbed // objects that appear smaller than this can't be grabbed
var MAX_SOLID_ANGLE = 0.01; var MAX_SOLID_ANGLE = 0.01;

2
scripts/default/controllers/handControllerGrab.js
View file

@ -12,7 +12,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */ /*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
Script.include("/~/libraries/utils.js"); Script.include("../libraries/utils.js");
// //

3
scripts/default/defaultScripts.js
View file

@ -16,7 +16,8 @@ Script.load("selectAudioDevice.js");
Script.load("notifications.js"); Script.load("notifications.js");
Script.load("controllers/handControllerGrab.js"); Script.load("controllers/handControllerGrab.js");
Script.load("controllers/squeezeHands.js"); Script.load("controllers/squeezeHands.js");
Script.load("grab.js"); Script.load("controllers/grab.js");
Script.load("directory.js"); Script.load("directory.js");
Script.load("dialTone.js"); Script.load("dialTone.js");
// Script.load("attachedEntitiesManager.js");
Script.load("depthReticle.js"); Script.load("depthReticle.js");

8
scripts/default/dialTone.js
View file

@ -11,9 +11,11 @@
// //
// setup the local sound we're going to use // setup the local sound we're going to use
var connectSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/hello.wav");
var disconnectSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/goodbye.wav");
var micMutedSound = SoundCache.getSound("file:///" + Paths.resources + "sounds/goodbye.wav"); var connectSound = SoundCache.getSound(Script.resolvePath("assets/sounds/hello.wav"));
var disconnectSound = SoundCache.getSound(Script.resolvePath("assets/sounds/goodbye.wav"));
var micMutedSound = SoundCache.getSound(Script.resolvePath("assets/sounds/goodbye.wav"));
// setup the options needed for that sound // setup the options needed for that sound
var soundOptions = { var soundOptions = {

3
scripts/default/directory.js
View file

@ -13,8 +13,7 @@ Script.include([
"libraries/toolBars.js", "libraries/toolBars.js",
]); ]);
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var toolIconUrl = Script.resolvePath("assets/images/tools/");
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory"; var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory";
var directoryWindow = new OverlayWebWindow({ var directoryWindow = new OverlayWebWindow({

10
scripts/default/edit.js
View file

@ -50,7 +50,7 @@ selectionManager.addEventListener(function() {
lightOverlayManager.updatePositions(); lightOverlayManager.updatePositions();
}); });
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/"; var toolIconUrl = Script.resolvePath("assets/images/tools/");
var toolHeight = 50; var toolHeight = 50;
var toolWidth = 50; var toolWidth = 50;
@ -105,7 +105,7 @@ IMPORTING_SVO_OVERLAY_HEIGHT = 30;
IMPORTING_SVO_OVERLAY_MARGIN = 5; IMPORTING_SVO_OVERLAY_MARGIN = 5;
IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34; IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34;
var importingSVOImageOverlay = Overlays.addOverlay("image", { var importingSVOImageOverlay = Overlays.addOverlay("image", {
imageURL: HIFI_PUBLIC_BUCKET + "images/hourglass.svg", imageURL: Script.resolvePath("assets") + "/images/hourglass.svg",
width: 20, width: 20,
height: 20, height: 20,
alpha: 1.0, alpha: 1.0,
@ -187,7 +187,7 @@ var toolBar = (function() {
}); });
activeButton = toolBar.addTool({ activeButton = toolBar.addTool({
imageURL: toolIconUrl + "edit-01.svg", imageURL: toolIconUrl + "edit-01.svg",
subImage: { subImage: {
x: 0, x: 0,
y: Tool.IMAGE_WIDTH, y: Tool.IMAGE_WIDTH,
@ -201,7 +201,7 @@ var toolBar = (function() {
}, true, false); }, true, false);
newModelButton = toolBar.addTool({ newModelButton = toolBar.addTool({
imageURL: toolIconUrl + "model-01.svg", imageURL:toolIconUrl + "model-01.svg",
subImage: { subImage: {
x: 0, x: 0,
y: Tool.IMAGE_WIDTH, y: Tool.IMAGE_WIDTH,
@ -216,7 +216,7 @@ var toolBar = (function() {
}); });
newCubeButton = toolBar.addTool({ newCubeButton = toolBar.addTool({
imageURL: toolIconUrl + "cube-01.svg", imageURL:toolIconUrl + "cube-01.svg",
subImage: { subImage: {
x: 0, x: 0,
y: Tool.IMAGE_WIDTH, y: Tool.IMAGE_WIDTH,

5
scripts/default/examples.js
View file

@ -13,8 +13,7 @@ Script.include([
"libraries/toolBars.js", "libraries/toolBars.js",
]); ]);
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var toolIconUrl = Script.resolvePath("assets/images/tools/");
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var EXAMPLES_URL = "https://metaverse.highfidelity.com/examples"; var EXAMPLES_URL = "https://metaverse.highfidelity.com/examples";
var examplesWindow = new OverlayWebWindow({ var examplesWindow = new OverlayWebWindow({
@ -132,4 +131,4 @@ var toolBar = (function() {
}()); }());
Controller.mousePressEvent.connect(toolBar.mousePressEvent) Controller.mousePressEvent.connect(toolBar.mousePressEvent)
Script.scriptEnding.connect(toolBar.cleanup); Script.scriptEnding.connect(toolBar.cleanup);

42
scripts/default/html/edit-style.css
View file

@ -10,51 +10,51 @@
@font-face { @font-face {
font-family: Raleway-Regular; font-family: Raleway-Regular;
src: url(../../resources/fonts/Raleway-Regular.ttf), /* Windows production */ src: url(../../../resources/fonts/Raleway-Regular.ttf), /* Windows production */
url(../../fonts/Raleway-Regular.ttf), /* OSX production */ url(../../../fonts/Raleway-Regular.ttf), /* OSX production */
url(../../interface/resources/fonts/Raleway-Regular.ttf); /* Development, running script in /HiFi/examples */ url(../../../interface/resources/fonts/Raleway-Regular.ttf); /* Development, running script in /HiFi/examples */
} }
@font-face { @font-face {
font-family: Raleway-Light; font-family: Raleway-Light;
src: url(../../resources/fonts/Raleway-Light.ttf), src: url(../../../resources/fonts/Raleway-Light.ttf),
url(../../fonts/Raleway-Light.ttf), url(../../../fonts/Raleway-Light.ttf),
url(../../interface/resources/fonts/Raleway-Light.ttf); url(../../../interface/resources/fonts/Raleway-Light.ttf);
} }
@font-face { @font-face {
font-family: Raleway-Bold; font-family: Raleway-Bold;
src: url(../../resources/fonts/Raleway-Bold.ttf), src: url(../../../resources/fonts/Raleway-Bold.ttf),
url(../../fonts/Raleway-Bold.ttf), url(../../../fonts/Raleway-Bold.ttf),
url(../../interface/resources/fonts/Raleway-Bold.ttf); url(../../../interface/resources/fonts/Raleway-Bold.ttf);
} }
@font-face { @font-face {
font-family: Raleway-SemiBold; font-family: Raleway-SemiBold;
src: url(../../resources/fonts/Raleway-SemiBold.ttf), src: url(../../../resources/fonts/Raleway-SemiBold.ttf),
url(../../fonts/Raleway-SemiBold.ttf), url(../../../fonts/Raleway-SemiBold.ttf),
url(../../interface/resources/fonts/Raleway-SemiBold.ttf); url(../../../interface/resources/fonts/Raleway-SemiBold.ttf);
} }
@font-face { @font-face {
font-family: FiraSans-SemiBold; font-family: FiraSans-SemiBold;
src: url(../../resources/fonts/FiraSans-SemiBold.ttf), src: url(../../../resources/fonts/FiraSans-SemiBold.ttf),
url(../../fonts/FiraSans-SemiBold.ttf), url(../../../fonts/FiraSans-SemiBold.ttf),
url(../../interface/resources/fonts/FiraSans-SemiBold.ttf); url(../../../interface/resources/fonts/FiraSans-SemiBold.ttf);
} }
@font-face { @font-face {
font-family: AnonymousPro-Regular; font-family: AnonymousPro-Regular;
src: url(../../resources/fonts/AnonymousPro-Regular.ttf), src: url(../../../resources/fonts/AnonymousPro-Regular.ttf),
url(../../fonts/AnonymousPro-Regular.ttf), url(../../../fonts/AnonymousPro-Regular.ttf),
url(../../interface/resources/fonts/AnonymousPro-Regular.ttf); url(../../../interface/resources/fonts/AnonymousPro-Regular.ttf);
} }
@font-face { @font-face {
font-family: HiFi-Glyphs; font-family: HiFi-Glyphs;
src: url(../../resources/fonts/hifi-glyphs.ttf), src: url(../../../resources/fonts/hifi-glyphs.ttf),
url(../../fonts/hifi-glyphs.ttf), url(../../../fonts/hifi-glyphs.ttf),
url(../../interface/resources/fonts/hifi-glyphs.ttf); url(../../../interface/resources/fonts/hifi-glyphs.ttf);
} }
* { * {

7
scripts/default/notifications.js
View file

@ -55,7 +55,7 @@
// createNotification(noteString, NotificationType.SNAPSHOT); // createNotification(noteString, NotificationType.SNAPSHOT);
// } // }
// } // }
Script.include("./libraries/globals.js");
Script.include("./libraries/soundArray.js"); Script.include("./libraries/soundArray.js");
var width = 340.0; //width of notification overlay var width = 340.0; //width of notification overlay
@ -120,7 +120,8 @@ var NotificationType = {
var randomSounds = new SoundArray({ localOnly: true }, true); var randomSounds = new SoundArray({ localOnly: true }, true);
var numberOfSounds = 2; var numberOfSounds = 2;
for (var i = 1; i <= numberOfSounds; i++) { for (var i = 1; i <= numberOfSounds; i++) {
randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw");
randomSounds.addSound(Script.resolvePath("assets/sounds/notification-general"+ i + ".raw"));
} }
var notifications = []; var notifications = [];
@ -328,7 +329,7 @@ function createNotification(text, notificationType) {
width: 10.0, width: 10.0,
height: 10.0, height: 10.0,
subImage: { x: 0, y: 0, width: 10, height: 10 }, subImage: { x: 0, y: 0, width: 10, height: 10 },
imageURL: "http://hifi-public.s3.amazonaws.com/images/close-small-light.svg", imageURL: Script.resolvePath("assets/images/close-small-light.svg"),
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},
visible: true, visible: true,
alpha: backgroundAlpha alpha: backgroundAlpha

2
scripts/default/particle_explorer/particleExplorer.html
View file

@ -18,7 +18,7 @@
<script type="text/javascript" src="underscore-min.js"></script> <script type="text/javascript" src="underscore-min.js"></script>
<script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script> <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
<script type="text/javascript" src="../html/eventBridgeLoader.js"></script> <script type="text/javascript" src="../html/eventBridgeLoader.js"></script>
<script type="text/javascript" src="particleExplorer.js?v42"></script> <script type="text/javascript" src="particleExplorer.js"></script>
<script> <script>
function loaded() { function loaded() {
// Disable right-click context menu which is not visible in the HMD and makes it seem like the app has locked // Disable right-click context menu which is not visible in the HMD and makes it seem like the app has locked

2
scripts/developer/tests/performance/simpleKeepAway.js
View file

@ -94,7 +94,7 @@ Script.setInterval(function () {
gravity: GRAVITY, gravity: GRAVITY,
collisionsWillMove: true, collisionsWillMove: true,
lifetime: LIFETIME, lifetime: LIFETIME,
script: Script.resolvePath("../../entityScripts/simpleKeepAway.js") script: Script.resolvePath("keepAwayEntity.js")
}; };
Entities.addEntity(properties); Entities.addEntity(properties);
totalCreated++; totalCreated++;

2
scripts/developer/tests/performance/tribbleEntity.js
View file

@ -1,6 +1,6 @@
(function () { (function () {
// See tests/performance/tribbles.js // See tests/performance/tribbles.js
Script.include("../libraries/virtualBaton.js"); Script.include("../../libraries/virtualBaton.js");
var dimensions, oldColor, entityID, var dimensions, oldColor, entityID,
editRate = 60, editRate = 60,
moveRate = 1, moveRate = 1,

2
scripts/developer/tests/performance/tribbles.js
View file

@ -86,7 +86,7 @@ Script.setInterval(function () {
gravity: GRAVITY, gravity: GRAVITY,
collisionsWillMove: true, collisionsWillMove: true,
lifetime: LIFETIME, lifetime: LIFETIME,
script: Script.resolvePath("../../entityScripts/tribble.js") script: Script.resolvePath("tribbleEntity.js")
}); });
totalCreated++; totalCreated++;