Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update teleport FBX models

Browse source
This commit is contained in:
David Rowe 2018-09-26 17:20:56 +12:00
parent af1b4fef5d
commit 496e0a6304
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/system/assets/models/oculusSensorv2.fbx → scripts/system/assets/models/oculusSensorv4.fbx
View file

Binary file not shown.

BIN
scripts/system/assets/models/teleportationSpotBasev5.fbx
View file

Binary file not shown.

BIN
scripts/system/assets/models/teleportationSpotBasev8.fbx Normal file
View file

Binary file not shown.

BIN
scripts/system/assets/models/trackingSpacev2.fbx
View file

Binary file not shown.

BIN
scripts/system/assets/models/trackingSpacev9.fbx Normal file
View file

Binary file not shown.

11
scripts/system/controllers/controllerModules/teleport.js
View file

@ -21,7 +21,7 @@ Script.include("/~/system/libraries/controllers.js");
(function() { // BEGIN LOCAL_SCOPE (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 SEAT_MODEL_URL = Script.resolvePath("../../assets/models/teleport-seat.fbx");
var TARGET_MODEL_DIMENSIONS = { x: 0.6552, y: 0.3063, z: 0.6552 }; 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.teleportParabolaHeadCollisions;
this.PLAY_AREA_OVERLAY_MODEL = Script.resolvePath("../../assets/models/trackingSpacev2.fbx"); this.PLAY_AREA_OVERLAY_MODEL = Script.resolvePath("../../assets/models/trackingSpacev9.fbx");
this.PLAY_AREA_OVERLAY_MODEL_DIMENSIONS = { x: 2, y: 0.2, z: 2 }; 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_FLOAT_ABOVE_FLOOR = 0;
this.PLAY_AREA_OVERLAY_OFFSET = // Offset from floor. 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 }; { 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_MODEL = Script.resolvePath("../../assets/models/oculusSensorv4.fbx");
this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS = { x: 0.1198, y: 0.2981, z: 0.1198 }; 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.PLAY_AREA_SENSOR_OVERLAY_ROTATION = Quat.fromVec3Degrees({ x: 0, y: -90, z: 0 });
this.playAreaSensorPositions = []; this.playAreaSensorPositions = [];
this.playArea = { x: 0, y: 0 }; this.playArea = { x: 0, y: 0 };
@ -400,6 +400,7 @@ Script.include("/~/system/libraries/controllers.js");
_this.playAreaOverlay = Overlays.addOverlay("model", { _this.playAreaOverlay = Overlays.addOverlay("model", {
url: _this.PLAY_AREA_OVERLAY_MODEL, url: _this.PLAY_AREA_OVERLAY_MODEL,
textures: { "Map #264": Math.random().toString() }, // Work around model displaying black.
drawInFront: false, drawInFront: false,
visible: false visible: false
}); });