rename files

This commit is contained in:
James Pollack 2015-12-16 01:31:24 -08:00
parent 5a9549a2d9
commit 28a5dba2d3
5 changed files with 29 additions and 17 deletions

View file

@ -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)

View file

@ -1,5 +1,5 @@
// //
// light_modifier.js // lightModifier.js
// //
// Created by James Pollack @imgntn on 12/15/2015 // Created by James Pollack @imgntn on 12/15/2015
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
@ -201,13 +201,13 @@ entitySlider.prototype = {
//message is not for our light //message is not for our light
if (message.lightID !== this.lightID) { if (message.lightID !== this.lightID) {
print('not our light') // print('not our light')
return; return;
} }
//message is not our type //message is not our type
if (message.sliderType !== this.sliderType) { if (message.sliderType !== this.sliderType) {
print('not our slider type') // print('not our slider type')
return return
} }

View file

@ -1,5 +1,5 @@
// //
// light_modifier_test_scene.js // lightModifierTestScene.js
// //
// Created by James Pollack @imgntn on 12/15/2015 // Created by James Pollack @imgntn on 12/15/2015
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
@ -116,7 +116,6 @@ function evalLightWorldTransform(modelPos, modelRot) {
} }
function cleanup() { function cleanup() {
print('CLEANUP TEST SCENE SCRIPT')
Entities.deleteEntity(block); Entities.deleteEntity(block);
Entities.deleteEntity(ground); Entities.deleteEntity(ground);
Entities.deleteEntity(light); Entities.deleteEntity(light);

View file

@ -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)

View file

@ -8,6 +8,7 @@
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
(function() { (function() {
var AXIS_SCALE = 1; var AXIS_SCALE = 1;
@ -60,7 +61,7 @@
this.sliderValue = this.scaleValueBasedOnDistanceFromStart(distance, EXPONENT_MAX); this.sliderValue = this.scaleValueBasedOnDistanceFromStart(distance, EXPONENT_MAX);
}; };
print('SLIDER VALUE:::' + this.sliderValue) //print('SLIDER VALUE:::' + this.sliderValue)
this.sendValueToSlider(); this.sendValueToSlider();
}, },