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

changes

Browse source
This commit is contained in:
James B. Pollack 2016-03-17 09:57:57 -07:00
parent b080dd8c64
commit fc3bac7fa5
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
View file

@ -113,6 +113,7 @@ FishTank = function(spawnPosition, spawnRotation) {
modelURL: TANK_MODEL_URL, modelURL: TANK_MODEL_URL,
dimensions: TANK_DIMENSIONS, dimensions: TANK_DIMENSIONS,
position: TANK_POSITION, position: TANK_POSITION,
rotation:spawnRotation,
color: DEBUG_COLOR, color: DEBUG_COLOR,
collisionless: true, collisionless: true,
script: TANK_SCRIPT, script: TANK_SCRIPT,

1
unpublishedScripts/DomainContent/Home/kineticObjects/books.json
View file

@ -161,7 +161,6 @@
"z": 0.04995863139629364 "z": 0.04995863139629364
}, },
"id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}", "id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}",
"locked": 1,
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx", "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx",
"name": "home_model_book_Foundation3", "name": "home_model_book_Foundation3",
"position": { "position": {

4
unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
View file

@ -42,7 +42,7 @@ LabLamp = function(spawnLocation, spawnRotation) {
var created = []; var created = [];
function create() { function create() {
var success = Clipboard.importEntities(FRUIT_BOWL_URL); var success = Clipboard.importEntities(LAB_LAMP_URL);
if (success === true) { if (success === true) {
hasBow = true; hasBow = true;
created = Clipboard.pasteEntities(spawnLocation) created = Clipboard.pasteEntities(spawnLocation)
@ -65,7 +65,7 @@ LivingRoomLamp = function(spawnLocation, spawnRotation) {
var created = []; var created = [];
function create() { function create() {
var success = Clipboard.importEntities(FRUIT_BOWL_URL); var success = Clipboard.importEntities(LIVING_ROOM_LAMP_URL);
if (success === true) { if (success === true) {
created = Clipboard.pasteEntities(spawnLocation) created = Clipboard.pasteEntities(spawnLocation)
print('created ' + created); print('created ' + created);

6
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -121,6 +121,10 @@
x: 1098.9254, x: 1098.9254,
y: 460.5814, y: 460.5814,
z: -79.1103 z: -79.1103
},{
x:0,
y:152,
z:0
}); });
var tiltMaze = new TiltMaze({ var tiltMaze = new TiltMaze({
@ -131,7 +135,7 @@
var whiteboard = new Whiteboard({ var whiteboard = new Whiteboard({
x: 1104, x: 1104,
y: 450, y: 460,
z: -77 z: -77
}); });