From e682881374791252bbb5fb7c3e43e8e75b181358 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 19 Jan 2022 22:06:55 -0500 Subject: [PATCH] pushing poiint lights way out seems to be better overall --- src/kiri/main.js | 8 ++++---- src/kiri/widget.js | 4 ++-- src/main/mesh.js | 2 +- src/moto/space.js | 16 +++++++--------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index 6bd9f1f3..37d76b13 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1879,18 +1879,18 @@ gridMinor = unitMM ? 5 : 25.4 / 10; if (updateDark) { if (ctrl.dark) { - SPACE.platform.set({ light: 0.13 }); + SPACE.platform.set({ light: 0.06 }); 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.07 } }); + SPACE.sky.set({ color: 0, ambient: { intensity: 0.5 } }); DOC.body.classList.add('dark'); } else { - SPACE.platform.set({ light: 0.12 }); + SPACE.platform.set({ light: 0.06 }); 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.3 } }); + SPACE.sky.set({ color: 0xffffff, ambient: { intensity: 1 } }); DOC.body.classList.remove('dark'); } SPACE.platform.setSize(); diff --git a/src/kiri/widget.js b/src/kiri/widget.js index 1a25df10..d640bb35 100644 --- a/src/kiri/widget.js +++ b/src/kiri/widget.js @@ -451,8 +451,8 @@ console.log/** Copyright Stewart Allen -- All Rights Reserved */ geometry, new THREE.MeshPhongMaterial({ color: 0xffff00, - specular: 0x181818, - shininess: 100, + specular: 0x202020, + shininess: 125, transparent: true, opacity: solid_opacity }) diff --git a/src/main/mesh.js b/src/main/mesh.js index 4056d2de..eeac19a4 100644 --- a/src/main/mesh.js +++ b/src/main/mesh.js @@ -45,7 +45,7 @@ function init() { opacity: 0, color: 0xdddddd, zoom: { reverse: true, speed: 1 }, - size: { width: 2000, depth: 2000, height: 0.05, maxz: 200 }, + size: { width: 2000, depth: 2000, height: 0.05, maxz: 2000 }, grid: { major: 25, minor: 5, zOffset: 0, colorMajor: 0xcccccc, colorMinor: 0xeeeeee, colorX: 0xff7777, colorY: 0x7777ff }, diff --git a/src/moto/space.js b/src/moto/space.js index 07658cf8..f1acf2d0 100644 --- a/src/moto/space.js +++ b/src/moto/space.js @@ -242,31 +242,29 @@ for (let l of lights || []) { SCENE.remove(l); } - x *= 1.1; y *= 1.1; z *= 1.1; + // override + x = y = z = 20000; + x *= 2; y *= 2; z *= 2; // add new let x0 = -x/2, y0 = -y/2, z0 = 0; let x1 = x/2, y1 = y/2, z1 = z / 2, z2 = z; lights = [ + // top addLight( x0, y0, z1, lightIntensity * 2.5), addLight( x0, y1, z1, lightIntensity * 2.0), addLight( x1, y1, z1, lightIntensity * 2.5), addLight( x1, y0, z1, lightIntensity * 2.0), - - // addLight( 0, y0, z0, lightIntensity * 1.2), - // addLight( 0, y1, z0, lightIntensity * 0.8), - // addLight( x0, 0, z0, lightIntensity * 1.2), - // addLight( x1, 0, z0, lightIntensity * 0.8), - + // middle addLight( x0, y0, z0, lightIntensity * 0.8), addLight( x0, y1, z0, lightIntensity * 1.2), addLight( x1, y1, z0, lightIntensity * 0.8), addLight( x1, y0, z0, lightIntensity * 1.2), - + // bottom addLight( x0, y0, -z1, lightIntensity * 0.5), addLight( x0, y1, -z1, lightIntensity * 0.2), addLight( x1, y1, -z1, lightIntensity * 0.5), addLight( x1, y0, -z1, lightIntensity * 0.2), - + // center top/bottom addLight( 0, 0, z2, lightIntensity * 1.2), addLight( 0, 0, -z2, lightIntensity * 0.8), ];