diff --git a/scripts/system/attachedEntitiesManager.js b/scripts/system/attachedEntitiesManager.js index 79c5973a6e..ee852d8d65 100644 --- a/scripts/system/attachedEntitiesManager.js +++ b/scripts/system/attachedEntitiesManager.js @@ -22,7 +22,7 @@ var MINIMUM_DROP_DISTANCE_FROM_JOINT = 0.8; var ATTACHED_ENTITY_SEARCH_DISTANCE = 10.0; var ATTACHED_ENTITIES_SETTINGS_KEY = "ATTACHED_ENTITIES"; var DRESSING_ROOM_DISTANCE = 2.0; -var SHOW_TOOL_BAR = true; +var SHOW_TOOL_BAR = false; // tool bar @@ -71,12 +71,11 @@ Script.scriptEnding.connect(scriptEnding); - // attached entites function AttachedEntitiesManager() { - var clothingLocked = true; + var clothingLocked = false; this.subscribeToMessages = function() { Messages.subscribe('Hifi-Object-Manipulation'); @@ -87,10 +86,6 @@ function AttachedEntitiesManager() { if (channel !== 'Hifi-Object-Manipulation') { return; } - // if (sender !== MyAvatar.sessionUUID) { - // print('wearablesManager got message from wrong sender'); - // return; - // } var parsedMessage = null; @@ -106,7 +101,7 @@ function AttachedEntitiesManager() { // ignore } else if (parsedMessage.action === 'release') { manager.handleEntityRelease(parsedMessage.grabbedEntity, parsedMessage.joint) - // manager.saveAttachedEntities(); + // manager.saveAttachedEntities(); } else if (parsedMessage.action === 'equip') { // manager.saveAttachedEntities(); } else { @@ -117,11 +112,6 @@ function AttachedEntitiesManager() { this.handleEntityRelease = function(grabbedEntity, releasedFromJoint) { // if this is still equipped, just rewrite the position information. var grabData = getEntityCustomData('grabKey', grabbedEntity, {}); - // if ("refCount" in grabData && grabData.refCount > 0) { - // // for adjusting things in your other hand - // manager.updateRelativeOffsets(grabbedEntity); - // return; - // } var allowedJoints = getEntityCustomData('wearable', grabbedEntity, DEFAULT_WEARABLE_DATA).joints; @@ -156,7 +146,8 @@ function AttachedEntitiesManager() { var wearProps = Entities.getEntityProperties(grabbedEntity); wearProps.parentID = MyAvatar.sessionUUID; wearProps.parentJointIndex = bestJointIndex; - + delete wearProps.localPosition; + delete wearProps.localRotation; var updatePresets = false; if (bestJointOffset && bestJointOffset.constructor === Array) { if (!clothingLocked || bestJointOffset.length < 2) { @@ -170,21 +161,23 @@ function AttachedEntitiesManager() { } Entities.deleteEntity(grabbedEntity); - grabbedEntity = Entities.addEntity(wearProps, true); + //the true boolean here after add entity adds it as an 'avatar entity', which can travel with you from server to server. + + var newEntity = Entities.addEntity(wearProps, true); + if (updatePresets) { - this.updateRelativeOffsets(grabbedEntity); + this.updateRelativeOffsets(newEntity); } } else if (props.parentID != NULL_UUID) { // drop the entity and set it to have no parent (not on the avatar), unless it's being equipped in a hand. if (props.parentID === MyAvatar.sessionUUID && (props.parentJointIndex == MyAvatar.getJointIndex("RightHand") || - props.parentJointIndex == MyAvatar.getJointIndex("LeftHand"))) { + props.parentJointIndex == MyAvatar.getJointIndex("LeftHand"))) { // this is equipped on a hand -- don't clear the parent. } else { var wearProps = Entities.getEntityProperties(grabbedEntity); wearProps.parentID = NULL_UUID; wearProps.parentJointIndex = -1; - delete wearProps.id; delete wearProps.created; delete wearProps.age; @@ -198,7 +191,6 @@ function AttachedEntitiesManager() { delete wearProps.owningAvatarID; delete wearProps.localPosition; delete wearProps.localRotation; - Entities.deleteEntity(grabbedEntity); Entities.addEntity(wearProps); } @@ -220,17 +212,6 @@ function AttachedEntitiesManager() { return false; } - this.toggleLocked = function() { - print("toggleLocked"); - if (clothingLocked) { - clothingLocked = false; - toolBar.setImageURL(Script.resolvePath("assets/images/unlock.svg"), lockButton); - } else { - clothingLocked = true; - toolBar.setImageURL(Script.resolvePath("assets/images/lock.svg"), lockButton); - } - } - // this.saveAttachedEntities = function() { // print("--- saving attached entities ---"); // saveData = []; @@ -246,27 +227,27 @@ function AttachedEntitiesManager() { // Settings.setValue(ATTACHED_ENTITIES_SETTINGS_KEY, JSON.stringify(saveData)); // } - this.scrubProperties = function(props) { - var toScrub = ["queryAACube", "position", "rotation", - "created", "ageAsText", "naturalDimensions", - "naturalPosition", "velocity", "acceleration", - "angularVelocity", "boundingBox"]; - toScrub.forEach(function(propertyName) { - delete props[propertyName]; - }); - // if the userData has a grabKey, clear old state - if ("userData" in props) { - try { - parsedUserData = JSON.parse(props.userData); - if ("grabKey" in parsedUserData) { - parsedUserData.grabKey.refCount = 0; - delete parsedUserData.grabKey["avatarId"]; - props["userData"] = JSON.stringify(parsedUserData); - } - } catch (e) { - } - } - } + // this.scrubProperties = function(props) { + // var toScrub = ["queryAACube", "position", "rotation", + // "created", "ageAsText", "naturalDimensions", + // "naturalPosition", "velocity", "acceleration", + // "angularVelocity", "boundingBox"]; + // toScrub.forEach(function(propertyName) { + // delete props[propertyName]; + // }); + // // if the userData has a grabKey, clear old state + // if ("userData" in props) { + // try { + // parsedUserData = JSON.parse(props.userData); + // if ("grabKey" in parsedUserData) { + // parsedUserData.grabKey.refCount = 0; + // delete parsedUserData.grabKey["avatarId"]; + // props["userData"] = JSON.stringify(parsedUserData); + // } + // } catch (e) { + // } + // } + // } // this.loadAttachedEntities = function(grabbedEntity) { // print("--- loading attached entities ---"); @@ -302,4 +283,4 @@ function AttachedEntitiesManager() { } var manager = new AttachedEntitiesManager(); -manager.subscribeToMessages(); +manager.subscribeToMessages(); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/blocky/arrangement6B.json b/unpublishedScripts/DomainContent/Home/blocky/arrangement6B.json new file mode 100644 index 0000000000..2a0510e259 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/arrangement6B.json @@ -0,0 +1,231 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:37:13Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{5692ed0d-52ae-4bd9-8ef6-13a3d28dbcec}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": 0.076191246509552002, + "y": -0.0050119552761316299, + "z": -4.275888204574585e-05 + }, + "queryAACube": { + "scale": 0.77012991905212402, + "x": 1104.9146728515625, + "y": 460.09011840820312, + "z": -69.708526611328125 + }, + "rotation": { + "w": -3.1195580959320068e-05, + "x": -0.99968332052230835, + "y": 0.019217833876609802, + "z": 0.0013828873634338379 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:28:29Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{41fdce7a-5c15-4335-a7d4-e6e42c419edb}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": 0.31622248888015747, + "y": -0.076068185269832611, + "z": -0.00023670494556427002 + }, + "queryAACube": { + "scale": 0.77012991905212402, + "x": 1104.552734375, + "y": 460.09014892578125, + "z": -69.711776733398438 + }, + "rotation": { + "w": 0.9812014102935791, + "x": 2.8990209102630615e-05, + "y": 0.00053216516971588135, + "z": -0.19223560392856598 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:30:40Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{376ea748-6b7b-4ac4-9194-b0f118ac39dd}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": -0.22965218126773834, + "y": 0.0041047781705856323, + "z": 0.00015974044799804688 + }, + "queryAACube": { + "scale": 0.77012991905212402, + "x": 1105.10009765625, + "y": 460.09011840820312, + "z": -69.742721557617188 + }, + "rotation": { + "w": -7.3388218879699707e-06, + "x": -0.99162417650222778, + "y": 0.1281534731388092, + "z": 0.00039628148078918457 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T21:28:38Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{d1359425-9129-4827-b881-e4802703a0ca}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": 0.23440317809581757, + "y": -0.035929545760154724, + "z": -0.00016139447689056396 + }, + "queryAACube": { + "scale": 0.77012991905212402, + "x": 1104.6361083984375, + "y": 460.09011840820312, + "z": -69.792564392089844 + }, + "rotation": { + "w": 0.986641526222229, + "x": -0.00016996264457702637, + "y": -0.00021627545356750488, + "z": -0.16198150813579559 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:32:51Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{11b3c61c-abe3-48ac-9033-3f88d3efee00}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": -0.15134727954864502, + "y": 0.00060278922319412231, + "z": 0.00011575222015380859 + }, + "queryAACube": { + "scale": 0.77012991905212402, + "x": 1104.79541015625, + "y": 460.090087890625, + "z": -69.902366638183594 + }, + "rotation": { + "w": -0.00098252296447753906, + "x": -0.030791401863098145, + "y": 0.99939167499542236, + "z": 0.0002511441707611084 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:32:51Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{15c3aeae-1166-4cff-aa53-d732f20a1203}", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "parentID": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "position": { + "x": -0.35397925972938538, + "y": 0.020401254296302795, + "z": 0.00025978684425354004 + }, + "queryAACube": { + "scale": 0.82158386707305908, + "x": 1105.195068359375, + "y": 460.06436157226562, + "z": -69.863059997558594 + }, + "rotation": { + "w": 0.68755638599395752, + "x": -0.00055142492055892944, + "y": 0.00033529102802276611, + "z": -0.72594141960144043 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "angularDamping": 0, + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "created": "2016-05-09T19:30:40Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{8c29606d-b071-4793-a5d5-26453bb12bf4}", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "queryAACube": { + "scale": 0.25670996308326721, + "x": -0.12835498154163361, + "y": -0.12835498154163361, + "z": -0.12835498154163361 + }, + "rotation": { + "w": 0.097722500562667847, + "x": 0.097280360758304596, + "y": 0.70029336214065552, + "z": -0.70041131973266602 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/blocky.js b/unpublishedScripts/DomainContent/Home/blocky/blocky.js new file mode 100644 index 0000000000..8eae31a439 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/blocky.js @@ -0,0 +1,286 @@ +// this script creates a pile of playable blocks and displays a target arrangement when you trigger it + +var BLOCK_RED = { + url: 'atp:/kineticObjects/blocks/planky_red.fbx', + dimensions: { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + } +}; +var BLOCK_BLUE = { + url: 'atp:/kineticObjects/blocks/planky_blue.fbx', + dimensions: { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, +}; +var BLOCK_YELLOW = { + url: 'atp:/kineticObjects/blocks/planky_yellow.fbx', + dimensions: { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + } +}; +var BLOCK_GREEN = { + url: 'atp:/kineticObjects/blocks/planky_green.fbx', + dimensions: { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, +}; +var BLOCK_NATURAL = { + url: "atp:/kineticObjects/blocks/planky_natural.fbx", + dimensions: { + "x": 0.05, + "y": 0.05, + "z": 0.05 + } +}; + +var blocks = [ + BLOCK_RED, BLOCK_BLUE, BLOCK_YELLOW, BLOCK_GREEN, BLOCK_NATURAL +]; + +var arrangements = [{ + name: 'greenhenge', + blocks: [BLOCK_GREEN, BLOCK_GREEN, BLOCK_YELLOW, BLOCK_YELLOW], + target: "atp:/blocky/newblocks1.json" +}, { + name: 'tallstuff', + blocks: [BLOCK_RED, BLOCK_RED, BLOCK_RED], + target: "atp:/blocky/newblocks2.json" +}, { + name: 'ostrich', + blocks: [BLOCK_RED, BLOCK_RED, BLOCK_GREEN, BLOCK_YELLOW, BLOCK_NATURAL], + target: "atp:/blocky/newblocks5.json" +}, { + name: 'fourppl', + blocks: [BLOCK_BLUE, BLOCK_BLUE, BLOCK_BLUE, BLOCK_BLUE, BLOCK_NATURAL, BLOCK_NATURAL, BLOCK_NATURAL, BLOCK_NATURAL], + target: "atp:/blocky/newblocks3.json" +}, { + name: 'frogguy', + blocks: [BLOCK_GREEN, BLOCK_GREEN, BLOCK_GREEN, BLOCK_YELLOW, BLOCK_RED, BLOCK_RED, BLOCK_NATURAL, BLOCK_NATURAL], + target: "atp:/blocky/newblocks4.json" +}, { + name: 'dominoes', + blocks: [BLOCK_RED, BLOCK_YELLOW, BLOCK_YELLOW, BLOCK_YELLOW, BLOCK_YELLOW, BLOCK_YELLOW, BLOCK_YELLOW], + target: "atp:/blocky/arrangement6B.json" +}] + +var PLAYABLE_BLOCKS_POSITION = { + x: 1097.6, + y: 460.5, + z: -66.22 +}; + +var TARGET_BLOCKS_POSITION = { + x: 1096.82, + y: 460.5, + z: -67.689 +}; +//#debug +(function() { + + print('BLOCK ENTITY SCRIPT') + var _this; + + function Blocky() { + _this = this; + } + + Blocky.prototype = { + busy: false, + debug: false, + playableBlocks: [], + targetBlocks: [], + preload: function(entityID) { + print('BLOCKY preload') + this.entityID = entityID; + Script.update.connect(_this.update); + }, + + createTargetBlocks: function(arrangement) { + var created = []; + print('BLOCKY create target blocks') + + var created = []; + var success = Clipboard.importEntities(arrangement.target); + if (success === true) { + created = Clipboard.pasteEntities(TARGET_BLOCKS_POSITION) + print('created ' + created); + } + + this.targetBlocks = created; + print('BLOCKY TARGET BLOCKS:: ' + this.targetBlocks); + }, + + createPlayableBlocks: function(arrangement) { + print('BLOCKY creating playable blocks' + arrangement.blocks.length); + arrangement.blocks.forEach(function(block) { + print('BLOCKY in a block loop') + var blockProps = { + name: "home_model_blocky_block", + type: 'Model', + collisionSoundURL: "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + dynamic: true, + collisionless: false, + gravity: { + x: 0, + y: -9.8, + z: 0 + }, + userData: JSON.stringify({ + grabbableKey: { + grabbable: true + }, + hifiHomeKey: { + reset: true + } + }), + dimensions: block.dimensions, + modelURL: block.url, + shapeType: 'box', + velocity: { + x: 0, + y: -0.01, + z: 0, + }, + position: PLAYABLE_BLOCKS_POSITION + } + var newBlock = Entities.addEntity(blockProps); + print('BLOCKY made a playable block' + newBlock) + _this.playableBlocks.push(newBlock); + print('BLOCKY pushing it into playable blocks'); + }) + + print('BLOCKY after going through playable arrangement') + }, + + startNearTrigger: function() { + print('BLOCKY got a near trigger'); + this.advanceRound(); + }, + + advanceRound: function() { + print('BLOCKY advance round'); + this.busy = true; + this.cleanup(); + var arrangement = arrangements[Math.floor(Math.random() * arrangements.length)]; + this.createTargetBlocks(arrangement); + + if (this.debug === true) { + this.debugCreatePlayableBlocks(); + } else { + this.createPlayableBlocks(arrangement); + + } + Script.setTimeout(function() { + _this.busy = false; + }, 1000) + }, + + findBlocks: function() { + var found = []; + var results = Entities.findEntities(MyAvatar.position, 10); + results.forEach(function(result) { + var properties = Entities.getEntityProperties(result); + print('got result props') + if (properties.name.indexOf('blocky_block') > -1) { + found.push(result); + } + }); + return found; + }, + + cleanup: function() { + print('BLOCKY cleanup'); + var blocks = this.findBlocks(); + print('BLOCKY cleanup2' + blocks.length) + blocks.forEach(function(block) { + Entities.deleteEntity(block); + }) + print('BLOCKY after find and delete') + this.targetBlocks.forEach(function(block) { + Entities.deleteEntity(block); + }); + this.playableBlocks.forEach(function(block) { + Entities.deleteEntity(block); + }); + this.targetBlocks = []; + this.playableBlocks = []; + }, + + debugCreatePlayableBlocks: function() { + print('BLOCKY debug create'); + var howMany = 10; + var i; + for (i = 0; i < howMany; i++) { + var block = blocks[Math.floor(Math.random() * blocks.length)]; + var blockProps = { + name: "home_model_blocky_block", + type: 'Model', + collisionSoundURL: "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + dynamic: false, + collisionless: true, + userData: JSON.stringify({ + grabbableKey: { + grabbable: true + }, + hifiHomeKey: { + reset: true + } + }), + dimensions: block.dimensions, + modelURL: block.url, + shapeType: 'box', + velocity: { + x: 0, + y: -0.01, + z: 0, + }, + position: PLAYABLE_BLOCKS_POSITION + } + this.playableBlocks.push(Entities.addEntity(blockProps)); + } + }, + + unload: function() { + this.cleanup(); + Script.update.disconnect(_this.update); + }, + + clickReleaseOnEntity: function() { + print('BLOCKY click') + this.startNearTrigger(); + }, + + update: function() { + if (_this.busy === true) { + return; + } + var BEAM_TRIGGER_THRESHOLD = 0.075; + + var BEAM_POSITION = { + x: 1098.4424, + y: 460.3090, + z: -66.2190 + }; + + var leftHandPosition = MyAvatar.getLeftPalmPosition(); + var rightHandPosition = MyAvatar.getRightPalmPosition(); + + var rightDistance = Vec3.distance(leftHandPosition, BEAM_POSITION) + var leftDistance = Vec3.distance(rightHandPosition, BEAM_POSITION) + + if (rightDistance < BEAM_TRIGGER_THRESHOLD || leftDistance < BEAM_TRIGGER_THRESHOLD) { + _this.startNearTrigger(); + } + } + } + + return new Blocky(); +}) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/blocky/newblocks1.json b/unpublishedScripts/DomainContent/Home/blocky/newblocks1.json new file mode 100644 index 0000000000..2409c7c34c --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/newblocks1.json @@ -0,0 +1,136 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:35:13Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{aad3b1c3-6478-46dd-a985-800d0e38c8e7}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.069580078125, + "y": 0.153778076171875, + "z": 0.04181671142578125 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": -0.058774903416633606, + "y": 0.025423094630241394, + "z": -0.086538270115852356 + }, + "rotation": { + "w": 0.95882409811019897, + "x": -1.896415778901428e-05, + "y": 0.28400072455406189, + "z": -1.0296697837475222e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:30:51Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{f5714678-d436-4353-b0c8-2d73599dda3a}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0181884765625, + "y": 0.153778076171875, + "z": 0.0773468017578125 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": -0.11016650497913361, + "y": 0.025423094630241394, + "z": -0.051008179783821106 + }, + "rotation": { + "w": 0.95882409811019897, + "x": -1.896415778901428e-05, + "y": 0.28400072455406189, + "z": -1.0296697837475222e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:30:51Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{0cf93a58-18d2-4c69-9c1b-33d6d1e647b8}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.078857421875, + "y": 0.002899169921875, + "z": 0.11455535888671875 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.064756646752357483, + "y": -0.14071489870548248, + "z": -0.029058709740638733 + }, + "rotation": { + "w": 0.33741602301597595, + "x": -0.33740735054016113, + "y": 0.62139773368835449, + "z": 0.62142699956893921 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:33:02Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{7f8791fb-e236-4280-b9d4-4ee6d1663e2a}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.14361406862735748, + "y": -0.14361406862735748, + "z": -0.14361406862735748 + }, + "rotation": { + "w": 0.68138498067855835, + "x": -0.68140000104904175, + "y": 0.18894240260124207, + "z": 0.1889689564704895 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/newblocks2.json b/unpublishedScripts/DomainContent/Home/blocky/newblocks2.json new file mode 100644 index 0000000000..8487e709d4 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/newblocks2.json @@ -0,0 +1,107 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:37:24Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{2454f490-787c-491b-9b7e-c0e098af86e8}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0.504150390625, + "z": 0 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.13693064451217651, + "y": 0.36721974611282349, + "z": -0.13693064451217651 + }, + "rotation": { + "w": 0.70711755752563477, + "x": 0.70709598064422607, + "y": 0, + "z": -2.1579186068265699e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:37:24Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{5bf66e29-a3b6-4171-8470-6e0462d51dd3}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0, + "z": 0.00112152099609375 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.13693064451217651, + "y": -0.13693064451217651, + "z": -0.13580912351608276 + }, + "rotation": { + "w": 0.70711755752563477, + "x": 0.70709598064422607, + "y": 0, + "z": -2.1579186068265699e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:39:35Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{2cf52537-9f88-41eb-86d6-14a5ff218fb6}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0.253204345703125, + "z": 0 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.13693064451217651, + "y": 0.11627370119094849, + "z": -0.13693064451217651 + }, + "rotation": { + "w": 0.70711755752563477, + "x": 0.70709598064422607, + "y": 0, + "z": -2.1579186068265699e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/newblocks3.json b/unpublishedScripts/DomainContent/Home/blocky/newblocks3.json new file mode 100644 index 0000000000..846800a2eb --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/newblocks3.json @@ -0,0 +1,277 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{806e18fc-1ffd-4d7a-a405-52f1ad6cc164}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.1412353515625, + "y": 0.150634765625, + "z": 0.19216156005859375 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.09793408215045929, + "y": 0.10733349621295929, + "z": 0.14886029064655304 + }, + "rotation": { + "w": 0.96592974662780762, + "x": -1.8688122509047389e-05, + "y": 0.25880429148674011, + "z": -1.0789593034132849e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{3c99f577-fc38-4f5b-8b7b-2dc36b742ff9}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.078369140625, + "y": 0.150634765625, + "z": 0.10829925537109375 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.03506787121295929, + "y": 0.10733349621295929, + "z": 0.06499798595905304 + }, + "rotation": { + "w": 0.96592974662780762, + "x": -1.8688122509047389e-05, + "y": 0.25880429148674011, + "z": -1.0789593034132849e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{3aa37e21-48ff-4d41-be0b-d47a67e004cc}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.2056884765625, + "y": 0.150634765625, + "z": 0.2870941162109375 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.16238720715045929, + "y": 0.10733349621295929, + "z": 0.24379284679889679 + }, + "rotation": { + "w": 0.96592974662780762, + "x": -1.8688122509047389e-05, + "y": 0.25880429148674011, + "z": -1.0789593034132849e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:39:35Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{a34966c4-0f1c-4103-8857-f998559318e7}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0.150634765625, + "z": 0 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": -0.04330126941204071, + "y": 0.10733349621295929, + "z": -0.04330126941204071 + }, + "rotation": { + "w": 0.96592974662780762, + "x": -1.8688122509047389e-05, + "y": 0.25880429148674011, + "z": -1.0789593034132849e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{96336167-827c-48ec-b641-ee462fb2abdc}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.2088623046875, + "y": 0, + "z": 0.28765869140625 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": 0.078958496451377869, + "y": -0.12990380823612213, + "z": 0.15775488317012787 + }, + "rotation": { + "w": 0.68138498067855835, + "x": -0.68140000104904175, + "y": 0.18894240260124207, + "z": 0.1889689564704895 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:39:35Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{17b1be58-b3d6-4b27-856e-f74b8ba34309}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.001953125, + "y": 0, + "z": 0.00205230712890625 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": -0.12795068323612213, + "y": -0.12990380823612213, + "z": -0.12785150110721588 + }, + "rotation": { + "w": 0.68138498067855835, + "x": -0.68140000104904175, + "y": 0.18894240260124207, + "z": 0.1889689564704895 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{161eefc7-ba39-4301-913f-edb4f7d9236e}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0777587890625, + "y": 0, + "z": 0.10608673095703125 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": -0.052145019173622131, + "y": -0.12990380823612213, + "z": -0.023817077279090881 + }, + "rotation": { + "w": 0.68138498067855835, + "x": -0.68140000104904175, + "y": 0.18894240260124207, + "z": 0.1889689564704895 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:41:47Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{ea1eebe2-fef3-4587-9f87-f7812359ec8b}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.152099609375, + "y": 0, + "z": 0.1891937255859375 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": 0.022195801138877869, + "y": -0.12990380823612213, + "z": 0.059289917349815369 + }, + "rotation": { + "w": 0.68138498067855835, + "x": -0.68140000104904175, + "y": 0.18894240260124207, + "z": 0.1889689564704895 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/newblocks4.json b/unpublishedScripts/DomainContent/Home/blocky/newblocks4.json new file mode 100644 index 0000000000..5d5a7a8d9d --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/newblocks4.json @@ -0,0 +1,277 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:52:42Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{df9f2e81-c7c3-45b3-9459-0dc1647e3ac8}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.1153564453125, + "y": 0.3056640625, + "z": 0.19878387451171875 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.07205517590045929, + "y": 0.2623627781867981, + "z": 0.15548260509967804 + }, + "rotation": { + "w": 0.87880980968475342, + "x": -6.1288210417842492e-06, + "y": -0.4771721363067627, + "z": -2.0690549717983231e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{00f70709-d22b-4e50-98b6-c49783a1ca2d}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0565185546875, + "y": 0.3056640625, + "z": 0.0875244140625 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.01321728527545929, + "y": 0.2623627781867981, + "z": 0.04422314465045929 + }, + "rotation": { + "w": 0.87880980968475342, + "x": -6.1288210417842492e-06, + "y": -0.4771721363067627, + "z": -2.0690549717983231e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{925922c7-c8da-4862-8695-9e823cde5f43}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.165771484375, + "y": 0.1016845703125, + "z": 0.3075103759765625 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": 0.028840839862823486, + "y": -0.035246074199676514, + "z": 0.17057973146438599 + }, + "rotation": { + "w": 0.76051729917526245, + "x": 0.5797961950302124, + "y": 0.20168730616569519, + "z": -0.21159422397613525 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{9754d1bd-30f0-473c-87fa-159902f3ae54}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0.1016845703125, + "z": 0 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.13693064451217651, + "y": -0.035246074199676514, + "z": -0.13693064451217651 + }, + "rotation": { + "w": -0.24484673142433167, + "x": -0.2088056355714798, + "y": 0.70473498106002808, + "z": -0.63229680061340332 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{d2cd5cb1-cc1c-48b5-a190-b25279ca46aa}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0667724609375, + "y": 0.18121337890625, + "z": 0.155120849609375 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.076841607689857483, + "y": 0.037599310278892517, + "z": 0.011506780982017517 + }, + "rotation": { + "w": 0.9612659215927124, + "x": -1.8873581211664714e-05, + "y": 0.27562269568443298, + "z": -1.0461797501193359e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{168a3f35-29f3-4a5c-92e5-868ce8476052}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.08154296875, + "y": 0.256256103515625, + "z": 0.1437225341796875 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": -0.046812012791633606, + "y": 0.12790112197399139, + "z": 0.015367552638053894 + }, + "rotation": { + "w": 0.96592974662780762, + "x": -1.8688122509047389e-05, + "y": 0.25880429148674011, + "z": -1.0789593034132849e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{8df113eb-303f-461a-914b-1ff86083af28}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0667724609375, + "y": 0.093353271484375, + "z": 0.155120849609375 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.076841607689857483, + "y": -0.050260797142982483, + "z": 0.011506780982017517 + }, + "rotation": { + "w": 0.9612659215927124, + "x": -1.8873581211664714e-05, + "y": 0.27562269568443298, + "z": -1.0461797501193359e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T22:48:20Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{6126fb1e-5702-4ea5-9840-fc93534a284c}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0667724609375, + "y": 0, + "z": 0.155120849609375 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.076841607689857483, + "y": -0.14361406862735748, + "z": 0.011506780982017517 + }, + "rotation": { + "w": 0.9612659215927124, + "x": -1.8873581211664714e-05, + "y": 0.27562269568443298, + "z": -1.0461797501193359e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/newblocks5.json b/unpublishedScripts/DomainContent/Home/blocky/newblocks5.json new file mode 100644 index 0000000000..88ccb23c44 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/newblocks5.json @@ -0,0 +1,175 @@ +{ + "Entities": [ + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T23:42:57Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{f89e9217-6048-4ad8-a9fa-80404931864c}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0689697265625, + "y": 0.336700439453125, + "z": 0.02086639404296875 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": -0.059385254979133606, + "y": 0.20834545791149139, + "z": -0.10748858749866486 + }, + "rotation": { + "w": 0.66232722997665405, + "x": 0.66232722997665405, + "y": 0.24763399362564087, + "z": -0.24763399362564087 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T23:42:57Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "id": "{e065e9c3-b722-4ad3-bbd4-3f12efb530f5}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0335693359375, + "y": 0.179962158203125, + "z": 0.0505828857421875 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": -0.11004473268985748, + "y": 0.036348089575767517, + "z": -0.093031182885169983 + }, + "rotation": { + "w": 0.88294041156768799, + "x": -6.3091447373153642e-06, + "y": -0.46948501467704773, + "z": -2.0636278350139037e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T23:42:57Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{f1367c6c-744a-4ee2-9a6f-ffe89fe67e7e}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0, + "y": 0, + "z": 0.03073883056640625 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.13693064451217651, + "y": -0.13693064451217651, + "z": -0.10619181394577026 + }, + "rotation": { + "w": 0.67456501722335815, + "x": 0.67456501722335815, + "y": 0.21204251050949097, + "z": -0.21204251050949097 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T23:42:57Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "id": "{73c2bd96-e77d-4ba2-908b-1ee8ca7c814c}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.02685546875, + "y": 0, + "z": 0.0877532958984375 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": -0.11007517576217651, + "y": -0.13693064451217651, + "z": -0.049177348613739014 + }, + "rotation": { + "w": 0.67456501722335815, + "x": 0.67456501722335815, + "y": 0.21204251050949097, + "z": -0.21204251050949097 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + }, + { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionless": 1, + "created": "2016-05-23T23:42:57Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "id": "{28fd21e4-2138-4ca1-875b-1d35cbefa6b8}", + "ignoreForCollisions": 1, + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "home_model_blocky_block", + "position": { + "x": 0.0506591796875, + "y": 0.485748291015625, + "z": 0 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.0073579102754592896, + "y": 0.4424470067024231, + "z": -0.04330126941204071 + }, + "rotation": { + "w": 1, + "x": -1.52587890625e-05, + "y": -1.52587890625e-05, + "z": -1.52587890625e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true},\"hifiHomeKey\":{\"reset\":true}}" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/blocky/singleSpawner.js b/unpublishedScripts/DomainContent/Home/blocky/singleSpawner.js new file mode 100644 index 0000000000..fc6650ac6a --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/singleSpawner.js @@ -0,0 +1,27 @@ +// +// +// Created by The Content Team 4/10/216 +// Copyright 2016 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 +// + +var blockyPath = 'atp:/blocky/wrapper.js'; +Script.include(blockyPath); +var center = Vec3.sum(Vec3.sum(MyAvatar.position, { + x: 0, + y: 0.5, + z: 0 +}), Vec3.multiply(1, Quat.getFront(Camera.getOrientation()))); +var blocky = new BlockyGame(center, { + x: 0, + y: 0, + z: 0 +}); + +Script.scriptEnding.connect(function() { + blocky.cleanup() +}) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/blocky/wrapper.js b/unpublishedScripts/DomainContent/Home/blocky/wrapper.js new file mode 100644 index 0000000000..5ae7d4592e --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/blocky/wrapper.js @@ -0,0 +1,51 @@ +// createPingPongGun.js +// +// Script Type: Entity Spawner +// Created by James B. Pollack on 9/30/2015 +// Copyright 2015 High Fidelity, Inc. +// +// This script creates a gun that shoots ping pong balls when you pull the trigger on a hand controller. +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + + +BlockyGame = function(spawnPosition, spawnRotation) { + + var scriptURL = "atp:/blocky/blocky.js"; + + var blockyProps = { + type: 'Model', + modelURL:'atp:/blocky/swiper.fbx', + name: 'home_box_blocky_resetter', + dimensions: { + x: 0.2543, + y: 0.3269, + z: 0.4154 + }, + rotation:Quat.fromPitchYawRollDegrees(-9.5165,-147.3687,16.6577), + script: scriptURL, + userData: JSON.stringify({ + "grabbableKey": { + "wantsTrigger": true + }, + 'hifiHomeKey': { + 'reset': true + } + }), + dynamic: false, + position: spawnPosition + }; + + var blocky = Entities.addEntity(blockyProps); + + function cleanup() { + print('BLOCKY CLEANUP!') + Entities.deleteEntity(blocky); + } + + this.cleanup = cleanup; + + print('HOME CREATED BLOCKY GAME BLOCK 1') + +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/hoverGame/hoverBall.js b/unpublishedScripts/DomainContent/Home/hoverGame/hoverBall.js new file mode 100644 index 0000000000..b4072d4b69 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/hoverGame/hoverBall.js @@ -0,0 +1,60 @@ +(function() { + var _this; + HoverBall = function() { + _this = this; + } + + var MIN_DISTANCE_THRESHOLD = 0.075; + + var CENTER_POINT_LOCATION = { + x: 0, + y: 0, + z: 0 + }; + + HoverBall.prototype = { + preload: function(entityID) { + this.entityID = entityID; + + }, + unload: function() { + + }, + startDistanceGrab: function() { + + }, + continueDistantGrab: function() { + var position = Entities.getEntityProperties(_this.entityID).position; + var distanceFromCenterPoint = Vec3.distance(position, CENTER_POINT_LOCATION); + if (distanceFromCenterPoint < MIN_DISTANCE_THRESHOLD) { + + _this.turnOnGlow(); + } else { + _this.turnOffGlow(); + } + }, + releaseGrab: function() { + _this.turnOffGlow(); + }, + turnOnGlow: function() { + + }, + turnOffGlow: function() { + + }, + findHoverContainer: function() { + var position = Entities.getEntityProperties(_this.entityID).position; + var results = Entities.findEntities(position, 3); + results.forEach(function(item) { + var props = Entities.getEntityProperties(item); + if (props.name.indexOf('hoverGame_container') > -1) { + return item + } + }) + }, + + } + + return new HoverBall(); + +}) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/hoverGame/hoverContainer.js b/unpublishedScripts/DomainContent/Home/hoverGame/hoverContainer.js new file mode 100644 index 0000000000..3391879793 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/hoverGame/hoverContainer.js @@ -0,0 +1,28 @@ +(function() { + + HoverContainer = function() { + + } + + HoverContainer.prototype = { + preload: function(entityID) { + this.entityID = entityID; + + var data = { + action: 'add', + id: this.entityID + }; + Messages.sendLocalMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data)) + }, + unload: function() { + var data = { + action: 'remove', + id: this.entityID + }; + Messages.sendLocalMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data)) + } + } + + return new HoverContainer(); + +}) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/hoverGame/wrapper.js b/unpublishedScripts/DomainContent/Home/hoverGame/wrapper.js new file mode 100644 index 0000000000..a176e359fa --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/hoverGame/wrapper.js @@ -0,0 +1,80 @@ +// createPingPongGun.js +// +// Script Type: Entity Spawner +// Created by James B. Pollack on 9/30/2015 +// Copyright 2015 High Fidelity, Inc. +// +// This script creates a gun that shoots ping pong balls when you pull the trigger on a hand controller. +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +//var position = {x:1098.4813,y:461.6781,z:-71.3820} +// var dimensions = {x:1.0233,y:3.1541,z:0.8684} +HoverGame = function(spawnPosition, spawnRotation) { + + var scriptURL = "atp:/hoverGame/hoverInner.js"; + + var hoverContainerProps = { + type: 'Model', + modelURL: 'atp:/hoverGame/hover.fbx', + name: 'home_model_hoverGame_container', + dimensions: {x:1.0233,y:3.1541,z:0.8684}, + compoundShapeURL: 'atp:/hoverGame/hoverHull.obj', + rotation: spawnRotation, + script: scriptURL, + userData: JSON.stringify({ + "grabbableKey": { + "grabbable":false + }, + 'hifiHomeKey': { + 'reset': true + } + }), + dynamic: false, + position: spawnPosition + }; + + var hoverBall = { + type: 'Sphere', + name: 'home_model_hoverGame_sphere', + dimensions: { + x: 0.25, + y: 0.25, + z: 0.25, + }, + compoundShapeURL: 'atp:/hoverGame/hoverHull.obj', + rotation: spawnRotation, + script: scriptURL, + userData: JSON.stringify({ + 'hifiHomeKey': { + 'reset': true + } + }), + dynamic: true, + gravity:{ + x:0, + y:-9.8, + z:0 + }, + position: spawnPosition, + userData:JSON.stringify({ + grabKey:{ + shouldCollideWith:'static' + } + }) + }; + + var hoverContainer = Entities.addEntity(hoverContainerProps); + var hoverBall = Entities.addEntity(hoverContainerProps); + + function cleanup() { + print('HOVER GAME CLEANUP!') + Entities.deleteEntity(hoverInner); + } + + this.cleanup = cleanup; + + print('HOME CREATED HOVER GAME') + +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json b/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json new file mode 100644 index 0000000000..6ad65af88d --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json @@ -0,0 +1,37 @@ +{ + "Entities": [{ + "name": "home_model_bench", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/bench/Bench.obj", + "created": "2016-05-17T19:27:31Z", + "dimensions": { + "x": 2.3647537231445312, + "y": 0.51260757446289062, + "z": 0.49234861135482788 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{733c3f02-a98a-4876-91dc-320a26a07090}", + "modelURL": "atp:/kineticObjects/bench/Bench.fbx", + "queryAACube": { + "scale": 2.4692578315734863, + "x": -1.2346289157867432, + "y": -1.2346289157867432, + "z": -1.2346289157867432 + }, + "rotation": { + "w": 0.88613712787628174, + "x": -0.0015716552734375, + "y": -0.46337074041366577, + "z": -1.52587890625e-05 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }], + "Version": 57 +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json deleted file mode 100644 index 08331169de..0000000000 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json +++ /dev/null @@ -1,778 +0,0 @@ -{ - "Entities": [{ - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{5371218c-e05b-49da-ac70-81f1f76c55ea}", - "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", - "name": "home_model_block", - "position": { - "x": 0.69732666015625, - "y": 0.1600341796875, - "z": 0.28265380859375 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.6540253758430481, - "y": 0.11673291027545929, - "z": 0.23935253918170929 - }, - "rotation": { - "w": 0.996917724609375, - "x": -0.0001678466796875, - "y": 0.078294038772583008, - "z": -0.0003204345703125 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{ccc1198a-a501-48b8-959a-68297258aea7}", - "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", - "name": "home_model_block", - "position": { - "x": 0.47344970703125, - "y": 0.06005859375, - "z": 0.30706787109375 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.4301484227180481, - "y": 0.01675732433795929, - "z": 0.2637665867805481 - }, - "rotation": { - "w": 0.70644688606262207, - "x": 0.70638585090637207, - "y": -0.030960559844970703, - "z": 0.031174182891845703 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{3aaf5dd5-16d8-4852-880d-8256de68de19}", - "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", - "name": "home_model_block", - "position": { - "x": 0.2613525390625, - "y": 0.01007080078125, - "z": 0.359466552734375 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.12442189455032349, - "y": -0.12685984373092651, - "z": 0.22253590822219849 - }, - "rotation": { - "w": -4.57763671875e-05, - "x": 0.35637450218200684, - "y": -4.57763671875e-05, - "z": 0.93432521820068359 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{0474a29f-c45b-4d42-ae95-0c0bd1e6c501}", - "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", - "name": "home_model_block", - "position": { - "x": 0.30487060546875, - "y": 0.01007080078125, - "z": 0.188262939453125 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.17651562392711639, - "y": -0.11828418076038361, - "z": 0.059907957911491394 - }, - "rotation": { - "w": 0.99496448040008545, - "x": 1.52587890625e-05, - "y": 0.10020601749420166, - "z": 0.0002288818359375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{53e06851-8346-45ac-bdb5-0a74c99b5bd5}", - "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", - "name": "home_model_block", - "position": { - "x": 0.40277099609375, - "y": 0.035064697265625, - "z": 0.254364013671875 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.25915694236755371, - "y": -0.10854937136173248, - "z": 0.11074994504451752 - }, - "rotation": { - "w": 0.70650792121887207, - "x": -0.031143665313720703, - "y": -0.031143665313720703, - "z": 0.70632481575012207 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{38bcb70d-e384-4b60-878a-e34d4830f045}", - "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", - "name": "home_model_block", - "position": { - "x": 0.54962158203125, - "y": 0.010040283203125, - "z": 0.294647216796875 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.42126661539077759, - "y": -0.11831469833850861, - "z": 0.16629223525524139 - }, - "rotation": { - "w": 0.999969482421875, - "x": -7.62939453125e-05, - "y": -0.0037384629249572754, - "z": 0.0001068115234375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{fa8f8bbc-5bd0-4121-985d-75ce2f68eba1}", - "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", - "name": "home_model_block", - "position": { - "x": 0.52001953125, - "y": 0.01007080078125, - "z": 0 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.38308888673782349, - "y": -0.12685984373092651, - "z": -0.13693064451217651 - }, - "rotation": { - "w": 0.9861142635345459, - "x": -7.62939453125e-05, - "y": -0.16603344678878784, - "z": -7.62939453125e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{d4b8582b-b707-453c-89c6-65e358da5cd7}", - "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", - "name": "home_model_block", - "position": { - "x": 0.66876220703125, - "y": 0, - "z": 0.012939453125 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.54040724039077759, - "y": -0.12835498154163361, - "z": -0.11541552841663361 - }, - "rotation": { - "w": 0.70589756965637207, - "x": 0.036270737648010254, - "y": -0.036331713199615479, - "z": -0.70647746324539185 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{3b5b53fb-7ee5-44eb-9b81-8de8a525c433}", - "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", - "name": "home_model_block", - "position": { - "x": 0.83819580078125, - "y": 0.135040283203125, - "z": 0.261627197265625 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.70126515626907349, - "y": -0.0018903613090515137, - "z": 0.12469655275344849 - }, - "rotation": { - "w": 0.69332420825958252, - "x": 0.13832306861877441, - "y": -0.13841456174850464, - "z": -0.69353783130645752 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{0d1f27e9-7e74-4263-9428-8c8f7aac94a6}", - "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", - "name": "home_model_block", - "position": { - "x": 0.61773681640625, - "y": 0.0350341796875, - "z": 0.265533447265625 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.47412276268005371, - "y": -0.10857988893985748, - "z": 0.12191937863826752 - }, - "rotation": { - "w": 0.9998779296875, - "x": -4.57763671875e-05, - "y": -0.014206171035766602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{79ea518f-aac3-45ff-b22d-6d295b3c9e87}", - "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", - "name": "home_model_block", - "position": { - "x": 0.7188720703125, - "y": 0.08502197265625, - "z": 0.26397705078125 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.57525801658630371, - "y": -0.058592095971107483, - "z": 0.12036298215389252 - }, - "rotation": { - "w": 0.99993896484375, - "x": -4.57763671875e-05, - "y": -0.0099946856498718262, - "z": -0.0001068115234375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{ff470ff9-c889-4893-a25f-80895bff0e9a}", - "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", - "name": "home_model_block", - "position": { - "x": 0.74981689453125, - "y": 0.010040283203125, - "z": 0.258575439453125 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.61991310119628906, - "y": -0.11986352503299713, - "z": 0.12867163121700287 - }, - "rotation": { - "w": 0.99993896484375, - "x": -4.57763671875e-05, - "y": -0.010666072368621826, - "z": -0.0003814697265625 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{b5319f85-603d-436b-8bbe-fc9f798ca738}", - "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", - "name": "home_model_block", - "position": { - "x": 0.8824462890625, - "y": 0.0350341796875, - "z": 0.281097412109375 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.73883223533630371, - "y": -0.10857988893985748, - "z": 0.13748334348201752 - }, - "rotation": { - "w": 0.999847412109375, - "x": -4.57763671875e-05, - "y": -0.016922235488891602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{944a4616-8dac-4d6a-a92b-49fa98514416}", - "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", - "name": "home_model_block", - "position": { - "x": 0.963623046875, - "y": 0.010009765625, - "z": 0.25885009765625 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.83371925354003906, - "y": -0.11989404261112213, - "z": 0.12894628942012787 - }, - "rotation": { - "w": 0.999847412109375, - "x": -4.57763671875e-05, - "y": -0.017379999160766602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{ea6a1038-7047-4a1e-bdbd-076d6e41508c}", - "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", - "name": "home_model_block", - "position": { - "x": 0.49188232421875, - "y": 0.010040283203125, - "z": 0.27752685546875 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.36197853088378906, - "y": -0.11986352503299713, - "z": 0.14762304723262787 - }, - "rotation": { - "w": 0.99798583984375, - "x": -4.57763671875e-05, - "y": -0.063248634338378906, - "z": 4.57763671875e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{ff65f5dd-2d53-4127-86da-05156a42946d}", - "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", - "name": "home_model_block", - "position": { - "x": 0, - "y": 0.010101318359375, - "z": 0.353302001953125 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": -0.04330126941204071, - "y": -0.03319995105266571, - "z": 0.3100007176399231 - }, - "rotation": { - "w": 0.55049967765808105, - "x": 0.44353401660919189, - "y": -0.44359505176544189, - "z": -0.55083543062210083 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{3a9acd14-f754-4c70-b294-9f622c000785}", - "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", - "name": "home_model_block", - "position": { - "x": 0.88006591796875, - "y": 0.010040283203125, - "z": 0.05718994140625 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.74313527345657349, - "y": -0.12689036130905151, - "z": -0.079740703105926514 - }, - "rotation": { - "w": 0.86965739727020264, - "x": -4.57763671875e-05, - "y": -0.4936751127243042, - "z": -4.57763671875e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }, { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "velocity": { - "x": 0, - "y": -0.1, - "z": 0 - }, - "id": "{bb014301-247b-44d0-8b09-b830fea4439e}", - "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", - "name": "home_model_block", - "position": { - "x": 0.80487060546875, - "y": 0.010040283203125, - "z": 0.19500732421875 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.7615693211555481, - "y": -0.03326098620891571, - "z": 0.15170605480670929 - }, - "rotation": { - "w": 0.70440220832824707, - "x": 0.060776710510253906, - "y": -0.060868263244628906, - "z": -0.70455479621887207 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }], - "Version": 57 -} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json deleted file mode 100644 index 2556cd6223..0000000000 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "Entities": [{ - "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj", - "created": "2016-03-29T17:37:52Z", - "dimensions": { - "x": 1.1764, - "y": 1.4557, - "z": 1.2657 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "id": "{51a44c3a-ec4a-4c79-8034-aeb5c45660b5}", - "modelURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue.fbx", - "name": "home_model_comfyChair", - "queryAACube": { - "scale": 1.9147497415542603, - "x": -0.95737487077713013, - "y": -0.95737487077713013, - "z": -0.95737487077713013 - }, - "rotation": { - "w": 0.46746015548706055, - "x": -0.0017547607421875, - "y": 0.88400089740753174, - "z": 0.0024261474609375 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - }], - "Version": 57 -} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json b/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json new file mode 100644 index 0000000000..c87fd7bc98 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json @@ -0,0 +1,554 @@ +{ + "Entities": [{ + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/skully/skullyhull.obj", + "created": "2016-05-16T19:34:28Z", + "dimensions": { + "x": 0.19080814719200134, + "y": 0.20009028911590576, + "z": 0.21198928356170654 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -6, + "z": 0 + }, + "id": "{cef37b0a-bb3d-4549-a645-f3a934f82148}", + "modelURL": "atp:/kineticObjects/skully/skully.fbx", + "position": { + "x": 0.254150390625, + "y": 0.4500732421875, + "z": 0.26517486572265625 + }, + "queryAACube": { + "scale": 0.34840109944343567, + "x": 0.079949840903282166, + "y": 0.27587270736694336, + "z": 0.090974316000938416 + }, + "rotation": { + "w": 0.11515986919403076, + "x": -0.087693572044372559, + "y": 0.88818192481994629, + "z": -0.43608760833740234 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/dressingRoom/trump.obj", + "created": "2016-05-18T00:02:46Z", + "dimensions": { + "x": 0.25387090444564819, + "y": 0.28642392158508301, + "z": 0.31468403339385986 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{6483a752-5ba0-4a02-bee5-3290781dfef8}", + "modelURL": "atp:/dressingRoom/trump.fbx", + "position": { + "x": 0.3887939453125, + "y": 0.879974365234375, + "z": 0.2674407958984375 + }, + "queryAACube": { + "scale": 0.49549484252929688, + "x": 0.14104652404785156, + "y": 0.63222694396972656, + "z": 0.019693374633789062 + }, + "rotation": { + "w": 0.58565652370452881, + "x": -0.039444565773010254, + "y": 0.73434042930603027, + "z": -0.34084075689315796 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/dressingRoom/dreads.obj", + "created": "2016-05-18T00:02:46Z", + "dimensions": { + "x": 0.30918264389038086, + "y": 0.31221473217010498, + "z": 0.29840445518493652 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{2f2fb50b-35f0-4818-9cfa-e29f7aeb7a1f}", + "modelURL": "atp:/dressingRoom/dreads.fbx", + "position": { + "x": 0.5389404296875, + "y": 0.52008056640625, + "z": 0.09856414794921875 + }, + "queryAACube": { + "scale": 0.53114700317382812, + "x": 0.27336692810058594, + "y": 0.25450706481933594, + "z": -0.16700935363769531 + }, + "rotation": { + "w": 0.85949492454528809, + "x": 0.051773905754089355, + "y": -0.41289389133453369, + "z": 0.29680323600769043 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/tophat/tophat.obj", + "created": "2016-05-16T16:59:22Z", + "dimensions": { + "x": 0.38495281338691711, + "y": 0.26857495307922363, + "z": 0.39648750424385071 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{8cff801b-cb50-47d2-a1e8-4f7ee245d2ee}", + "modelURL": "atp:/kineticObjects/tophat/tophat.fbx", + "position": { + "x": 0, + "y": 0.541900634765625, + "z": 0.4959869384765625 + }, + "queryAACube": { + "scale": 0.61442941427230835, + "x": -0.30721470713615417, + "y": 0.23468592762947083, + "z": 0.18877223134040833 + }, + "rotation": { + "w": 0.92727553844451904, + "x": -0.18382543325424194, + "y": 0.32610058784484863, + "z": 0.0003204345703125 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/m2.obj", + "created": "2016-05-16T17:12:28Z", + "dimensions": { + "x": 0.094467177987098694, + "y": 0.079604864120483398, + "z": 0.029766213148832321 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{0805851a-4ef1-4075-b4b3-5692ca7d6352}", + "modelURL": "atp:/kineticObjects/hair/m3.fbx", + "position": { + "x": 0.0111083984375, + "y": 0.00689697265625, + "z": 0.45806884765625 + }, + "queryAACube": { + "scale": 0.12707087397575378, + "x": -0.052427038550376892, + "y": -0.056638464331626892, + "z": 0.39453339576721191 + }, + "rotation": { + "w": 0.84777605533599854, + "x": 0.43642330169677734, + "y": 0.26695656776428223, + "z": -0.13978791236877441 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/dressingRoom/rectangleFrames.obj", + "created": "2016-05-18T15:50:52Z", + "dimensions": { + "x": 0.18497957289218903, + "y": 0.048084259033203125, + "z": 0.14581345021724701 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{692df470-2a76-4d5b-971b-257291ff67f7}", + "modelURL": "atp:/dressingRoom/rectangleFrames.fbx", + "name": "rectangleFrames.fbx", + "position": { + "x": 0.3701171875, + "y": 0.062652587890625, + "z": 0.35735321044921875 + }, + "queryAACube": { + "scale": 0.24039779603481293, + "x": 0.24991828203201294, + "y": -0.057546310126781464, + "z": 0.23715430498123169 + }, + "rotation": { + "w": -0.084428191184997559, + "x": -0.10658425092697144, + "y": 0.9651484489440918, + "z": -0.2235599160194397 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/b3.obj", + "created": "2016-05-16T17:10:17Z", + "dimensions": { + "x": 0.19054701924324036, + "y": 0.16880631446838379, + "z": 0.11410932987928391 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{32926ddc-7c3b-49ca-97da-56e69af211af}", + "modelURL": "atp:/kineticObjects/hair/b3.fbx", + "position": { + "x": 0.75, + "y": 0.0643310546875, + "z": 0 + }, + "queryAACube": { + "scale": 0.27897074818611145, + "x": 0.61051464080810547, + "y": -0.075154319405555725, + "z": -0.13948537409305573 + }, + "rotation": { + "w": -0.26207369565963745, + "x": 0.055374979972839355, + "y": 0.93298232555389404, + "z": 0.24034488201141357 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/b1.obj", + "created": "2016-05-16T17:05:55Z", + "dimensions": { + "x": 0.18918535113334656, + "y": 0.15465652942657471, + "z": 0.11267256736755371 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{c412654f-9feb-489d-91f9-6f4eb369afe7}", + "modelURL": "atp:/kineticObjects/hair/b1.fbx", + "position": { + "x": 0.55712890625, + "y": 0.0443115234375, + "z": 0.0774078369140625 + }, + "queryAACube": { + "scale": 0.2690814733505249, + "x": 0.42258816957473755, + "y": -0.090229213237762451, + "z": -0.057132899761199951 + }, + "rotation": { + "w": -0.26680397987365723, + "x": 0.16276800632476807, + "y": 0.81954681873321533, + "z": 0.4802471399307251 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/m3.obj", + "created": "2016-05-16T17:12:28Z", + "dimensions": { + "x": 0.15590831637382507, + "y": 0.057838320732116699, + "z": 0.033922493457794189 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{c2df6722-e970-4c36-bf42-b117e2bc13c4}", + "modelURL": "atp:/kineticObjects/hair/m3.fbx", + "position": { + "x": 0.1549072265625, + "y": 0.006439208984375, + "z": 0.34037017822265625 + }, + "queryAACube": { + "scale": 0.16971567273139954, + "x": 0.070049390196800232, + "y": -0.078418627381324768, + "z": 0.25551235675811768 + }, + "rotation": { + "w": -0.2230105996131897, + "x": 0.19484245777130127, + "y": 0.73751425743103027, + "z": 0.60689711570739746 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/dressingRoom/Elvis.obj", + "created": "2016-05-17T23:58:24Z", + "dimensions": { + "x": 0.22462925314903259, + "y": 0.32056856155395508, + "z": 0.32186508178710938 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{5fe0d835-e52b-432b-8ffe-2e7467613974}", + "modelURL": "atp:/dressingRoom/Elvis.fbx", + "position": { + "x": 0.6776123046875, + "y": 0.89739990234375, + "z": 0.036468505859375 + }, + "queryAACube": { + "scale": 0.50677376985549927, + "x": 0.42422541975975037, + "y": 0.64401304721832275, + "z": -0.21691837906837463 + }, + "rotation": { + "w": 0.76330208778381348, + "x": 0.26140224933624268, + "y": -0.43398183584213257, + "z": 0.40090024471282959 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/dressingRoom/roundFrames.obj", + "created": "2016-05-18T15:55:14Z", + "dimensions": { + "x": 0.18497957289218903, + "y": 0.061892151832580566, + "z": 0.14581345021724701 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{2706fd7c-9f99-4e11-aebe-4c7274d29d69}", + "modelURL": "atp:/dressingRoom/roundFrames.fbx", + "name": "roundFrames.fbx", + "position": { + "x": 0.1690673828125, + "y": 0.08319091796875, + "z": 0.50496673583984375 + }, + "queryAACube": { + "scale": 0.24353571236133575, + "x": 0.047299526631832123, + "y": -0.038576938211917877, + "z": 0.38319888710975647 + }, + "rotation": { + "w": -0.27809566259384155, + "x": -0.059800088405609131, + "y": 0.93838405609130859, + "z": -0.19615471363067627 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/m1.obj", + "created": "2016-05-16T17:10:17Z", + "dimensions": { + "x": 0.10473950952291489, + "y": 0.044521570205688477, + "z": 0.032888296991586685 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{448c53c2-bf1e-44f5-b28f-06da33a4145d}", + "modelURL": "atp:/kineticObjects/hair/m1.fbx", + "position": { + "x": 0.29052734375, + "y": 0, + "z": 0.254638671875 + }, + "queryAACube": { + "scale": 0.11846592277288437, + "x": 0.23129437863826752, + "y": -0.059232961386442184, + "z": 0.19540570676326752 + }, + "rotation": { + "w": -0.24409854412078857, + "x": -0.17210650444030762, + "y": 0.76794075965881348, + "z": -0.56667429208755493 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/hair/b2.obj", + "created": "2016-05-16T17:05:55Z", + "dimensions": { + "x": 0.12604480981826782, + "y": 0.090894937515258789, + "z": 0.069697588682174683 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{33d3ba77-d2c9-4a5f-ba1c-f6f731d05221}", + "modelURL": "atp:/kineticObjects/hair/b3.fbx", + "position": { + "x": 0.4130859375, + "y": 0.030181884765625, + "z": 0.182342529296875 + }, + "queryAACube": { + "scale": 0.1703142374753952, + "x": 0.3279288113117218, + "y": -0.054975233972072601, + "z": 0.097185410559177399 + }, + "rotation": { + "w": -0.2856946587562561, + "x": 0.17711150646209717, + "y": 0.86263823509216309, + "z": 0.37792015075683594 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "name": "home_model_dressing_room_bricabrac", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/snapback/snapback.obj", + "created": "2016-05-16T17:01:33Z", + "dimensions": { + "x": 0.19942393898963928, + "y": 0.12862896919250488, + "z": 0.30034130811691284 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{26e895b7-4a83-45fe-a3e9-5b6ba5f5717e}", + "modelURL": "atp:/kineticObjects/snapback/snapback.fbx", + "position": { + "x": 0.7891845703125, + "y": 0.492218017578125, + "z": 0.0359649658203125 + }, + "queryAACube": { + "scale": 0.38277959823608398, + "x": 0.59779477119445801, + "y": 0.30082821846008301, + "z": -0.15542483329772949 + }, + "rotation": { + "w": -0.31783014535903931, + "x": -0.04985123872756958, + "y": 0.92556643486022949, + "z": -0.19945067167282104 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"wearable\":{\"joints\":{\"head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"Head\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"hair\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}],\"neck\":[{\"x\":0,\"y\":0,\"z\":0},{\"w\":0,\"x\":0,\"y\":0,\"z\":0}]}}}" + }], + "Version": 57 +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json b/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json new file mode 100644 index 0000000000..6ab8f11ddc --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json @@ -0,0 +1,39 @@ +{ + "Entities": [{ + "name": "home_model_umbrella", + "collidesWith": "static,dynamic,kinematic,otherAvatar,", + "collisionMask": 23, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/umbrella/umbrellaopen_ch.obj", + "created": "2016-05-16T22:48:54Z", + "dimensions": { + "x": 1.2649545669555664, + "y": 1.0218980312347412, + "z": 1.2649545669555664 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -5, + "z": 0 + }, + "id": "{59f5cc21-c6e8-4deb-a1e2-0364e82fe062}", + "modelURL": "atp:/kineticObjects/umbrella/umbrella_open.fbx", + "queryAACube": { + "scale": 2.0602173805236816, + "x": -1.0301086902618408, + "y": -1.0301086902618408, + "z": -1.0301086902618408 + }, + "rotation": { + "w": 0.66066992282867432, + "x": -0.2207522988319397, + "y": 0.64501416683197021, + "z": -0.31422901153564453 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }], + "Version": 57 +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index 5b0e75dc94..d4512823db 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -1,24 +1,23 @@ -print('HOME KINETIC INCLUDING WRAPPER') - -var BOOKS_URL = "atp:/kineticObjects/books.json" -var UPPER_BOOKSHELF_URL = "atp:/kineticObjects/upperBookShelf.json" -var LOWER_BOOKSHELF_URL = "atp:/kineticObjects/lowerBookShelf.json" +print('HOME KINETIC INCLUDING WRAPPER'); +var BOOKS_URL = "atp:/kineticObjects/books.json"; +var UPPER_BOOKSHELF_URL = "atp:/kineticObjects/upperBookShelf.json"; +var LOWER_BOOKSHELF_URL = "atp:/kineticObjects/lowerBookShelf.json"; var CHAIR_URL = 'atp:/kineticObjects/deskChair.json'; -var BLUE_CHAIR_URL = 'atp:/kineticObjects/blueChair.json'; - var FRUIT_BOWL_URL = "atp:/kineticObjects/fruit.json" - -var LIVING_ROOM_LAMP_URL = "atp:/kineticObjects/deskLamp.json" +var LIVING_ROOM_LAMP_URL = "atp:/kineticObjects/deskLamp.json"; var TRASHCAN_URL = "atp:/kineticObjects/trashcan.json" var BLOCKS_URL = "atp:/kineticObjects/blocks.json"; -var PLAYA_POSTER_URL = "atp:/kineticObjects/postersPlaya.json" -var CELL_POSTER_URL = "atp:/kineticObjects/postersCell.json" -var STUFF_ON_SHELVES_URL = "atp:/kineticObjects/stuff_on_shelves.json" -var JUNK_URL = "atp:/kineticObjects/junk.json" +var PLAYA_POSTER_URL = "atp:/kineticObjects/postersPlaya.json"; +var CELL_POSTER_URL = "atp:/kineticObjects/postersCell.json"; +var STUFF_ON_SHELVES_URL = "atp:/kineticObjects/stuff_on_shelves.json"; +var JUNK_URL = "atp:/kineticObjects/junk.json"; +var BRICABRAC_URL = "atp:/kineticObjects/dressingRoomBricabrac.json"; +var BENCH_URL = "atp:/kineticObjects/bench.json"; +var UMBRELLA_URL = "atp:/kineticObjects/umbrella.json"; FruitBowl = function(spawnLocation, spawnRotation) { - print('CREATE FRUIT BOWL') + print('CREATE FRUIT BOWL'); var created = []; function create() { @@ -42,7 +41,7 @@ FruitBowl = function(spawnLocation, spawnRotation) { } LivingRoomLamp = function(spawnLocation, spawnRotation) { - print('CREATE LIVING ROOM LAMP') + print('CREATE LIVING ROOM LAMP'); var created = []; function create() { @@ -65,7 +64,7 @@ LivingRoomLamp = function(spawnLocation, spawnRotation) { } UpperBookShelf = function(spawnLocation, spawnRotation) { - print('CREATE UPPER SHELF') + print('CREATE UPPER SHELF'); var created = []; function create() { @@ -89,7 +88,7 @@ UpperBookShelf = function(spawnLocation, spawnRotation) { LowerBookShelf = function(spawnLocation, spawnRotation) { - print('CREATE LOWER SHELF') + print('CREATE LOWER SHELF'); var created = []; function create() { @@ -112,7 +111,7 @@ LowerBookShelf = function(spawnLocation, spawnRotation) { } Chair = function(spawnLocation, spawnRotation) { - print('CREATE CHAIR') + print('CREATE CHAIR'); var created = []; function create() { @@ -134,32 +133,8 @@ Chair = function(spawnLocation, spawnRotation) { this.cleanup = cleanup; } -BlueChair = function(spawnLocation, spawnRotation) { - print('CREATE BLUE CHAIR') - var created = []; - - function create() { - var success = Clipboard.importEntities(BLUE_CHAIR_URL); - - if (success === true) { - created = Clipboard.pasteEntities(spawnLocation) - print('created ' + created); - } - }; - - function cleanup() { - created.forEach(function(obj) { - Entities.deleteEntity(obj); - }) - }; - - create(); - - this.cleanup = cleanup; -} - Trashcan = function(spawnLocation, spawnRotation) { - print('CREATE TRASHCAN') + print('CREATE TRASHCAN'); var created = []; function create() { @@ -183,7 +158,7 @@ Trashcan = function(spawnLocation, spawnRotation) { } Books = function(spawnLocation, spawnRotation) { - print('CREATE BOOKS') + print('CREATE BOOKS'); var created = []; function create() { @@ -206,7 +181,7 @@ Books = function(spawnLocation, spawnRotation) { } Blocks = function(spawnLocation, spawnRotation) { - print('EBL CREATE BLOCKS') + print('EBL CREATE BLOCKS'); var created = []; function create() { @@ -230,7 +205,7 @@ Blocks = function(spawnLocation, spawnRotation) { } PosterCell = function(spawnLocation, spawnRotation) { - print('CREATE CELL POSTER') + print('CREATE CELL POSTER'); var created = []; function create() { @@ -253,7 +228,7 @@ PosterCell = function(spawnLocation, spawnRotation) { } PosterPlaya = function(spawnLocation, spawnRotation) { - print('CREATE PLAYA POSTER') + print('CREATE PLAYA POSTER'); var created = []; function create() { @@ -276,9 +251,10 @@ PosterPlaya = function(spawnLocation, spawnRotation) { } StuffOnShelves = function(spawnLocation, spawnRotation) { - print('CREATE STUFF ON SHELVES') + print('CREATE STUFF ON SHELVES'); var created = []; + function create() { var success = Clipboard.importEntities(STUFF_ON_SHELVES_URL); if (success === true) { @@ -293,17 +269,115 @@ StuffOnShelves = function(spawnLocation, spawnRotation) { }) }; + + + create(); + + this.cleanup = cleanup; +} + +HomeJunk = function(spawnLocation, spawnRotation) { + print('HOME CREATE JUNK'); + var created = []; + function addVelocityDown() { + print('HOME ADDING DOWN VELOCITY TO SHELF ITEMS') + created.forEach(function(obj) { + Entities.editEntity(obj, { + velocity: { + x: 0, + y: -0.1, + z: 0 + } + }); + }) + } + function create() { + var success = Clipboard.importEntities(JUNK_URL); + if (success === true) { + created = Clipboard.pasteEntities(spawnLocation) + print('created ' + created); + addVelocityDown(); + } + }; + + function cleanup() { + created.forEach(function(obj) { + Entities.deleteEntity(obj); + }) + }; + + create(); + + this.cleanup = cleanup; +} + +// Bricabrac = function(spawnLocation, spawnRotation) { +// print('HOME CREATE BRICABRAC'); +// var created = []; + +// function addVelocityDown() { +// print('HOME ADDING DOWN VELOCITY TO DRESSING ROOM ITEMS') +// created.forEach(function(obj) { +// Entities.editEntity(obj, { +// velocity: { +// x: 0, +// y: -0.1, +// z: 0 +// } +// }); +// }) +// } + +// function create() { +// var success = Clipboard.importEntities(BRICABRAC_URL); +// if (success === true) { +// created = Clipboard.pasteEntities(spawnLocation) +// print('created ' + created); +// addVelocityDown(); + +// } +// }; + +// function cleanup() { +// created.forEach(function(obj) { +// Entities.deleteEntity(obj); +// }) +// }; + +// create(); + +// this.cleanup = cleanup; +// } + +Bench = function(spawnLocation, spawnRotation) { + print('HOME CREATE BENCH'); + var created = []; + + function create() { + var success = Clipboard.importEntities(BENCH_URL); + if (success === true) { + created = Clipboard.pasteEntities(spawnLocation) + print('created ' + created); + } + }; + + function cleanup() { + created.forEach(function(obj) { + Entities.deleteEntity(obj); + }) + }; + create(); this.cleanup = cleanup; } -HomeJunk = function(spawnLocation, spawnRotation) { - print('HOME CREATE JUNK') +Umbrella = function(spawnLocation, spawnRotation) { + print('HOME CREATE Umbrella'); var created = []; function create() { - var success = Clipboard.importEntities(JUNK_URL); + var success = Clipboard.importEntities(UMBRELLA_URL); if (success === true) { created = Clipboard.pasteEntities(spawnLocation) print('created ' + created); diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/target.js b/unpublishedScripts/DomainContent/Home/pingPongGun/target.js new file mode 100644 index 0000000000..1a8ea6a25b --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/target.js @@ -0,0 +1,76 @@ +// +// Copyright 2016 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 +// + + +(function() { + + var _this = this; + _this.COLLISION_COOLDOWN_TIME = 5000; + + var startPosition = { + x: 1100.6343, + y: 460.5366, + z: -65.2142 + }; + + var startRotation = Quat.fromPitchYawRollDegrees(3.1471, -170.4121, -0.0060) + + _this.preload = function(entityID) { + + //set our id so other methods can get it. + _this.entityID = entityID; + + //variables we will use to keep track of when to reset the cow + _this.timeSinceLastCollision = 0; + _this.shouldUntip = true; + } + + _this.collisionWithEntity = function(myID, otherID, collisionInfo) { + //we dont actually use any of the parameters above, since we don't really care what we collided with, or the details of the collision. + //5 seconds after a collision, upright the target. protect from multiple collisions in a short timespan with the 'shouldUntip' variable + if (_this.shouldUntip) { + //in Hifi, preface setTimeout with Script.setTimeout + Script.setTimeout(function() { + _this.untip(); + _this.shouldUntip = true; + }, _this.COLLISION_COOLDOWN_TIME); + } + + _this.shouldUntip = false; + + } + + _this.untip = function() { + var props = Entities.getEntityProperties(this.entityID); + var rotation = Quat.safeEulerAngles(props.rotation) + if (rotation.x > 3 || rotation.x < -3 || rotation.z > 3 || rotation.z < -3) { + print('home target - too much pitch or roll, fix it'); + + //we zero out the velocity and angular velocity + Entities.editEntity(_this.entityID, { + position: startPosition, + rotation: startRotation, + velocity: { + x: 0, + y: 0, + z: 0 + }, + angularVelocity: { + x: 0, + y: 0, + z: 0 + } + }); + } + + + + } + + +}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index f6e5a01c7c..cd1dcea76e 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -43,6 +43,8 @@ var transformerPath = Script.resolvePath("atp:/dressingRoom/wrapper.js"); + var blockyPath = Script.resolvePath("atp:/blocky/wrapper.js"); + Script.include(utilsPath); Script.include(kineticPath); @@ -53,6 +55,7 @@ Script.include(cuckooClockPath); Script.include(pingPongGunPath); Script.include(transformerPath); + Script.include(blockyPath); var TRANSFORMER_URL_ROBOT = 'atp:/dressingRoom/simple_robot.fbx'; @@ -60,7 +63,7 @@ var TRANSFORMER_URL_WILL = 'atp:/dressingRoom/will_T.fbx'; - var TRANSFORMER_URL_STYLIZED_FEMALE = 'atp:/dressingRoom/stylized_female.fbx'; + var TRANSFORMER_URL_STYLIZED_FEMALE = 'atp:/dressingRoom/ArtemisJacketOn.fbx'; var TRANSFORMER_URL_PRISCILLA = 'atp:/dressingRoom/priscilla.fbx'; @@ -199,6 +202,8 @@ _this.createKineticEntities(); _this.createScriptedEntities(); _this.setupDressingRoom(); + _this.createMilkPailBalls(); + _this.createTarget(); }, 750); } }, @@ -338,18 +343,18 @@ z: -0.0013 }); + var blocky = new BlockyGame({ + x: 1098.4424, + y: 460.3090, + z: -66.2190 + }) + print('HOME after creating scripted entities') }, createKineticEntities: function() { - var blocks = new Blocks({ - x: 1097.1383, - y: 460.3790, - z: -66.4895 - }); - var fruitBowl = new FruitBowl({ x: 1105.3185, y: 460.3221, @@ -380,12 +385,6 @@ z: -79.8097 }); - var blueChair = new BlueChair({ - x: 1100.4821, - y: 459.9147, - z: -75.9071 - }); - var stuffOnShelves = new StuffOnShelves({ x: 1105.9432, @@ -422,6 +421,25 @@ y: 461, z: -73.3 }); + + // var dressingRoomBricabrac = new Bricabrac({ + // x: 1106.8, + // y: 460.3909, + // z: -72.6 + // }); + + var bench = new Bench({ + x: 1100.1210, + y: 459.4552, + z: -75.4537 + }); + + var umbrella = new Umbrella({ + x: 1097.5510, + y: 459.5230, + z: -84.3897 + }); + print('HOME after creating kinetic entities'); }, @@ -510,6 +528,100 @@ var dais = Entities.addEntity(daisProperties); }, + createTarget: function() { + var targetProperties = { + type: 'Model', + modelURL: 'atp:/pingPongGun/Target.fbx', + shapeType: 'Compound', + compoundShapeURL: 'atp:/pingPongGun/Target.obj', + dimensions: { + x: 0.4937, + y: 0.6816, + z: 0.0778 + }, + rotation: Quat.fromPitchYawRollDegrees(3.1471, -170.4121, -0.0060), + gravity: { + x: 0, + y: -9.8, + z: 0 + }, + velocity: { + x: 0, + y: -0.1, + z: 0 + }, + position: { + x: 1100.6343, + y: 460.5366, + z: -65.2142 + }, + userData: JSON.stringify({ + grabbableKey: { + grabbable: true + }, + hifiHomeKey: { + reset: true + } + }), + script: 'atp:/pingPongGun/target.js', + density: 100, + dynamic: true + } + var target = Entities.addEntity(targetProperties); + }, + + createMilkPailBalls: function() { + var locations = [{ + x: 1099.0795, + y: 459.4186, + z: -70.8603 + }, { + x: 1099.2826, + y: 459.4186, + z: -70.9094 + }, { + x: 1099.5012, + y: 459.4186, + z: -71.1000 + }]; + + var ballProperties = { + type: 'Model', + modelURL: 'atp:/static_objects/StarBall.fbx', + shapeType: 'Sphere', + dimensions: { + x: 0.1646, + y: 0.1646, + z: 0.1646 + }, + gravity: { + x: 0, + y: -9.8, + z: 0 + }, + velocity: { + x: 0, + y: -0.1, + z: 0 + }, + userData: JSON.stringify({ + grabbableKey: { + grabbable: true + }, + hifiHomeKey: { + reset: true + } + }), + dynamic: true + }; + + locations.forEach(function(location) { + ballProperties.position = location; + var ball = Entities.addEntity(ballProperties); + }); + print('HOME made milk pail balls') + }, + createTransformers: function() { var firstDollPosition = { x: 1107.6, diff --git a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/dressingRoomLights.js similarity index 89% rename from unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js rename to unpublishedScripts/DomainContent/Home/switches/dressingRoomLights.js index 6e2c4908b9..a44fa8f2f3 100644 --- a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/dressingRoomLights.js @@ -147,6 +147,16 @@ setEntityCustomData('home-switch', _this.entityID, { state: 'on' }); + + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 1, + "firstFrame": 1, + "hold": 1, + "lastFrame": 2, + "url": "atp:/switches/lightswitch.fbx" + }, + }); } else { glowLights.forEach(function(glowLight) { @@ -161,9 +171,18 @@ setEntityCustomData('home-switch', this.entityID, { state: 'off' }); + + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 3, + "firstFrame": 3, + "hold": 1, + "lastFrame": 4, + "url": "atp:/switches/lightswitch.fbx" + }, + }); } - this.flipSwitch(); Audio.playSound(this.switchSound, { volume: 0.5, position: this.position @@ -171,20 +190,7 @@ }, - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, preload: function(entityID) { this.entityID = entityID; diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js index 6005503cf3..09d0fb97c8 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js @@ -11,7 +11,7 @@ (function() { - var FAN_SOUND_ENTITY_NAME ="home_sfx_ceiling_fan" + var FAN_SOUND_ENTITY_NAME = "home_sfx_ceiling_fan" var SEARCH_RADIUS = 100; var _this; var utilitiesScript = Script.resolvePath('../utils.js'); @@ -74,16 +74,16 @@ if (!_this.fanSoundEntity) { return; } - print('HOME FAN OFF 2') + print('HOME FAN OFF 2') var soundUserData = getEntityCustomData("soundKey", _this.fanSoundEntity); if (!soundUserData) { print("NO SOUND USER DATA! RETURNING."); return; } - print('HOME FAN OFF 3') + print('HOME FAN OFF 3') soundUserData.volume = 0.0; setEntityCustomData("soundKey", _this.fanSoundEntity, soundUserData); - print('HOME FAN OFF 4') + print('HOME FAN OFF 4') }, findFan: function() { @@ -105,7 +105,7 @@ var fan = null; print('HOME LOOKING FOR A FAN') - print('HOME TOTAL ENTITIES:: ' +entities.length) + print('HOME TOTAL ENTITIES:: ' + entities.length) entities.forEach(function(entity) { var props = Entities.getEntityProperties(entity); if (props.name === FAN_SOUND_ENTITY_NAME) { @@ -129,10 +129,22 @@ if (this._switch.state === 'off') { this.fanRotationOn(); this.fanSoundOn(); + setEntityCustomData('home-switch', this.entityID, { state: 'on' }); + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 1, + "firstFrame": 1, + "hold": 1, + "lastFrame": 2, + "url": "atp:/switches/fanswitch.fbx" + }, + }) + + } else { this.fanRotationOff(); this.fanSoundOff(); @@ -140,9 +152,20 @@ setEntityCustomData('home-switch', this.entityID, { state: 'off' }); + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 3, + "firstFrame": 3, + "hold": 1, + "lastFrame": 4, + "url": "atp:/switches/fanswitch.fbx" + }, + }) + + } - this.flipSwitch(); + Audio.playSound(this.switchSound, { volume: 0.5, position: this.position @@ -150,21 +173,6 @@ }, - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, - preload: function(entityID) { this.entityID = entityID; setEntityCustomData('grabbableKey', this.entityID, { diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomLights.js similarity index 89% rename from unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js rename to unpublishedScripts/DomainContent/Home/switches/livingRoomLights.js index eef64fd3f8..2c6208481f 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomLights.js @@ -39,7 +39,7 @@ "Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg", "Tex.CeilingLight.Emit": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg", "TexCeilingLight.Diffuse": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg" - } + }; Entities.editEntity(glowDisc, { textures: JSON.stringify(data) @@ -51,7 +51,7 @@ "Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg", "Tex.CeilingLight.Emit": "", "TexCeilingLight.Diffuse": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg" - } + }; Entities.editEntity(glowDisc, { textures: JSON.stringify(data) @@ -143,6 +143,16 @@ state: 'on' }); + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 1, + "firstFrame": 1, + "hold": 1, + "lastFrame": 2, + "url": "atp:/switches/lightswitch.fbx" + }, + }); + } else { glowLights.forEach(function(glowLight) { _this.glowLightOff(glowLight); @@ -156,9 +166,18 @@ setEntityCustomData('home-switch', this.entityID, { state: 'off' }); + + Entities.editEntity(this.entityID, { + "animation": { + "currentFrame": 3, + "firstFrame": 3, + "hold": 1, + "lastFrame": 4, + "url": "atp:/switches/lightswitch.fbx" + }, + }); } - this.flipSwitch(); Audio.playSound(this.switchSound, { volume: 0.5, position: this.position @@ -166,21 +185,6 @@ }, - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, - preload: function(entityID) { this.entityID = entityID; setEntityCustomData('grabbableKey', this.entityID, { diff --git a/unpublishedScripts/DomainContent/Home/teleport/downsparkle.json b/unpublishedScripts/DomainContent/Home/teleport/downsparkle.json new file mode 100644 index 0000000000..8682a4ed4c --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/teleport/downsparkle.json @@ -0,0 +1,65 @@ +down sparkle + +{ + "color": { + "red": "#", + "green": "c", + "blue": "f" + }, + "isEmitting": 1, + "maxParticles": 1000, + "lifespan": 2, + "emitRate": 10, + "emitSpeed": 0.1, + "speedSpread": 0.6, + "emitOrientation": { + "x": 0.8, + "y": 0, + "z": 0, + "w": 0.7071068286895752 + }, + "emitDimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "polarStart": 0, + "polarFinish": 0, + "azimuthStart": -3.1415927410125732, + "azimuthFinish": 3.1415927410125732, + "emitAcceleration": { + "x": 0, + "y": -1, + "z": 0 + }, + "accelerationSpread": { + "x": 0, + "y": 1, + "z": 0 + }, + "particleRadius": 0.02500000037252903, + "radiusSpread": 0, + "radiusStart": 0.079, + "radiusFinish": 0.053, + "colorSpread": { + "red": "#", + "green": "e", + "blue": "8" + }, + "colorStart": { + "red": 255, + "green": 255, + "blue": 255 + }, + "colorFinish": { + "red": "#", + "green": "d", + "blue": "4" + }, + "alpha": 1, + "alphaSpread": 0, + "alphaStart": 1, + "alphaFinish": 0, + "emitterShouldTrail": 1, + "textures": "atp:/teleport/sparkle1.png" +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/teleport/downsparkler.json b/unpublishedScripts/DomainContent/Home/teleport/downsparkler.json new file mode 100644 index 0000000000..09ec79910a --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/teleport/downsparkler.json @@ -0,0 +1,63 @@ +{ + "Entities": [ + { + "accelerationSpread": { + "x": 0, + "y": 1, + "z": 0 + }, + "color": { + "blue": 207, + "green": 207, + "red": 207 + }, + "colorFinish": { + "blue": 207, + "green": 207, + "red": 207 + }, + "colorSpread": { + "blue": 125, + "green": 125, + "red": 232 + }, + "colorStart": { + "blue": 207, + "green": 207, + "red": 207 + }, + "created": "2016-05-23T20:41:38Z", + "dimensions": { + "x": 2.6566545963287354, + "y": 2.6566545963287354, + "z": 2.6566545963287354 + }, + "emitAcceleration": { + "x": 0, + "y": -1, + "z": 0 + }, + "emitOrientation": { + "w": 0.66226339340209961, + "x": 0.74927115440368652, + "y": -1.5258940038620494e-05, + "z": -1.5258940038620494e-05 + }, + "emitRate": 10, + "emitSpeed": 0.10000000149011612, + "id": "{e700e0a1-026a-4ebd-8609-6068b32df14e}", + "lifespan": 2, + "name": "home_particle_teleport_sparkle_down", + "queryAACube": { + "scale": 4.6014609336853027, + "x": -2.3007304668426514, + "y": -2.3007304668426514, + "z": -2.3007304668426514 + }, + "speedSpread": 0.60000002384185791, + "textures": "atp:/teleport/sparkle1.png", + "type": "ParticleEffect" + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/teleport/upsparkle.json b/unpublishedScripts/DomainContent/Home/teleport/upsparkle.json new file mode 100644 index 0000000000..508366d293 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/teleport/upsparkle.json @@ -0,0 +1,63 @@ +{ + "color": { + "red": 255, + "green": 255, + "blue": 255 + }, + "isEmitting": 1, + "maxParticles": 210, + "lifespan": 3.6, + "emitRate": 11, + "emitSpeed": 0.5, + "speedSpread": 0.8, + "emitOrientation": { + "x": -1, + "y": -0.0000152587890625, + "z": -0.0000152587890625, + "w": 1 + }, + "emitDimensions": { + "x": 0, + "y": 0, + "z": 0 + }, + "polarStart": 0, + "polarFinish": 0, + "azimuthStart": -3.1415927410125732, + "azimuthFinish": 3.1415927410125732, + "emitAcceleration": { + "x": 0, + "y": 0.2, + "z": 0 + }, + "accelerationSpread": { + "x": 0, + "y": 0.30000000000000004, + "z": 0 + }, + "particleRadius": 0.02500000037252903, + "radiusSpread": 0, + "radiusStart": 0.013, + "radiusFinish": 0.014, + "colorSpread": { + "red": 0, + "green": 0, + "blue": 0 + }, + "colorStart": { + "red": 255, + "green": 255, + "blue": 255 + }, + "colorFinish": { + "red": 255, + "green": 255, + "blue": 255 + }, + "alpha": 1, + "alphaSpread": 0, + "alphaStart": 1, + "alphaFinish": 0, + "emitterShouldTrail": 0, + "textures": "atp:/teleport/sparkle2.png" +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/teleport/upsparkler.json b/unpublishedScripts/DomainContent/Home/teleport/upsparkler.json new file mode 100644 index 0000000000..a573b3deae --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/teleport/upsparkler.json @@ -0,0 +1,44 @@ +{ + "Entities": [ + { + "accelerationSpread": { + "x": 0, + "y": 0.30000001192092896, + "z": 0 + }, + "created": "2016-05-23T20:56:55Z", + "dimensions": { + "x": 15.000479698181152, + "y": 15.000479698181152, + "z": 15.000479698181152 + }, + "emitAcceleration": { + "x": 0, + "y": 0.20000000298023224, + "z": 0 + }, + "emitOrientation": { + "w": 0.7070763111114502, + "x": -0.70713728666305542, + "y": -1.5258539860951714e-05, + "z": -1.5258539860951714e-05 + }, + "emitRate": 11, + "emitSpeed": 0.5, + "id": "{57104b1c-01a9-4f2b-b7bf-9eb406e8d78b}", + "lifespan": 3.5999999046325684, + "maxParticles": 210, + "name": "home_teleport_sparkler_up", + "queryAACube": { + "scale": 25.981592178344727, + "x": -12.990796089172363, + "y": -12.990796089172363, + "z": -12.990796089172363 + }, + "speedSpread": 0.80000001192092896, + "textures": "atp:/teleport/sparkle2.png", + "type": "ParticleEffect" + } + ], + "Version": 57 +}