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

more lighting work

Browse source
This commit is contained in:
Stewart Allen 2022-01-19 21:39:11 -05:00
commit 7a4e0d515d
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/main.js
View file

@ -1883,14 +1883,14 @@
SPACE.platform.setFont({rulerColor:'#888888'}); SPACE.platform.setFont({rulerColor:'#888888'});
SPACE.platform.setGrid(gridMajor, gridMinor, 0x666666, 0x333333); SPACE.platform.setGrid(gridMajor, gridMinor, 0x666666, 0x333333);
SPACE.platform.opacity(0.05); 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'); DOC.body.classList.add('dark');
} else { } else {
SPACE.platform.set({ light: 0.12 }); SPACE.platform.set({ light: 0.12 });
SPACE.platform.setFont({rulerColor:'#333333'}); SPACE.platform.setFont({rulerColor:'#333333'});
SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0xcccccc); SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0xcccccc);
SPACE.platform.opacity(0.2); 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'); DOC.body.classList.remove('dark');
} }
SPACE.platform.setSize(); SPACE.platform.setSize();

3
src/kiri/widget.js
View file

@ -947,8 +947,9 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
this.wire = null; this.wire = null;
} }
if (set) { if (set) {
let dark = KIRI.api.conf.get().controller.dark;
let geo = new THREE.WireframeGeometry(mesh.geometry); 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); let wire = widget.wire = new THREE.LineSegments(geo, mat);
mesh.add(wire); mesh.add(wire);
} }

4
src/main/mesh.js
View file

@ -476,10 +476,10 @@ function set_darkmode(dark) {
} }
sky.set({ sky.set({
color: dark ? 0 : 0xffffff, color: dark ? 0 : 0xffffff,
ambient: { intensity: dark ? 0.4 : 0.9 } ambient: { intensity: dark ? 0.5 : 1.0 }
}); });
platform.set({ platform.set({
light: dark ? 0.05 : 0.05, light: dark ? 0.06 : 0.06,
grid: dark ? { grid: dark ? {
colorMajor: 0x666666, colorMajor: 0x666666,
colorMinor: 0x333333, colorMinor: 0x333333,

4
src/mesh/model.js
View file

@ -29,7 +29,7 @@ let materials = mesh.material = {
normal: new MeshPhongMaterial({ normal: new MeshPhongMaterial({
side: DoubleSide, side: DoubleSide,
transparent: true, transparent: true,
shininess: 100, shininess: 125,
specular: 0x202020, specular: 0x202020,
color: 0xf0f000, color: 0xf0f000,
opacity: 1 opacity: 1
@ -38,7 +38,7 @@ let materials = mesh.material = {
select: new MeshPhongMaterial({ select: new MeshPhongMaterial({
side: DoubleSide, side: DoubleSide,
transparent: true, transparent: true,
shininess: 100, shininess: 125,
specular: 0x202020, specular: 0x202020,
color: 0x00e000, color: 0x00e000,
opacity: 1 opacity: 1

2
src/moto/space.js
View file

@ -267,7 +267,7 @@
addLight( x1, y1, -z1, lightIntensity * 0.5), addLight( x1, y1, -z1, lightIntensity * 0.5),
addLight( x1, y0, -z1, lightIntensity * 0.2), 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), addLight( 0, 0, -z2, lightIntensity * 0.8),
]; ];
} }