Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for incorrect tip texture URLs.

Browse source
This commit is contained in:
Anthony J. Thibault 2016-10-21 14:49:46 -07:00
parent c431c69d60
commit ae301602e7
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/controllerDisplay.js
View file

@ -67,6 +67,9 @@ createControllerDisplay = function(config) {
textures[part.textureName] = layer.defaultTextureURL; textures[part.textureName] = layer.defaultTextureURL;
} }
for (var i = 0; i < this.partOverlays[partName].length; ++i) { for (var i = 0; i < this.partOverlays[partName].length; ++i) {
// AJT: REMOVE
print("AJT: Overlays.editOverlays(" + partName + ", " + i + ", { textures: " + JSON.stringify(textures) + " })");
Overlays.editOverlay(this.partOverlays[partName][i], { Overlays.editOverlay(this.partOverlays[partName][i], {
textures: textures textures: textures
}); });

22
scripts/system/controllers/viveControllerConfiguration.js
View file

@ -58,6 +58,8 @@ var viveNaturalPosition = {
}; };
var BASE_URL = Script.resourcesPath(); var BASE_URL = Script.resourcesPath();
var TIP_TEXTURE_BASE_URL = BASE_URL + "meshes/controller/vive_tips.fbm/";
var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx"; var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx";
var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx"; var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx";
@ -84,19 +86,19 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
defaultTextureLayer: "blank", defaultTextureLayer: "blank",
textureLayers: { textureLayers: {
blank: { blank: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Blank.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "Blank.png"
}, },
trigger: { trigger: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Trigger.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
}, },
arrows: { arrows: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Rotate.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Rotate.png"
}, },
grip: { grip: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Grip.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Grip.png"
}, },
teleport: { teleport: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Teleport.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Teleport.png"
} }
} }
}, },
@ -205,19 +207,19 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
defaultTextureLayer: "blank", defaultTextureLayer: "blank",
textureLayers: { textureLayers: {
blank: { blank: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Blank.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Blank.png"
}, },
trigger: { trigger: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Trigger.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
}, },
arrows: { arrows: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Rotate.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Rotate.png"
}, },
grip: { grip: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Grip.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Grip.png"
}, },
teleport: { teleport: {
defaultTextureURL: viveTipsModelURL + "meshes/Controller-Tips.fbm/Teleport.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Teleport.png"
} }
} }
}, },