From fb6fcab078bbdb881eb2a0d3a557b4b2199c3469 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Sat, 30 Jan 2016 12:28:48 -0800 Subject: [PATCH] add simple headers to all files --- .../CellScience/Scripts/billboard.js | 8 ++++++++ .../CellScience/Scripts/clickToRideAndLook.js | 7 +++++++ .../CellScience/Scripts/deleteAll.js | 7 +++++++ .../CellScience/Scripts/findScripts.js | 7 +++++++ .../CellScience/Scripts/moveRandomly.js | 6 ++++++ .../CellScience/Scripts/navigationButton.js | 8 ++++++++ .../CellScience/Scripts/playBackgroundAudio.js | 7 +++++++ .../CellScience/Scripts/showButtonToPlaySound.js | 7 +++++++ .../CellScience/Scripts/showIdentification.js | 7 +++++++ .../DomainContent/CellScience/Scripts/utils.js | 7 +++++++ .../DomainContent/CellScience/Scripts/zoom.js | 7 +++++++ .../CellScience/importCellScience.js | 7 +++++++ .../CellScience/motorProteinControllerAC.js | 15 +++++++++++---- 13 files changed, 96 insertions(+), 4 deletions(-) diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js index 247670de30..e0d5fe0cac 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/billboard.js @@ -1,3 +1,11 @@ +// 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 spriteURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/Sprites/nucleosomes_sprite.fbx"; var spriteDimensions = { x: 10, diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js index 8ef9f38466..805cdc423b 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js @@ -1,3 +1,10 @@ +// 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 TARGET_OFFSET = { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/deleteAll.js b/unpublishedScripts/DomainContent/CellScience/Scripts/deleteAll.js index f303cbd335..716a5a8424 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/deleteAll.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/deleteAll.js @@ -1,3 +1,10 @@ +// 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 deleteAllInRadius(r) { var n = 0; var arrayFound = Entities.findEntities(MyAvatar.position, r); diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/findScripts.js b/unpublishedScripts/DomainContent/CellScience/Scripts/findScripts.js index c6423c7411..bdf6278f19 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/findScripts.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/findScripts.js @@ -1,3 +1,10 @@ +// 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 scriptName = "Controller"; function findScriptsInRadius(r) { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/moveRandomly.js b/unpublishedScripts/DomainContent/CellScience/Scripts/moveRandomly.js index cb2a73bfc7..7a3f2cf8fd 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/moveRandomly.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/moveRandomly.js @@ -1,3 +1,9 @@ +// 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 self = this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js index d5e0c48ce5..9e1874ed00 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js @@ -1,3 +1,11 @@ + +// 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 version = 1; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js index 3b3f37af86..0cb348c3f4 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js @@ -1,3 +1,10 @@ +// 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 self = this; var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js index e8b97209d2..e505a532e3 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showButtonToPlaySound.js @@ -1,3 +1,10 @@ +// 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 baseURL = "https://hifi-content.s3.amazonaws.com/hifi-content/DomainContent/CellScience/"; var self = this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js index d4699bee14..c0b0cb54d4 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/showIdentification.js @@ -1,3 +1,10 @@ +// 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 self = this; diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/utils.js b/unpublishedScripts/DomainContent/CellScience/Scripts/utils.js index ec7ac3b87d..a79637acc3 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/utils.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/utils.js @@ -1,3 +1,10 @@ +// 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 +// + setEntityUserData = function(id, data) { var json = JSON.stringify(data) Entities.editEntity(id, { diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js index a922b26e64..d69f33e7c9 100644 --- a/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js +++ b/unpublishedScripts/DomainContent/CellScience/Scripts/zoom.js @@ -1,3 +1,10 @@ +// 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 teleport; var portalDestination; diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importCellScience.js index bc1b4e33ff..afad35c229 100644 --- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js +++ b/unpublishedScripts/DomainContent/CellScience/importCellScience.js @@ -1,3 +1,10 @@ +// 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 version = 1003; var cellLayout; var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/"; diff --git a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js index 35a55d867f..672ec1fd92 100644 --- a/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js +++ b/unpublishedScripts/DomainContent/CellScience/motorProteinControllerAC.js @@ -1,7 +1,14 @@ +// 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 numDynein = 2; var numKinesin = 2; var percentOnMainMT = 100; -print('RUNNING AC!!'); +//print('RUNNING AC!!'); var baseLocation; if (USE_LOCAL_HOST === true) { baseLocation = "http://localhost:8080/"; @@ -78,7 +85,7 @@ function deleteAllMotorProteins() { results.forEach(function(r) { var name = Entities.getEntityProperties(r, 'name').name; if (name.indexOf('Hifi-Motor-Protein-Anchor') > -1) { - print('Script.clearTimeout DELETING A MOTOR PROTEIN::' + r) + // print('Script.clearTimeout DELETING A MOTOR PROTEIN::' + r) Entities.deleteEntity(r); } @@ -90,7 +97,7 @@ function deleteAllMotorProteins() { } function makeAll() { - print('CREATING MOTOR PROTEINS') + // print('CREATING MOTOR PROTEINS') var segment; var segments = shuffleSegments(); var lastSegment = []; @@ -191,7 +198,7 @@ function update(deltaTime) { Entities.setPacketsPerSecond(6000); print("PPS:" + Entities.getPacketsPerSecond()); Script.setTimeout(function(){ - print('SETTING TIMEOUT') + //print('SETTING TIMEOUT') deleteAllMotorProteins() },10000)