From 6400bb6319f59348d45e8ef2c4a6cc336a4c4ef9 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Mar 2017 14:34:14 -0800 Subject: [PATCH] CR feedback --- script-archive/example/games/grabHockey.js | 2 +- script-archive/example/games/hydraGrabHockey.js | 2 +- script-archive/vrShop/item/shopItemGrab.js | 2 +- scripts/system/controllers/grab.js | 2 +- scripts/tutorials/entity_scripts/pistol.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/script-archive/example/games/grabHockey.js b/script-archive/example/games/grabHockey.js index af688d72d6..3f2a2fcf91 100644 --- a/script-archive/example/games/grabHockey.js +++ b/script-archive/example/games/grabHockey.js @@ -142,7 +142,7 @@ function mousePressEvent(event) { if (!pickResults.intersects) { return; } - var isDynamic = Entites.getEntityProperties(pickResults.entityID,"dynamic").dynamic; + var isDynamic = Entites.getEntityProperties(pickResults.entityID, "dynamic").dynamic; if (isDynamic) { grabbedEntity = pickResults.entityID; var props = Entities.getEntityProperties(grabbedEntity) diff --git a/script-archive/example/games/hydraGrabHockey.js b/script-archive/example/games/hydraGrabHockey.js index 181e4f4547..e357735fe5 100644 --- a/script-archive/example/games/hydraGrabHockey.js +++ b/script-archive/example/games/hydraGrabHockey.js @@ -191,7 +191,7 @@ function controller(side) { }; var intersection = getRayIntersection(pickRay, true); - var isDynamic = Entites.getEntityProperties(intersection.entityID,"dynamic").dynamic; + var isDynamic = Entites.getEntityProperties(intersection.entityID, "dynamic").dynamic; if (intersection.intersects && isDynamic) { this.laserWasHovered = true; diff --git a/script-archive/vrShop/item/shopItemGrab.js b/script-archive/vrShop/item/shopItemGrab.js index b583d8c0b4..2b63ca1b53 100644 --- a/script-archive/vrShop/item/shopItemGrab.js +++ b/script-archive/vrShop/item/shopItemGrab.js @@ -382,7 +382,7 @@ function MyController(hand) { var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, intersection.entityID, DEFAULT_GRABBABLE_DATA); - var properties = Entites.getEntityProperties(intersection.entityID,["locked","name"]); + var properties = Entites.getEntityProperties(intersection.entityID, ["locked", "name"]); if (properties.name == "Grab Debug Entity") { diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index 6262c6af6f..2c1fd47490 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -343,7 +343,7 @@ Grabber.prototype.pressEvent = function(event) { return; } - var isDynamic = Entites.getEntityProperties(pickResults.entityID,"dynamic").dynamic; + var isDynamic = Entites.getEntityProperties(pickResults.entityID, "dynamic").dynamic; if (!isDynamic) { // only grab dynamic objects return; diff --git a/scripts/tutorials/entity_scripts/pistol.js b/scripts/tutorials/entity_scripts/pistol.js index 00b496c05d..c8c9ab185c 100644 --- a/scripts/tutorials/entity_scripts/pistol.js +++ b/scripts/tutorials/entity_scripts/pistol.js @@ -151,7 +151,7 @@ }); }, randFloat(10, 200)); } - var isDynamic = Entites.getEntityProperties(intersection.entityID,"dynamic").dynamic; + var isDynamic = Entites.getEntityProperties(intersection.entityID, "dynamic").dynamic; if (isDynamic === 1) { // Any dynamic entity can be shot