Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

end of day

Browse source
This commit is contained in:
James B. Pollack 2016-04-07 16:18:27 -07:00
parent 3adb8dedb0
commit 4961b38aef
7 changed files with 51 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json
View file

@ -1,13 +1,12 @@
{ {
"Entities": [ "Entities": [{
{
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj", "compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj",
"created": "2016-03-29T17:37:52Z", "created": "2016-03-29T17:37:52Z",
"dimensions": { "dimensions": {
"x": 0.99695134162902832, "x": 1.1764,
"y": 1.23363196849823, "y": 1.4557,
"z": 1.0726165771484375 "z": 1.2657
}, },
"dynamic": 1, "dynamic": 1,
"gravity": { "gravity": {
@ -33,7 +32,6 @@
"shapeType": "compound", "shapeType": "compound",
"type": "Model", "type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}" "userData": "{\"hifiHomeKey\":{\"reset\":true}}"
} }],
],
"Version": 57 "Version": 57
} }

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

@ -158,6 +158,7 @@
"y": -10, "y": -10,
"z": 0 "z": 0
}, },
"dynamic": 1,
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}", "id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}",
"modelURL": "atp:/models/Junk-Crate.fbx", "modelURL": "atp:/models/Junk-Crate.fbx",

12
unpublishedScripts/DomainContent/Home/musicBox/lid.js
View file

@ -12,11 +12,9 @@
return this; return this;
} }
var MUSIC_URL = Script.resolvePath('http://hifi-content.s3.amazonaws.com/DomainContent/Home/musicBox/music_converted.wav'); var MUSIC_URL = Script.resolvePath('atp:/musicBox/music.wav');
// var SHUT_SOUND_URL = Script.resolvePath('http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav'); var OPENSHUT_SOUND_URL = Script.resolvePath('atp:/openCloseSound.wav');
// var OPEN_SOUND_URL = Script.resolvePath('http://public.highfidelity.io/sounds/Switches%20and%20sliders/lamp_switch_2.wav');
var SHUT_SOUND_URL = Script.resolvePath('atp:/openSound.wav');
var OPEN_SOUND_URL = Script.resolvePath('atp:/closeSound.wav');
Lid.prototype = { Lid.prototype = {
disabledHand: 'none', disabledHand: 'none',
@ -26,8 +24,8 @@
preload: function(entityID) { preload: function(entityID) {
this.entityID = entityID; this.entityID = entityID;
this.music = SoundCache.getSound(MUSIC_URL); this.music = SoundCache.getSound(MUSIC_URL);
this.shutSound = SoundCache.getSound(SHUT_SOUND_URL); this.shutSound = SoundCache.getSound(OPENSHUT_SOUND_URL);
this.openSound = SoundCache.getSound(OPEN_SOUND_URL); this.openSound = SoundCache.getSound(OPENSHUT_SOUND_URL);
print('OPEN SOUND?? ' + this.openSound) print('OPEN SOUND?? ' + this.openSound)
this.musicIsPlaying = false; this.musicIsPlaying = false;

14
unpublishedScripts/DomainContent/Home/musicBox/wrapper.js
View file

@ -58,9 +58,9 @@ HomeMusicBox = function(spawnPosition, spawnRotation) {
z: 0.5 z: 0.5
} }
var LID_SCRIPT_URL = Script.resolvePath('lid.js?' + Math.random()); var LID_SCRIPT_URL = Script.resolvePath('atp:/musicBox/lid.js');
var BASE_SCRIPT_URL = Script.resolvePath('baseBox.js?' + Math.random()); var BASE_SCRIPT_URL = Script.resolvePath('atp:/musicBox/baseBox.js');
var base, lid, hat, key; var base, lid, hat, key;
function createLid(baseID) { function createLid(baseID) {
@ -75,7 +75,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) {
var lidProperties = { var lidProperties = {
name: 'home_music_box_lid', name: 'home_music_box_lid',
type: 'Model', type: 'Model',
modelURL: 'atp:/MB_Lid.fbx', modelURL: 'atp:/musicBox/MB_Lid.fbx',
dimensions: LID_DIMENSIONS, dimensions: LID_DIMENSIONS,
position: startPosition, position: startPosition,
parentID: baseID, parentID: baseID,
@ -106,7 +106,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) {
var LATERAL_OFFSET = 0.0; var LATERAL_OFFSET = 0.0;
var properties = { var properties = {
modelURL: "atp:/MB_Hat.fbx", modelURL: "atp:/musicBox/MB_Hat.fbx",
name: 'home_music_box_hat', name: 'home_music_box_hat',
type: 'Model', type: 'Model',
position: getOffsetFromCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET), position: getOffsetFromCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET),
@ -138,7 +138,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) {
var LATERAL_OFFSET = 0.0; var LATERAL_OFFSET = 0.0;
var properties = { var properties = {
modelURL: "atp:/MB_Key.fbx", modelURL: "atp:/musicBox/MB_Key.fbx",
name: 'home_music_box_key', name: 'home_music_box_key',
type: 'Model', type: 'Model',
parentID: baseID, parentID: baseID,
@ -167,13 +167,13 @@ HomeMusicBox = function(spawnPosition, spawnRotation) {
function createBaseBox() { function createBaseBox() {
var properties = { var properties = {
modelURL: "atp:/MB_Box.fbx", modelURL: "atp:/musicBox/MB_Box.fbx",
name: 'home_music_box_base', name: 'home_music_box_base',
type: 'Model', type: 'Model',
position: BASE_POSITION, position: BASE_POSITION,
dynamic: true, dynamic: true,
shapeType: 'compound', shapeType: 'compound',
compoundShapeURL: 'atp:/boxHull3.obj', compoundShapeURL: 'atp:/musicBox/boxHull3.obj',
dimensions: { dimensions: {
x: 0.1661, x: 0.1661,
y: 0.0928, y: 0.0928,

2
unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js
View file

@ -10,7 +10,7 @@
// //
Script.include("../utils.js"); Script.include("../utils.js");
var scriptURL = 'atp:/pingPongGun/pingPingGun.js'; var scriptURL = 'atp:/pingPongGun/pingPongGun.js';
var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx'; var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx';
var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj'; var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj';

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

@ -242,7 +242,7 @@
var blueChair = new BlueChair({ var blueChair = new BlueChair({
x: 1100.4821, x: 1100.4821,
y: 459.8161, y: 459.9147,
z: -75.9071 z: -75.9071
}); });

2
unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
View file

@ -26,7 +26,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
var whiteboardPosition = spawnPosition; var whiteboardPosition = spawnPosition;
var whiteboardRotation = orientation; var whiteboardRotation = orientation;
var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx"; var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-6.fbx";
var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj"; var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
var whiteboard = Entities.addEntity({ var whiteboard = Entities.addEntity({