From 7d0eb79115d397f0b5fd5f058bdd40631c48e903 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Sat, 30 Jan 2016 12:13:40 -0800 Subject: [PATCH] sanatize files and remove unused messages stuff --- .../CellScience/Scripts/clickToRideAndLook.js | 30 +++++-------------- .../Scripts/playBackgroundAudio.js | 2 +- .../DomainContent/CellScience/Scripts/zoom.js | 4 +-- .../CellScience/importCellScience.js | 4 +-- .../CellScience/motorProteinControllerAC.js | 2 +- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js index 369181a2bc..8ef9f38466 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js @@ -81,10 +81,10 @@ self.lastTargetLocation = self.targetLocation self.entityLocation = Entities.getEntityProperties(self.entityId, "position").position; self.targetLocation = Vec3.sum(self.entityLocation, TARGET_OFFSET); - // print('JBP self.lastTargetLocation' + JSON.stringify(self.lastTargetLocation)) - // print('JBP self.targetLocation' + JSON.stringify(self.targetLocation)) + // print('Script.clearTimeout self.lastTargetLocation' + JSON.stringify(self.lastTargetLocation)) + // print('Script.clearTimeout self.targetLocation' + JSON.stringify(self.targetLocation)) var diff = Vec3.distance(self.targetLocation, self.lastTargetLocation); - // print('JBP diff is::' + diff) + // print('Script.clearTimeout diff is::' + diff) self.addThrustToAvatar(deltaTime); } @@ -92,12 +92,12 @@ this.addThrustToAvatar = function(deltaTime) { var targetCurrentLocationToLastLocation = Vec3.subtract(self.targetLocation, self.lastTargetLocation); - // print('JBP targetCurrentLocationToLastLocation' + JSON.stringify(targetCurrentLocationToLastLocation)); - // print('JBP deltaTime' + deltaTime) - // print('JBP velocity' + JSON.stringify(self.velocity)) + // print('Script.clearTimeout targetCurrentLocationToLastLocation' + JSON.stringify(targetCurrentLocationToLastLocation)); + // print('Script.clearTimeout deltaTime' + deltaTime) + // print('Script.clearTimeout velocity' + JSON.stringify(self.velocity)) var thrustToAdd = Vec3.multiply(100, targetCurrentLocationToLastLocation); thrustToAdd = Vec3.multiply(thrustToAdd, 1 / deltaTime); - // print('JBP adding thrust!' + JSON.stringify(thrustToAdd)) + // print('Script.clearTimeout adding thrust!' + JSON.stringify(thrustToAdd)) MyAvatar.addThrust(thrustToAdd); @@ -132,21 +132,5 @@ Controller.mousePressEvent.disconnect(this.onMousePress); } - function handleMessages(channel, message, sender) { - // print('HANDLING A MESSAGE IN PROTEIN') - if (sender === MyAvatar.sessionUUID) { - if (channel === "Hifi-Motor-Protein-Channel") { - if (message === 'delete') { - // print('SHOULD DELETE PROTEIN') - Entities.deleteEntity(self.entityId) - } - } - } - - } - - Messages.messageReceived.connect(handleMessages); - - }); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js index a79e6c0be0..3b3f37af86 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js @@ -7,7 +7,7 @@ self.entityId = entityId; self.getUserData(); self.soundURL = baseURL + "Audio/" + self.userData.name + ".wav?" + version; - print("JBP creating WAV name location is " + baseURL + "Audio/" + self.userData.name + ".wav"); + print("Script.clearTimeout creating WAV name location is " + baseURL + "Audio/" + self.userData.name + ".wav"); self.soundOptions = { stereo: true, diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index 291d9db46e..a922b26e64 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -21,12 +21,12 @@ volume: 0.5 }; this.teleportSound = SoundCache.getSound("https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Audio/whoosh.wav"); - //print('JBP PRELOADING A ZOOM ENTITY') + //print('Script.clearTimeout PRELOADING A ZOOM ENTITY') print(" portal destination is " + portalDestination); } this.enterEntity = function(entityID) { - print('JBP ENTERED A BOUNDARY ENTITY, SHOULD ZOOM', entityID) + print('Script.clearTimeout ENTERED A BOUNDARY ENTITY, SHOULD ZOOM', entityID) var data = JSON.parse(Entities.getEntityProperties(this.entityId).userData); diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importCellScience.js index a39e8dbcfd..bc1b4e33ff 100644 --- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js +++ b/unpublishedScripts/DomainContent/CellScience/importCellScience.js @@ -805,7 +805,7 @@ function CreateInstances(scene) { }, idBounds, 150); } - print('JBP SCRIPT AT CREATE ENTITY: ' + script) + print('Script.clearTimeout SCRIPT AT CREATE ENTITY: ' + script) CreateEntity(scene.instances[i].model, position, rotation, scene.instances[i].dimensions, url, script, scene.instances[i].userData, scene.instances[i].visible); } } @@ -907,7 +907,7 @@ function CreateEntity(name, position, rotation, dimensions, url, script, userDat scriptLocation = baseLocation + "Scripts/" + script; } - print('JBP SCRIPT LOCATION IN CREATE ENTITY' + scriptLocation) + print('Script.clearTimeout SCRIPT LOCATION IN CREATE ENTITY' + scriptLocation) Entities.addEntity({ type: "Model", name: name, diff --git a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js index c3ece4baec..35a55d867f 100644 --- a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js +++ b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js @@ -78,7 +78,7 @@ function deleteAllMotorProteins() { results.forEach(function(r) { var name = Entities.getEntityProperties(r, 'name').name; if (name.indexOf('Hifi-Motor-Protein-Anchor') > -1) { - print('JBP DELETING A MOTOR PROTEIN::' + r) + print('Script.clearTimeout DELETING A MOTOR PROTEIN::' + r) Entities.deleteEntity(r); }