Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 14:18:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

For development testing, apply physics to the entity intersected

Browse source
This commit is contained in:
David Rowe 2017-08-12 16:59:28 +12:00
parent a5407398e7
commit bc00bcd02c
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/vr-edit/modules/selection.js
View file

@ -415,6 +415,15 @@ Selection = function (side) {
} }
function applyPhysics(physicsProperties) { function applyPhysics(physicsProperties) {
// TODO: For development testing, apply physics to the currently intersected entity.
var properties;
properties = Object.clone(physicsProperties);
properties.userData = updatePhysicsUserData(selection[intersectedEntityIndex].userData, physicsProperties.userData);
Entities.editEntity(selection[intersectedEntityIndex].id, properties);
// TODO: Original functionality applied physics to all entities in the selection.
/*
// Applies physics to the current selection (i.e., the selection made when entity was trigger-clicked to apply physics). // Applies physics to the current selection (i.e., the selection made when entity was trigger-clicked to apply physics).
var properties, var properties,
i, i,
@ -434,6 +443,7 @@ Selection = function (side) {
Entities.editEntity(selection[0].id, { velocity: DYNAMIC_VELOCITY_KICK }); Entities.editEntity(selection[0].id, { velocity: DYNAMIC_VELOCITY_KICK });
} }
} }
*/
} }
function clear() { function clear() {

7
scripts/vr-edit/vr-edit.js
View file

@ -851,7 +851,6 @@
function update() { function update() {
var previousState = editorState, var previousState = editorState,
doUpdateState, doUpdateState,
doRefreshSelection,
color; color;
intersection = getIntersection(); intersection = getIntersection();
@ -953,6 +952,12 @@
intersectedEntityID = intersection.entityID; intersectedEntityID = intersection.entityID;
doUpdateState = true; doUpdateState = true;
} }
// TODO: For development testing, update intersectedEntityID so that physics can be applied to it.
if ((toolSelected === TOOL_COLOR || toolSelected === TOOL_PHYSICS)
&& intersection.entityID !== intersectedEntityID) {
intersectedEntityID = intersection.entityID;
doUpdateState = true;
}
if (doUpdateState) { if (doUpdateState) {
updateState(); updateState();
} }