AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add more light controls and testing modes

Browse source
This commit is contained in:
Stewart Allen 2022-09-26 11:15:02 -04:00
commit bcea87dbe6
1 changed files with 56 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/moto/space.js
View file

@ -33,7 +33,6 @@ gapp.register("moto.space", [], (root, exports) => {
refreshRequested = false, refreshRequested = false,
selectRecurse = false, selectRecurse = false,
defaultKeys = true, defaultKeys = true,
lightIntensity = 0.09,
initialized = false, initialized = false,
alignedTracking = false, alignedTracking = false,
skyAmbient, skyAmbient,
@ -44,9 +43,15 @@ gapp.register("moto.space", [], (root, exports) => {
hidePlatformBelow = true, hidePlatformBelow = true,
showFocus = 0, showFocus = 0,
focalPoint = undefined, focalPoint = undefined,
origin = {x:0, y:0, z: 0}, lightInfo = {
trackcam = addLight(0, 0, 0, lightIntensity), mode: 2,
array: [],
intensity: 0.09,
debug: false
},
cameraLight = addLight(0, 0, 0, lightInfo.intensity),
trackDelta = {x:0, y:0, z:0}, trackDelta = {x:0, y:0, z:0},
origin = {x:0, y:0, z: 0},
mouse = {x: 0, y: 0}, mouse = {x: 0, y: 0},
mouseStart = null, mouseStart = null,
mouseDragPoint = null, mouseDragPoint = null,
@ -99,7 +104,6 @@ gapp.register("moto.space", [], (root, exports) => {
platformOnMoveTime = 500, platformOnMoveTime = 500,
platformMoveTimer, platformMoveTimer,
volume, volume,
lights,
camera, camera,
renderer, renderer,
container, container,
@ -246,36 +250,54 @@ gapp.register("moto.space", [], (root, exports) => {
function addLight(x, y, z, i, color = 0xffffff) { function addLight(x, y, z, i, color = 0xffffff) {
let l = new THREE.DirectionalLight(color, i, 0); let l = new THREE.DirectionalLight(color, i, 0);
l.position.set(x,z,y); l.position.set(x,z,y);
// let b; l.add(b = new THREE.Mesh( if (lightInfo.debug) {
// new THREE.BoxGeometry(1,1,1), let b; l.add(b = new THREE.Mesh(
// new THREE.MeshBasicMaterial( {color: 0xff0000} ) new THREE.BoxGeometry(1,1,1),
// )); b.scale.set(5,5,5); new THREE.MeshBasicMaterial( {color: 0xff0000} )
)); b.scale.set(5,5,5);
}
SCENE.add(l); SCENE.add(l);
return l; return l;
} }
// 4 corners bottom, 4 axis centers top // 4 corners bottom, 4 axis centers top
function updateLights(x, y, z) { function updateLights() {
// remove old let x = psize.width;
for (let l of lights || []) { let y = psize.depth;
let z = Math.max(x,y);
let { mode, intensity, array } = lightInfo;
// remove old lights
for (let l of array) {
SCENE.remove(l); SCENE.remove(l);
} }
// override Z
z = Math.max(x,y,z);
// add new // add new
let x0 = -x/2, y0 = -y/2, z0 = 0; let x0 = -x/2, y0 = -y/2, z0 = 0;
let x1 = x/2, y1 = y/2, z1 = z / 2, z2 = z; let x1 = x/2, y1 = y/2, z1 = z / 2, z2 = z;
lights = [ switch (mode) {
// over case 0: array = [
addLight( 0, 0, z2, lightIntensity * 1.2), addLight( x1, y0, z1, intensity * 1.5),
addLight( x0, y0, z1, lightIntensity * 2.5, 0xeeeeee), addLight( x0, y1, -z1, intensity * 0.7)]; break;
addLight( x1, y1, z1, lightIntensity * 2.5), case 1: array = [
// under addLight( x1, y1, z1, intensity * 2.5),
addLight( x0, y1, -z1, lightIntensity * 0.5), addLight( x0, y1, -z1, intensity * 0.5),
addLight( x1, y0, -z1, lightIntensity * 0.5, 0xeeeeee), addLight( x0, y0, z1, intensity * 2.5, 0xeeeeee),
addLight( 0, 0, -z2, lightIntensity * 0.8), addLight( x1, y0, -z1, intensity * 0.5, 0xeeeeee)]; break;
]; case 2: array = [
addLight( x1, y1, z1, intensity * 2.5),
addLight( x0, y1, -z1, intensity * 0.5),
addLight( x0, y0, z1, intensity * 2.5, 0xeeeeee),
addLight( x1, y0, -z1, intensity * 0.5, 0xeeeeee),
addLight( 0, 0, z2, intensity * 1.2),
addLight( 0, 0, -z2, intensity * 0.8)]; break;
}
// update tracking cam intensity
cameraLight.intensity = intensity;
lightInfo.array = array;
} }
function updatePlatformPosition() { function updatePlatformPosition() {
@ -301,7 +323,7 @@ gapp.register("moto.space", [], (root, exports) => {
} }
viewControl.maxDistance = Math.max(width,depth) * 4; viewControl.maxDistance = Math.max(width,depth) * 4;
updatePlatformPosition(); updatePlatformPosition();
updateLights(width, depth, maxz); updateLights();
if (volume) { if (volume) {
SCENE.remove(volume); SCENE.remove(volume);
THREE.dispose(volume); THREE.dispose(volume);
@ -994,7 +1016,7 @@ gapp.register("moto.space", [], (root, exports) => {
let { color, round, size, grid, opacity } = opt; let { color, round, size, grid, opacity } = opt;
let { visible, volume, zOffset, origin, light } = opt; let { visible, volume, zOffset, origin, light } = opt;
if (light) { if (light) {
lightIntensity = light; lightInfo.intensity = light;
} }
if (color) { if (color) {
platform.setColor(color); platform.setColor(color);
@ -1096,6 +1118,13 @@ gapp.register("moto.space", [], (root, exports) => {
// todo: option to clip for close views // todo: option to clip for close views
// camera.near = dist / 2; // camera.near = dist / 2;
// camera.updateProjectionMatrix(); // camera.updateProjectionMatrix();
},
lightMode: (mode, intensity) => {
lightInfo.mode = mode;
if (intensity) lightInfo.intensity = intensity;
updateLights();
return lightInfo;
} }
}, },
@ -1289,8 +1318,8 @@ gapp.register("moto.space", [], (root, exports) => {
platform.visible = hidePlatformBelow ? platform.visible = hidePlatformBelow ?
initialized && position.y >= 0 && showPlatform : showPlatform; initialized && position.y >= 0 && showPlatform : showPlatform;
} }
if (trackcam) { if (cameraLight) {
trackcam.position.copy(camera.position); cameraLight.position.copy(camera.position);
} }
if (moved && platformOnMove) { if (moved && platformOnMove) {
clearTimeout(platformMoveTimer); clearTimeout(platformMoveTimer);
@ -1309,8 +1338,6 @@ gapp.register("moto.space", [], (root, exports) => {
SCENE.add(skyAmbient = new THREE.AmbientLight(0x707070)); SCENE.add(skyAmbient = new THREE.AmbientLight(0x707070));
updateLights(250, 250, 250);
platform = new THREE.Mesh( platform = new THREE.Mesh(
new THREE.BoxGeometry(1, 1, 1), new THREE.BoxGeometry(1, 1, 1),
platformMaterial platformMaterial