From 28a5dba2d32a0a2a96ff161fff58a4647a07f07e Mon Sep 17 00:00:00 2001 From: James Pollack Date: Wed, 16 Dec 2015 01:31:24 -0800 Subject: [PATCH] rename files --- examples/lights/lightLoader.js | 20 +++++++++++++++++++ .../{light_modifier.js => lightModifier.js} | 8 ++++---- ...est_scene.js => lightModifierTestScene.js} | 5 ++--- examples/lights/light_loader.js | 8 -------- examples/lights/slider.js | 5 +++-- 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 examples/lights/lightLoader.js rename examples/lights/{light_modifier.js => lightModifier.js} (98%) rename examples/lights/{light_modifier_test_scene.js => lightModifierTestScene.js} (95%) delete mode 100644 examples/lights/light_loader.js diff --git a/examples/lights/lightLoader.js b/examples/lights/lightLoader.js new file mode 100644 index 0000000000..e4022e7bc1 --- /dev/null +++ b/examples/lights/lightLoader.js @@ -0,0 +1,20 @@ +// +// lightLoader.js +// +// Created by James Pollack @imgntn on 12/15/2015 +// Copyright 2015 High Fidelity, Inc. +// +// Loads a test scene showing sliders that you can grab and move to change entity properties. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +var grabScript = Script.resolvePath('../controllers/handControllerGrab.js'); +Script.load(grabScript); +var lightModifier = Script.resolvePath('lightModifier.js'); +Script.load(lightModifier); +Script.setTimeout(function() { + var lightModifierTestScene = Script.resolvePath('lightModifierTestScene.js'); + Script.load(lightModifierTestScene); +}, 750) \ No newline at end of file diff --git a/examples/lights/light_modifier.js b/examples/lights/lightModifier.js similarity index 98% rename from examples/lights/light_modifier.js rename to examples/lights/lightModifier.js index 132934f5d2..ffd1469a4a 100644 --- a/examples/lights/light_modifier.js +++ b/examples/lights/lightModifier.js @@ -1,7 +1,7 @@ // -// light_modifier.js +// lightModifier.js // -// Created byJames Pollack @imgntn on 12/15/2015 +// Created by James Pollack @imgntn on 12/15/2015 // Copyright 2015 High Fidelity, Inc. // // Given a selected light, instantiate some entities that represent various values you can dynamically adjust by grabbing and moving. @@ -201,13 +201,13 @@ entitySlider.prototype = { //message is not for our light if (message.lightID !== this.lightID) { - print('not our light') + // print('not our light') return; } //message is not our type if (message.sliderType !== this.sliderType) { - print('not our slider type') + // print('not our slider type') return } diff --git a/examples/lights/light_modifier_test_scene.js b/examples/lights/lightModifierTestScene.js similarity index 95% rename from examples/lights/light_modifier_test_scene.js rename to examples/lights/lightModifierTestScene.js index e70812cb45..214d900130 100644 --- a/examples/lights/light_modifier_test_scene.js +++ b/examples/lights/lightModifierTestScene.js @@ -1,7 +1,7 @@ // -// light_modifier_test_scene.js +// lightModifierTestScene.js // -// Created byJames Pollack @imgntn on 12/15/2015 +// Created by James Pollack @imgntn on 12/15/2015 // Copyright 2015 High Fidelity, Inc. // // Given a selected light, instantiate some entities that represent various values you can dynamically adjust. @@ -116,7 +116,6 @@ function evalLightWorldTransform(modelPos, modelRot) { } function cleanup() { - print('CLEANUP TEST SCENE SCRIPT') Entities.deleteEntity(block); Entities.deleteEntity(ground); Entities.deleteEntity(light); diff --git a/examples/lights/light_loader.js b/examples/lights/light_loader.js deleted file mode 100644 index 8edaa20f57..0000000000 --- a/examples/lights/light_loader.js +++ /dev/null @@ -1,8 +0,0 @@ -var grabScript = Script.resolvePath('../controllers/handControllerGrab.js'); -Script.load(grabScript); -var lightModifier = Script.resolvePath('light_modifier.js'); -Script.load(lightModifier); -Script.setTimeout(function() { - var lightModifierTestScene = Script.resolvePath('light_modifier_test_scene.js'); - Script.load(lightModifierTestScene); -}, 750) \ No newline at end of file diff --git a/examples/lights/slider.js b/examples/lights/slider.js index ab59b6eed1..c17704b0db 100644 --- a/examples/lights/slider.js +++ b/examples/lights/slider.js @@ -1,13 +1,14 @@ // // slider.js // -// Created byJames Pollack @imgntn on 12/15/2015 +// Created by James Pollack @imgntn on 12/15/2015 // Copyright 2015 High Fidelity, Inc. // // Entity script that sends a scaled value to a light based on its distance from the start of its constraint axis. // // 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 AXIS_SCALE = 1; @@ -60,7 +61,7 @@ this.sliderValue = this.scaleValueBasedOnDistanceFromStart(distance, EXPONENT_MAX); }; - print('SLIDER VALUE:::' + this.sliderValue) + //print('SLIDER VALUE:::' + this.sliderValue) this.sendValueToSlider(); },