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

dark mode and lighting tweaks

Browse source
This commit is contained in:
Stewart Allen 2022-01-19 17:48:29 -05:00
commit 2b91c5fa80
3 changed files with 50 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/kiri/main.js
View file

@ -1879,16 +1879,18 @@
gridMinor = unitMM ? 5 : 25.4 / 10;
if (updateDark) {
if (ctrl.dark) {
SPACE.platform.set({ light: 0.13 });
SPACE.platform.setFont({rulerColor:'#888888'});
SPACE.platform.setGrid(gridMajor, gridMinor, 0x666666, 0x333333);
SPACE.platform.opacity(0.05);
SPACE.sky.setColor(0);
SPACE.sky.set({ color: 0, ambient: { intensity: 0.08 } });
DOC.body.classList.add('dark');
} else {
SPACE.platform.set({ light: 0.09 });
SPACE.platform.setFont({rulerColor:'#333333'});
SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0xcccccc);
SPACE.platform.opacity(0.2);
SPACE.sky.setColor(0xffffff);
SPACE.sky.set({ color: 0xffffff, ambient: { intensity: 0.9 } });
DOC.body.classList.remove('dark');
}
SPACE.platform.setSize();

2
src/main/mesh.js
View file

@ -468,7 +468,7 @@ function set_darkmode(dark) {
let { sky, platform } = moto.Space;
prefs.map.space.dark = dark;
if (dark) {
mesh.material.wireframe.color.set(0xeeeeee);
mesh.material.wireframe.color.set(0xaaaaaa);
$('app').classList.add('dark');
} else {
mesh.material.wireframe.color.set(0,0,0);

64
src/moto/space.js
View file

@ -32,7 +32,7 @@
refreshRequested = false,
selectRecurse = false,
defaultKeys = true,
lightIntensity = 0.3,
lightIntensity = 0.09,
initialized = false,
alignedTracking = false,
skyAmbient,
@ -43,7 +43,7 @@
showPlatform = true,
hidePlatformBelow = true,
origin = {x:0, y:0, z: 0},
trackcam = addLight(0, 0, 0, lightIntensity/3),
trackcam = addLight(0, 0, 0, lightIntensity),
trackDelta = {x:0, y:0, z:0},
mouse = {x: 0, y: 0},
mouseStart = null,
@ -99,11 +99,7 @@
platformOnMoveTime = 500,
platformMoveTimer,
volume,
light1,
light2,
light3,
light4,
light5,
lights,
camera,
renderer,
container,
@ -240,9 +236,44 @@
}
}
// 4 corners bottom, 4 axis centers top
function updateLights(x, y, z) {
// remove old
for (let l of lights || []) {
SCENE.remove(l);
}
x *= 1.5; y *= 1.5; z *= 1.5;
// add new
let x0 = -x/2, y0 = -y/2, z0 = 0;
let x1 = x/2, y1 = y/2, z1 = z / 2, z2 = z;
lights = [
addLight( 0, y0, z0, lightIntensity),
addLight( 0, y1, z0, lightIntensity),
addLight( x0, 0, z0, lightIntensity),
addLight( x1, 0, z0, lightIntensity),
addLight( x0, y0, z1, lightIntensity * 1.5),
addLight( x0, y1, z1, lightIntensity / 1.5),
addLight( x1, y1, z1, lightIntensity * 1.5),
addLight( x1, y0, z1, lightIntensity / 1.5),
addLight( x0, y0, -z1, lightIntensity / 1.5),
addLight( x0, y1, -z1, lightIntensity),
addLight( x1, y1, -z1, lightIntensity / 1.5),
addLight( x1, y0, -z1, lightIntensity),
addLight( 0, 0, z2, lightIntensity * 2),
addLight( 0, 0, -z2, lightIntensity / 1),
];
}
function addLight(x,y,z,i) {
let l = new THREE.PointLight(0xffffff, i, 0);
l.position.set(x,y,z);
l.position.set(x,z,y);
// let b; l.add(b = new THREE.Mesh(
// new THREE.BoxGeometry(1,1,1),
// new THREE.MeshBasicMaterial( {color: 0xff0000} )
// )); b.scale.set(5,5,5);
SCENE.add(l);
return l;
}
@ -270,11 +301,7 @@
}
viewControl.maxDistance = Math.max(width,depth) * 4;
updatePlatformPosition();
let y = Math.max(width, height) * 1;
light1.position.set( width, y, depth);
light2.position.set(-width, y, -depth);
light4.position.set( width, light4.position.y, -depth);
light5.position.set(-width, light5.position.y, depth);
updateLights(width, depth, maxz);
if (volume) {
SCENE.remove(volume);
volume = null;
@ -934,7 +961,10 @@
function setPlatform(opt = {}) {
let platform = Space.platform;
let { color, round, size, grid, opacity } = opt;
let { visible, volume, zOffset, origin } = opt;
let { visible, volume, zOffset, origin, light } = opt;
if (light) {
lightIntensity = light;
}
if (color) {
platform.setColor(color);
}
@ -1194,11 +1224,7 @@
SCENE.add(skyAmbient = new THREE.AmbientLight(0x707070));
light1 = addLight( 200, 250, 200, lightIntensity * 1.15);
light2 = addLight(-200, 250, -200, lightIntensity * 0.95);
light3 = addLight( 0, -200, 0, lightIntensity * 0.5);
light4 = addLight( 200, 5, -200, lightIntensity * 0.35);
light5 = addLight(-200, 5, 200, lightIntensity * 0.4);
updateLights(250, 250, 250);
platform = new THREE.Mesh(
new THREE.BoxGeometry(1, 1, 1),