spoint 0.1.0 → 0.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +134 -209
- package/SKILL.md +95 -0
- package/apps/environment/index.js +200 -1
- package/apps/environment/models/decorative/.gitkeep +0 -0
- package/apps/environment/models/hazards/.gitkeep +0 -0
- package/apps/environment/models/interactive/.gitkeep +0 -0
- package/apps/environment/models/structures/.gitkeep +0 -0
- package/apps/environment/smartObjects.js +114 -0
- package/apps/interactable/index.js +155 -0
- package/apps/physics-crate/index.js +15 -9
- package/apps/power-crate/index.js +18 -12
- package/apps/tps-game/$GDUPI.vrm +0 -0
- package/apps/tps-game/Cleetus.vrm +0 -0
- package/apps/tps-game/index.js +185 -27
- package/apps/world/index.js +68 -22
- package/bin/create-app.js +337 -0
- package/client/ARControls.js +301 -0
- package/client/LoadingManager.js +117 -0
- package/client/MobileControls.js +1122 -0
- package/client/anim-lib.glb +0 -0
- package/client/animation.js +306 -0
- package/client/app.js +1341 -65
- package/client/camera.js +191 -33
- package/client/createLoadingScreen.js +69 -0
- package/client/editor/bridge.js +113 -0
- package/client/editor/css/main.css +794 -0
- package/client/editor/images/rotate.svg +4 -0
- package/client/editor/images/scale.svg +4 -0
- package/client/editor/images/translate.svg +4 -0
- package/client/editor/index.html +103 -0
- package/client/editor/js/Command.js +41 -0
- package/client/editor/js/Config.js +81 -0
- package/client/editor/js/Editor.js +785 -0
- package/client/editor/js/EditorControls.js +438 -0
- package/client/editor/js/History.js +321 -0
- package/client/editor/js/Loader.js +987 -0
- package/client/editor/js/LoaderUtils.js +90 -0
- package/client/editor/js/Menubar.Add.js +510 -0
- package/client/editor/js/Menubar.Edit.js +145 -0
- package/client/editor/js/Menubar.File.js +466 -0
- package/client/editor/js/Menubar.Help.js +73 -0
- package/client/editor/js/Menubar.Status.js +51 -0
- package/client/editor/js/Menubar.View.js +183 -0
- package/client/editor/js/Menubar.js +27 -0
- package/client/editor/js/Player.js +53 -0
- package/client/editor/js/Resizer.js +58 -0
- package/client/editor/js/Script.js +503 -0
- package/client/editor/js/Selector.js +102 -0
- package/client/editor/js/Sidebar.Geometry.BoxGeometry.js +121 -0
- package/client/editor/js/Sidebar.Geometry.BufferGeometry.js +115 -0
- package/client/editor/js/Sidebar.Geometry.CapsuleGeometry.js +97 -0
- package/client/editor/js/Sidebar.Geometry.CircleGeometry.js +97 -0
- package/client/editor/js/Sidebar.Geometry.CylinderGeometry.js +121 -0
- package/client/editor/js/Sidebar.Geometry.DodecahedronGeometry.js +73 -0
- package/client/editor/js/Sidebar.Geometry.ExtrudeGeometry.js +196 -0
- package/client/editor/js/Sidebar.Geometry.IcosahedronGeometry.js +73 -0
- package/client/editor/js/Sidebar.Geometry.LatheGeometry.js +98 -0
- package/client/editor/js/Sidebar.Geometry.Modifiers.js +73 -0
- package/client/editor/js/Sidebar.Geometry.OctahedronGeometry.js +74 -0
- package/client/editor/js/Sidebar.Geometry.PlaneGeometry.js +97 -0
- package/client/editor/js/Sidebar.Geometry.RingGeometry.js +121 -0
- package/client/editor/js/Sidebar.Geometry.ShapeGeometry.js +76 -0
- package/client/editor/js/Sidebar.Geometry.SphereGeometry.js +133 -0
- package/client/editor/js/Sidebar.Geometry.TetrahedronGeometry.js +74 -0
- package/client/editor/js/Sidebar.Geometry.TorusGeometry.js +109 -0
- package/client/editor/js/Sidebar.Geometry.TorusKnotGeometry.js +121 -0
- package/client/editor/js/Sidebar.Geometry.TubeGeometry.js +135 -0
- package/client/editor/js/Sidebar.Geometry.js +332 -0
- package/client/editor/js/Sidebar.Material.BooleanProperty.js +60 -0
- package/client/editor/js/Sidebar.Material.ColorProperty.js +87 -0
- package/client/editor/js/Sidebar.Material.ConstantProperty.js +62 -0
- package/client/editor/js/Sidebar.Material.MapProperty.js +249 -0
- package/client/editor/js/Sidebar.Material.NumberProperty.js +60 -0
- package/client/editor/js/Sidebar.Material.Program.js +73 -0
- package/client/editor/js/Sidebar.Material.RangeValueProperty.js +63 -0
- package/client/editor/js/Sidebar.Material.js +751 -0
- package/client/editor/js/Sidebar.Object.Animation.js +102 -0
- package/client/editor/js/Sidebar.Object.js +898 -0
- package/client/editor/js/Sidebar.Project.App.js +165 -0
- package/client/editor/js/Sidebar.Project.Image.js +225 -0
- package/client/editor/js/Sidebar.Project.Materials.js +82 -0
- package/client/editor/js/Sidebar.Project.Renderer.js +144 -0
- package/client/editor/js/Sidebar.Project.Video.js +242 -0
- package/client/editor/js/Sidebar.Project.js +31 -0
- package/client/editor/js/Sidebar.Properties.js +73 -0
- package/client/editor/js/Sidebar.Scene.js +585 -0
- package/client/editor/js/Sidebar.Script.js +129 -0
- package/client/editor/js/Sidebar.Settings.History.js +146 -0
- package/client/editor/js/Sidebar.Settings.Shortcuts.js +175 -0
- package/client/editor/js/Sidebar.Settings.js +60 -0
- package/client/editor/js/Sidebar.js +41 -0
- package/client/editor/js/Storage.js +98 -0
- package/client/editor/js/Strings.js +2028 -0
- package/client/editor/js/Toolbar.js +84 -0
- package/client/editor/js/Viewport.Controls.js +92 -0
- package/client/editor/js/Viewport.Info.js +136 -0
- package/client/editor/js/Viewport.Pathtracer.js +91 -0
- package/client/editor/js/Viewport.ViewHelper.js +39 -0
- package/client/editor/js/Viewport.XR.js +222 -0
- package/client/editor/js/Viewport.js +900 -0
- package/client/editor/js/commands/AddObjectCommand.js +68 -0
- package/client/editor/js/commands/AddScriptCommand.js +75 -0
- package/client/editor/js/commands/Commands.js +23 -0
- package/client/editor/js/commands/MoveObjectCommand.js +111 -0
- package/client/editor/js/commands/MultiCmdsCommand.js +85 -0
- package/client/editor/js/commands/RemoveObjectCommand.js +88 -0
- package/client/editor/js/commands/RemoveScriptCommand.js +81 -0
- package/client/editor/js/commands/SetColorCommand.js +73 -0
- package/client/editor/js/commands/SetGeometryCommand.js +87 -0
- package/client/editor/js/commands/SetGeometryValueCommand.js +70 -0
- package/client/editor/js/commands/SetMaterialColorCommand.js +86 -0
- package/client/editor/js/commands/SetMaterialCommand.js +79 -0
- package/client/editor/js/commands/SetMaterialMapCommand.js +143 -0
- package/client/editor/js/commands/SetMaterialRangeCommand.js +91 -0
- package/client/editor/js/commands/SetMaterialValueCommand.js +90 -0
- package/client/editor/js/commands/SetMaterialVectorCommand.js +79 -0
- package/client/editor/js/commands/SetPositionCommand.js +84 -0
- package/client/editor/js/commands/SetRotationCommand.js +84 -0
- package/client/editor/js/commands/SetScaleCommand.js +84 -0
- package/client/editor/js/commands/SetSceneCommand.js +103 -0
- package/client/editor/js/commands/SetScriptValueCommand.js +80 -0
- package/client/editor/js/commands/SetShadowValueCommand.js +73 -0
- package/client/editor/js/commands/SetUuidCommand.js +70 -0
- package/client/editor/js/commands/SetValueCommand.js +75 -0
- package/client/editor/js/libs/acorn/acorn.js +3236 -0
- package/client/editor/js/libs/acorn/acorn_loose.js +1299 -0
- package/client/editor/js/libs/acorn/walk.js +344 -0
- package/client/editor/js/libs/app/index.html +57 -0
- package/client/editor/js/libs/app.js +251 -0
- package/client/editor/js/libs/codemirror/addon/dialog.css +32 -0
- package/client/editor/js/libs/codemirror/addon/dialog.js +163 -0
- package/client/editor/js/libs/codemirror/addon/show-hint.css +36 -0
- package/client/editor/js/libs/codemirror/addon/show-hint.js +529 -0
- package/client/editor/js/libs/codemirror/addon/tern.css +87 -0
- package/client/editor/js/libs/codemirror/addon/tern.js +750 -0
- package/client/editor/js/libs/codemirror/codemirror.css +344 -0
- package/client/editor/js/libs/codemirror/codemirror.js +9849 -0
- package/client/editor/js/libs/codemirror/mode/glsl.js +233 -0
- package/client/editor/js/libs/codemirror/mode/javascript.js +959 -0
- package/client/editor/js/libs/codemirror/theme/monokai.css +41 -0
- package/client/editor/js/libs/esprima.js +6401 -0
- package/client/editor/js/libs/jsonlint.js +453 -0
- package/client/editor/js/libs/signals.min.js +14 -0
- package/client/editor/js/libs/tern-threejs/threejs.js +5031 -0
- package/client/editor/js/libs/ternjs/comment.js +87 -0
- package/client/editor/js/libs/ternjs/def.js +588 -0
- package/client/editor/js/libs/ternjs/doc_comment.js +401 -0
- package/client/editor/js/libs/ternjs/infer.js +1635 -0
- package/client/editor/js/libs/ternjs/polyfill.js +80 -0
- package/client/editor/js/libs/ternjs/signal.js +26 -0
- package/client/editor/js/libs/ternjs/tern.js +993 -0
- package/client/editor/js/libs/ui.js +1346 -0
- package/client/editor/js/libs/ui.three.js +855 -0
- package/client/facial-animation.js +455 -0
- package/client/index.html +7 -4
- package/client/loading.css +147 -0
- package/client/loading.html +25 -0
- package/client/style.css +251 -0
- package/package.json +7 -3
- package/server.js +9 -1
- package/src/apps/AppContext.js +1 -1
- package/src/apps/AppLoader.js +50 -37
- package/src/apps/AppRuntime.js +32 -8
- package/src/client/InputHandler.js +233 -0
- package/src/client/JitterBuffer.js +207 -0
- package/src/client/KalmanFilter.js +125 -0
- package/src/client/MessageHandler.js +101 -0
- package/src/client/PhysicsNetworkClient.js +141 -68
- package/src/client/ReconnectManager.js +62 -0
- package/src/client/SmoothInterpolation.js +127 -0
- package/src/client/SnapshotProcessor.js +144 -0
- package/src/connection/ConnectionManager.js +21 -3
- package/src/connection/SessionStore.js +13 -3
- package/src/index.client.js +4 -6
- package/src/netcode/EventLog.js +29 -15
- package/src/netcode/LagCompensator.js +25 -26
- package/src/netcode/NetworkState.js +4 -1
- package/src/netcode/PhysicsIntegration.js +20 -6
- package/src/netcode/PlayerManager.js +10 -2
- package/src/netcode/SnapshotEncoder.js +66 -19
- package/src/netcode/TickSystem.js +13 -4
- package/src/physics/World.js +66 -13
- package/src/protocol/msgpack.js +90 -63
- package/src/sdk/ReloadHandlers.js +12 -2
- package/src/sdk/ReloadManager.js +5 -0
- package/src/sdk/ServerHandlers.js +50 -11
- package/src/sdk/StaticHandler.js +22 -6
- package/src/sdk/TickHandler.js +101 -34
- package/src/sdk/scaffold.js +28 -0
- package/src/sdk/server.js +59 -33
- package/src/shared/movement.js +2 -1
- package/src/spatial/Octree.js +5 -0
- package/apps/interactive-door/index.js +0 -33
- package/apps/patrol-npc/index.js +0 -37
- package/src/connection/QualityMonitor.js +0 -46
- package/src/debug/StateInspector.js +0 -42
- package/src/index.js +0 -1
- package/src/index.server.js +0 -27
- package/src/protocol/Codec.js +0 -60
- package/src/protocol/SequenceTracker.js +0 -71
- package/src/sdk/ClientMessageHandler.js +0 -80
- package/src/sdk/client.js +0 -122
- package/world/kaira.glb +0 -0
- package/world/schwust.glb +0 -0
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { UIPanel, UIButton, UICheckbox } from './libs/ui.js';
|
|
2
|
+
|
|
3
|
+
function Toolbar( editor ) {
|
|
4
|
+
|
|
5
|
+
const signals = editor.signals;
|
|
6
|
+
const strings = editor.strings;
|
|
7
|
+
|
|
8
|
+
const container = new UIPanel();
|
|
9
|
+
container.setId( 'toolbar' );
|
|
10
|
+
|
|
11
|
+
// translate / rotate / scale
|
|
12
|
+
|
|
13
|
+
const translateIcon = document.createElement( 'img' );
|
|
14
|
+
translateIcon.title = strings.getKey( 'toolbar/translate' );
|
|
15
|
+
translateIcon.src = 'images/translate.svg';
|
|
16
|
+
|
|
17
|
+
const translate = new UIButton();
|
|
18
|
+
translate.dom.className = 'Button selected';
|
|
19
|
+
translate.dom.appendChild( translateIcon );
|
|
20
|
+
translate.onClick( function () {
|
|
21
|
+
|
|
22
|
+
signals.transformModeChanged.dispatch( 'translate' );
|
|
23
|
+
|
|
24
|
+
} );
|
|
25
|
+
container.add( translate );
|
|
26
|
+
|
|
27
|
+
const rotateIcon = document.createElement( 'img' );
|
|
28
|
+
rotateIcon.title = strings.getKey( 'toolbar/rotate' );
|
|
29
|
+
rotateIcon.src = 'images/rotate.svg';
|
|
30
|
+
|
|
31
|
+
const rotate = new UIButton();
|
|
32
|
+
rotate.dom.appendChild( rotateIcon );
|
|
33
|
+
rotate.onClick( function () {
|
|
34
|
+
|
|
35
|
+
signals.transformModeChanged.dispatch( 'rotate' );
|
|
36
|
+
|
|
37
|
+
} );
|
|
38
|
+
container.add( rotate );
|
|
39
|
+
|
|
40
|
+
const scaleIcon = document.createElement( 'img' );
|
|
41
|
+
scaleIcon.title = strings.getKey( 'toolbar/scale' );
|
|
42
|
+
scaleIcon.src = 'images/scale.svg';
|
|
43
|
+
|
|
44
|
+
const scale = new UIButton();
|
|
45
|
+
scale.dom.appendChild( scaleIcon );
|
|
46
|
+
scale.onClick( function () {
|
|
47
|
+
|
|
48
|
+
signals.transformModeChanged.dispatch( 'scale' );
|
|
49
|
+
|
|
50
|
+
} );
|
|
51
|
+
container.add( scale );
|
|
52
|
+
|
|
53
|
+
const local = new UICheckbox( false );
|
|
54
|
+
local.dom.title = strings.getKey( 'toolbar/local' );
|
|
55
|
+
local.onChange( function () {
|
|
56
|
+
|
|
57
|
+
signals.spaceChanged.dispatch( this.getValue() === true ? 'local' : 'world' );
|
|
58
|
+
|
|
59
|
+
} );
|
|
60
|
+
container.add( local );
|
|
61
|
+
|
|
62
|
+
//
|
|
63
|
+
|
|
64
|
+
signals.transformModeChanged.add( function ( mode ) {
|
|
65
|
+
|
|
66
|
+
translate.dom.classList.remove( 'selected' );
|
|
67
|
+
rotate.dom.classList.remove( 'selected' );
|
|
68
|
+
scale.dom.classList.remove( 'selected' );
|
|
69
|
+
|
|
70
|
+
switch ( mode ) {
|
|
71
|
+
|
|
72
|
+
case 'translate': translate.dom.classList.add( 'selected' ); break;
|
|
73
|
+
case 'rotate': rotate.dom.classList.add( 'selected' ); break;
|
|
74
|
+
case 'scale': scale.dom.classList.add( 'selected' ); break;
|
|
75
|
+
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
} );
|
|
79
|
+
|
|
80
|
+
return container;
|
|
81
|
+
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export { Toolbar };
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { UIPanel, UISelect } from './libs/ui.js';
|
|
2
|
+
|
|
3
|
+
function ViewportControls( editor ) {
|
|
4
|
+
|
|
5
|
+
const signals = editor.signals;
|
|
6
|
+
|
|
7
|
+
const container = new UIPanel();
|
|
8
|
+
container.setPosition( 'absolute' );
|
|
9
|
+
container.setRight( '10px' );
|
|
10
|
+
container.setTop( '10px' );
|
|
11
|
+
container.setColor( '#ffffff' );
|
|
12
|
+
|
|
13
|
+
// camera
|
|
14
|
+
|
|
15
|
+
const cameraSelect = new UISelect();
|
|
16
|
+
cameraSelect.setMarginLeft( '10px' );
|
|
17
|
+
cameraSelect.setMarginRight( '10px' );
|
|
18
|
+
cameraSelect.onChange( function () {
|
|
19
|
+
|
|
20
|
+
editor.setViewportCamera( this.getValue() );
|
|
21
|
+
|
|
22
|
+
} );
|
|
23
|
+
container.add( cameraSelect );
|
|
24
|
+
|
|
25
|
+
signals.cameraAdded.add( update );
|
|
26
|
+
signals.cameraRemoved.add( update );
|
|
27
|
+
signals.objectChanged.add( function ( object ) {
|
|
28
|
+
|
|
29
|
+
if ( object.isCamera ) {
|
|
30
|
+
|
|
31
|
+
update();
|
|
32
|
+
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
} );
|
|
36
|
+
|
|
37
|
+
// shading
|
|
38
|
+
|
|
39
|
+
const shadingSelect = new UISelect();
|
|
40
|
+
shadingSelect.setOptions( { 'realistic': 'realistic', 'solid': 'solid', 'normals': 'normals', 'wireframe': 'wireframe' } );
|
|
41
|
+
shadingSelect.setValue( 'solid' );
|
|
42
|
+
shadingSelect.onChange( function () {
|
|
43
|
+
|
|
44
|
+
editor.setViewportShading( this.getValue() );
|
|
45
|
+
|
|
46
|
+
} );
|
|
47
|
+
container.add( shadingSelect );
|
|
48
|
+
|
|
49
|
+
signals.editorCleared.add( function () {
|
|
50
|
+
|
|
51
|
+
editor.setViewportCamera( editor.camera.uuid );
|
|
52
|
+
|
|
53
|
+
shadingSelect.setValue( 'solid' );
|
|
54
|
+
editor.setViewportShading( shadingSelect.getValue() );
|
|
55
|
+
|
|
56
|
+
} );
|
|
57
|
+
|
|
58
|
+
signals.cameraResetted.add( update );
|
|
59
|
+
|
|
60
|
+
update();
|
|
61
|
+
|
|
62
|
+
//
|
|
63
|
+
|
|
64
|
+
function update() {
|
|
65
|
+
|
|
66
|
+
const options = {};
|
|
67
|
+
|
|
68
|
+
const cameras = editor.cameras;
|
|
69
|
+
|
|
70
|
+
for ( const key in cameras ) {
|
|
71
|
+
|
|
72
|
+
const camera = cameras[ key ];
|
|
73
|
+
options[ camera.uuid ] = camera.name;
|
|
74
|
+
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
cameraSelect.setOptions( options );
|
|
78
|
+
|
|
79
|
+
const selectedCamera = ( editor.viewportCamera.uuid in options )
|
|
80
|
+
? editor.viewportCamera
|
|
81
|
+
: editor.camera;
|
|
82
|
+
|
|
83
|
+
cameraSelect.setValue( selectedCamera.uuid );
|
|
84
|
+
editor.setViewportCamera( selectedCamera.uuid );
|
|
85
|
+
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return container;
|
|
89
|
+
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
export { ViewportControls };
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { UIPanel, UIBreak, UIText } from './libs/ui.js';
|
|
2
|
+
|
|
3
|
+
function ViewportInfo( editor ) {
|
|
4
|
+
|
|
5
|
+
const signals = editor.signals;
|
|
6
|
+
const strings = editor.strings;
|
|
7
|
+
|
|
8
|
+
const container = new UIPanel();
|
|
9
|
+
container.setId( 'info' );
|
|
10
|
+
container.setPosition( 'absolute' );
|
|
11
|
+
container.setLeft( '10px' );
|
|
12
|
+
container.setBottom( '20px' );
|
|
13
|
+
container.setFontSize( '12px' );
|
|
14
|
+
container.setColor( '#fff' );
|
|
15
|
+
container.setTextTransform( 'lowercase' );
|
|
16
|
+
|
|
17
|
+
const objectsText = new UIText( '0' ).setTextAlign( 'right' ).setWidth( '60px' ).setMarginRight( '6px' );
|
|
18
|
+
const verticesText = new UIText( '0' ).setTextAlign( 'right' ).setWidth( '60px' ).setMarginRight( '6px' );
|
|
19
|
+
const trianglesText = new UIText( '0' ).setTextAlign( 'right' ).setWidth( '60px' ).setMarginRight( '6px' );
|
|
20
|
+
const frametimeText = new UIText( '0' ).setTextAlign( 'right' ).setWidth( '60px' ).setMarginRight( '6px' );
|
|
21
|
+
const samplesText = new UIText( '0' ).setTextAlign( 'right' ).setWidth( '60px' ).setMarginRight( '6px' ).setHidden( true );
|
|
22
|
+
|
|
23
|
+
const objectsUnitText = new UIText( strings.getKey( 'viewport/info/objects' ) );
|
|
24
|
+
const verticesUnitText = new UIText( strings.getKey( 'viewport/info/vertices' ) );
|
|
25
|
+
const trianglesUnitText = new UIText( strings.getKey( 'viewport/info/triangles' ) );
|
|
26
|
+
const samplesUnitText = new UIText( strings.getKey( 'viewport/info/samples' ) ).setHidden( true );
|
|
27
|
+
|
|
28
|
+
container.add( objectsText, objectsUnitText, new UIBreak() );
|
|
29
|
+
container.add( verticesText, verticesUnitText, new UIBreak() );
|
|
30
|
+
container.add( trianglesText, trianglesUnitText, new UIBreak() );
|
|
31
|
+
container.add( frametimeText, new UIText( strings.getKey( 'viewport/info/rendertime' ) ), new UIBreak() );
|
|
32
|
+
container.add( samplesText, samplesUnitText, new UIBreak() );
|
|
33
|
+
|
|
34
|
+
signals.objectAdded.add( update );
|
|
35
|
+
signals.objectRemoved.add( update );
|
|
36
|
+
signals.geometryChanged.add( update );
|
|
37
|
+
signals.sceneRendered.add( updateFrametime );
|
|
38
|
+
|
|
39
|
+
//
|
|
40
|
+
|
|
41
|
+
const pluralRules = new Intl.PluralRules( editor.config.getKey( 'language' ) );
|
|
42
|
+
|
|
43
|
+
//
|
|
44
|
+
|
|
45
|
+
function update() {
|
|
46
|
+
|
|
47
|
+
const scene = editor.scene;
|
|
48
|
+
|
|
49
|
+
let objects = 0, vertices = 0, triangles = 0;
|
|
50
|
+
|
|
51
|
+
for ( let i = 0, l = scene.children.length; i < l; i ++ ) {
|
|
52
|
+
|
|
53
|
+
const object = scene.children[ i ];
|
|
54
|
+
|
|
55
|
+
object.traverseVisible( function ( object ) {
|
|
56
|
+
|
|
57
|
+
objects ++;
|
|
58
|
+
|
|
59
|
+
if ( object.isMesh || object.isPoints ) {
|
|
60
|
+
|
|
61
|
+
const geometry = object.geometry;
|
|
62
|
+
|
|
63
|
+
vertices += geometry.attributes.position.count;
|
|
64
|
+
|
|
65
|
+
if ( object.isMesh ) {
|
|
66
|
+
|
|
67
|
+
if ( geometry.index !== null ) {
|
|
68
|
+
|
|
69
|
+
triangles += geometry.index.count / 3;
|
|
70
|
+
|
|
71
|
+
} else {
|
|
72
|
+
|
|
73
|
+
triangles += geometry.attributes.position.count / 3;
|
|
74
|
+
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
} );
|
|
82
|
+
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
objectsText.setValue( editor.utils.formatNumber( objects ) );
|
|
86
|
+
verticesText.setValue( editor.utils.formatNumber( vertices ) );
|
|
87
|
+
trianglesText.setValue( editor.utils.formatNumber( triangles ) );
|
|
88
|
+
|
|
89
|
+
const pluralRules = new Intl.PluralRules( editor.config.getKey( 'language' ) );
|
|
90
|
+
|
|
91
|
+
const objectsStringKey = ( pluralRules.select( objects ) === 'one' ) ? 'viewport/info/object' : 'viewport/info/objects';
|
|
92
|
+
objectsUnitText.setValue( strings.getKey( objectsStringKey ) );
|
|
93
|
+
|
|
94
|
+
const verticesStringKey = ( pluralRules.select( vertices ) === 'one' ) ? 'viewport/info/vertex' : 'viewport/info/vertices';
|
|
95
|
+
verticesUnitText.setValue( strings.getKey( verticesStringKey ) );
|
|
96
|
+
|
|
97
|
+
const trianglesStringKey = ( pluralRules.select( triangles ) === 'one' ) ? 'viewport/info/triangle' : 'viewport/info/triangles';
|
|
98
|
+
trianglesUnitText.setValue( strings.getKey( trianglesStringKey ) );
|
|
99
|
+
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function updateFrametime( frametime ) {
|
|
103
|
+
|
|
104
|
+
frametimeText.setValue( Number( frametime ).toFixed( 2 ) );
|
|
105
|
+
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
//
|
|
109
|
+
|
|
110
|
+
editor.signals.pathTracerUpdated.add( function ( samples ) {
|
|
111
|
+
|
|
112
|
+
samples = Math.floor( samples );
|
|
113
|
+
|
|
114
|
+
samplesText.setValue( samples );
|
|
115
|
+
|
|
116
|
+
const samplesStringKey = ( pluralRules.select( samples ) === 'one' ) ? 'viewport/info/sample' : 'viewport/info/samples';
|
|
117
|
+
samplesUnitText.setValue( strings.getKey( samplesStringKey ) );
|
|
118
|
+
|
|
119
|
+
} );
|
|
120
|
+
|
|
121
|
+
editor.signals.viewportShadingChanged.add( function () {
|
|
122
|
+
|
|
123
|
+
const isRealisticShading = ( editor.viewportShading === 'realistic' );
|
|
124
|
+
|
|
125
|
+
samplesText.setHidden( ! isRealisticShading );
|
|
126
|
+
samplesUnitText.setHidden( ! isRealisticShading );
|
|
127
|
+
|
|
128
|
+
container.setBottom( isRealisticShading ? '32px' : '20px' );
|
|
129
|
+
|
|
130
|
+
} );
|
|
131
|
+
|
|
132
|
+
return container;
|
|
133
|
+
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
export { ViewportInfo };
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { WebGLPathTracer } from 'three-gpu-pathtracer';
|
|
2
|
+
|
|
3
|
+
function ViewportPathtracer( renderer ) {
|
|
4
|
+
|
|
5
|
+
let pathTracer = null;
|
|
6
|
+
|
|
7
|
+
function init( scene, camera ) {
|
|
8
|
+
|
|
9
|
+
if ( pathTracer === null ) {
|
|
10
|
+
|
|
11
|
+
pathTracer = new WebGLPathTracer( renderer );
|
|
12
|
+
pathTracer.filterGlossyFactor = 0.5;
|
|
13
|
+
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
pathTracer.setScene( scene, camera );
|
|
17
|
+
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function setSize( /* width, height */ ) {
|
|
21
|
+
|
|
22
|
+
if ( pathTracer === null ) return;
|
|
23
|
+
|
|
24
|
+
// path tracer size automatically updates based on the canvas
|
|
25
|
+
pathTracer.updateCamera();
|
|
26
|
+
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function setBackground( /* background, blurriness */ ) {
|
|
30
|
+
|
|
31
|
+
if ( pathTracer === null ) return;
|
|
32
|
+
|
|
33
|
+
// update environment settings based on initialized scene fields
|
|
34
|
+
pathTracer.updateEnvironment();
|
|
35
|
+
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function updateMaterials() {
|
|
39
|
+
|
|
40
|
+
if ( pathTracer === null ) return;
|
|
41
|
+
|
|
42
|
+
pathTracer.updateMaterials();
|
|
43
|
+
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
function setEnvironment( /* environment */ ) {
|
|
47
|
+
|
|
48
|
+
if ( pathTracer === null ) return;
|
|
49
|
+
|
|
50
|
+
pathTracer.updateEnvironment();
|
|
51
|
+
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function update() {
|
|
55
|
+
|
|
56
|
+
if ( pathTracer === null ) return;
|
|
57
|
+
|
|
58
|
+
pathTracer.renderSample();
|
|
59
|
+
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function reset() {
|
|
63
|
+
|
|
64
|
+
if ( pathTracer === null ) return;
|
|
65
|
+
|
|
66
|
+
pathTracer.updateCamera();
|
|
67
|
+
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function getSamples() {
|
|
71
|
+
|
|
72
|
+
if ( pathTracer === null ) return;
|
|
73
|
+
|
|
74
|
+
return pathTracer.samples;
|
|
75
|
+
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
return {
|
|
79
|
+
init: init,
|
|
80
|
+
setSize: setSize,
|
|
81
|
+
setBackground: setBackground,
|
|
82
|
+
setEnvironment: setEnvironment,
|
|
83
|
+
updateMaterials: updateMaterials,
|
|
84
|
+
update: update,
|
|
85
|
+
reset: reset,
|
|
86
|
+
getSamples: getSamples
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export { ViewportPathtracer };
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { UIPanel } from './libs/ui.js';
|
|
2
|
+
|
|
3
|
+
import { ViewHelper as ViewHelperBase } from 'three/addons/helpers/ViewHelper.js';
|
|
4
|
+
|
|
5
|
+
class ViewHelper extends ViewHelperBase {
|
|
6
|
+
|
|
7
|
+
constructor( editorCamera, container ) {
|
|
8
|
+
|
|
9
|
+
super( editorCamera, container.dom );
|
|
10
|
+
|
|
11
|
+
const panel = new UIPanel();
|
|
12
|
+
panel.setId( 'viewHelper' );
|
|
13
|
+
panel.setPosition( 'absolute' );
|
|
14
|
+
panel.setRight( '0px' );
|
|
15
|
+
panel.setBottom( '0px' );
|
|
16
|
+
panel.setHeight( '128px' );
|
|
17
|
+
panel.setWidth( '128px' );
|
|
18
|
+
|
|
19
|
+
panel.dom.addEventListener( 'pointerup', ( event ) => {
|
|
20
|
+
|
|
21
|
+
event.stopPropagation();
|
|
22
|
+
|
|
23
|
+
this.handleClick( event );
|
|
24
|
+
|
|
25
|
+
} );
|
|
26
|
+
|
|
27
|
+
panel.dom.addEventListener( 'pointerdown', function ( event ) {
|
|
28
|
+
|
|
29
|
+
event.stopPropagation();
|
|
30
|
+
|
|
31
|
+
} );
|
|
32
|
+
|
|
33
|
+
container.add( panel );
|
|
34
|
+
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export { ViewHelper };
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import * as THREE from 'three';
|
|
2
|
+
|
|
3
|
+
import { HTMLMesh } from 'three/addons/interactive/HTMLMesh.js';
|
|
4
|
+
import { InteractiveGroup } from 'three/addons/interactive/InteractiveGroup.js';
|
|
5
|
+
|
|
6
|
+
import { XRControllerModelFactory } from 'three/addons/webxr/XRControllerModelFactory.js';
|
|
7
|
+
|
|
8
|
+
class XR {
|
|
9
|
+
|
|
10
|
+
constructor( editor, controls ) {
|
|
11
|
+
|
|
12
|
+
const selector = editor.selector;
|
|
13
|
+
const signals = editor.signals;
|
|
14
|
+
|
|
15
|
+
let controllers = null;
|
|
16
|
+
let group = null;
|
|
17
|
+
let renderer = null;
|
|
18
|
+
|
|
19
|
+
const camera = new THREE.PerspectiveCamera();
|
|
20
|
+
|
|
21
|
+
const onSessionStarted = async ( session ) => {
|
|
22
|
+
|
|
23
|
+
camera.copy( editor.camera );
|
|
24
|
+
|
|
25
|
+
const sidebar = document.getElementById( 'sidebar' );
|
|
26
|
+
sidebar.style.width = '350px';
|
|
27
|
+
sidebar.style.height = '700px';
|
|
28
|
+
|
|
29
|
+
//
|
|
30
|
+
|
|
31
|
+
if ( controllers === null ) {
|
|
32
|
+
|
|
33
|
+
const geometry = new THREE.BufferGeometry();
|
|
34
|
+
geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 0, 0, - 5 ], 3 ) );
|
|
35
|
+
|
|
36
|
+
const line = new THREE.Line( geometry );
|
|
37
|
+
|
|
38
|
+
const raycaster = new THREE.Raycaster();
|
|
39
|
+
|
|
40
|
+
function onSelect( event ) {
|
|
41
|
+
|
|
42
|
+
const controller = event.target;
|
|
43
|
+
|
|
44
|
+
controller1.userData.active = false;
|
|
45
|
+
controller2.userData.active = false;
|
|
46
|
+
|
|
47
|
+
if ( controller === controller1 ) {
|
|
48
|
+
|
|
49
|
+
controller1.userData.active = true;
|
|
50
|
+
controller1.add( line );
|
|
51
|
+
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if ( controller === controller2 ) {
|
|
55
|
+
|
|
56
|
+
controller2.userData.active = true;
|
|
57
|
+
controller2.add( line );
|
|
58
|
+
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
raycaster.setFromXRController( controller );
|
|
62
|
+
|
|
63
|
+
const intersects = selector.getIntersects( raycaster );
|
|
64
|
+
|
|
65
|
+
if ( intersects.length > 0 ) {
|
|
66
|
+
|
|
67
|
+
// Ignore menu clicks
|
|
68
|
+
|
|
69
|
+
const intersect = intersects[ 0 ];
|
|
70
|
+
if ( intersect.object === group.children[ 0 ] ) return;
|
|
71
|
+
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
signals.intersectionsDetected.dispatch( intersects );
|
|
75
|
+
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function onControllerEvent( event ) {
|
|
79
|
+
|
|
80
|
+
const controller = event.target;
|
|
81
|
+
|
|
82
|
+
if ( controller.userData.active === false ) return;
|
|
83
|
+
|
|
84
|
+
controls.getRaycaster().setFromXRController( controller );
|
|
85
|
+
|
|
86
|
+
switch ( event.type ) {
|
|
87
|
+
|
|
88
|
+
case 'selectstart':
|
|
89
|
+
controls.pointerDown( null );
|
|
90
|
+
break;
|
|
91
|
+
|
|
92
|
+
case 'selectend':
|
|
93
|
+
controls.pointerUp( null );
|
|
94
|
+
break;
|
|
95
|
+
|
|
96
|
+
case 'move':
|
|
97
|
+
controls.pointerHover( null );
|
|
98
|
+
controls.pointerMove( null );
|
|
99
|
+
break;
|
|
100
|
+
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
controllers = new THREE.Group();
|
|
106
|
+
|
|
107
|
+
const controller1 = renderer.xr.getController( 0 );
|
|
108
|
+
controller1.addEventListener( 'select', onSelect );
|
|
109
|
+
controller1.addEventListener( 'selectstart', onControllerEvent );
|
|
110
|
+
controller1.addEventListener( 'selectend', onControllerEvent );
|
|
111
|
+
controller1.addEventListener( 'move', onControllerEvent );
|
|
112
|
+
controller1.userData.active = false;
|
|
113
|
+
controllers.add( controller1 );
|
|
114
|
+
|
|
115
|
+
const controller2 = renderer.xr.getController( 1 );
|
|
116
|
+
controller2.addEventListener( 'select', onSelect );
|
|
117
|
+
controller2.addEventListener( 'selectstart', onControllerEvent );
|
|
118
|
+
controller2.addEventListener( 'selectend', onControllerEvent );
|
|
119
|
+
controller2.addEventListener( 'move', onControllerEvent );
|
|
120
|
+
controller2.userData.active = true;
|
|
121
|
+
controllers.add( controller2 );
|
|
122
|
+
|
|
123
|
+
//
|
|
124
|
+
|
|
125
|
+
const controllerModelFactory = new XRControllerModelFactory();
|
|
126
|
+
|
|
127
|
+
const controllerGrip1 = renderer.xr.getControllerGrip( 0 );
|
|
128
|
+
controllerGrip1.add( controllerModelFactory.createControllerModel( controllerGrip1 ) );
|
|
129
|
+
controllers.add( controllerGrip1 );
|
|
130
|
+
|
|
131
|
+
const controllerGrip2 = renderer.xr.getControllerGrip( 1 );
|
|
132
|
+
controllerGrip2.add( controllerModelFactory.createControllerModel( controllerGrip2 ) );
|
|
133
|
+
controllers.add( controllerGrip2 );
|
|
134
|
+
|
|
135
|
+
// menu
|
|
136
|
+
|
|
137
|
+
group = new InteractiveGroup();
|
|
138
|
+
|
|
139
|
+
const mesh = new HTMLMesh( sidebar );
|
|
140
|
+
mesh.name = 'picker'; // Make Selector be aware of the menu
|
|
141
|
+
mesh.position.set( 0.5, 1.0, - 0.5 );
|
|
142
|
+
mesh.rotation.y = - 0.5;
|
|
143
|
+
group.add( mesh );
|
|
144
|
+
|
|
145
|
+
group.listenToXRControllerEvents( controller1 );
|
|
146
|
+
group.listenToXRControllerEvents( controller2 );
|
|
147
|
+
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
editor.sceneHelpers.add( group );
|
|
151
|
+
editor.sceneHelpers.add( controllers );
|
|
152
|
+
|
|
153
|
+
renderer.xr.enabled = true;
|
|
154
|
+
renderer.xr.addEventListener( 'sessionend', onSessionEnded );
|
|
155
|
+
|
|
156
|
+
await renderer.xr.setSession( session );
|
|
157
|
+
|
|
158
|
+
};
|
|
159
|
+
|
|
160
|
+
const onSessionEnded = async () => {
|
|
161
|
+
|
|
162
|
+
editor.sceneHelpers.remove( group );
|
|
163
|
+
editor.sceneHelpers.remove( controllers );
|
|
164
|
+
|
|
165
|
+
const sidebar = document.getElementById( 'sidebar' );
|
|
166
|
+
sidebar.style.width = '';
|
|
167
|
+
sidebar.style.height = '';
|
|
168
|
+
|
|
169
|
+
renderer.xr.removeEventListener( 'sessionend', onSessionEnded );
|
|
170
|
+
renderer.xr.enabled = false;
|
|
171
|
+
|
|
172
|
+
editor.camera.copy( camera );
|
|
173
|
+
|
|
174
|
+
signals.windowResize.dispatch();
|
|
175
|
+
signals.leaveXR.dispatch();
|
|
176
|
+
|
|
177
|
+
};
|
|
178
|
+
|
|
179
|
+
// signals
|
|
180
|
+
|
|
181
|
+
const sessionInit = { optionalFeatures: [ 'local-floor' ] };
|
|
182
|
+
|
|
183
|
+
signals.enterXR.add( ( mode ) => {
|
|
184
|
+
|
|
185
|
+
if ( 'xr' in navigator ) {
|
|
186
|
+
|
|
187
|
+
navigator.xr.requestSession( mode, sessionInit )
|
|
188
|
+
.then( onSessionStarted );
|
|
189
|
+
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
} );
|
|
193
|
+
|
|
194
|
+
signals.offerXR.add( function ( mode ) {
|
|
195
|
+
|
|
196
|
+
if ( 'xr' in navigator ) {
|
|
197
|
+
|
|
198
|
+
navigator.xr.offerSession( mode, sessionInit )
|
|
199
|
+
.then( onSessionStarted );
|
|
200
|
+
|
|
201
|
+
signals.leaveXR.add( function () {
|
|
202
|
+
|
|
203
|
+
navigator.xr.offerSession( mode, sessionInit )
|
|
204
|
+
.then( onSessionStarted );
|
|
205
|
+
|
|
206
|
+
} );
|
|
207
|
+
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
} );
|
|
211
|
+
|
|
212
|
+
signals.rendererCreated.add( ( value ) => {
|
|
213
|
+
|
|
214
|
+
renderer = value;
|
|
215
|
+
|
|
216
|
+
} );
|
|
217
|
+
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
export { XR };
|