diff --git a/scripts/system/assets/models/oculusSensorv2.fbx b/scripts/system/assets/models/oculusSensorv4.fbx similarity index 64% rename from scripts/system/assets/models/oculusSensorv2.fbx rename to scripts/system/assets/models/oculusSensorv4.fbx index 9ac55267aa..ec9782e426 100644 Binary files a/scripts/system/assets/models/oculusSensorv2.fbx and b/scripts/system/assets/models/oculusSensorv4.fbx differ diff --git a/scripts/system/assets/models/teleportationSpotBasev5.fbx b/scripts/system/assets/models/teleportationSpotBasev5.fbx deleted file mode 100644 index 59df8fdfa9..0000000000 Binary files a/scripts/system/assets/models/teleportationSpotBasev5.fbx and /dev/null differ diff --git a/scripts/system/assets/models/teleportationSpotBasev8.fbx b/scripts/system/assets/models/teleportationSpotBasev8.fbx new file mode 100644 index 0000000000..d651575dea Binary files /dev/null and b/scripts/system/assets/models/teleportationSpotBasev8.fbx differ diff --git a/scripts/system/assets/models/trackingSpacev2.fbx b/scripts/system/assets/models/trackingSpacev2.fbx deleted file mode 100644 index 77b548a3ae..0000000000 Binary files a/scripts/system/assets/models/trackingSpacev2.fbx and /dev/null differ diff --git a/scripts/system/assets/models/trackingSpacev9.fbx b/scripts/system/assets/models/trackingSpacev9.fbx new file mode 100644 index 0000000000..793c94702c Binary files /dev/null and b/scripts/system/assets/models/trackingSpacev9.fbx differ diff --git a/scripts/system/controllers/controllerModules/teleport.js b/scripts/system/controllers/controllerModules/teleport.js index baad556b86..fd582e38c8 100644 --- a/scripts/system/controllers/controllerModules/teleport.js +++ b/scripts/system/controllers/controllerModules/teleport.js @@ -21,7 +21,7 @@ Script.include("/~/system/libraries/controllers.js"); (function() { // BEGIN LOCAL_SCOPE - var TARGET_MODEL_URL = Script.resolvePath("../../assets/models/teleportationSpotBasev5.fbx"); + var TARGET_MODEL_URL = Script.resolvePath("../../assets/models/teleportationSpotBasev8.fbx"); var SEAT_MODEL_URL = Script.resolvePath("../../assets/models/teleport-seat.fbx"); var TARGET_MODEL_DIMENSIONS = { x: 0.6552, y: 0.3063, z: 0.6552 }; @@ -150,13 +150,13 @@ Script.include("/~/system/libraries/controllers.js"); this.teleportParabolaHeadCollisions; - this.PLAY_AREA_OVERLAY_MODEL = Script.resolvePath("../../assets/models/trackingSpacev2.fbx"); - this.PLAY_AREA_OVERLAY_MODEL_DIMENSIONS = { x: 2, y: 0.2, z: 2 }; + this.PLAY_AREA_OVERLAY_MODEL = Script.resolvePath("../../assets/models/trackingSpacev9.fbx"); + this.PLAY_AREA_OVERLAY_MODEL_DIMENSIONS = { x: 1.969, y: 0.001, z: 1.969 }; this.PLAY_AREA_FLOAT_ABOVE_FLOOR = 0; this.PLAY_AREA_OVERLAY_OFFSET = // Offset from floor. { x: 0, y: this.PLAY_AREA_OVERLAY_MODEL_DIMENSIONS.y / 2 + this.PLAY_AREA_FLOAT_ABOVE_FLOOR, z: 0 }; - this.PLAY_AREA_SENSOR_OVERLAY_MODEL = Script.resolvePath("../../assets/models/oculusSensorv2.fbx"); - this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS = { x: 0.1198, y: 0.2981, z: 0.1198 }; + this.PLAY_AREA_SENSOR_OVERLAY_MODEL = Script.resolvePath("../../assets/models/oculusSensorv4.fbx"); + this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS = { x: 0.1198, y: 0.2981, z: 0.1199 }; this.PLAY_AREA_SENSOR_OVERLAY_ROTATION = Quat.fromVec3Degrees({ x: 0, y: -90, z: 0 }); this.playAreaSensorPositions = []; this.playArea = { x: 0, y: 0 }; @@ -400,6 +400,7 @@ Script.include("/~/system/libraries/controllers.js"); _this.playAreaOverlay = Overlays.addOverlay("model", { url: _this.PLAY_AREA_OVERLAY_MODEL, + textures: { "Map #264": Math.random().toString() }, // Work around model displaying black. drawInFront: false, visible: false });