playcanvas · slimbuck · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024
diff --git a/src/edit-ops.ts b/src/edit-ops.ts
@@ -1,6 +1,7 @@
 import { Color, Mat4 } from 'playcanvas';
 
 import { Pivot } from './pivot';
+import { Scene } from './scene';
 import { Splat } from './splat';
 import { State } from './splat-state';
 import { Transform } from './transform';
@@ -379,6 +380,29 @@ class MultiOp {
     }
 }
 
+class AddSplatOp {
+    name: 'addSplat';
+    scene: Scene;
+    splat: Splat;
+
+    constructor(scene: Scene, splat: Splat) {
+        this.scene = scene;
+        this.splat = splat;
+    }
+
+    do() {
+        this.scene.add(this.splat);
+    }
+
+    undo() {
+        this.scene.remove(this.splat);
+    }
+
+    destroy() {
+        this.splat.destroy();
+    }
+}
+
 export {
     EditOp,
     SelectAllOp,
@@ -394,5 +418,6 @@ export {
     PlacePivotOp,
     ColorAdjustment,
     SetSplatColorAdjustmentOp,
-    MultiOp
+    MultiOp,
+    AddSplatOp
 };
diff --git a/src/editor.ts b/src/editor.ts
@@ -7,11 +7,12 @@ import {
 } from 'playcanvas';
 
 import { EditHistory } from './edit-history';
-import { SelectAllOp, SelectNoneOp, SelectInvertOp, SelectOp, HideSelectionOp, UnhideAllOp, DeleteSelectionOp, ResetOp } from './edit-ops';
+import { SelectAllOp, SelectNoneOp, SelectInvertOp, SelectOp, HideSelectionOp, UnhideAllOp, DeleteSelectionOp, ResetOp, MultiOp, AddSplatOp } from './edit-ops';
 import { Events } from './events';
 import { PngCompressor } from './png-compressor';
 import { Scene } from './scene';
 import { Splat } from './splat';
+import { serializePly } from './splat-serialize';
 
 // register for editor and scene events
 const registerEditorEvents = (events: Events, editHistory: EditHistory, scene: Scene) => {
@@ -187,6 +188,12 @@ const registerEditorEvents = (events: Events, editHistory: EditHistory, scene: S
         scene.camera.ortho = true;
     });
 
+    // returns true if the selected splat has selected gaussians
+    events.function('selection.splats', () => {
+        const splat = events.invoke('selection') as Splat;
+        return splat?.numSelected > 0;
+    });
+
     events.on('select.all', () => {
         selectedSplats().forEach((splat) => {
             events.fire('edit.add', new SelectAllOp(splat));
@@ -388,6 +395,68 @@ const registerEditorEvents = (events: Events, editHistory: EditHistory, scene: S
         });
     });
 
+    const performSelectionFunc = async (func: 'duplicate' | 'separate') => {
+        const splats = selectedSplats();
+
+        let data: Uint8Array = null;
+        let cursor = 0;
+
+        const writeFunc = (chunk: Uint8Array, finalWrite?: boolean) => {
+            if (!data) {
+                data = finalWrite ? chunk : chunk.slice();
+                cursor = chunk.byteLength;
+            } else {
+                if (data.byteLength < cursor + chunk.byteLength) {
+                    let newSize = data.byteLength * 2;
+                    while (newSize < cursor + chunk.byteLength) {
+                        newSize *= 2;
+                    }
+                    const newData = new Uint8Array(newSize);
+                    newData.set(data);
+                    data = newData;
+                }
+                data.set(chunk, cursor);
+                cursor += chunk.byteLength;
+            }
+        };
+
+        await serializePly({
+            splats,
+            maxSHBands: 3,
+            selected: true
+        }, writeFunc);
+
+        if (data) {
+            const splat = splats[0];
+
+            // wrap PLY in a blob and load it
+            const blob = new Blob([data], { type: 'octet/stream' });
+            const url = URL.createObjectURL(blob);
+            const { filename } = splat;
+            const copy = await scene.assetLoader.loadPly({ url, filename });
+
+            if (func === 'separate') {
+                editHistory.add(new MultiOp([
+                    new DeleteSelectionOp(splat),
+                    new AddSplatOp(scene, copy)
+                ]));
+            } else {
+                editHistory.add(new AddSplatOp(scene, copy));
+            }
+
+            URL.revokeObjectURL(url);
+        }
+    };
+
+    // duplicate the current selection
+    events.on('select.duplicate', async () => {
+        await performSelectionFunc('duplicate');
+    });
+
+    events.on('select.separate', async () => {
+        await performSelectionFunc('separate');
+    });
+
     events.on('scene.reset', () => {
         selectedSplats().forEach((splat) => {
             editHistory.add(new ResetOp(splat));

diff --git a/src/file-handler.ts b/src/file-handler.ts
@@ -156,7 +156,7 @@ const initFileHandler = (scene: Scene, events: Events, dropTarget: HTMLElement,
                 const model = await scene.assetLoader.loadModel({ url, filename });
                 scene.add(model);
                 scene.camera.focus();
-                events.fire('loaded', filename);
+                return model;
             } else {
                 throw new Error('Unsupported file type');
             }

diff --git a/src/splat-serialize.ts b/src/splat-serialize.ts
@@ -19,6 +19,7 @@ type WriteFunc = (data: Uint8Array, finalWrite?: boolean) => void;
 type SerializeOptions = {
     splats: Splat[];
     maxSHBands: number;
+    selected?: boolean;      // only export selected splats, only used for PLY export
 };
 
 type ViewerExportOptions = {
@@ -38,6 +39,12 @@ const countTotalSplats = (splats: Splat[]) => {
     }, 0);
 };
 
+const countSelectedSplats = (splats: Splat[]) => {
+    return splats.reduce((accum, splat) => {
+        return accum + splat.numSelected;
+    }, 0);
+};
+
 const getVertexProperties = (splatData: GSplatData) => {
     return new Set<string>(
         splatData.getElement('vertex')
@@ -309,7 +316,11 @@ const serializePly = async (options: SerializeOptions, write: WriteFunc) => {
     const { splats, maxSHBands } = options;
 
     // count the number of non-deleted splats
-    const totalSplats = countTotalSplats(splats);
+    const totalSplats = options.selected ? countSelectedSplats(splats) : countTotalSplats(splats);
+
+    if (totalSplats === 0) {
+        return;
+    }
 
     // this data is filtered out, as it holds internal editor state
     const internalProps = ['state', 'transform'];
@@ -354,6 +365,7 @@ const serializePly = async (options: SerializeOptions, write: WriteFunc) => {
 
         for (let i = 0; i < splatData.numSplats; ++i) {
             if ((state[i] & State.deleted) === State.deleted) continue;
+            if (options.selected && (state[i] & State.selected) === 0) continue;
 
             singleSplat.read(splat, i);
 

diff --git a/src/ui/localization.ts b/src/ui/localization.ts
@@ -36,6 +36,8 @@ const localizeInit = () => {
                     'select.unlock': 'Sperre aufheben',
                     'select.delete': 'Selektion aufheben',
                     'select.reset': 'Splats zurücksetzen',
+                    'select.duplicate': 'Duplizieren',
+                    'select.separate': 'Separieren',
 
                     // Help menu
                     'help': 'Hilfe',
@@ -204,6 +206,8 @@ const localizeInit = () => {
                     'select.unlock': 'Unlock All',
                     'select.delete': 'Delete Selection',
                     'select.reset': 'Reset Splat',
+                    'select.duplicate': 'Duplicate',
+                    'select.separate': 'Separate',
 
                     // Help menu
                     'help': 'Help',
@@ -381,6 +385,8 @@ const localizeInit = () => {
                     'select.unlock': 'Tout débloquer',
                     'select.delete': 'Supprimer la sélection',
                     'select.reset': 'Réinitialiser splat',
+                    'select.duplicate': 'Dupliquer',
+                    'select.separate': 'Séparer',
 
                     // Help menu
                     'help': 'Aide',
@@ -549,6 +555,8 @@ const localizeInit = () => {
                     'select.unlock': 'ロックを解除',
                     'select.delete': '選択を削除',
                     'select.reset': '変更を全てリセット',
+                    'select.duplicate': '複製',
+                    'select.separate': '分離',
 
                     // Help menu
                     'help': 'ヘルプ',
@@ -717,6 +725,8 @@ const localizeInit = () => {
                     'select.unlock': '모두 잠금 해제',
                     'select.delete': '선택 삭제',
                     'select.reset': 'Splat 재설정',
+                    'select.duplicate': '복제',
+                    'select.separate': '분리',
 
                     // Help menu
                     'help': '도움말',
@@ -885,6 +895,8 @@ const localizeInit = () => {
                     'select.unlock': '解锁全部',
                     'select.delete': '删除选择',
                     'select.reset': '重置 Splat',
+                    'select.duplicate': '复制',
+                    'select.separate': '分离',
 
                     // Help menu
                     'help': '帮助',

diff --git a/src/ui/menu.ts b/src/ui/menu.ts
@@ -13,9 +13,11 @@ import sceneOpen from './svg/open.svg';
 import logoSvg from './svg/playcanvas-logo.svg';
 import sceneSave from './svg/save.svg';
 import selectAll from './svg/select-all.svg';
+import selectDuplicate from './svg/select-duplicate.svg';
 import selectInverse from './svg/select-inverse.svg';
 import selectLock from './svg/select-lock.svg';
 import selectNone from './svg/select-none.svg';
+import selectSeparate from './svg/select-separate.svg';
 import selectUnlock from './svg/select-unlock.svg';
 
 const createSvg = (svgString: string) => {
@@ -195,7 +197,8 @@ class Menu extends Container {
             text: localize('select.lock'),
             icon: createSvg(selectLock),
             extra: 'H',
-            onSelect: () => events.fire('select.hide')
+            onSelect: () => events.fire('select.hide'),
+            isEnabled: () => events.invoke('selection.splats')
         }, {
             text: localize('select.unlock'),
             icon: createSvg(selectUnlock),
@@ -205,10 +208,23 @@ class Menu extends Container {
             text: localize('select.delete'),
             icon: createSvg(selectDelete),
             extra: 'Delete',
-            onSelect: () => events.fire('select.delete')
+            onSelect: () => events.fire('select.delete'),
+            isEnabled: () => events.invoke('selection.splats')
         }, {
             text: localize('select.reset'),
             onSelect: () => events.fire('scene.reset')
+        }, {
+            // separator
+        }, {
+            text: localize('select.duplicate'),
+            icon: createSvg(selectDuplicate),
+            onSelect: () => events.fire('select.duplicate'),
+            isEnabled: () => events.invoke('selection.splats')
+        }, {
+            text: localize('select.separate'),
+            icon: createSvg(selectSeparate),
+            onSelect: () => events.fire('select.separate'),
+            isEnabled: () => events.invoke('selection.splats')
         }]);
 
         const helpMenuPanel = new MenuPanel([{

diff --git a/src/ui/svg/select-duplicate.svg b/src/ui/svg/select-duplicate.svg
diff --git a/src/ui/svg/select-separate.svg b/src/ui/svg/select-separate.svg