From adc487ef782509a802b1721f8b68e6650c573152 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 7 May 2026 15:17:49 +0900 Subject: [PATCH] wip --- .../assets/room/objects/monitor/monitor.blend | Bin 729979 -> 712667 bytes .../assets/room/objects/monitor/monitor.glb | Bin 12132 -> 12032 bytes .../src/world/room/objects/allInOnePc.ts | 5 +++-- .../src/world/room/objects/djPlayer.ts | 6 ++++-- .../world/room/objects/handheldGameConsole.ts | 5 +++-- .../src/world/room/objects/laptopPc.ts | 5 +++-- .../src/world/room/objects/monitor.ts | 7 ++++--- .../objects/tabletopLcdButtonsController.ts | 3 ++- .../frontend/src/world/room/objects/tv.ts | 2 +- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/frontend/assets/room/objects/monitor/monitor.blend b/packages/frontend/assets/room/objects/monitor/monitor.blend index 5b07daaf8e9072aa6c86e94850b12892732588c4..838d650bdeb35328575fdac646713660524fa5da 100644 GIT binary patch delta 13159 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 delta 14635 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 diff --git a/packages/frontend/assets/room/objects/monitor/monitor.glb b/packages/frontend/assets/room/objects/monitor/monitor.glb index 769e586fcc1a9745cb9ae22ff48113bf56af9a63..ab4d51bd24d9e1fc7b3b3a36eecd4c55e3fb0b42 100644 GIT binary patch delta 48 zcmaD7*AT~>o)hB6!~g{P3=A0)d2JajH+uUrPPS#{nD|g?@@Gbq%>hh({F@&Lw#Whi DO4kmY delta 115 zcmZpOdlJW+o)hB6#K6FiqR+r^W+JaGqs2yVUq*WaJp&_414~O26LT|DBQr~LQ!`^7 gq6K3o-j|uYi_v6qCzIo5Hl{LuCIyAfHG(a&08lX;ZvX%Q diff --git a/packages/frontend/src/world/room/objects/allInOnePc.ts b/packages/frontend/src/world/room/objects/allInOnePc.ts index 71357190d7..e21988bdac 100644 --- a/packages/frontend/src/world/room/objects/allInOnePc.ts +++ b/packages/frontend/src/world/room/objects/allInOnePc.ts @@ -41,7 +41,7 @@ export const allInOnePc = defineObject({ default: { bodyColor: [1, 1, 1], bezelColor: [0, 0, 0], - screenBrightness: 0.35, + screenBrightness: 0.5, customPicture: null, fit: 'cover', }, @@ -88,7 +88,7 @@ export const allInOnePc = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; light.intensity = (5 * b) * WORLD_SCALE * WORLD_SCALE; }; @@ -98,6 +98,7 @@ export const allInOnePc = defineObject({ if (options.customPicture != null) { screenMaterial.unfreeze(); const tex = new BABYLON.Texture(options.customPicture, scene, false, false, undefined, () => { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = tex; applyFit(); applyScreenBrightness(); diff --git a/packages/frontend/src/world/room/objects/djPlayer.ts b/packages/frontend/src/world/room/objects/djPlayer.ts index d5b9f0c42d..09994b183c 100644 --- a/packages/frontend/src/world/room/objects/djPlayer.ts +++ b/packages/frontend/src/world/room/objects/djPlayer.ts @@ -30,7 +30,7 @@ export const djPlayer = defineObject({ }, }, default: { - screenBrightness: 0.35, + screenBrightness: 0.5, customPicture: null, fit: 'cover', }, @@ -62,7 +62,7 @@ export const djPlayer = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; }; applyScreenBrightness(); @@ -71,6 +71,7 @@ export const djPlayer = defineObject({ if (options.customPicture != null && options.customPicture !== '') { screenMaterial.unfreeze(); const tex = new BABYLON.Texture(options.customPicture, scene, false, false, undefined, () => { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = tex; applyFit(); applyScreenBrightness(); @@ -83,6 +84,7 @@ export const djPlayer = defineObject({ }); tex.level = 0.5; } else { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = defaultScreenTexture; applyFit(); resolve(); diff --git a/packages/frontend/src/world/room/objects/handheldGameConsole.ts b/packages/frontend/src/world/room/objects/handheldGameConsole.ts index bbaed98935..3e5cb3d663 100644 --- a/packages/frontend/src/world/room/objects/handheldGameConsole.ts +++ b/packages/frontend/src/world/room/objects/handheldGameConsole.ts @@ -36,7 +36,7 @@ export const handheldGameConsole = defineObject({ }, default: { bodyColor: [1, 1, 1], - screenBrightness: 0.35, + screenBrightness: 0.5, customPicture: null, fit: 'cover', }, @@ -71,7 +71,7 @@ export const handheldGameConsole = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; }; applyScreenBrightness(); @@ -80,6 +80,7 @@ export const handheldGameConsole = defineObject({ if (options.customPicture != null) { screenMaterial.unfreeze(); const tex = new BABYLON.Texture(options.customPicture, scene, false, false, undefined, () => { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = tex; applyFit(); applyScreenBrightness(); diff --git a/packages/frontend/src/world/room/objects/laptopPc.ts b/packages/frontend/src/world/room/objects/laptopPc.ts index 851425fc4a..1a4bbfc29d 100644 --- a/packages/frontend/src/world/room/objects/laptopPc.ts +++ b/packages/frontend/src/world/room/objects/laptopPc.ts @@ -48,7 +48,7 @@ export const laptopPc = defineObject({ default: { bodyColor: [1, 1, 1], bezelColor: [0, 0, 0], - screenBrightness: 0.35, + screenBrightness: 0.5, customPicture: null, fit: 'cover', openAngle: 0, @@ -98,7 +98,7 @@ export const laptopPc = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; light.intensity = (2 * b) * WORLD_SCALE * WORLD_SCALE; }; @@ -108,6 +108,7 @@ export const laptopPc = defineObject({ if (options.customPicture != null) { screenMaterial.unfreeze(); const tex = new BABYLON.Texture(options.customPicture, scene, false, false, undefined, () => { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = tex; applyFit(); applyScreenBrightness(); diff --git a/packages/frontend/src/world/room/objects/monitor.ts b/packages/frontend/src/world/room/objects/monitor.ts index 82567be1ca..7be89b48d4 100644 --- a/packages/frontend/src/world/room/objects/monitor.ts +++ b/packages/frontend/src/world/room/objects/monitor.ts @@ -36,7 +36,7 @@ export const monitor = defineObject({ }, default: { bodyColor: [0.1, 0.1, 0.1], - screenBrightness: 0.35, + screenBrightness: 0.5, customPicture: null, fit: 'cover', }, @@ -48,6 +48,7 @@ export const monitor = defineObject({ const scale = new BABYLON.Vector3(); matrix.decompose(scale); + // TODO: graphicsQualityがLOWならそもそも追加しない const light = new BABYLON.SpotLight('', new BABYLON.Vector3(cm(0), cm(20) / Math.abs(scale.y), 0), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, room?.lightContainer != null); light.parent = model.root; light.diffuse = new BABYLON.Color3(1.0, 1.0, 1.0); @@ -82,8 +83,8 @@ export const monitor = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); - light.intensity = (5 * b) * WORLD_SCALE * WORLD_SCALE; + screenMaterial.emissiveIntensity = b * 2; + light.intensity = (1 * b) * WORLD_SCALE * WORLD_SCALE; }; applyScreenBrightness(); diff --git a/packages/frontend/src/world/room/objects/tabletopLcdButtonsController.ts b/packages/frontend/src/world/room/objects/tabletopLcdButtonsController.ts index b190097c89..08cbd66870 100644 --- a/packages/frontend/src/world/room/objects/tabletopLcdButtonsController.ts +++ b/packages/frontend/src/world/room/objects/tabletopLcdButtonsController.ts @@ -77,6 +77,7 @@ export const tabletopLcdButtonsController = defineObject({ if (options.customPicture != null && options.customPicture !== '') { screenMaterial.unfreeze(); const tex = new BABYLON.Texture(options.customPicture, scene, false, false, undefined, () => { + screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1); screenMaterial.emissiveTexture = tex; screenMaterial.emissiveTexture.level = 2; applyFit(); @@ -100,7 +101,7 @@ export const tabletopLcdButtonsController = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; }; applyScreenBrightness(); diff --git a/packages/frontend/src/world/room/objects/tv.ts b/packages/frontend/src/world/room/objects/tv.ts index 8b5c1eb801..43688e9f86 100644 --- a/packages/frontend/src/world/room/objects/tv.ts +++ b/packages/frontend/src/world/room/objects/tv.ts @@ -62,7 +62,7 @@ export const tv = defineObject({ const applyScreenBrightness = () => { const b = options.screenBrightness; - screenMaterial.emissiveColor = new BABYLON.Color3(b, b, b); + screenMaterial.emissiveIntensity = b * 2; light.intensity = (7 * b) * WORLD_SCALE * WORLD_SCALE; };