From 995084556604a7a3838ad3b5ffce16a5eae97c4d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 9 Apr 2014 09:19:29 -0700 Subject: [PATCH] more apache licensing tweaks to JS files --- examples/clap.js | 8 ++++++++ examples/clipboardExample.js | 2 +- examples/count.js | 2 +- examples/drumStick.js | 8 ++++++++ examples/findParticleExample.js | 5 ++++- examples/flockingBirds.js | 8 ++++++-- examples/fountain.js | 10 +++++++++- examples/gameoflife.js | 14 +++++++++++--- examples/globalCollisionsExample.js | 2 +- examples/gun.js | 3 +-- examples/hideAvatarExample.js | 2 +- examples/hydraMove.js | 2 +- examples/includeExample.js | 2 +- examples/inspect.js | 2 +- examples/localVoxelsExample.js | 9 +++++++++ examples/lookAtExample.js | 2 +- examples/lookWithMouse.js | 2 +- examples/lookWithTouch.js | 2 +- examples/menuExample.js | 2 +- examples/movingVoxel.js | 8 ++++++++ examples/multitouchExample.js | 2 +- examples/overlaysExample.js | 2 +- examples/paintGun.js | 2 +- examples/particleBird.js | 2 ++ examples/particleModelExample.js | 2 +- examples/playSound.js | 4 ++++ examples/rayPickExample.js | 2 +- examples/ribbon.js | 2 +- examples/rideAlongWithAParticleExample.js | 2 +- examples/seeingVoxelsExample.js | 4 +--- examples/selectAudioDevice.js | 2 +- examples/settingsExample.js | 2 +- examples/spaceInvadersExample.js | 2 +- examples/timer.js | 10 ++++++++++ examples/toyball.js | 2 +- examples/voxelDrumming.js | 2 +- 36 files changed, 104 insertions(+), 35 deletions(-) diff --git a/examples/clap.js b/examples/clap.js index ef8b61f05a..a0efcfab7b 100644 --- a/examples/clap.js +++ b/examples/clap.js @@ -1,6 +1,14 @@ // +// cameraExample.js +// examples +// +// Copyright 2014 High Fidelity, Inc. +// // This sample script watches your hydra hands and makes clapping sound when they come close together fast // +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/examples/clipboardExample.js b/examples/clipboardExample.js index e9f581f581..d36b077451 100644 --- a/examples/clipboardExample.js +++ b/examples/clipboardExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Clipboard class // diff --git a/examples/count.js b/examples/count.js index 1a59d6af36..2a8699ac55 100644 --- a/examples/count.js +++ b/examples/count.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 12/31/13. -// Copyright 2013 High Fidelity, Inc. All rights reserved. +// Copyright 2013 High Fidelity, Inc. // // This is an example script that runs in a loop and displays a counter to the log // diff --git a/examples/drumStick.js b/examples/drumStick.js index 9b0a8ccbca..e9ac54f814 100644 --- a/examples/drumStick.js +++ b/examples/drumStick.js @@ -1,6 +1,14 @@ // +// drumStick.js +// examples +// +// Copyright 2014 High Fidelity, Inc. +// // This example musical instrument script plays 'air drums' when you move your hands downward // +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/examples/findParticleExample.js b/examples/findParticleExample.js index 0b07471273..b37890d766 100644 --- a/examples/findParticleExample.js +++ b/examples/findParticleExample.js @@ -3,10 +3,13 @@ // examples // // Created by Brad Hefta-Gaub on 1/24/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates "finding" particles // +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// var iteration = 0; diff --git a/examples/flockingBirds.js b/examples/flockingBirds.js index a45bcc9f97..f85b4b38c4 100644 --- a/examples/flockingBirds.js +++ b/examples/flockingBirds.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 3/4/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. All rights reserved. // // This is an example script that generates particles that act like flocking birds // @@ -13,12 +13,16 @@ // go back to gliding // birds don't like to be below a certain altitude // if they are below that altitude they will keep thrusting up, until they get ove - +// // flocking // try to align your velocity with velocity of other birds // try to fly toward center of flock // but dont get too close // +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// var birdsInFlock = 40; diff --git a/examples/fountain.js b/examples/fountain.js index 8816dab09a..ab1b82cb76 100644 --- a/examples/fountain.js +++ b/examples/fountain.js @@ -1,4 +1,12 @@ - +// +// fountain.js +// examples +// +// Copyright 2014 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 vLength(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/examples/gameoflife.js b/examples/gameoflife.js index c0122c604a..3fcbfa8138 100644 --- a/examples/gameoflife.js +++ b/examples/gameoflife.js @@ -1,6 +1,14 @@ -// Add your JavaScript for assignment below this line - -// The following is an example of Conway's Game of Life (http://en.wikipedia.org/wiki/Conway's_Game_of_Life) +// +// gameoflife.js +// examples +// +// Copyright 2014 High Fidelity, Inc. +// +// The following is an example of Conway's Game of Life (http://en.wikipedia.org/wiki/Conway's_Game_of_Life) +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// var NUMBER_OF_CELLS_EACH_DIMENSION = 64; var NUMBER_OF_CELLS = NUMBER_OF_CELLS_EACH_DIMENSION * NUMBER_OF_CELLS_EACH_DIMENSION; diff --git a/examples/globalCollisionsExample.js b/examples/globalCollisionsExample.js index b9d1dceefe..a9667396a4 100644 --- a/examples/globalCollisionsExample.js +++ b/examples/globalCollisionsExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/29/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Controller class // diff --git a/examples/gun.js b/examples/gun.js index 85d0f9c1e5..95d3905cc7 100644 --- a/examples/gun.js +++ b/examples/gun.js @@ -4,7 +4,7 @@ // // Created by Brad Hefta-Gaub on 12/31/13. // Modified by Philip on 3/3/14 -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright 2013 HighFidelity, Inc. // // This is an example script that turns the hydra controllers and mouse into a particle gun. // It reads the controller, watches for trigger pulls, and launches particles. @@ -14,7 +14,6 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // - function getRandomFloat(min, max) { return Math.random() * (max - min) + min; } diff --git a/examples/hideAvatarExample.js b/examples/hideAvatarExample.js index d9e4b350f4..cea503b205 100644 --- a/examples/hideAvatarExample.js +++ b/examples/hideAvatarExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates how to enable or disable local rendering of your own avatar // diff --git a/examples/hydraMove.js b/examples/hydraMove.js index e2dd608b4a..6df6784ea1 100644 --- a/examples/hydraMove.js +++ b/examples/hydraMove.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/10/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Controller and MyAvatar classes to implement // avatar flying through the hydra/controller joysticks diff --git a/examples/includeExample.js b/examples/includeExample.js index e82a95fc63..d3ed398c94 100644 --- a/examples/includeExample.js +++ b/examples/includeExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 3/24/14 -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright 2013 HighFidelity, Inc. // // This is an example script that demonstrates use of the Script.include() feature // diff --git a/examples/inspect.js b/examples/inspect.js index 5402a6a830..39b74c9117 100644 --- a/examples/inspect.js +++ b/examples/inspect.js @@ -3,7 +3,7 @@ // examples // // Created by Clément Brisset on March 20, 2014 -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // Allows you to inspect non moving objects (Voxels or Avatars) using Atl, Control (Command on Mac) and Shift // diff --git a/examples/localVoxelsExample.js b/examples/localVoxelsExample.js index 7d9007f590..d64138b214 100644 --- a/examples/localVoxelsExample.js +++ b/examples/localVoxelsExample.js @@ -1,3 +1,12 @@ +// +// localVoxelsExample.js +// examples +// +// Copyright 2014 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 TREE_SCALE = 16384; var tree = LocalVoxels("tree"); diff --git a/examples/lookAtExample.js b/examples/lookAtExample.js index 6e208ddbdd..58dcfc9184 100644 --- a/examples/lookAtExample.js +++ b/examples/lookAtExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/6/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Camera class's lookAt(), keepLookingAt(), and stopLookingAt() // features. diff --git a/examples/lookWithMouse.js b/examples/lookWithMouse.js index 4293654ae5..b269da3c7a 100644 --- a/examples/lookWithMouse.js +++ b/examples/lookWithMouse.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright (c) 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Controller class // diff --git a/examples/lookWithTouch.js b/examples/lookWithTouch.js index 0278d2b7b2..29920a5b4e 100644 --- a/examples/lookWithTouch.js +++ b/examples/lookWithTouch.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright (c) 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Controller class // diff --git a/examples/menuExample.js b/examples/menuExample.js index d448c32bf8..b4f956218a 100644 --- a/examples/menuExample.js +++ b/examples/menuExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/24/14 -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright (c) 2013 HighFidelity, Inc. // // This is an example script that demonstrates use of the Menu object // diff --git a/examples/movingVoxel.js b/examples/movingVoxel.js index 0ddce48334..c55957cd04 100644 --- a/examples/movingVoxel.js +++ b/examples/movingVoxel.js @@ -1,6 +1,14 @@ // +// movingVoxel.js +// examples +// +// Copyright 2014 High Fidelity, Inc. +// // This sample script creates a voxel moving back and forth in a line // +// 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: 0, y: 0, z: 0 }; var oldPosition = { x: 0, y: 0, z:0 }; diff --git a/examples/multitouchExample.js b/examples/multitouchExample.js index b76902f57a..55d1d834bd 100644 --- a/examples/multitouchExample.js +++ b/examples/multitouchExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/9/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Controller class's multi-touch features // diff --git a/examples/overlaysExample.js b/examples/overlaysExample.js index ec54438692..420500faf1 100644 --- a/examples/overlaysExample.js +++ b/examples/overlaysExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/14/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 HighFidelity, Inc. // // This is an example script that demonstrates use of the Overlays class // diff --git a/examples/paintGun.js b/examples/paintGun.js index fa2d4f1e1f..7d2ec54351 100644 --- a/examples/paintGun.js +++ b/examples/paintGun.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 12/31/13. -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright 2013 HighFidelity, Inc. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/examples/particleBird.js b/examples/particleBird.js index 59ada1950e..5241b3550b 100644 --- a/examples/particleBird.js +++ b/examples/particleBird.js @@ -2,6 +2,8 @@ // particleBird.js // examples // +// Copyright 2014 High Fidelity, Inc. +// // This sample script moves a voxel around like a bird and sometimes makes tweeting noises // // Distributed under the Apache License, Version 2.0. diff --git a/examples/particleModelExample.js b/examples/particleModelExample.js index 96b16c503d..b489e704c9 100644 --- a/examples/particleModelExample.js +++ b/examples/particleModelExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates creating and editing a particle // diff --git a/examples/playSound.js b/examples/playSound.js index 7715604de2..fb589bc9e3 100644 --- a/examples/playSound.js +++ b/examples/playSound.js @@ -1,4 +1,8 @@ // +// playSound.js +// examples +// +// Copyright 2014 High Fidelity, Inc. // This sample script loads a sound file and plays it at the 'fingertip' of the // // Distributed under the Apache License, Version 2.0. diff --git a/examples/rayPickExample.js b/examples/rayPickExample.js index 13ab285af5..c09a7b1e57 100644 --- a/examples/rayPickExample.js +++ b/examples/rayPickExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/6/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates use of the Camera class // diff --git a/examples/ribbon.js b/examples/ribbon.js index 5e48ee3193..9f0cc02e52 100644 --- a/examples/ribbon.js +++ b/examples/ribbon.js @@ -3,7 +3,7 @@ // examples // // Created by Andrzej Kapolka on 2/24/14. -// Copyright (c) 2014 High Fidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. All rights reserved. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/examples/rideAlongWithAParticleExample.js b/examples/rideAlongWithAParticleExample.js index a6decbc2c2..552f6fb7fe 100644 --- a/examples/rideAlongWithAParticleExample.js +++ b/examples/rideAlongWithAParticleExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/24/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates "finding" particles // diff --git a/examples/seeingVoxelsExample.js b/examples/seeingVoxelsExample.js index e0f991ea40..35e2f95dd7 100644 --- a/examples/seeingVoxelsExample.js +++ b/examples/seeingVoxelsExample.js @@ -3,9 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/26/14 -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. -// -// This is an example script +// Copyright 2014 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 diff --git a/examples/selectAudioDevice.js b/examples/selectAudioDevice.js index 668e467254..23606f774c 100644 --- a/examples/selectAudioDevice.js +++ b/examples/selectAudioDevice.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 3/22/14 -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright 2013 High Fidelity, Inc. // // This is an example script that demonstrates use of the Menu object // diff --git a/examples/settingsExample.js b/examples/settingsExample.js index 816fc956a3..bef347ff07 100644 --- a/examples/settingsExample.js +++ b/examples/settingsExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 3/22/14 -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// Copyright 2013 High Fidelity, Inc. // // This is an example script that demonstrates use of the Menu object // diff --git a/examples/spaceInvadersExample.js b/examples/spaceInvadersExample.js index be4fcf445f..5b25fa1236 100644 --- a/examples/spaceInvadersExample.js +++ b/examples/spaceInvadersExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/30/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates a simple space invaders style of game // diff --git a/examples/timer.js b/examples/timer.js index c7ad0290ab..b3af1d902c 100644 --- a/examples/timer.js +++ b/examples/timer.js @@ -1,3 +1,13 @@ +// +// timer.js +// examples +// +// Copyright 2014 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 one_timer = Script.setTimeout(function() { print("One time timer fired!"); }, 10000); var multiple_timer = Script.setInterval(function() { print("Repeating timer fired!"); }, 1000); diff --git a/examples/toyball.js b/examples/toyball.js index 52646c94b4..de68e97357 100644 --- a/examples/toyball.js +++ b/examples/toyball.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/20/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that turns the hydra controllers into a toy ball catch and throw game. // It reads the controller, watches for button presses and trigger pulls, and launches particles. diff --git a/examples/voxelDrumming.js b/examples/voxelDrumming.js index f064d6736e..7f3495dea7 100644 --- a/examples/voxelDrumming.js +++ b/examples/voxelDrumming.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/14/14. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates use of the Overlays, Controller, and Audio classes //