Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scene origin and position #20

Merged
merged 1 commit into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "super-splat",
"version": "0.9.5",
"version": "0.9.6",
"author": "PlayCanvas<[email protected]>",
"homepage": "https://playcanvas.com",
"description": "All the splat things",
Expand Down
33 changes: 33 additions & 0 deletions src/editor-ops.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@ const registerEvents = (scene: Scene, editorUI: EditorUI) => {
const debugPlane = new Vec3();
let debugPlaneDistance = 0;

let showOrigin = false;

// draw debug mesh instances
scene.on('prerender', () => {
const app = scene.app;
Expand Down Expand Up @@ -361,6 +363,20 @@ const registerEvents = (scene: Scene, editorUI: EditorUI) => {
app.drawLines(lines, Color.RED);
}
});

if (showOrigin) {
const lines = [
0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 1
];
const colors = [
1, 0, 0, 1, 1, 0, 0, 1,
0, 1, 0, 1, 0, 1, 0, 1,
0, 0, 1, 1, 0, 0, 1, 1
];
app.drawLineArrays(lines, colors);
}
});

const editHistory = new EditHistory();
Expand Down Expand Up @@ -648,6 +664,23 @@ const registerEvents = (scene: Scene, editorUI: EditorUI) => {
});
});

events.on('showOrigin', (value: boolean) => {
showOrigin = value;
scene.forceRender = true;
});

events.on('scenePosition', (value: number[]) => {
forEachSplat((splatData: SplatData, resource: any) => {
resource.instances.forEach((instance: any) => {
instance.entity.setLocalPosition(value[0], value[1], value[2]);
});

updateSelection(splatData);
});

scene.updateBound();
});

events.on('sceneOrientation', (value: number[]) => {
forEachSplat((splatData: SplatData, resource: any) => {
resource.instances.forEach((instance: any) => {
Expand Down
1 change: 1 addition & 0 deletions src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ body {
width: 100px;
flex-shrink: 0;
flex-grow: 0;
line-height: 24px;
}

.control-element {
Expand Down
85 changes: 70 additions & 15 deletions src/ui/control-panel.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventHandler } from 'playcanvas';
import { Button, Container, Label, NumericInput, Panel, RadioButton, SelectInput, SliderInput, VectorInput } from 'pcui';
import { BooleanInput, Button, Container, Label, NumericInput, Panel, RadioButton, SelectInput, SliderInput, VectorInput } from 'pcui';
import { version as supersplatVersion } from '../../package.json';
import logo from './playcanvas-logo.png';

Expand Down Expand Up @@ -535,10 +535,10 @@ class ControlPanel extends Container {
selectionPanel.append(selectTools);
selectionPanel.append(selectGlobal);

// scene
const scenePanel = new Panel({
// modify
const modifyPanel = new Panel({
class: 'control-panel',
headerText: 'Scene'
headerText: 'Modify'
});

const deleteSelectionButton = new Button({
Expand All @@ -551,29 +551,75 @@ class ControlPanel extends Container {
text: 'Reset Scene'
});

modifyPanel.append(deleteSelectionButton);
modifyPanel.append(resetButton);

// scene
const scenePanel = new Panel({
class: 'control-panel',
headerText: 'Scene'
});

const origin = new Container({
class: 'control-parent'
});

const originLabel = new Label({
class: 'control-label',
text: 'Show Origin'
});

const originToggle = new BooleanInput({
class: 'control-element',
value: false
});

origin.append(originLabel);
origin.append(originToggle);

// position
const position = new Container({
class: 'control-parent'
});

const positionLabel = new Label({
class: 'control-label',
text: 'Position'
});

const positionVector = new VectorInput({
class: 'control-element-expand',
precision: 4,
dimensions: 3,
value: [0, 0, 0]
});

position.append(positionLabel);
position.append(positionVector);

// orientation
const sceneOrientation = new Container({
const rotation = new Container({
class: 'control-parent'
});

const sceneOrientationLabel = new Label({
const rotationLabel = new Label({
class: 'control-label',
text: 'Scene Orientation'
text: 'Rotation'
});

const sceneOrientationVector = new VectorInput({
const rotationVector = new VectorInput({
class: 'control-element-expand',
precision: 4,
dimensions: 3,
value: [0, 0, 0]
});

sceneOrientation.append(sceneOrientationLabel);
sceneOrientation.append(sceneOrientationVector);
rotation.append(rotationLabel);
rotation.append(rotationVector);

scenePanel.append(deleteSelectionButton);
scenePanel.append(resetButton);
scenePanel.append(sceneOrientation);
scenePanel.append(origin);
scenePanel.append(position);
scenePanel.append(rotation);

// export
const exportPanel = new Panel({
Expand Down Expand Up @@ -626,6 +672,7 @@ class ControlPanel extends Container {
this.append(title);
this.append(cameraPanel);
this.append(selectionPanel);
this.append(modifyPanel);
this.append(scenePanel);
this.append(exportPanel);
this.append(keyboardPanel);
Expand Down Expand Up @@ -761,8 +808,16 @@ class ControlPanel extends Container {
this.events.fire('selectByPlanePlacement', axes[selectByPlaneAxis.value], selectByPlaneOffset.value);
});

sceneOrientationVector.on('change', () => {
this.events.fire('sceneOrientation', sceneOrientationVector.value);
originToggle.on('change', (enabled: boolean) => {
this.events.fire('showOrigin', enabled);
});

positionVector.on('change', () => {
this.events.fire('scenePosition', positionVector.value);
});

rotationVector.on('change', () => {
this.events.fire('sceneOrientation', rotationVector.value);
});

deleteSelectionButton.on('click', () => {
Expand Down