From 7a4e0d515d748bff9143bdcddf6e64dd9067d75e Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 19 Jan 2022 21:39:11 -0500 Subject: [PATCH] more lighting work --- src/kiri/main.js | 4 ++-- src/kiri/widget.js | 3 ++- src/main/mesh.js | 4 ++-- src/mesh/model.js | 4 ++-- src/moto/space.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index c9132089..6bd9f1f3 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1883,14 +1883,14 @@ SPACE.platform.setFont({rulerColor:'#888888'}); SPACE.platform.setGrid(gridMajor, gridMinor, 0x666666, 0x333333); SPACE.platform.opacity(0.05); - SPACE.sky.set({ color: 0, ambient: { intensity: 0.08 } }); + SPACE.sky.set({ color: 0, ambient: { intensity: 0.07 } }); DOC.body.classList.add('dark'); } else { SPACE.platform.set({ light: 0.12 }); SPACE.platform.setFont({rulerColor:'#333333'}); SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0xcccccc); SPACE.platform.opacity(0.2); - SPACE.sky.set({ color: 0xffffff, ambient: { intensity: 0.4 } }); + SPACE.sky.set({ color: 0xffffff, ambient: { intensity: 0.3 } }); DOC.body.classList.remove('dark'); } SPACE.platform.setSize(); diff --git a/src/kiri/widget.js b/src/kiri/widget.js index 48dcddac..1a25df10 100644 --- a/src/kiri/widget.js +++ b/src/kiri/widget.js @@ -947,8 +947,9 @@ console.log/** Copyright Stewart Allen -- All Rights Reserved */ this.wire = null; } if (set) { + let dark = KIRI.api.conf.get().controller.dark; let geo = new THREE.WireframeGeometry(mesh.geometry); - let mat = new THREE.LineBasicMaterial({ color: 0 }); + let mat = new THREE.LineBasicMaterial({ color: dark ? 0xaaaaaa : 0 }); let wire = widget.wire = new THREE.LineSegments(geo, mat); mesh.add(wire); } diff --git a/src/main/mesh.js b/src/main/mesh.js index f221a4c6..4056d2de 100644 --- a/src/main/mesh.js +++ b/src/main/mesh.js @@ -476,10 +476,10 @@ function set_darkmode(dark) { } sky.set({ color: dark ? 0 : 0xffffff, - ambient: { intensity: dark ? 0.4 : 0.9 } + ambient: { intensity: dark ? 0.5 : 1.0 } }); platform.set({ - light: dark ? 0.05 : 0.05, + light: dark ? 0.06 : 0.06, grid: dark ? { colorMajor: 0x666666, colorMinor: 0x333333, diff --git a/src/mesh/model.js b/src/mesh/model.js index 3d5f0f04..f81dfc3f 100644 --- a/src/mesh/model.js +++ b/src/mesh/model.js @@ -29,7 +29,7 @@ let materials = mesh.material = { normal: new MeshPhongMaterial({ side: DoubleSide, transparent: true, - shininess: 100, + shininess: 125, specular: 0x202020, color: 0xf0f000, opacity: 1 @@ -38,7 +38,7 @@ let materials = mesh.material = { select: new MeshPhongMaterial({ side: DoubleSide, transparent: true, - shininess: 100, + shininess: 125, specular: 0x202020, color: 0x00e000, opacity: 1 diff --git a/src/moto/space.js b/src/moto/space.js index e71dbfde..07658cf8 100644 --- a/src/moto/space.js +++ b/src/moto/space.js @@ -267,7 +267,7 @@ addLight( x1, y1, -z1, lightIntensity * 0.5), addLight( x1, y0, -z1, lightIntensity * 0.2), - addLight( 0, 0, z2, lightIntensity * 0.8), + addLight( 0, 0, z2, lightIntensity * 1.2), addLight( 0, 0, -z2, lightIntensity * 0.8), ]; }