diff --git a/packages/frontend/assets/room/object-thumbs/clipped-picture.png b/packages/frontend/assets/room/object-thumbs/clipped-picture.png new file mode 100644 index 0000000000..46350ce8d9 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/clipped-picture.png differ diff --git a/packages/frontend/assets/room/object-thumbs/curtain.png b/packages/frontend/assets/room/object-thumbs/curtain.png new file mode 100644 index 0000000000..d5a615fc71 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/curtain.png differ diff --git a/packages/frontend/assets/room/object-thumbs/description-plate.png b/packages/frontend/assets/room/object-thumbs/description-plate.png new file mode 100644 index 0000000000..3e59bd88b0 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/description-plate.png differ diff --git a/packages/frontend/assets/room/object-thumbs/handheld-game-console.png b/packages/frontend/assets/room/object-thumbs/handheld-game-console.png new file mode 100644 index 0000000000..121c0afd06 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/handheld-game-console.png differ diff --git a/packages/frontend/assets/room/object-thumbs/hanging-duct-rail.png b/packages/frontend/assets/room/object-thumbs/hanging-duct-rail.png new file mode 100644 index 0000000000..45e99025a4 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/hanging-duct-rail.png differ diff --git a/packages/frontend/assets/room/object-thumbs/large-mousepad.png b/packages/frontend/assets/room/object-thumbs/large-mousepad.png new file mode 100644 index 0000000000..91a26dce02 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/large-mousepad.png differ diff --git a/packages/frontend/assets/room/object-thumbs/low-partition-bar.png b/packages/frontend/assets/room/object-thumbs/low-partition-bar.png new file mode 100644 index 0000000000..0ccb78bc87 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/low-partition-bar.png differ diff --git a/packages/frontend/assets/room/object-thumbs/record-player.png b/packages/frontend/assets/room/object-thumbs/record-player.png new file mode 100644 index 0000000000..728bac2b4c Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/record-player.png differ diff --git a/packages/frontend/assets/room/object-thumbs/spot-light.png b/packages/frontend/assets/room/object-thumbs/spot-light.png new file mode 100644 index 0000000000..5852b4642e Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/spot-light.png differ diff --git a/packages/frontend/assets/room/object-thumbs/stanchion-pole.png b/packages/frontend/assets/room/object-thumbs/stanchion-pole.png new file mode 100644 index 0000000000..b0fb4b0697 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/stanchion-pole.png differ diff --git a/packages/frontend/assets/room/object-thumbs/wire-basket.png b/packages/frontend/assets/room/object-thumbs/wire-basket.png new file mode 100644 index 0000000000..6afa43d05e Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/wire-basket.png differ diff --git a/packages/frontend/assets/room/object-thumbs/wire-net.png b/packages/frontend/assets/room/object-thumbs/wire-net.png new file mode 100644 index 0000000000..6a1992e096 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/wire-net.png differ diff --git a/packages/frontend/src/pages/room.add-object-dialog.vue b/packages/frontend/src/pages/room.add-object-dialog.vue index 481439342a..728a2a2fdb 100644 --- a/packages/frontend/src/pages/room.add-object-dialog.vue +++ b/packages/frontend/src/pages/room.add-object-dialog.vue @@ -248,6 +248,7 @@ async function cancel() { display: block; touch-action: none; background: #000; + cursor: grab; } .canvas:focus { outline: none; diff --git a/packages/frontend/src/world/engineControllerBase.ts b/packages/frontend/src/world/engineControllerBase.ts index cc2a56b5fa..59217dace7 100644 --- a/packages/frontend/src/world/engineControllerBase.ts +++ b/packages/frontend/src/world/engineControllerBase.ts @@ -89,10 +89,6 @@ export abstract class EngineControllerBase { if (this.options.resolution === 2) babylonEngine.setHardwareScalingLevel(0.5); if (this.options.resolution === 0.5) babylonEngine.setHardwareScalingLevel(2); - //this.engine = new RoomEngine(this.roomState.value, { - // engine: babylonEngine, - // ...this.options, - //}); this.engine = await params.createEngine(babylonEngine); this.engine.on('ev', ({ type, ctx }) => { diff --git a/packages/frontend/src/world/room/previewEngine.ts b/packages/frontend/src/world/room/previewEngine.ts index 325097b5db..e7ab304985 100644 --- a/packages/frontend/src/world/room/previewEngine.ts +++ b/packages/frontend/src/world/room/previewEngine.ts @@ -116,6 +116,11 @@ export class RoomObjectPreviewEngine extends EventEmitter { window.takeScreenshot = () => { const def = getObjectDef(this.objectType); + this.scene.clearColor = new BABYLON.Color4(0, 0, 0, 0); + this.scene.autoClear = true; + this.sr.disableSnapshotRendering(); + this.pipeline.dispose(); + const boundingInfo = getMeshesBoundingBox(this.objectMesh!.getChildMeshes().filter(m => m.isEnabled() && m.isVisible)); const camera = new BABYLON.ArcRotateCamera('camera', Math.PI / 4, Math.PI / 2.5, cm(300), new BABYLON.Vector3(0, cm(90), 0), this.scene); @@ -268,10 +273,6 @@ export class RoomObjectPreviewEngine extends EventEmitter { const size = boundingInfo.extendSize; const distance = Math.max(size.x, size.y, size.z) * 2; this.camera.radius = distance * 3; - //this.camera.orthoLeft = -distance; - //this.camera.orthoRight = distance; - //this.camera.orthoTop = distance; - //this.camera.orthoBottom = -distance; this.pipeline.addCamera(this.camera);