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

Naming changes

Browse source
This commit is contained in:
ericrius1 2016-01-26 12:57:41 -08:00
parent 793654cbca
commit e6379fcaa8
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/junkyard/junkyardClientReset.js
View file

@ -22,10 +22,10 @@ function reset() {
for (i = 0; i < e.length; i++) { for (i = 0; i < e.length; i++) {
Entities.deleteEntity(e[i]); Entities.deleteEntity(e[i]);
} }
importArf(); importAssetResourceFile();
} }
function importArf() { function importAssetResourceFile() {
Clipboard.importEntities(IMPORT_URL); Clipboard.importEntities(IMPORT_URL);
Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION); Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);
} }

7
examples/junkyard/junkyardResetEntitySpawner.js
View file

@ -19,12 +19,13 @@
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation))); var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
var scriptURL = Script.resolvePath("junkyardResetEntityScript.js?v1" + Math.random()); var SCRIPT_URL = Script.resolvePath("junkyardResetEntityScript.js");
var MODEL_URL = "http://hifi-content.s3.amazonaws.com/caitlyn/dev/Blueprint%20Objects/Asylum/Asylum_Table/Asylum_Table.fbx";
var resetEntity = Entities.addEntity({ var resetEntity = Entities.addEntity({
type: "Model", type: "Model",
modelURL: "http://hifi-content.s3.amazonaws.com/caitlyn/dev/Blueprint%20Objects/Asylum/Asylum_Table/Asylum_Table.fbx", modelURL: MODEL_URL,
position: center, position: center,
script: scriptURL, script: SCRIPT_URL,
dimensions: { dimensions: {
x: 2.8, x: 2.8,
y: 1.76, y: 1.76,