Merge pull request #6019 from ericrius1/entityReset

Adding a discreet entity to toybox that, when a user clicks on it, or near grabs it, will reset toybox
This commit is contained in:
Brad Hefta-Gaub 2015-10-07 20:38:07 -07:00
commit 7c286a41db
3 changed files with 2311 additions and 1057 deletions

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,56 @@
// immediateClientReset.js
// Created by Eric Levin on 9/23/2015
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
var masterResetScript = Script.resolvePath("masterReset.js");
var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js");
Script.include(masterResetScript);
function createHiddenMasterSwitch() {
var resetKey = "resetMe";
var masterSwitch = Entities.addEntity({
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
}
});
}
var entities = Entities.findEntities(MyAvatar.position, 100);
entities.forEach(function (entity) {
//params: customKey, id, defaultValue
var name = Entities.getEntityProperties(entity, "name").name
if (name === "Master Switch") {
Entities.deleteEntity(entity);
}
});
createHiddenMasterSwitch();
MasterReset();

File diff suppressed because it is too large Load diff