diff --git a/interface/resources/meshes/controller/touch/touch_r_joystick.fbx b/interface/resources/meshes/controller/touch/touch_r_joystick.fbx index 7749dbf498..d6180d4af9 100644 Binary files a/interface/resources/meshes/controller/touch/touch_r_joystick.fbx and b/interface/resources/meshes/controller/touch/touch_r_joystick.fbx differ diff --git a/scripts/system/controllers/touchControllerConfiguration.js b/scripts/system/controllers/touchControllerConfiguration.js index a81c667e06..b7714603aa 100644 --- a/scripts/system/controllers/touchControllerConfiguration.js +++ b/scripts/system/controllers/touchControllerConfiguration.js @@ -48,8 +48,8 @@ rightBasePosition = { z: CONTROLLER_LATERAL_OFFSET }; -var BASE_URL = "file:///C:/Users/Ryan/dev/hifi/interface/resources/meshes/controller/touch/"; -//var BASE_URL = Script.resourcesPath() + "meshes/controller/touch/"; +//var BASE_URL = "file:///C:/Users/Ryan/dev/hifi/interface/resources/meshes/controller/touch/"; +var BASE_URL = Script.resourcesPath() + "meshes/controller/touch/"; TOUCH_CONTROLLER_CONFIGURATION_LEFT = { name: "Touch", @@ -309,8 +309,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = { xHalfAngle: 20, yHalfAngle: 20, - - textureName: "psdFileTex2", + textureName: "R_controller_DIF.jpg", defaultTextureLayer: "normal", textureLayers: { normal: {