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

Add Edit.js Entities spawn up according to the orientation of the avatar.

Browse source
This commit is contained in:
Daniela 2017-09-15 12:41:15 +01:00 committed by Anthony J. Thibault
parent 0873b88347
commit 8144841258
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/edit.js
View file

@ -247,9 +247,12 @@ var toolBar = (function () {
direction = MyAvatar.orientation; direction = MyAvatar.orientation;
} }
direction = Vec3.multiplyQbyV(direction, Vec3.UNIT_Z); direction = Vec3.multiplyQbyV(direction, Vec3.UNIT_Z);
// Align entity with Avatar orientation.
properties.rotation = MyAvatar.orientation;
var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"]; var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) { if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
// Adjust position of entity per bounding box prior to creating it. // Adjust position of entity per bounding box prior to creating it.
var registration = properties.registration; var registration = properties.registration;
if (registration === undefined) { if (registration === undefined) {
@ -259,7 +262,14 @@ var toolBar = (function () {
var orientation = properties.orientation; var orientation = properties.orientation;
if (orientation === undefined) { if (orientation === undefined) {
var DEFAULT_ORIENTATION = Quat.fromPitchYawRollDegrees(0, 0, 0); properties.orientation = MyAvatar.orientation;
var DEFAULT_ORIENTATION = properties.orientation;
orientation = DEFAULT_ORIENTATION;
} else {
// If the orientation is already defined, we perform the corresponding rotation assuming that
// our start referential is the avatar referential.
properties.orientation = Quat.multiply(MyAvatar.orientation, properties.orientation);
var DEFAULT_ORIENTATION = properties.orientation;
orientation = DEFAULT_ORIENTATION; orientation = DEFAULT_ORIENTATION;
} }