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

Merge pull request #6024 from ericrius1/entityResetTweaks

Browse source 
Moved entity reset switch, fixed some style issues
This commit is contained in:
Clément Brisset 2015-10-08 11:56:01 -07:00
commit 8e2ce379e1
2 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
unpublishedScripts/hiddenEntityReset.js
View file

@ -10,7 +10,7 @@
//
(function () {
(function() {
var _this;
@ -22,13 +22,13 @@
var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js");
var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js");
ResetSwitch = function () {
ResetSwitch = function() {
_this = this;
};
ResetSwitch.prototype = {
clickReleaseOnEntity: function (entityId, mouseEvent) {
clickReleaseOnEntity: function(entityId, mouseEvent) {
if (!mouseEvent.isLeftButton) {
return;
}
@ -36,26 +36,22 @@
},
startNearGrabNonColliding: function () {
startNearGrabNonColliding: function() {
this.triggerReset();
},
startFarGrabNonColliding: function () {
this.triggerReset();
},
triggerReset: function () {
triggerReset: function() {
MasterReset();
},
preload: function (entityID) {
preload: function(entityID) {
this.entityID = entityID;
}
};
MasterReset = function () {
MasterReset = function() {
var resetKey = "resetMe";
var GRABBABLE_DATA_KEY = "grabbableKey";
@ -145,7 +141,7 @@
function deleteAllToys() {
var entities = Entities.findEntities(MyAvatar.position, 100);
entities.forEach(function (entity) {
entities.forEach(function(entity) {
//params: customKey, id, defaultValue
var shouldReset = getEntityCustomData(resetKey, entity, {}).resetMe;
if (shouldReset === true) {
@ -330,14 +326,14 @@
function testBallDistanceFromStart() {
var resetCount = 0;
collidingBalls.forEach(function (ball, index) {
collidingBalls.forEach(function(ball, index) {
var currentPosition = Entities.getEntityProperties(ball, "position").position;
var originalPosition = originalBallPositions[index];
var distance = Vec3.subtract(originalPosition, currentPosition);
var length = Vec3.length(distance);
if (length > RESET_DISTANCE) {
Script.setTimeout(function () {
Script.setTimeout(function() {
var newPosition = Entities.getEntityProperties(ball, "position").position;
var moving = Vec3.length(Vec3.subtract(currentPosition, newPosition));
if (moving < MINIMUM_MOVE_LENGTH) {

21
unpublishedScripts/immediateClientReset.js
View file

@ -24,28 +24,17 @@ function createHiddenMasterSwitch() {
type: "Box",
name: "Master Switch",
script: hiddenEntityScriptURL,
dimensions: {
x: 0.2,
y: 0.2,
z: 0.2
},
color: {
red: 42,
green: 36,
blue: 30
},
position: {
x: 554,
y: 495.5,
z: 503.2
}
dimensions: {x: 0.7, y: 0.2, z: 0.1},
position: {x: 543.9, y: 496.05, z: 502.43},
rotation: Quat.fromPitchYawRollDegrees(0, 33, 0),
visible: false
});
}
var entities = Entities.findEntities(MyAvatar.position, 100);
entities.forEach(function (entity) {
entities.forEach(function(entity) {
//params: customKey, id, defaultValue
var name = Entities.getEntityProperties(entity, "name").name
if (name === "Master Switch") {