Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 03:59:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #18 from ericrius1/atpHomeReset

Browse source 
Name changes and plant tweaks
This commit is contained in:
James B. Pollack 2016-04-01 16:36:41 -07:00
commit c87abd023c
12 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js
View file

@ -11,6 +11,7 @@
var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" ) var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" )
var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx"; var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx";
var CLOCK_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/cuckooCollider.obj";
var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx"; var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx";
var CLOCK_HOUR_HAND_URL = "atp:/cuckooClock/cuckooClock2_HOUR_HAND.fbx"; var CLOCK_HOUR_HAND_URL = "atp:/cuckooClock/cuckooClock2_HOUR_HAND.fbx";
var CLOCK_MINUTE_HAND_URL = "atp:/cuckooClock/cuckooClock2_MINUTE_HAND.fbx"; var CLOCK_MINUTE_HAND_URL = "atp:/cuckooClock/cuckooClock2_MINUTE_HAND.fbx";
@ -24,7 +25,9 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
clockBody = Entities.addEntity({ clockBody = Entities.addEntity({
type: "Model", type: "Model",
modelURL: CLOCK_BODY_URL, modelURL: CLOCK_BODY_URL,
name: "hifi-home-model-clockbody", shapeType: "compound",
compoundShapeURL: CLOCK_BODY_COLLISION_HULL_URL,
name: "home_model_clockBody",
animation: { animation: {
url: CLOCK_BODY_URL, url: CLOCK_BODY_URL,
running: false, running: false,
@ -59,7 +62,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
type: "Model", type: "Model",
parentID: clockBody, parentID: clockBody,
rotation: clockRotation, rotation: clockRotation,
name: "hifi-home-model-clockface", name: "home_model_clockFace",
modelURL: CLOCK_FACE_URL, modelURL: CLOCK_FACE_URL,
position: clockFacePosition, position: clockFacePosition,
dimensions: { dimensions: {
@ -103,7 +106,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
clockHourHand = Entities.addEntity({ clockHourHand = Entities.addEntity({
type: "Model", type: "Model",
name: "hifi-home-model-clockHourHand", name: "home_model_clockHourHand",
parentID: clockFace, parentID: clockFace,
modelURL: CLOCK_HOUR_HAND_URL, modelURL: CLOCK_HOUR_HAND_URL,
position: hourHandPosition, position: hourHandPosition,
@ -145,7 +148,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
type: "Model", type: "Model",
parentID: clockBody, parentID: clockBody,
modelURL: CLOCK_SECOND_HAND_URL, modelURL: CLOCK_SECOND_HAND_URL,
name: "hifi-home-model-clockSecondHand", name: "home_model_clockSecondHand",
position: hourHandPosition, position: hourHandPosition,
dimensions: { dimensions: {
x: 0.0043, x: 0.0043,
@ -191,7 +194,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
clockMinuteHand = Entities.addEntity({ clockMinuteHand = Entities.addEntity({
type: "Model", type: "Model",
modelURL: CLOCK_HOUR_HAND_URL, modelURL: CLOCK_HOUR_HAND_URL,
name: "hifi-home-model-clockMinuteHand", name: 'home_model_clockMinuteHand',
parentID: clockFace, parentID: clockFace,
position: hourHandPosition, position: hourHandPosition,
registrationPoint: { registrationPoint: {

5
unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
View file

@ -80,8 +80,7 @@ Plant = function(spawnPosition, spawnRotation) {
var waterCanRotation = orientation; var waterCanRotation = orientation;
var waterCan = Entities.addEntity({ var waterCan = Entities.addEntity({
type: "Model", type: "Model",
shapeType: 'compound', shapeType: 'box',
compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL,
name: "home_model_waterCan", name: "home_model_waterCan",
modelURL: WATER_CAN_MODEL_URL, modelURL: WATER_CAN_MODEL_URL,
script: WATER_CAN_SCRIPT_URL, script: WATER_CAN_SCRIPT_URL,
@ -94,7 +93,6 @@ Plant = function(spawnPosition, spawnRotation) {
compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL, compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL,
position: waterCanPosition, position: waterCanPosition,
collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav", collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav",
angularDamping: 1,
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0.0, x: 0.0,
@ -155,6 +153,7 @@ Plant = function(spawnPosition, spawnRotation) {
green: 10, green: 10,
blue: 200 blue: 200
}, },
collisionless: true,
position: waterSpoutPosition, position: waterSpoutPosition,
rotation: waterSpoutRotation, rotation: waterSpoutRotation,
parentID: waterCan, parentID: waterCan,

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

@ -16,7 +16,7 @@
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{e9edc4d0-ecef-42de-88de-a652087f8a18}", "id": "{e9edc4d0-ecef-42de-88de-a652087f8a18}",
"modelURL": "atp:/tutorialContent/Junk-Album-3.fbx", "modelURL": "atp:/tutorialContent/Junk-Album-3.fbx",
"name": "Junk-Album-3.fbx", "name": "home_model_junkAlbum3.fbx",
"queryAACube": { "queryAACube": {
"scale": 0.44973927736282349, "scale": 0.44973927736282349,
"x": -0.22486963868141174, "x": -0.22486963868141174,
@ -49,7 +49,7 @@
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{cc75df45-0caf-41ff-8c05-29c771cc63d9}", "id": "{cc75df45-0caf-41ff-8c05-29c771cc63d9}",
"modelURL": "atp:/tutorialContent/Hideous-Knick-Knack1.fbx", "modelURL": "atp:/tutorialContent/Hideous-Knick-Knack1.fbx",
"name": "Junk-Doll", "name": "home_model_junkDoll",
"position": { "position": {
"x": 0.3363037109375, "x": 0.3363037109375,
"y": 0.1844482421875, "y": 0.1844482421875,
@ -87,7 +87,7 @@
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{903543d7-4531-4532-997a-8176be9fc660}", "id": "{903543d7-4531-4532-997a-8176be9fc660}",
"modelURL": "atp:/tutorialContent/Junk-Album-1.fbx", "modelURL": "atp:/tutorialContent/Junk-Album-1.fbx",
"name": "Junk-Album-1.fbx", "name": "home_model_junkAlbum1",
"position": { "position": {
"x": 0.10009765625, "x": 0.10009765625,
"y": 0.087310791015625, "y": 0.087310791015625,
@ -125,7 +125,7 @@
"id": "{d99aeed0-9d38-4b82-8ae0-630cdfcd32cb}", "id": "{d99aeed0-9d38-4b82-8ae0-630cdfcd32cb}",
"marketplaceID": "268b7d13-d3f6-4e03-a252-3e5bde1d145e", "marketplaceID": "268b7d13-d3f6-4e03-a252-3e5bde1d145e",
"modelURL": "https://s3.amazonaws.com/hifi-public/marketplace/hificontent/ozan/Lamp.fbx", "modelURL": "https://s3.amazonaws.com/hifi-public/marketplace/hificontent/ozan/Lamp.fbx",
"name": "Junk - lamp", "name": "home_model_Junk - lamp",
"position": { "position": {
"x": 0.61279296875, "x": 0.61279296875,
"y": 0.2528076171875, "y": 0.2528076171875,
@ -161,7 +161,7 @@
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}", "id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}",
"modelURL": "atp:/models/Junk-Crate.fbx", "modelURL": "atp:/models/Junk-Crate.fbx",
"name": "home_model_junk_holder", "name": "home_model_junkHolder",
"position": { "position": {
"x": 0.369384765625, "x": 0.369384765625,
"y": 0.0540771484375, "y": 0.0540771484375,

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

@ -1,6 +1,7 @@
{ {
"Entities": [{ "Entities": [{
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
"name": "home_model_lowerBookShelf",
"dimensions": { "dimensions": {
"x": 2.0069153308868408, "x": 2.0069153308868408,
"y": 0.0160951167345047, "y": 0.0160951167345047,

4
unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json
View file

@ -12,7 +12,7 @@
"z": 0.14119282364845276 "z": 0.14119282364845276
}, },
"id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}", "id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}",
"name": "Poster-Nail", "name": "home_model_posterNail",
"position" : { "position" : {
"x": -0.05, "x": -0.05,
"y": 0.4, "y": 0.4,
@ -44,7 +44,7 @@
"dynamic": 0, "dynamic": 0,
"id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}", "id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}",
"modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx", "modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx",
"name": "hifi-home-poster-cell", "name": "home_model_posterCell",
"queryAACube": { "queryAACube": {
"scale": 1.4568163156509399, "scale": 1.4568163156509399,
"x": 1103.1385498046875, "x": 1103.1385498046875,

4
unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json
View file

@ -9,7 +9,7 @@
"z": 0.92656642198562622 "z": 0.92656642198562622
}, },
"dynamic": 0, "dynamic": 0,
"name": "hifi-home-poster-playa", "name": "home_model_posterPlaya",
"id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}", "id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}",
"modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx", "modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx",
"queryAACube": { "queryAACube": {
@ -41,7 +41,7 @@
"z": 0.14119282364845276 "z": 0.14119282364845276
}, },
"id": "{7f060027-2927-4513-bd92-13a98e6fc06c}", "id": "{7f060027-2927-4513-bd92-13a98e6fc06c}",
"name": "Poster-Nail", "name": "home_model_posterNail",
"position": { "position": {
"x": -0.07, "x": -0.07,
"y": 0.5, "y": 0.5,

2
unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json
View file

@ -3,7 +3,7 @@
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj",
"created": "2016-03-15T23:06:41Z", "created": "2016-03-15T23:06:41Z",
"name": "hifi-home-model-trashcan", "name": "home_model_Trashcan",
"dimensions": { "dimensions": {
"x": 0.4264354407787323, "x": 0.4264354407787323,
"y": 0.50489801168441772, "y": 0.50489801168441772,

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

@ -1,6 +1,7 @@
{ {
"Entities": [{ "Entities": [{
"created": "2016-03-15T21:26:11Z", "created": "2016-03-15T21:26:11Z",
"name": "home_model_upperBookShelf",
"dimensions": { "dimensions": {
"x": 2.0069153308868408, "x": 2.0069153308868408,
"y": 0.0160951167345047, "y": 0.0160951167345047,

10
unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js
View file

@ -139,7 +139,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var createBall = function(position) { var createBall = function(position) {
var properties = { var properties = {
name: 'Hifi Tilt Maze Ball', name: 'home_sphere_tiltMazeBall',
type: 'Sphere', type: 'Sphere',
position: getBallStartLocation(), position: getBallStartLocation(),
dynamic: true, dynamic: true,
@ -169,7 +169,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var createBallSpawningAnchor = function() { var createBallSpawningAnchor = function() {
var properties = { var properties = {
name: 'Hifi Tilt Maze Ball Detector', name: 'home_box_tiltMazeBallSpawningAnchor',
parentID: tiltMaze, parentID: tiltMaze,
type: 'Box', type: 'Box',
color: DEBUG_COLOR, color: DEBUG_COLOR,
@ -191,7 +191,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var createBallDetector = function() { var createBallDetector = function() {
var properties = { var properties = {
name: 'Hifi Tilt Maze Ball Detector', name: 'home_box_tiltMazeBallDetector',
parentID: tiltMaze, parentID: tiltMaze,
type: 'Box', type: 'Box',
color: DEBUG_COLOR, color: DEBUG_COLOR,
@ -215,7 +215,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var createTiltMaze = function(position) { var createTiltMaze = function(position) {
var properties = { var properties = {
name: 'Hifi Tilt Maze', name: 'home_model_tiltMaze',
type: 'Model', type: 'Model',
modelURL: MAZE_MODEL_URL, modelURL: MAZE_MODEL_URL,
gravity: MAZE_GRAVITY, gravity: MAZE_GRAVITY,
@ -254,7 +254,7 @@ TiltMaze = function(spawnPosition, spawnRotation) {
var position = getBallFinishLocation(); var position = getBallFinishLocation();
var lightProperties = { var lightProperties = {
parentID: tiltMaze, parentID: tiltMaze,
name: 'Hifi Tilt Maze End Light', name: 'home_light_tiltMazeEndLight',
type: "Light", type: "Light",
isSpotlight: true, isSpotlight: true,
dimensions: END_LIGHT_DIMENSIONS, dimensions: END_LIGHT_DIMENSIONS,

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

@ -22,7 +22,7 @@
_this = this; _this = this;
_this.ERASER_TRIGGER_THRESHOLD = 0.2; _this.ERASER_TRIGGER_THRESHOLD = 0.2;
_this.STROKE_NAME = "hifi-marker-stroke"; _this.STROKE_NAME = "home_polyline_markerStroke";
_this.ERASER_TO_STROKE_SEARCH_RADIUS = 0.7; _this.ERASER_TO_STROKE_SEARCH_RADIUS = 0.7;
_this.ERASER_RESET_WAIT_TIME = 3000; _this.ERASER_RESET_WAIT_TIME = 3000;
}; };

12
unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js
View file

@ -36,8 +36,8 @@
_this.MAX_DISTANCE_BETWEEN_POINTS = 0.1; _this.MAX_DISTANCE_BETWEEN_POINTS = 0.1;
_this.strokes = []; _this.strokes = [];
_this.PAINTING_TRIGGER_THRESHOLD = 0.2; _this.PAINTING_TRIGGER_THRESHOLD = 0.2;
_this.STROKE_NAME = "hifi-marker-stroke"; _this.STROKE_NAME = "home_polyline_markerStroke";
_this.WHITEBOARD_SURFACE_NAME = "hifi-whiteboardDrawingSurface"; _this.WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface"
_this.MARKER_RESET_WAIT_TIME = 3000; _this.MARKER_RESET_WAIT_TIME = 3000;
}; };
@ -48,25 +48,17 @@
_this.whiteboards = []; _this.whiteboards = [];
_this.equipped = true; _this.equipped = true;
_this.hand = params[0] == "left" ? 0 : 1; _this.hand = params[0] == "left" ? 0 : 1;
print('before thing', id)
print('GET user data?' + typeof getEntityUserData)
_this.markerColor = getEntityUserData(_this.entityID).markerColor; _this.markerColor = getEntityUserData(_this.entityID).markerColor;
print('after thing')
// search for whiteboards // search for whiteboards
var markerPosition = Entities.getEntityProperties(_this.entityID, "position").position; var markerPosition = Entities.getEntityProperties(_this.entityID, "position").position;
var entities = Entities.findEntities(markerPosition, 10); var entities = Entities.findEntities(markerPosition, 10);
print('LOOKING FOR BOARDS')
entities.forEach(function(entity) { entities.forEach(function(entity) {
var entityName = Entities.getEntityProperties(entity, "name").name; var entityName = Entities.getEntityProperties(entity, "name").name;
print('NAME ' + entityName)
if (entityName === _this.WHITEBOARD_SURFACE_NAME) { if (entityName === _this.WHITEBOARD_SURFACE_NAME) {
print('FOUND A WHITEBOARD!!')
_this.whiteboards.push(entity); _this.whiteboards.push(entity);
} }
}); });
print("intersectable entities " + JSON.stringify(_this.whiteboards))
}, },
releaseEquip: function() { releaseEquip: function() {

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

@ -29,7 +29,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj"; var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
var whiteboard = Entities.addEntity({ var whiteboard = Entities.addEntity({
type: "Model", type: "Model",
name: "whiteboard", name: "home_model_whiteboard",
modelURL: WHITEBOARD_MODEL_URL, modelURL: WHITEBOARD_MODEL_URL,
position: whiteboardPosition, position: whiteboardPosition,
rotation: whiteboardRotation, rotation: whiteboardRotation,
@ -57,9 +57,10 @@ Whiteboard = function(spawnPosition, spawnRotation) {
whiteboardSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-0.02, Quat.getRight(whiteboardRotation))); whiteboardSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-0.02, Quat.getRight(whiteboardRotation)));
var moveForwardDistance = 0.02; var moveForwardDistance = 0.02;
whiteboardFrontSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-moveForwardDistance, Quat.getFront(whiteboardRotation))); whiteboardFrontSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-moveForwardDistance, Quat.getFront(whiteboardRotation)));
var WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface";
var whiteboardSurfaceSettings = { var whiteboardSurfaceSettings = {
type: "Box", type: "Box",
name: "hifi-whiteboardDrawingSurface", name: WHITEBOARD_SURFACE_NAME,
dimensions: { dimensions: {
x: 1.82, x: 1.82,
y: 1.8, y: 1.8,
@ -99,6 +100,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
var eraser = Entities.addEntity({ var eraser = Entities.addEntity({
type: "Model", type: "Model",
name: "home_model_whiteboardEraser",
modelURL: ERASER_MODEL_URL, modelURL: ERASER_MODEL_URL,
position: eraserPosition, position: eraserPosition,
script: ERASER_SCRIPT_URL, script: ERASER_SCRIPT_URL,
@ -191,7 +193,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
modelURL: modelURL, modelURL: modelURL,
rotation: markerRotation, rotation: markerRotation,
shapeType: "box", shapeType: "box",
name: "marker", name: "home_model_marker",
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0, x: 0,
@ -209,7 +211,6 @@ Whiteboard = function(spawnPosition, spawnRotation) {
y: 0.027, y: 0.027,
z: 0.164 z: 0.164
}, },
name: "marker",
script: MARKER_SCRIPT_URL, script: MARKER_SCRIPT_URL,
userData: JSON.stringify({ userData: JSON.stringify({
'hifiHomeKey': { 'hifiHomeKey': {