@needle-tools/engine 2.65.2-pre → 2.67.0-pre
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/CHANGELOG.md +43 -0
- package/dist/needle-engine.js +34490 -26304
- package/dist/needle-engine.umd.cjs +748 -303
- package/lib/engine/api.d.ts +4 -0
- package/lib/engine/api.js +10 -0
- package/lib/engine/api.js.map +1 -1
- package/lib/engine/codegen/register_types.js +23 -7
- package/lib/engine/codegen/register_types.js.map +1 -1
- package/lib/engine/debug/debug_overlay.js +11 -2
- package/lib/engine/debug/debug_overlay.js.map +1 -1
- package/lib/engine/engine_addressables.js +4 -4
- package/lib/engine/engine_addressables.js.map +1 -1
- package/lib/engine/engine_assetdatabase.d.ts +17 -51
- package/lib/engine/engine_assetdatabase.js +252 -126
- package/lib/engine/engine_assetdatabase.js.map +1 -1
- package/lib/engine/engine_components.js +13 -1
- package/lib/engine/engine_components.js.map +1 -1
- package/lib/engine/engine_components_internal.d.ts +8 -0
- package/lib/engine/engine_components_internal.js +29 -0
- package/lib/engine/engine_components_internal.js.map +1 -0
- package/lib/engine/engine_constants.d.ts +1 -0
- package/lib/engine/engine_constants.js +1 -0
- package/lib/engine/engine_constants.js.map +1 -1
- package/lib/engine/engine_context_registry.d.ts +2 -0
- package/lib/engine/engine_context_registry.js +6 -0
- package/lib/engine/engine_context_registry.js.map +1 -1
- package/lib/engine/engine_editor-sync.d.ts +9 -0
- package/lib/engine/engine_editor-sync.js +8 -0
- package/lib/engine/engine_editor-sync.js.map +1 -0
- package/lib/engine/engine_element.d.ts +1 -0
- package/lib/engine/engine_element.js +4 -1
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_element_loading.d.ts +3 -2
- package/lib/engine/engine_element_loading.js +19 -15
- package/lib/engine/engine_element_loading.js.map +1 -1
- package/lib/engine/engine_gameobject.js +21 -23
- package/lib/engine/engine_gameobject.js.map +1 -1
- package/lib/engine/engine_gizmos.js +3 -1
- package/lib/engine/engine_gizmos.js.map +1 -1
- package/lib/engine/engine_gltf_builtin_components.d.ts +2 -3
- package/lib/engine/engine_gltf_builtin_components.js +23 -6
- package/lib/engine/engine_gltf_builtin_components.js.map +1 -1
- package/lib/engine/engine_networking.d.ts +3 -1
- package/lib/engine/engine_networking.js +10 -8
- package/lib/engine/engine_networking.js.map +1 -1
- package/lib/engine/engine_networking_auto.d.ts +1 -0
- package/lib/engine/engine_networking_auto.js +42 -9
- package/lib/engine/engine_networking_auto.js.map +1 -1
- package/lib/engine/engine_patcher.d.ts +8 -0
- package/lib/engine/engine_patcher.js +98 -0
- package/lib/engine/engine_patcher.js.map +1 -0
- package/lib/engine/engine_physics.d.ts +34 -2
- package/lib/engine/engine_physics.js +110 -11
- package/lib/engine/engine_physics.js.map +1 -1
- package/lib/engine/engine_scenetools.js +0 -1
- package/lib/engine/engine_scenetools.js.map +1 -1
- package/lib/engine/engine_serialization_core.js +4 -0
- package/lib/engine/engine_serialization_core.js.map +1 -1
- package/lib/engine/engine_setup.d.ts +1 -1
- package/lib/engine/engine_setup.js +12 -5
- package/lib/engine/engine_setup.js.map +1 -1
- package/lib/engine/engine_texture.d.ts +6 -1
- package/lib/engine/engine_texture.js +39 -1
- package/lib/engine/engine_texture.js.map +1 -1
- package/lib/engine/engine_types.d.ts +4 -0
- package/lib/engine/engine_types.js.map +1 -1
- package/lib/engine/engine_utils.js +3 -2
- package/lib/engine/engine_utils.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_progressive.d.ts +0 -1
- package/lib/engine/extensions/NEEDLE_progressive.js +24 -26
- package/lib/engine/extensions/NEEDLE_progressive.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_render_objects.js +9 -0
- package/lib/engine/extensions/NEEDLE_render_objects.js.map +1 -1
- package/lib/engine/extensions/extensions.d.ts +4 -1
- package/lib/engine/extensions/extensions.js +16 -0
- package/lib/engine/extensions/extensions.js.map +1 -1
- package/lib/engine/extensions/usage_tracker.d.ts +12 -0
- package/lib/engine/extensions/usage_tracker.js +59 -0
- package/lib/engine/extensions/usage_tracker.js.map +1 -0
- package/lib/engine-components/Animator.js +0 -1
- package/lib/engine-components/Animator.js.map +1 -1
- package/lib/engine-components/AnimatorController.js +4 -0
- package/lib/engine-components/AnimatorController.js.map +1 -1
- package/lib/engine-components/AudioSource.js +2 -1
- package/lib/engine-components/AudioSource.js.map +1 -1
- package/lib/engine-components/Camera.d.ts +6 -0
- package/lib/engine-components/Camera.js +70 -31
- package/lib/engine-components/Camera.js.map +1 -1
- package/lib/engine-components/CharacterController.d.ts +1 -0
- package/lib/engine-components/CharacterController.js +14 -9
- package/lib/engine-components/CharacterController.js.map +1 -1
- package/lib/engine-components/Collider.js +14 -1
- package/lib/engine-components/Collider.js.map +1 -1
- package/lib/engine-components/Component.d.ts +52 -0
- package/lib/engine-components/Component.js +55 -14
- package/lib/engine-components/Component.js.map +1 -1
- package/lib/engine-components/Networking.js +19 -0
- package/lib/engine-components/Networking.js.map +1 -1
- package/lib/engine-components/OrbitControls.d.ts +2 -0
- package/lib/engine-components/OrbitControls.js +9 -0
- package/lib/engine-components/OrbitControls.js.map +1 -1
- package/lib/engine-components/ParticleSystem.d.ts +5 -1
- package/lib/engine-components/ParticleSystem.js +52 -7
- package/lib/engine-components/ParticleSystem.js.map +1 -1
- package/lib/engine-components/ParticleSystemModules.d.ts +2 -0
- package/lib/engine-components/ParticleSystemModules.js +26 -0
- package/lib/engine-components/ParticleSystemModules.js.map +1 -1
- package/lib/engine-components/ParticleSystemSubEmitter.js +5 -2
- package/lib/engine-components/ParticleSystemSubEmitter.js.map +1 -1
- package/lib/engine-components/ReflectionProbe.js +18 -6
- package/lib/engine-components/ReflectionProbe.js.map +1 -1
- package/lib/engine-components/Renderer.d.ts +1 -1
- package/lib/engine-components/Renderer.js +33 -11
- package/lib/engine-components/Renderer.js.map +1 -1
- package/lib/engine-components/ScreenCapture.js +3 -3
- package/lib/engine-components/ScreenCapture.js.map +1 -1
- package/lib/engine-components/Skybox.js +2 -0
- package/lib/engine-components/Skybox.js.map +1 -1
- package/lib/engine-components/SmoothFollow.js +1 -2
- package/lib/engine-components/SmoothFollow.js.map +1 -1
- package/lib/engine-components/SpectatorCamera.js +3 -3
- package/lib/engine-components/SpectatorCamera.js.map +1 -1
- package/lib/engine-components/SyncedCamera.js +1 -1
- package/lib/engine-components/SyncedCamera.js.map +1 -1
- package/lib/engine-components/SyncedTransform.js +2 -2
- package/lib/engine-components/SyncedTransform.js.map +1 -1
- package/lib/engine-components/TestRunner.js +1 -1
- package/lib/engine-components/TestRunner.js.map +1 -1
- package/lib/engine-components/WebARCameraBackground.d.ts +19 -0
- package/lib/engine-components/WebARCameraBackground.js +185 -0
- package/lib/engine-components/WebARCameraBackground.js.map +1 -0
- package/lib/engine-components/WebARSessionRoot.js +3 -2
- package/lib/engine-components/WebARSessionRoot.js.map +1 -1
- package/lib/engine-components/WebXR.d.ts +4 -0
- package/lib/engine-components/WebXR.js +11 -8
- package/lib/engine-components/WebXR.js.map +1 -1
- package/lib/engine-components/WebXRAvatar.js +1 -0
- package/lib/engine-components/WebXRAvatar.js.map +1 -1
- package/lib/engine-components/WebXRGrabRendering.js +2 -2
- package/lib/engine-components/WebXRGrabRendering.js.map +1 -1
- package/lib/engine-components/WebXRSync.js +2 -2
- package/lib/engine-components/WebXRSync.js.map +1 -1
- package/lib/engine-components/codegen/components.d.ts +14 -6
- package/lib/engine-components/codegen/components.js +14 -6
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/js-extensions/Object3D.js +4 -1
- package/lib/engine-components/js-extensions/Object3D.js.map +1 -1
- package/lib/engine-components/postprocessing/Effects/Antialiasing.d.ts +13 -0
- package/lib/engine-components/postprocessing/Effects/Antialiasing.js +46 -0
- package/lib/engine-components/postprocessing/Effects/Antialiasing.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/Bloom.d.ts +12 -0
- package/lib/engine-components/postprocessing/Effects/Bloom.js +76 -0
- package/lib/engine-components/postprocessing/Effects/Bloom.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/ChromaticAberration.d.ts +8 -0
- package/lib/engine-components/postprocessing/Effects/ChromaticAberration.js +39 -0
- package/lib/engine-components/postprocessing/Effects/ChromaticAberration.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/ColorAdjustments.d.ts +12 -0
- package/lib/engine-components/postprocessing/Effects/ColorAdjustments.js +96 -0
- package/lib/engine-components/postprocessing/Effects/ColorAdjustments.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/DepthOfField.d.ts +21 -0
- package/lib/engine-components/postprocessing/Effects/DepthOfField.js +87 -0
- package/lib/engine-components/postprocessing/Effects/DepthOfField.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/Pixelation.d.ts +7 -0
- package/lib/engine-components/postprocessing/Effects/Pixelation.js +30 -0
- package/lib/engine-components/postprocessing/Effects/Pixelation.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/ScreenspaceAmbientOcclusion.d.ts +11 -0
- package/lib/engine-components/postprocessing/Effects/ScreenspaceAmbientOcclusion.js +70 -0
- package/lib/engine-components/postprocessing/Effects/ScreenspaceAmbientOcclusion.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/Tonemapping.d.ts +16 -0
- package/lib/engine-components/postprocessing/Effects/Tonemapping.js +52 -0
- package/lib/engine-components/postprocessing/Effects/Tonemapping.js.map +1 -0
- package/lib/engine-components/postprocessing/Effects/Vignette.d.ts +11 -0
- package/lib/engine-components/postprocessing/Effects/Vignette.js +57 -0
- package/lib/engine-components/postprocessing/Effects/Vignette.js.map +1 -0
- package/lib/engine-components/postprocessing/PostProcessingEffect.d.ts +29 -0
- package/lib/engine-components/postprocessing/PostProcessingEffect.js +89 -0
- package/lib/engine-components/postprocessing/PostProcessingEffect.js.map +1 -0
- package/lib/engine-components/postprocessing/PostProcessingHandler.d.ts +13 -0
- package/lib/engine-components/postprocessing/PostProcessingHandler.js +119 -0
- package/lib/engine-components/postprocessing/PostProcessingHandler.js.map +1 -0
- package/lib/engine-components/postprocessing/Volume.d.ts +23 -0
- package/lib/engine-components/postprocessing/Volume.js +176 -0
- package/lib/engine-components/postprocessing/Volume.js.map +1 -0
- package/lib/engine-components/postprocessing/VolumeParameter.d.ts +21 -0
- package/lib/engine-components/postprocessing/VolumeParameter.js +75 -0
- package/lib/engine-components/postprocessing/VolumeParameter.js.map +1 -0
- package/lib/engine-components/postprocessing/VolumeProfile.d.ts +7 -0
- package/lib/engine-components/postprocessing/VolumeProfile.js +42 -0
- package/lib/engine-components/postprocessing/VolumeProfile.js.map +1 -0
- package/lib/engine-components/timeline/TimelineTracks.js +14 -15
- package/lib/engine-components/timeline/TimelineTracks.js.map +1 -1
- package/lib/engine-components/ui/Text.js +28 -170
- package/lib/engine-components/ui/Text.js.map +1 -1
- package/lib/engine-components-experimental/networking/PlayerSync.d.ts +18 -0
- package/lib/engine-components-experimental/networking/PlayerSync.js +62 -8
- package/lib/engine-components-experimental/networking/PlayerSync.js.map +1 -1
- package/lib/include/three/ARButton.d.ts +1 -1
- package/lib/include/three/ARButton.js +11 -19
- package/lib/include/three/ARButton.js.map +1 -1
- package/lib/include/three/VRButton.js +1 -4
- package/lib/include/three/VRButton.js.map +1 -1
- package/package.json +3 -2
- package/plugins/vite/drop-client.js +77 -0
- package/plugins/vite/drop.js +81 -0
- package/plugins/vite/editor-connection.js +121 -0
- package/plugins/vite/index.js +9 -4
- package/plugins/vite/meta.js +3 -0
- package/plugins/vite/poster-client.js +6 -4
- package/src/engine/api.ts +30 -1
- package/src/engine/codegen/register_types.js +25 -9
- package/src/engine/debug/debug_overlay.ts +11 -2
- package/src/engine/engine_addressables.ts +4 -4
- package/src/engine/engine_assetdatabase.ts +291 -184
- package/src/engine/engine_components.ts +20 -1
- package/src/engine/engine_components_internal.ts +30 -0
- package/src/engine/engine_constants.ts +4 -1
- package/src/engine/engine_context_registry.ts +7 -0
- package/src/engine/engine_editor-sync.ts +21 -0
- package/src/engine/engine_element.ts +8 -1
- package/src/engine/engine_element_loading.ts +19 -15
- package/src/engine/engine_gameobject.ts +579 -583
- package/src/engine/engine_gizmos.ts +3 -2
- package/src/engine/engine_gltf_builtin_components.ts +30 -15
- package/src/engine/engine_networking.ts +10 -8
- package/src/engine/engine_networking_auto.ts +48 -11
- package/src/engine/engine_patcher.ts +113 -0
- package/src/engine/engine_physics.ts +128 -12
- package/src/engine/engine_scenetools.ts +0 -1
- package/src/engine/engine_serialization_core.ts +6 -0
- package/src/engine/engine_setup.ts +15 -5
- package/src/engine/engine_texture.ts +54 -5
- package/src/engine/engine_types.ts +6 -1
- package/src/engine/engine_utils.ts +6 -5
- package/src/engine/extensions/NEEDLE_progressive.ts +32 -32
- package/src/engine/extensions/NEEDLE_render_objects.ts +10 -1
- package/src/engine/extensions/extensions.ts +22 -1
- package/src/engine/extensions/usage_tracker.ts +91 -0
- package/src/engine-components/Animator.ts +0 -1
- package/src/engine-components/AnimatorController.ts +2 -0
- package/src/engine-components/AudioSource.ts +1 -1
- package/src/engine-components/Camera.ts +77 -37
- package/src/engine-components/CharacterController.ts +12 -9
- package/src/engine-components/Collider.ts +16 -2
- package/src/engine-components/Component.ts +74 -30
- package/src/engine-components/Networking.ts +9 -1
- package/src/engine-components/OrbitControls.ts +11 -2
- package/src/engine-components/ParticleSystem.ts +54 -10
- package/src/engine-components/ParticleSystemModules.ts +28 -1
- package/src/engine-components/ParticleSystemSubEmitter.ts +5 -3
- package/src/engine-components/ReflectionProbe.ts +17 -7
- package/src/engine-components/Renderer.ts +36 -16
- package/src/engine-components/ScreenCapture.ts +3 -3
- package/src/engine-components/Skybox.ts +2 -0
- package/src/engine-components/SmoothFollow.ts +4 -4
- package/src/engine-components/SpectatorCamera.ts +3 -3
- package/src/engine-components/SyncedCamera.ts +1 -1
- package/src/engine-components/SyncedTransform.ts +2 -2
- package/src/engine-components/TestRunner.ts +1 -1
- package/src/engine-components/WebARCameraBackground.ts +215 -0
- package/src/engine-components/WebARSessionRoot.ts +3 -2
- package/src/engine-components/WebXR.ts +12 -8
- package/src/engine-components/WebXRAvatar.ts +1 -1
- package/src/engine-components/WebXRGrabRendering.ts +2 -2
- package/src/engine-components/WebXRSync.ts +2 -2
- package/src/engine-components/codegen/components.ts +14 -6
- package/src/engine-components/js-extensions/Object3D.ts +6 -1
- package/src/engine-components/postprocessing/Effects/Antialiasing.ts +52 -0
- package/src/engine-components/postprocessing/Effects/Bloom.ts +75 -0
- package/src/engine-components/postprocessing/Effects/ChromaticAberration.ts +36 -0
- package/src/engine-components/postprocessing/Effects/ColorAdjustments.ts +114 -0
- package/src/engine-components/postprocessing/Effects/DepthOfField.ts +90 -0
- package/src/engine-components/postprocessing/Effects/Pixelation.ts +28 -0
- package/src/engine-components/postprocessing/Effects/ScreenspaceAmbientOcclusion.ts +71 -0
- package/src/engine-components/postprocessing/Effects/Tonemapping.ts +55 -0
- package/src/engine-components/postprocessing/Effects/Vignette.ts +55 -0
- package/src/engine-components/postprocessing/PostProcessingEffect.ts +112 -0
- package/src/engine-components/postprocessing/PostProcessingHandler.ts +148 -0
- package/src/engine-components/postprocessing/Volume.ts +194 -0
- package/src/engine-components/postprocessing/VolumeParameter.ts +85 -0
- package/src/engine-components/postprocessing/VolumeProfile.ts +40 -0
- package/src/engine-components/timeline/TimelineTracks.ts +16 -17
- package/src/engine-components/ui/Text.ts +37 -174
- package/src/engine-components-experimental/networking/PlayerSync.ts +69 -8
- package/src/include/three/ARButton.js +13 -24
- package/src/include/three/VRButton.js +1 -7
- package/lib/engine-components/Volume.d.ts +0 -34
- package/lib/engine-components/Volume.js +0 -140
- package/lib/engine-components/Volume.js.map +0 -1
- package/src/engine-components/Volume.ts +0 -141
|
@@ -22,7 +22,7 @@ export class PlayerSync extends Behaviour {
|
|
|
22
22
|
this.context.connection.beginListen(RoomEvents.JoinedRoom, this.joinedRoomFunction);
|
|
23
23
|
}
|
|
24
24
|
onDisable() {
|
|
25
|
-
this.context.connection.
|
|
25
|
+
this.context.connection.stopListen(RoomEvents.JoinedRoom, this.joinedRoomFunction);
|
|
26
26
|
}
|
|
27
27
|
async onUserJoined(_model) {
|
|
28
28
|
const instance = await this.asset?.instantiateSynced({ parent: this.gameObject }, true);
|
|
@@ -57,6 +57,10 @@ export class PlayerSync extends Behaviour {
|
|
|
57
57
|
__decorate([
|
|
58
58
|
serializable(AssetReference)
|
|
59
59
|
], PlayerSync.prototype, "asset", void 0);
|
|
60
|
+
export var PlayerStateEvent;
|
|
61
|
+
(function (PlayerStateEvent) {
|
|
62
|
+
PlayerStateEvent["OwnerChanged"] = "ownerChanged";
|
|
63
|
+
})(PlayerStateEvent || (PlayerStateEvent = {}));
|
|
60
64
|
export class PlayerState extends Behaviour {
|
|
61
65
|
static _all = [];
|
|
62
66
|
/** all instances for all players */
|
|
@@ -72,20 +76,67 @@ export class PlayerState extends Behaviour {
|
|
|
72
76
|
//** use to check if a component or gameobject is part of a instance owned by the local player */
|
|
73
77
|
static isLocalPlayer(obj) {
|
|
74
78
|
if (obj instanceof Object3D) {
|
|
75
|
-
|
|
79
|
+
const state = GameObject.getComponentInParent(obj, PlayerState);
|
|
80
|
+
return state?.isLocalPlayer ?? false;
|
|
76
81
|
}
|
|
77
82
|
else if (obj instanceof Component) {
|
|
78
|
-
|
|
83
|
+
const state = GameObject.getComponentInParent(obj.gameObject, PlayerState);
|
|
84
|
+
return state?.isLocalPlayer ?? false;
|
|
79
85
|
}
|
|
80
86
|
return false;
|
|
81
87
|
}
|
|
88
|
+
// static Callback
|
|
89
|
+
static _callbacks = {};
|
|
90
|
+
/**
|
|
91
|
+
* Add a callback for a PlayerStateEvent
|
|
92
|
+
*/
|
|
93
|
+
static addEventListener(event, cb) {
|
|
94
|
+
if (!this._callbacks[event])
|
|
95
|
+
this._callbacks[event] = [];
|
|
96
|
+
this._callbacks[event].push(cb);
|
|
97
|
+
return cb;
|
|
98
|
+
}
|
|
99
|
+
static removeEventListener(event, cb) {
|
|
100
|
+
if (!this._callbacks[event])
|
|
101
|
+
return;
|
|
102
|
+
const index = this._callbacks[event].indexOf(cb);
|
|
103
|
+
if (index >= 0)
|
|
104
|
+
this._callbacks[event].splice(index, 1);
|
|
105
|
+
}
|
|
106
|
+
static dispatchEvent(event, args) {
|
|
107
|
+
if (!this._callbacks[event])
|
|
108
|
+
return;
|
|
109
|
+
for (const cb of this._callbacks[event]) {
|
|
110
|
+
cb(args);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
82
113
|
owner;
|
|
83
114
|
get isLocalPlayer() {
|
|
84
115
|
return this.owner === this.context.connection.connectionId;
|
|
85
116
|
}
|
|
117
|
+
onOwnerChange(newOwner, oldOwner) {
|
|
118
|
+
// Remove from local owner array if it was local before
|
|
119
|
+
const index = PlayerState._local.indexOf(this);
|
|
120
|
+
if (index >= 0)
|
|
121
|
+
PlayerState._local.splice(index, 1);
|
|
122
|
+
// Args to use for dispatching events
|
|
123
|
+
const detail = {
|
|
124
|
+
playerState: this,
|
|
125
|
+
oldValue: oldOwner,
|
|
126
|
+
newValue: newOwner
|
|
127
|
+
};
|
|
128
|
+
if (this.owner === this.context.connection.connectionId) {
|
|
129
|
+
PlayerState._local.push(this);
|
|
130
|
+
// console.warn(this.gameObject.guid, this.guid, this.owner, this.isLocalPlayer, PlayerState.isLocalPlayer(this));
|
|
131
|
+
const evt = new CustomEvent("local-owner-changed", { detail: detail });
|
|
132
|
+
this.dispatchEvent(evt);
|
|
133
|
+
PlayerState.dispatchEvent(PlayerStateEvent.OwnerChanged, evt);
|
|
134
|
+
}
|
|
135
|
+
const evt = new CustomEvent("owner-changed", { detail: detail });
|
|
136
|
+
this.dispatchEvent(evt);
|
|
137
|
+
PlayerState.dispatchEvent(PlayerStateEvent.OwnerChanged, evt);
|
|
138
|
+
}
|
|
86
139
|
awake() {
|
|
87
|
-
if (this.isLocalPlayer)
|
|
88
|
-
PlayerState.local.push(this);
|
|
89
140
|
PlayerState.all.push(this);
|
|
90
141
|
this.context.connection.beginListen(RoomEvents.UserLeftRoom, (model) => {
|
|
91
142
|
// console.log("USER LEFT", model.userId)
|
|
@@ -97,11 +148,15 @@ export class PlayerState extends Behaviour {
|
|
|
97
148
|
});
|
|
98
149
|
}
|
|
99
150
|
start() {
|
|
100
|
-
|
|
151
|
+
// If a player is spawned but not in the room anymore we want to destroy it
|
|
152
|
+
// this might happen in a case where all users get disconnected at once and the server
|
|
153
|
+
// still has the syncInstantiate messages that are sent to all clients
|
|
154
|
+
if (this.owner && !this.context.connection.userIsInRoom(this.owner)) {
|
|
101
155
|
this.doDestroy();
|
|
102
156
|
return;
|
|
103
157
|
}
|
|
104
158
|
}
|
|
159
|
+
/** this tells the server that this client has been destroyed and the networking message for the instantiate will be removed */
|
|
105
160
|
doDestroy() {
|
|
106
161
|
syncDestroy(this.gameObject, this.context.connection);
|
|
107
162
|
}
|
|
@@ -115,7 +170,6 @@ export class PlayerState extends Behaviour {
|
|
|
115
170
|
}
|
|
116
171
|
}
|
|
117
172
|
__decorate([
|
|
118
|
-
syncField()
|
|
119
|
-
serializable()
|
|
173
|
+
syncField("onOwnerChange")
|
|
120
174
|
], PlayerState.prototype, "owner", void 0);
|
|
121
175
|
//# sourceMappingURL=PlayerSync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayerSync.js","sourceRoot":"","sources":["../../../../src/engine-components-experimental/networking/PlayerSync.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAKzE,MAAM,OAAO,UAAW,SAAQ,SAAS;IAErC,KAAK,CAAkB;IAEf,kBAAkB,CAAY;IAEtC,KAAK;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAmB,CAAC,CAAA;IACxF,CAAC;IACD,SAAS;QACL,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"PlayerSync.js","sourceRoot":"","sources":["../../../../src/engine-components-experimental/networking/PlayerSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
class ARButton {
|
|
2
|
-
static createButton(renderer,
|
|
2
|
+
static createButton(renderer, options = {}) {
|
|
3
3
|
const button = document.createElement('button');
|
|
4
4
|
let ARButtonControlsDomOverlay = false;
|
|
5
5
|
function showStartAR( /*device*/) {
|
|
6
|
-
|
|
6
|
+
options.optionalFeatures = options.optionalFeatures || [];
|
|
7
|
+
if (options.domOverlay === undefined) {
|
|
7
8
|
var overlay = document.createElement('div');
|
|
8
9
|
overlay.style.display = 'none';
|
|
9
10
|
document.body.appendChild(overlay);
|
|
@@ -22,19 +23,10 @@ class ARButton {
|
|
|
22
23
|
path.setAttribute('stroke', '#fff');
|
|
23
24
|
path.setAttribute('stroke-width', 2);
|
|
24
25
|
svg.appendChild(path);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
sessionInit.optionalFeatures.push('dom-overlay');
|
|
29
|
-
sessionInit.domOverlay = { root: overlay };
|
|
26
|
+
options.optionalFeatures.push('dom-overlay');
|
|
27
|
+
options.domOverlay = { root: overlay };
|
|
30
28
|
ARButtonControlsDomOverlay = true;
|
|
31
29
|
}
|
|
32
|
-
if (sessionInit.optionalFeatures === undefined)
|
|
33
|
-
sessionInit.optionalFeatures = [];
|
|
34
|
-
// added for Hololens support
|
|
35
|
-
sessionInit.optionalFeatures.push('local-floor');
|
|
36
|
-
sessionInit.optionalFeatures.push('hand-tracking');
|
|
37
|
-
sessionInit.optionalFeatures.push('layers');
|
|
38
30
|
//
|
|
39
31
|
let currentSession = null;
|
|
40
32
|
let originalDomOverlayParent = null;
|
|
@@ -43,8 +35,8 @@ class ARButton {
|
|
|
43
35
|
// HTMLElements that are inside the Canvas element are not visible in the DOM Overlay.
|
|
44
36
|
const isWebXRViewer = /WebXRViewer\//i.test(navigator.userAgent);
|
|
45
37
|
if (isWebXRViewer) {
|
|
46
|
-
if (
|
|
47
|
-
const overlayElement =
|
|
38
|
+
if (options.domOverlay?.root) {
|
|
39
|
+
const overlayElement = options.domOverlay.root;
|
|
48
40
|
originalDomOverlayParent = overlayElement.parentElement;
|
|
49
41
|
if (originalDomOverlayParent) {
|
|
50
42
|
console.log("Reparent DOM Overlay to body", overlayElement, overlayElement.style.display);
|
|
@@ -65,7 +57,7 @@ class ARButton {
|
|
|
65
57
|
await renderer.xr.setSession(session);
|
|
66
58
|
button.textContent = 'STOP AR';
|
|
67
59
|
if (ARButtonControlsDomOverlay)
|
|
68
|
-
|
|
60
|
+
options.domOverlay.root.style.display = '';
|
|
69
61
|
currentSession = session;
|
|
70
62
|
}
|
|
71
63
|
function onSessionEnded( /*event*/) {
|
|
@@ -73,9 +65,9 @@ class ARButton {
|
|
|
73
65
|
button.textContent = 'START AR';
|
|
74
66
|
// if we reparented the DOM overlay, we're reverting it here
|
|
75
67
|
if (originalDomOverlayParent)
|
|
76
|
-
originalDomOverlayParent.appendChild(
|
|
68
|
+
originalDomOverlayParent.appendChild(options.domOverlay.root);
|
|
77
69
|
if (ARButtonControlsDomOverlay)
|
|
78
|
-
|
|
70
|
+
options.domOverlay.root.style.display = 'none';
|
|
79
71
|
currentSession = null;
|
|
80
72
|
}
|
|
81
73
|
//
|
|
@@ -92,7 +84,7 @@ class ARButton {
|
|
|
92
84
|
};
|
|
93
85
|
button.onclick = function () {
|
|
94
86
|
if (currentSession === null) {
|
|
95
|
-
navigator.xr.requestSession('immersive-ar',
|
|
87
|
+
navigator.xr.requestSession('immersive-ar', options).then(onSessionStarted);
|
|
96
88
|
}
|
|
97
89
|
else {
|
|
98
90
|
currentSession.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ARButton.js","sourceRoot":"","sources":["../../../../src/include/three/ARButton.js"],"names":[],"mappings":"AAAA,MAAM,QAAQ;IAEb,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"ARButton.js","sourceRoot":"","sources":["../../../../src/include/three/ARButton.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
class VRButton {
|
|
2
2
|
static createButton(renderer, options) {
|
|
3
|
-
if (options) {
|
|
4
|
-
console.error('THREE.VRButton: The "options" parameter has been removed. Please set the reference space type via renderer.xr.setReferenceSpaceType() instead.');
|
|
5
|
-
}
|
|
6
3
|
const button = document.createElement('button');
|
|
7
4
|
function showEnterVR( /*device*/) {
|
|
8
5
|
let currentSession = null;
|
|
@@ -38,7 +35,7 @@ class VRButton {
|
|
|
38
35
|
// requestReferenceSpace call will fail if it turns out to be unavailable.
|
|
39
36
|
// ('local' is always available for immersive sessions and doesn't need to
|
|
40
37
|
// be requested separately.)
|
|
41
|
-
const sessionInit = { optionalFeatures:
|
|
38
|
+
const sessionInit = { optionalFeatures: options.optionalFeatures };
|
|
42
39
|
navigator.xr.requestSession('immersive-vr', sessionInit).then(onSessionStarted);
|
|
43
40
|
}
|
|
44
41
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VRButton.js","sourceRoot":"","sources":["../../../../src/include/three/VRButton.js"],"names":[],"mappings":"AAAA,MAAM,QAAQ;IAEb,MAAM,CAAC,YAAY,CAAE,QAAQ,EAAE,OAAO;QAErC,
|
|
1
|
+
{"version":3,"file":"VRButton.js","sourceRoot":"","sources":["../../../../src/include/three/VRButton.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@needle-tools/engine",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.67.0-pre",
|
|
4
4
|
"description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
|
|
5
5
|
"main": "dist/needle-engine.umd.cjs",
|
|
6
6
|
"module": "lib/needle-engine.js",
|
|
@@ -60,8 +60,9 @@
|
|
|
60
60
|
"md5": "^2.3.0",
|
|
61
61
|
"peerjs": "1.3.2",
|
|
62
62
|
"simplex-noise": "^4.0.1",
|
|
63
|
+
"postprocessing": "^6.30.1",
|
|
63
64
|
"stats.js": "^0.17.0",
|
|
64
|
-
"three": "npm:@needle-tools/three@^0.146.
|
|
65
|
+
"three": "npm:@needle-tools/three@^0.146.6",
|
|
65
66
|
"three-mesh-ui": "^6.4.5",
|
|
66
67
|
"three.quarks": "^0.7.3",
|
|
67
68
|
"uuid": "^9.0.0",
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
|
|
2
|
+
import { Context, destroy, loadSync } from "@needle-tools/engine"
|
|
3
|
+
|
|
4
|
+
// for testing import in main.ts like so:
|
|
5
|
+
// import "@needle-tools/engine/plugins/vite/drop-client.js"
|
|
6
|
+
|
|
7
|
+
if (import.meta?.hot) {
|
|
8
|
+
|
|
9
|
+
const previouslyLoaded = [];
|
|
10
|
+
import.meta.hot.on("needle-editor:exported-file", async msg => {
|
|
11
|
+
try {
|
|
12
|
+
console.log(msg);
|
|
13
|
+
const ctx = Context.Current;
|
|
14
|
+
for (const prev of previouslyLoaded) {
|
|
15
|
+
destroy(prev, true, true);
|
|
16
|
+
}
|
|
17
|
+
previouslyLoaded.length = 0;
|
|
18
|
+
const path = msg.path;
|
|
19
|
+
const glb = await loadSync(ctx, path);
|
|
20
|
+
previouslyLoaded.push(glb.scene);
|
|
21
|
+
console.log(glb);
|
|
22
|
+
ctx.scene.add(glb.scene);
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
console.error(err);
|
|
26
|
+
}
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
function isNeedleCanvas(target) {
|
|
30
|
+
if (target instanceof HTMLCanvasElement) {
|
|
31
|
+
return true
|
|
32
|
+
}
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
window.addEventListener('dragover', e => {
|
|
37
|
+
if (!isNeedleCanvas(e.target)) return;
|
|
38
|
+
if (!e.dataTransfer) return;
|
|
39
|
+
for (const type of e.dataTransfer.types) {
|
|
40
|
+
if (type === "Files") {
|
|
41
|
+
e.preventDefault();
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
window.addEventListener('drop', (e) => {
|
|
47
|
+
if (!isNeedleCanvas(e.target)) return;
|
|
48
|
+
|
|
49
|
+
for (const file of e.dataTransfer.files) {
|
|
50
|
+
if (file.name.endsWith(".prefab") ||
|
|
51
|
+
file.name.endsWith(".fbx") ||
|
|
52
|
+
file.name.endsWith(".gltf") ||
|
|
53
|
+
file.name.endsWith(".glb") ||
|
|
54
|
+
file.name.endsWith(".obj") ||
|
|
55
|
+
file.name.endsWith(".mat")) {
|
|
56
|
+
console.log("Dropped file: " + file.name)
|
|
57
|
+
e.preventDefault();
|
|
58
|
+
|
|
59
|
+
const data = {
|
|
60
|
+
name: file.name,
|
|
61
|
+
size: file.size,
|
|
62
|
+
lastModified: file.lastModified,
|
|
63
|
+
location: undefined
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
const hits = Context.Current?.physics.raycast();
|
|
67
|
+
if (hits?.length) {
|
|
68
|
+
data.location = hits[0].point;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// Notify vite -> export file -> wait for export response with path -> load file
|
|
72
|
+
import.meta.hot.send("needle:drop-file", data);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
});
|
|
77
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { loadConfig, tryLoadProjectConfig } from './config.js';
|
|
3
|
+
import { readFileSync } from 'fs';
|
|
4
|
+
import { fileURLToPath } from 'url';
|
|
5
|
+
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
|
|
9
|
+
export const needleDrop = (command, config, userSettings) => {
|
|
10
|
+
if (command === "build") return;
|
|
11
|
+
|
|
12
|
+
return {
|
|
13
|
+
config(config) {
|
|
14
|
+
if(userSettings)
|
|
15
|
+
if (!config.server) config.server = {};
|
|
16
|
+
if (!config.server.hmr) config.server.hmr = {};
|
|
17
|
+
config.server.hmr.port = 8080;
|
|
18
|
+
setTimeout(() => console.log("Update HMR port to " + config.server.hmr.port));
|
|
19
|
+
},
|
|
20
|
+
transformIndexHtml: {
|
|
21
|
+
enforce: 'pre',
|
|
22
|
+
transform(html, _) {
|
|
23
|
+
const file = path.join(__dirname, 'drop-client.js');
|
|
24
|
+
return [
|
|
25
|
+
{
|
|
26
|
+
tag: 'script',
|
|
27
|
+
attrs: {
|
|
28
|
+
type: 'module',
|
|
29
|
+
},
|
|
30
|
+
children: readFileSync(file, 'utf8'),
|
|
31
|
+
injectTo: 'body',
|
|
32
|
+
},
|
|
33
|
+
];
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
configureServer(server) {
|
|
37
|
+
|
|
38
|
+
server.ws.on('needle:drop-file', async (data, client) => {
|
|
39
|
+
server.ws.send({ type: 'needle-editor:drop-file', data: data });
|
|
40
|
+
});
|
|
41
|
+
// TODO: not sure how we can receive it with the normal vite server
|
|
42
|
+
// server.ws.on("custom", (data, client) => {
|
|
43
|
+
// console.log(data);
|
|
44
|
+
// })
|
|
45
|
+
|
|
46
|
+
server.ws.on('connection', (socket, request) => {
|
|
47
|
+
socket.on('message', async (bytes) => {
|
|
48
|
+
try {
|
|
49
|
+
const message = Buffer.from(bytes).toString();
|
|
50
|
+
if (message && message.startsWith("{")) {
|
|
51
|
+
const obj = JSON.parse(message);
|
|
52
|
+
if (obj.type === "needle-editor:exported-file") {
|
|
53
|
+
server.ws.send(obj.type, obj.data);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
console.error(e.message);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
// setTimeout(() => {
|
|
65
|
+
// // console.log(server);
|
|
66
|
+
// console.log("WAIT FOR CON");
|
|
67
|
+
// server.ws.on('connection', (socket, request) => {
|
|
68
|
+
// console.log("FOUND CONNECTION");
|
|
69
|
+
// socket.on('message', (bytes) => {
|
|
70
|
+
// // console.log("FOUND MESSAGE");
|
|
71
|
+
// const message = Buffer.from(bytes).toString();
|
|
72
|
+
// console.log(message);
|
|
73
|
+
// });
|
|
74
|
+
// });
|
|
75
|
+
// setInterval(() => {
|
|
76
|
+
// server.ws.send({ type: 'editor', data: ["test", "123"] });
|
|
77
|
+
// }, 1000)
|
|
78
|
+
// }, 1000)
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { existsSync } from "fs";
|
|
2
|
+
|
|
3
|
+
const root = process.cwd();
|
|
4
|
+
|
|
5
|
+
const editorSyncPackageName = "@needle-tools/editor-sync"
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
/** sent from the editor when the server was already running
|
|
9
|
+
/* when the user added the editor sync component
|
|
10
|
+
/* at the top of this file we check if the component is present in the scene
|
|
11
|
+
/* and enabled and if it's not it will not install the editor plugin
|
|
12
|
+
*/
|
|
13
|
+
let editorSyncEnabled = false;
|
|
14
|
+
|
|
15
|
+
export const editorConnection = async (command, config, userSettings, pluginsArray) => {
|
|
16
|
+
if (command === "build") return;
|
|
17
|
+
|
|
18
|
+
if (!config) {
|
|
19
|
+
setTimeout(() => console.log("Needle Editor Sync can not be installed automatically to vite: missing config"), 1000);
|
|
20
|
+
return createPlugin(false);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
if (config?.dontInstallEditor === true || userSettings?.dontInstallEditor === true) return;
|
|
24
|
+
|
|
25
|
+
const needleEditorSettings = config.needleEditor;
|
|
26
|
+
// If the component was added while the server was already running
|
|
27
|
+
// if (editorSyncEnabled === false) {
|
|
28
|
+
// if (!needleEditorSettings) {
|
|
29
|
+
// setTimeout(() => console.log("Needle Editor Sync is not enabled. Add a 'Needle Editor Sync' component to your scene to enable (no component)"), 1000);
|
|
30
|
+
// return createPlugin(false);
|
|
31
|
+
// }
|
|
32
|
+
// }
|
|
33
|
+
if (needleEditorSettings && needleEditorSettings.enabled === false) {
|
|
34
|
+
setTimeout(() => console.log("Needle Editor Sync is not enabled. Add a 'Needle Editor Sync' component to your scene to enable"), 1000);
|
|
35
|
+
return createPlugin(false);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// Check if the editor package is installed
|
|
39
|
+
let path = root + `/node_modules/${editorSyncPackageName}/plugins/index.js`;
|
|
40
|
+
if (existsSync(path) === false) {
|
|
41
|
+
setTimeout(() => console.log(`> ${editorSyncPackageName} is not installed: Add the "Needle Editor Sync" component to your scene if you want to send changes directly from the Unity Editor to web app`), 1000);
|
|
42
|
+
return createPlugin(false);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
// Load vite plugin
|
|
47
|
+
if (!path.startsWith("file:")) path = "file:" + path;
|
|
48
|
+
const { needleEditor } = await import(path);
|
|
49
|
+
setTimeout(() => console.log("Automatically installed Needle Editor Sync"), 500)
|
|
50
|
+
const method = needleEditor();
|
|
51
|
+
pluginsArray.push(method);
|
|
52
|
+
return createPlugin(true);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function createPlugin(isInstalled) {
|
|
56
|
+
return {
|
|
57
|
+
|
|
58
|
+
// Setup HMR port for connecting to the editor
|
|
59
|
+
config(config) {
|
|
60
|
+
if (!isInstalled) {
|
|
61
|
+
if (!config.server) config.server = {};
|
|
62
|
+
if (!config.server.hmr) config.server.hmr = {};
|
|
63
|
+
if (config.server.hmr === false) {
|
|
64
|
+
setTimeout(() => console.log("HMR is disabled, not initializing Needle Editor"));
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (config.server.hmr.port !== 1107) {
|
|
68
|
+
config.server.hmr.port = 1107;
|
|
69
|
+
setTimeout(() => console.log("Update HMR port to " + config.server.hmr.port));
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
},
|
|
74
|
+
|
|
75
|
+
configureServer(server) {
|
|
76
|
+
server.ws.on('connection', (socket, _request) => {
|
|
77
|
+
|
|
78
|
+
// console.log("Send editor sync status: " + isInstalled);
|
|
79
|
+
const reply = {
|
|
80
|
+
type: "needle:editor-sync:installation-status",
|
|
81
|
+
data: isInstalled
|
|
82
|
+
}
|
|
83
|
+
socket.send(JSON.stringify(reply));
|
|
84
|
+
|
|
85
|
+
socket.on('message', async (bytes) => {
|
|
86
|
+
if (bytes?.length < 50) {
|
|
87
|
+
const message = Buffer.from(bytes).toString();
|
|
88
|
+
if (message === "needle:editor:restart") {
|
|
89
|
+
console.log("Received request for a soft restart of the vite server... restarting in 1 second")
|
|
90
|
+
setTimeout(() => {
|
|
91
|
+
// This just restarts the vite server
|
|
92
|
+
server.restart();
|
|
93
|
+
// TODO: restart isnt recommended right now because e.g. Unity doesnt properly find the new process to display it in the progress bar
|
|
94
|
+
// spawn(process.argv.shift(), process.argv, {
|
|
95
|
+
// cwd: process.cwd(),
|
|
96
|
+
// detached: true,
|
|
97
|
+
// stdio: "inherit"
|
|
98
|
+
// });
|
|
99
|
+
// process.exit();
|
|
100
|
+
}, 1000);
|
|
101
|
+
}
|
|
102
|
+
else if (message === "needle:editor:stop") {
|
|
103
|
+
process.exit();
|
|
104
|
+
}
|
|
105
|
+
else if (message === `{"type":"ping"}`) {
|
|
106
|
+
socket.send(JSON.stringify({ type: "pong" }));
|
|
107
|
+
}
|
|
108
|
+
else if (message === "needle:editor:editor-sync-enabled") {
|
|
109
|
+
console.log("Editor sync enabled")
|
|
110
|
+
editorSyncEnabled = true;
|
|
111
|
+
}
|
|
112
|
+
else if (message === "needle:editor:editor-sync-disabled") {
|
|
113
|
+
editorSyncEnabled = false;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
})
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
}
|
|
121
|
+
}
|
package/plugins/vite/index.js
CHANGED
|
@@ -2,6 +2,8 @@ import { needleBuild } from "./build.js";
|
|
|
2
2
|
import { needleMeta } from "./meta.js"
|
|
3
3
|
import { needlePoster } from "./poster.js"
|
|
4
4
|
import { needleReload } from "./reload.js"
|
|
5
|
+
import { needleDrop } from "./drop.js";
|
|
6
|
+
import { editorConnection } from "./editor-connection.js";
|
|
5
7
|
|
|
6
8
|
export * from "./gzip.js";
|
|
7
9
|
export * from "./config.js";
|
|
@@ -11,13 +13,16 @@ const defaultUserSettings = {
|
|
|
11
13
|
allowHotReload: true,
|
|
12
14
|
}
|
|
13
15
|
|
|
14
|
-
export const needlePlugins = (command, config, userSettings) => {
|
|
16
|
+
export const needlePlugins = async (command, config, userSettings) => {
|
|
15
17
|
// ensure we have user settings initialized with defaults
|
|
16
18
|
userSettings = { ...defaultUserSettings, ...userSettings }
|
|
17
|
-
|
|
19
|
+
const array = [
|
|
18
20
|
needleMeta(command, config, userSettings),
|
|
19
21
|
needlePoster(command),
|
|
20
22
|
needleReload(command, config, userSettings),
|
|
21
|
-
needleBuild(command, config, userSettings)
|
|
22
|
-
|
|
23
|
+
needleBuild(command, config, userSettings),
|
|
24
|
+
needleDrop(command, config, userSettings),
|
|
25
|
+
];
|
|
26
|
+
array.push(await editorConnection(command, config, userSettings, array));
|
|
27
|
+
return array;
|
|
23
28
|
}
|
package/plugins/vite/meta.js
CHANGED
|
@@ -58,6 +58,9 @@ export const needleMeta = (command, config, userSettings) => {
|
|
|
58
58
|
tags.push({ tag: 'meta', attrs: { name: 'twitter:card', content: 'summary_large_image' } });
|
|
59
59
|
tags.push({ tag: 'meta', attrs: { name: 'twitter:image', content: url } });
|
|
60
60
|
tags.push({ tag: 'meta', attrs: { name: 'og:image', content: url } });
|
|
61
|
+
// Keep in sync with poster
|
|
62
|
+
tags.push({ tag: 'meta', attrs: { name: 'og:image:width', content: 1080 } });
|
|
63
|
+
tags.push({ tag: 'meta', attrs: { name: 'og:image:height', content: 1080 } });
|
|
61
64
|
}
|
|
62
65
|
}
|
|
63
66
|
|