@needle-tools/engine 2.52.0-pre → 2.54.2-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 +36 -0
- package/dist/needle-engine.d.ts +3018 -2680
- package/dist/needle-engine.js +439 -439
- package/dist/needle-engine.js.map +4 -4
- package/dist/needle-engine.min.js +41 -41
- package/dist/needle-engine.min.js.map +4 -4
- package/dist/needle-engine.tsbuildinfo +1 -0
- package/lib/engine/codegen/register_types.d.ts +1 -0
- package/lib/engine/codegen/register_types.js +346 -0
- package/lib/engine/codegen/register_types.js.map +1 -0
- package/lib/engine/debug/debug.d.ts +1 -0
- package/lib/engine/debug/debug.js +4 -0
- package/lib/engine/debug/debug.js.map +1 -1
- package/lib/engine/debug/debug_console.js +2 -1
- package/lib/engine/debug/debug_console.js.map +1 -1
- package/lib/engine/debug/debug_overlay.js +3 -1
- package/lib/engine/debug/debug_overlay.js.map +1 -1
- package/lib/engine/engine_components.js +2 -2
- package/lib/engine/engine_components.js.map +1 -1
- package/lib/engine/engine_default_parameters.d.ts +2 -2
- package/lib/engine/engine_element.js +4 -2
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_element_loading.d.ts +1 -0
- package/lib/engine/engine_element_loading.js +17 -6
- package/lib/engine/engine_element_loading.js.map +1 -1
- package/lib/engine/engine_element_overlay.js +4 -2
- package/lib/engine/engine_element_overlay.js.map +1 -1
- package/lib/engine/engine_fileloader.d.ts +3 -0
- package/lib/engine/engine_fileloader.js +8 -0
- package/lib/engine/engine_fileloader.js.map +1 -0
- package/lib/engine/engine_generic_utils.d.ts +1 -0
- package/lib/engine/engine_generic_utils.js +14 -0
- package/lib/engine/engine_generic_utils.js.map +1 -0
- package/lib/engine/engine_input.js +4 -0
- package/lib/engine/engine_input.js.map +1 -1
- package/lib/engine/engine_networking_instantiate.d.ts +1 -1
- package/lib/engine/engine_networking_instantiate.js +3 -0
- package/lib/engine/engine_networking_instantiate.js.map +1 -1
- package/lib/engine/engine_networking_websocket.d.ts +1 -0
- package/lib/engine/engine_networking_websocket.js +1 -1
- package/lib/engine/engine_networking_websocket.js.map +1 -1
- package/lib/engine/engine_serialization_builtin_serializer.d.ts +6 -0
- package/lib/engine/engine_serialization_builtin_serializer.js +35 -7
- package/lib/engine/engine_serialization_builtin_serializer.js.map +1 -1
- package/lib/engine/engine_serialization_core.d.ts +1 -0
- package/lib/engine/engine_serialization_core.js +6 -0
- package/lib/engine/engine_serialization_core.js.map +1 -1
- package/lib/engine/engine_setup.js +2 -2
- package/lib/engine/engine_setup.js.map +1 -1
- package/lib/engine/engine_texture.d.ts +3 -0
- package/lib/engine/engine_texture.js +4 -0
- package/lib/engine/engine_texture.js.map +1 -0
- package/lib/engine/engine_utils.d.ts +1 -1
- package/lib/engine/engine_utils.js +3 -0
- package/lib/engine/engine_utils.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_components.d.ts +1 -1
- package/lib/engine/extensions/NEEDLE_progressive.d.ts +40 -0
- package/lib/engine/extensions/NEEDLE_progressive.js +322 -0
- package/lib/engine/extensions/NEEDLE_progressive.js.map +1 -0
- package/lib/engine/extensions/extensions.js +2 -2
- package/lib/engine/extensions/extensions.js.map +1 -1
- package/lib/engine-components/Camera.js +17 -2
- package/lib/engine-components/Camera.js.map +1 -1
- package/lib/engine-components/GroundProjection.d.ts +2 -1
- package/lib/engine-components/GroundProjection.js +19 -12
- package/lib/engine-components/GroundProjection.js.map +1 -1
- package/lib/engine-components/Light.js +1 -0
- package/lib/engine-components/Light.js.map +1 -1
- package/lib/engine-components/OrbitControls.js +6 -2
- package/lib/engine-components/OrbitControls.js.map +1 -1
- package/lib/engine-components/ParticleSystemModules.d.ts +1 -1
- package/lib/engine-components/ParticleSystemModules.js +48 -44
- package/lib/engine-components/ParticleSystemModules.js.map +1 -1
- package/lib/engine-components/ReflectionProbe.d.ts +1 -1
- package/lib/engine-components/Renderer.d.ts +1 -1
- package/lib/engine-components/Renderer.js +4 -9
- package/lib/engine-components/Renderer.js.map +1 -1
- package/lib/engine-components/Voip.js +13 -4
- package/lib/engine-components/Voip.js.map +1 -1
- package/lib/engine-components/Volume.js +8 -1
- package/lib/engine-components/Volume.js.map +1 -1
- package/lib/engine-components/WebXR.d.ts +2 -2
- package/lib/engine-components/WebXRAvatar.d.ts +1 -1
- package/lib/engine-components/codegen/components.d.ts +99 -95
- package/lib/engine-components/codegen/components.js +99 -95
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/export/{GltfExport.d.ts → gltf/GltfExport.d.ts} +2 -2
- package/lib/engine-components/export/{GltfExport.js → gltf/GltfExport.js} +7 -7
- package/lib/engine-components/export/gltf/GltfExport.js.map +1 -0
- package/lib/engine-components/export/usdz/Extension.d.ts +9 -0
- package/lib/engine-components/export/usdz/Extension.js +2 -0
- package/lib/engine-components/export/usdz/Extension.js.map +1 -0
- package/lib/engine-components/export/usdz/USDZExporter.d.ts +26 -0
- package/lib/engine-components/export/usdz/USDZExporter.js +209 -0
- package/lib/engine-components/export/usdz/USDZExporter.js.map +1 -0
- package/lib/engine-components/export/usdz/extensions/Animation.d.ts +44 -0
- package/lib/engine-components/export/usdz/extensions/Animation.js +264 -0
- package/lib/engine-components/export/usdz/extensions/Animation.js.map +1 -0
- package/lib/engine-components/export/usdz/types.d.ts +34 -0
- package/lib/engine-components/export/usdz/types.js +2 -0
- package/lib/engine-components/export/usdz/types.js.map +1 -0
- package/lib/engine-components/export/usdz/utils/animationutils.d.ts +3 -0
- package/lib/engine-components/export/usdz/utils/animationutils.js +46 -0
- package/lib/engine-components/export/usdz/utils/animationutils.js.map +1 -0
- package/lib/engine-components/export/usdz/utils/quicklook.d.ts +2 -0
- package/lib/engine-components/export/usdz/utils/quicklook.js +36 -0
- package/lib/engine-components/export/usdz/utils/quicklook.js.map +1 -0
- package/lib/engine-components/export/usdz/utils/timeutils.d.ts +1 -0
- package/lib/engine-components/export/usdz/utils/timeutils.js +15 -0
- package/lib/engine-components/export/usdz/utils/timeutils.js.map +1 -0
- package/lib/engine-components/ui/Button.js +30 -0
- package/lib/engine-components/ui/Button.js.map +1 -1
- package/lib/engine-components/ui/Graphic.d.ts +2 -0
- package/lib/engine-components/ui/Graphic.js +15 -0
- package/lib/engine-components/ui/Graphic.js.map +1 -1
- package/lib/engine-components/ui/InputField.d.ts +2 -0
- package/lib/engine-components/ui/InputField.js +23 -1
- package/lib/engine-components/ui/InputField.js.map +1 -1
- package/lib/engine-components/ui/Utils.d.ts +4 -1
- package/lib/engine-components/ui/Utils.js +15 -12
- package/lib/engine-components/ui/Utils.js.map +1 -1
- package/lib/engine-components-experimental/Presentation.d.ts +6 -0
- package/lib/engine-components-experimental/Presentation.js +11 -0
- package/lib/engine-components-experimental/Presentation.js.map +1 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.d.ts +18 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.js +175 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.js.map +1 -0
- package/lib/engine-components-experimental/annotation/LinesManager.d.ts +54 -0
- package/lib/engine-components-experimental/annotation/LinesManager.js +155 -0
- package/lib/engine-components-experimental/annotation/LinesManager.js.map +1 -0
- package/lib/engine-components-experimental/networking/PlayerSync.d.ts +26 -0
- package/lib/engine-components-experimental/networking/PlayerSync.js +121 -0
- package/lib/engine-components-experimental/networking/PlayerSync.js.map +1 -0
- package/lib/engine-schemes/vec2.d.ts +10 -0
- package/lib/engine-schemes/vec2.js +26 -0
- package/lib/engine-schemes/vec2.js.map +1 -0
- package/lib/include/three/ARButton.d.ts +3 -0
- package/lib/include/three/ARButton.js +158 -0
- package/lib/include/three/ARButton.js.map +1 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.d.ts +6 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.js +46 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.js.map +1 -0
- package/lib/include/three/VRButton.d.ts +5 -0
- package/lib/include/three/VRButton.js +122 -0
- package/lib/include/three/VRButton.js.map +1 -0
- package/lib/tsconfig.tsbuildinfo +1 -0
- package/package.json +2 -2
- package/src/engine/codegen/register_types.js +212 -204
- package/src/engine/debug/debug.ts +5 -0
- package/src/engine/debug/debug_console.ts +3 -2
- package/src/engine/debug/debug_overlay.ts +3 -1
- package/src/engine/engine_components.ts +2 -2
- package/src/engine/engine_element.ts +4 -2
- package/src/engine/engine_element_loading.ts +13 -6
- package/src/engine/engine_element_overlay.ts +4 -2
- package/src/engine/engine_input.ts +4 -0
- package/src/engine/engine_networking_instantiate.ts +4 -1
- package/src/engine/engine_networking_websocket.ts +3 -1
- package/src/engine/engine_serialization_builtin_serializer.ts +39 -8
- package/src/engine/engine_serialization_core.ts +7 -1
- package/src/engine/engine_setup.ts +2 -2
- package/src/engine/engine_texture.ts +6 -0
- package/src/engine/engine_utils.ts +3 -1
- package/src/engine/extensions/NEEDLE_progressive.ts +357 -0
- package/src/engine/extensions/extensions.ts +2 -2
- package/src/engine-components/Camera.ts +17 -3
- package/src/engine-components/GroundProjection.ts +18 -12
- package/src/engine-components/Light.ts +3 -1
- package/src/engine-components/OrbitControls.ts +7 -3
- package/src/engine-components/ParticleSystemModules.ts +50 -47
- package/src/engine-components/Renderer.ts +6 -10
- package/src/engine-components/Voip.ts +14 -4
- package/src/engine-components/Volume.ts +8 -1
- package/src/engine-components/WebXR.ts +2 -2
- package/src/engine-components/codegen/components.ts +99 -95
- package/src/engine-components/export/{GltfExport.ts → gltf/GltfExport.ts} +7 -7
- package/src/engine-components/export/usdz/Extension.ts +12 -0
- package/src/engine-components/export/usdz/USDZExporter.ts +233 -0
- package/src/engine-components/export/usdz/extensions/Animation.ts +306 -0
- package/src/engine-components/export/usdz/types.ts +39 -0
- package/src/engine-components/export/usdz/utils/animationutils.ts +60 -0
- package/src/engine-components/export/usdz/utils/quicklook.ts +43 -0
- package/src/engine-components/export/usdz/utils/timeutils.ts +20 -0
- package/src/engine-components/ui/Button.ts +8 -8
- package/src/engine-components/ui/Graphic.ts +15 -1
- package/src/engine-components/ui/InputField.ts +25 -2
- package/src/engine-components/ui/Utils.ts +17 -14
- package/src/engine-components-experimental/annotation/LineDrawer.ts +10 -7
- package/src/engine-components-experimental/annotation/LinesManager.ts +6 -6
- package/src/engine-components-experimental/networking/PlayerSync.ts +1 -1
- package/lib/engine/engine_caching.d.ts +0 -0
- package/lib/engine/engine_caching.js +0 -2
- package/lib/engine/engine_caching.js.map +0 -1
- package/lib/engine/extensions/NEEDLE_deferred_texture.d.ts +0 -18
- package/lib/engine/extensions/NEEDLE_deferred_texture.js +0 -194
- package/lib/engine/extensions/NEEDLE_deferred_texture.js.map +0 -1
- package/lib/engine/tests/simulate_avatars.d.ts +0 -0
- package/lib/engine/tests/simulate_avatars.js +0 -3
- package/lib/engine/tests/simulate_avatars.js.map +0 -1
- package/lib/engine-components/NavMesh.d.ts +0 -0
- package/lib/engine-components/NavMesh.js +0 -101
- package/lib/engine-components/NavMesh.js.map +0 -1
- package/lib/engine-components/ParticleSystemBehaviours.d.ts +0 -0
- package/lib/engine-components/ParticleSystemBehaviours.js +0 -2
- package/lib/engine-components/ParticleSystemBehaviours.js.map +0 -1
- package/lib/engine-components/SpringJoint.d.ts +0 -0
- package/lib/engine-components/SpringJoint.js +0 -43
- package/lib/engine-components/SpringJoint.js.map +0 -1
- package/lib/engine-components/export/GltfExport.js.map +0 -1
- package/lib/engine-components/ui/CanvasScaler.d.ts +0 -0
- package/lib/engine-components/ui/CanvasScaler.js +0 -17
- package/lib/engine-components/ui/CanvasScaler.js.map +0 -1
- package/src/engine/dist/engine_three_utils.js +0 -279
- package/src/engine/engine_caching.ts +0 -0
- package/src/engine/extensions/NEEDLE_deferred_texture.ts +0 -217
- package/src/engine/tests/simulate_avatars.ts +0 -2
- package/src/engine-components/NavMesh.ts +0 -117
- package/src/engine-components/ParticleSystemBehaviours.ts +0 -0
- package/src/engine-components/SpringJoint.ts +0 -45
- package/src/engine-components/ui/CanvasScaler.ts +0 -21
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Object3D } from "three";
|
|
2
|
+
import { USDZObject } from "three/examples/jsm/exporters/USDZExporter";
|
|
3
|
+
import { IUSDZExporterExtension } from "../Extension";
|
|
4
|
+
export interface UsdzAnimation {
|
|
5
|
+
createAnimation(ext: AnimationExtension, model: USDZObject, context: any): any;
|
|
6
|
+
}
|
|
7
|
+
export type AnimationClipCollection = Array<{
|
|
8
|
+
root: Object3D;
|
|
9
|
+
clips: Array<THREE.AnimationClip>;
|
|
10
|
+
}>;
|
|
11
|
+
export declare class RegisteredAnimationInfo {
|
|
12
|
+
get start(): number;
|
|
13
|
+
get duration(): number;
|
|
14
|
+
private ext;
|
|
15
|
+
private root;
|
|
16
|
+
private clip;
|
|
17
|
+
constructor(ext: AnimationExtension, root: THREE.Object3D, clip: THREE.AnimationClip);
|
|
18
|
+
}
|
|
19
|
+
export declare class TransformData {
|
|
20
|
+
clip: THREE.AnimationClip;
|
|
21
|
+
pos?: THREE.KeyframeTrack;
|
|
22
|
+
rot?: THREE.KeyframeTrack;
|
|
23
|
+
scale?: THREE.KeyframeTrack;
|
|
24
|
+
get frameRate(): number;
|
|
25
|
+
private ext;
|
|
26
|
+
private root;
|
|
27
|
+
private target;
|
|
28
|
+
constructor(ext: AnimationExtension, root: Object3D, target: Object3D, clip: THREE.AnimationClip);
|
|
29
|
+
addTrack(track: any): void;
|
|
30
|
+
getFrames(): number;
|
|
31
|
+
getDuration(): number;
|
|
32
|
+
getStartTime(arr: TransformData[]): number;
|
|
33
|
+
}
|
|
34
|
+
export declare class AnimationExtension implements IUSDZExporterExtension {
|
|
35
|
+
get extensionName(): string;
|
|
36
|
+
private dict;
|
|
37
|
+
private rootTargetMap;
|
|
38
|
+
getStartTime01(root: Object3D, clip: THREE.AnimationClip): number;
|
|
39
|
+
registerAnimation(root: Object3D, clip: THREE.AnimationClip): RegisteredAnimationInfo | null;
|
|
40
|
+
onAfterHierarchy(_context: any): void;
|
|
41
|
+
private serializers;
|
|
42
|
+
onAfterBuildDocument(_context: any): void;
|
|
43
|
+
onExportObject(object: any, model: USDZObject, _context: any): void;
|
|
44
|
+
}
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { GameObject } from "../../../Component";
|
|
2
|
+
import { getParam } from "../../../../engine/engine_utils";
|
|
3
|
+
import { Matrix4, Vector3, Quaternion } from "three";
|
|
4
|
+
//@ts-ignore
|
|
5
|
+
import { buildMatrix } from "three/examples/jsm/exporters/USDZExporter";
|
|
6
|
+
const debug = getParam("debugusdzanimation");
|
|
7
|
+
export class RegisteredAnimationInfo {
|
|
8
|
+
get start() { return this.ext.getStartTime01(this.root, this.clip); }
|
|
9
|
+
get duration() { return this.clip.duration; }
|
|
10
|
+
ext;
|
|
11
|
+
root;
|
|
12
|
+
clip;
|
|
13
|
+
constructor(ext, root, clip) {
|
|
14
|
+
this.ext = ext;
|
|
15
|
+
this.root = root;
|
|
16
|
+
this.clip = clip;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export class TransformData {
|
|
20
|
+
clip;
|
|
21
|
+
pos;
|
|
22
|
+
rot;
|
|
23
|
+
scale;
|
|
24
|
+
get frameRate() { return 60; }
|
|
25
|
+
ext;
|
|
26
|
+
root;
|
|
27
|
+
target;
|
|
28
|
+
constructor(ext, root, target, clip) {
|
|
29
|
+
this.ext = ext;
|
|
30
|
+
this.root = root;
|
|
31
|
+
this.target = target;
|
|
32
|
+
this.clip = clip;
|
|
33
|
+
}
|
|
34
|
+
addTrack(track) {
|
|
35
|
+
if (track.name.endsWith("position"))
|
|
36
|
+
this.pos = track;
|
|
37
|
+
if (track.name.endsWith("quaternion"))
|
|
38
|
+
this.rot = track;
|
|
39
|
+
if (track.name.endsWith("scale"))
|
|
40
|
+
this.scale = track;
|
|
41
|
+
}
|
|
42
|
+
getFrames() {
|
|
43
|
+
return Math.max(this.pos?.times?.length ?? 0, this.rot?.times?.length ?? 0, this.scale?.times?.length ?? 0);
|
|
44
|
+
}
|
|
45
|
+
getDuration() {
|
|
46
|
+
const times = this.pos?.times ?? this.rot?.times ?? this.scale?.times;
|
|
47
|
+
if (!times)
|
|
48
|
+
return 0;
|
|
49
|
+
return times[times.length - 1];
|
|
50
|
+
}
|
|
51
|
+
getStartTime(arr) {
|
|
52
|
+
let sum = 0;
|
|
53
|
+
for (let i = 0; i < arr.length; i++) {
|
|
54
|
+
const entry = arr[i];
|
|
55
|
+
if (entry === this) {
|
|
56
|
+
return sum;
|
|
57
|
+
}
|
|
58
|
+
else
|
|
59
|
+
sum += entry.getDuration();
|
|
60
|
+
}
|
|
61
|
+
return sum;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
export class AnimationExtension {
|
|
65
|
+
get extensionName() { return "animation"; }
|
|
66
|
+
dict = new Map();
|
|
67
|
+
// private rootTargetMap: Map<Object3D, Object3D[]> = new Map();
|
|
68
|
+
rootTargetMap = new Map();
|
|
69
|
+
getStartTime01(root, clip) {
|
|
70
|
+
const targets = this.rootTargetMap.get(root);
|
|
71
|
+
if (!targets)
|
|
72
|
+
return Infinity;
|
|
73
|
+
let longestStartTime = -1;
|
|
74
|
+
for (const target of targets) {
|
|
75
|
+
const data = this.dict.get(target);
|
|
76
|
+
let startTimeInSeconds = 0;
|
|
77
|
+
if (data?.length) {
|
|
78
|
+
for (const entry of data) {
|
|
79
|
+
if (entry.clip === clip) {
|
|
80
|
+
break;
|
|
81
|
+
}
|
|
82
|
+
startTimeInSeconds += entry.getDuration();
|
|
83
|
+
}
|
|
84
|
+
longestStartTime = Math.max(longestStartTime, startTimeInSeconds);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
console.warn("No animation found on root", root, clip, data);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
return longestStartTime;
|
|
91
|
+
}
|
|
92
|
+
registerAnimation(root, clip) {
|
|
93
|
+
if (!clip || !root)
|
|
94
|
+
return null;
|
|
95
|
+
if (!this.rootTargetMap.has(root))
|
|
96
|
+
this.rootTargetMap.set(root, []);
|
|
97
|
+
// this.rootTargetMap.get(root)?.push(clip);
|
|
98
|
+
for (const track of clip.tracks) {
|
|
99
|
+
const trackName = track.name.split(".")[2];
|
|
100
|
+
const animationTarget = root.getObjectByName(trackName); // object name
|
|
101
|
+
if (!animationTarget) {
|
|
102
|
+
console.warn("no object found for track", track.name, "using " + root.name + " instead");
|
|
103
|
+
continue;
|
|
104
|
+
// // if no object was found it might be that we have a component that references an animation clip but wants to target another object
|
|
105
|
+
// // in that case UnityGLTF writes the name of the component as track targets because it doesnt know of the intented target
|
|
106
|
+
// animationTarget = root;
|
|
107
|
+
}
|
|
108
|
+
if (!this.dict.has(animationTarget)) {
|
|
109
|
+
this.dict.set(animationTarget, []);
|
|
110
|
+
}
|
|
111
|
+
const arr = this.dict.get(animationTarget);
|
|
112
|
+
if (!arr)
|
|
113
|
+
continue;
|
|
114
|
+
let model = arr.find(x => x.clip === clip);
|
|
115
|
+
if (!model) {
|
|
116
|
+
model = new TransformData(this, root, animationTarget, clip);
|
|
117
|
+
arr.push(model);
|
|
118
|
+
}
|
|
119
|
+
model.addTrack(track);
|
|
120
|
+
const targets = this.rootTargetMap.get(root);
|
|
121
|
+
if (!targets?.includes(animationTarget))
|
|
122
|
+
targets?.push(animationTarget);
|
|
123
|
+
}
|
|
124
|
+
// get the entry for this object.
|
|
125
|
+
// This doesnt work if we have clips animating multiple objects
|
|
126
|
+
const info = new RegisteredAnimationInfo(this, root, clip);
|
|
127
|
+
return info;
|
|
128
|
+
}
|
|
129
|
+
onAfterHierarchy(_context) {
|
|
130
|
+
if (debug)
|
|
131
|
+
console.log(this.dict);
|
|
132
|
+
}
|
|
133
|
+
serializers = [];
|
|
134
|
+
onAfterBuildDocument(_context) {
|
|
135
|
+
for (const ser of this.serializers) {
|
|
136
|
+
const parent = ser.model?.parent;
|
|
137
|
+
const isEmptyParent = parent?.isDynamic === true;
|
|
138
|
+
if (debug)
|
|
139
|
+
console.log(isEmptyParent, ser.model?.parent);
|
|
140
|
+
if (isEmptyParent) {
|
|
141
|
+
ser.registerCallback(parent);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
onExportObject(object, model, _context) {
|
|
146
|
+
GameObject.foreachComponent(object, (comp) => {
|
|
147
|
+
const c = comp;
|
|
148
|
+
if (typeof c.createAnimation === "function") {
|
|
149
|
+
c.createAnimation(this, model, _context);
|
|
150
|
+
}
|
|
151
|
+
}, false);
|
|
152
|
+
// we need to be able to retarget serialization to empty parents before actually serializing (we do that in another callback)
|
|
153
|
+
const ser = new SerializeAnimation(object, this.dict);
|
|
154
|
+
this.serializers.push(ser);
|
|
155
|
+
ser.registerCallback(model);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
class SerializeAnimation {
|
|
159
|
+
object;
|
|
160
|
+
dict;
|
|
161
|
+
model;
|
|
162
|
+
callback;
|
|
163
|
+
constructor(object, dict) {
|
|
164
|
+
this.object = object;
|
|
165
|
+
this.dict = dict;
|
|
166
|
+
}
|
|
167
|
+
registerCallback(model) {
|
|
168
|
+
if (this.model && this.callback) {
|
|
169
|
+
this.model.removeEventListener("serialize", this.callback);
|
|
170
|
+
}
|
|
171
|
+
if (!this.callback)
|
|
172
|
+
this.callback = this.onSerialize.bind(this);
|
|
173
|
+
if (debug)
|
|
174
|
+
console.log("REPARENT", model);
|
|
175
|
+
this.model = model;
|
|
176
|
+
this.model.addEventListener("serialize", this.callback);
|
|
177
|
+
}
|
|
178
|
+
onSerialize(writer, _context) {
|
|
179
|
+
if (debug)
|
|
180
|
+
console.log("SERIALIZE", this.model.name, this.object.type);
|
|
181
|
+
// do we have a track for this?
|
|
182
|
+
const object = this.object;
|
|
183
|
+
const arr = this.dict.get(object);
|
|
184
|
+
if (!arr)
|
|
185
|
+
return;
|
|
186
|
+
// console.log("found data for", object, "exporting animation now");
|
|
187
|
+
// assumption: all tracks have the same time values
|
|
188
|
+
// TODO collect all time values and then use the interpolator to access
|
|
189
|
+
const composedTransform = new Matrix4();
|
|
190
|
+
const translation = new Vector3();
|
|
191
|
+
const rotation = new Quaternion();
|
|
192
|
+
const scale = new Vector3(1, 1, 1);
|
|
193
|
+
// TODO doesn't support individual time arrays right now
|
|
194
|
+
// could use these in case we don't have time values that are identical
|
|
195
|
+
/*
|
|
196
|
+
const translationInterpolant = o.pos?.createInterpolant() as THREE.Interpolant;
|
|
197
|
+
const rotationInterpolant = o.rot?.createInterpolant() as THREE.Interpolant;
|
|
198
|
+
const scaleInterpolant = o.scale?.createInterpolant() as THREE.Interpolant;
|
|
199
|
+
*/
|
|
200
|
+
writer.appendLine("matrix4d xformOp:transform.timeSamples = {");
|
|
201
|
+
writer.indent++;
|
|
202
|
+
for (const transformData of arr) {
|
|
203
|
+
let timesArray = transformData.pos?.times;
|
|
204
|
+
if (!timesArray || transformData.rot && transformData.rot.times?.length > timesArray?.length)
|
|
205
|
+
timesArray = transformData.rot?.times;
|
|
206
|
+
if (!timesArray || transformData.scale && transformData.scale.times?.length > timesArray?.length)
|
|
207
|
+
timesArray = transformData.scale?.times;
|
|
208
|
+
if (!timesArray) {
|
|
209
|
+
console.error("got an animated object but no time values??", object, transformData);
|
|
210
|
+
continue;
|
|
211
|
+
}
|
|
212
|
+
const startTime = transformData.getStartTime(arr);
|
|
213
|
+
if (debug)
|
|
214
|
+
writer.appendLine(transformData.clip.name + ": start=" + startTime.toFixed(3) + ", length=" + transformData.getDuration().toFixed(3) + ", frames=" + transformData.getFrames());
|
|
215
|
+
// ignore until https://github.com/three-types/three-ts-types/pull/293 gets merged
|
|
216
|
+
//@ts-ignore
|
|
217
|
+
const positionInterpolant = transformData.pos?.createInterpolant();
|
|
218
|
+
//@ts-ignore
|
|
219
|
+
const rotationInterpolant = transformData.rot?.createInterpolant();
|
|
220
|
+
//@ts-ignore
|
|
221
|
+
const scaleInterpolant = transformData.scale?.createInterpolant();
|
|
222
|
+
if (!positionInterpolant)
|
|
223
|
+
translation.set(object.position.x, object.position.y, object.position.z);
|
|
224
|
+
if (!rotationInterpolant)
|
|
225
|
+
rotation.set(object.quaternion.x, object.quaternion.y, object.quaternion.z, object.quaternion.w);
|
|
226
|
+
if (!scaleInterpolant)
|
|
227
|
+
scale.set(object.scale.x, object.scale.y, object.scale.z);
|
|
228
|
+
for (let index = 0; index < timesArray.length; index++) {
|
|
229
|
+
const time = timesArray[index];
|
|
230
|
+
if (positionInterpolant) {
|
|
231
|
+
const pos = positionInterpolant.evaluate(time);
|
|
232
|
+
translation.set(pos[0], pos[1], pos[2]);
|
|
233
|
+
}
|
|
234
|
+
if (rotationInterpolant) {
|
|
235
|
+
const quat = rotationInterpolant.evaluate(time);
|
|
236
|
+
rotation.set(quat[0], quat[1], quat[2], quat[3]);
|
|
237
|
+
}
|
|
238
|
+
if (scaleInterpolant) {
|
|
239
|
+
const scale = scaleInterpolant.evaluate(time);
|
|
240
|
+
scale.set(scale[0], scale[1], scale[2]);
|
|
241
|
+
}
|
|
242
|
+
composedTransform.compose(translation, rotation, scale);
|
|
243
|
+
let line = `${(startTime + time) * transformData.frameRate}: ${buildMatrix(composedTransform)},`;
|
|
244
|
+
if (debug)
|
|
245
|
+
line = "#" + index + "\t" + line;
|
|
246
|
+
writer.appendLine(line);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
writer.indent--;
|
|
250
|
+
writer.appendLine("}");
|
|
251
|
+
/*
|
|
252
|
+
let transform3 = new Matrix4();
|
|
253
|
+
transform3.compose(0.2,0,0);
|
|
254
|
+
const transform = buildMatrix(model.matrix);
|
|
255
|
+
const transform2 = buildMatrix(transform3.multiply(model.matrix));
|
|
256
|
+
|
|
257
|
+
writer.appendLine(`matrix4d xformOp:transform.timeSamples = {
|
|
258
|
+
0: ${transform},
|
|
259
|
+
30: ${transform2}
|
|
260
|
+
}`);
|
|
261
|
+
*/
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
//# sourceMappingURL=Animation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Animation.js","sourceRoot":"","sources":["../../../../../../engine-components/export/usdz/extensions/Animation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Object3D, Matrix4, Material, BufferGeometry } from "three";
|
|
2
|
+
/** implementation is in three */
|
|
3
|
+
export declare class USDZDocument {
|
|
4
|
+
name: string;
|
|
5
|
+
get isDocumentRoot(): boolean;
|
|
6
|
+
add(obj: USDZObject): any;
|
|
7
|
+
remove(obj: USDZObject): any;
|
|
8
|
+
traverse(callback: (obj: USDZObject) => void): any;
|
|
9
|
+
findById(uuid: string): USDZObject | undefined;
|
|
10
|
+
get isDynamic(): boolean;
|
|
11
|
+
}
|
|
12
|
+
/** implementation is in three */
|
|
13
|
+
export declare class USDZObject {
|
|
14
|
+
static createEmptyParent(parent: USDZObject): any;
|
|
15
|
+
uuid: string;
|
|
16
|
+
name: string;
|
|
17
|
+
matrix: Matrix4;
|
|
18
|
+
material: Material;
|
|
19
|
+
geometry: BufferGeometry;
|
|
20
|
+
parent: USDZObject | USDZDocument | null;
|
|
21
|
+
children: USDZObject[];
|
|
22
|
+
_eventListeners: {
|
|
23
|
+
[event: string]: Function[];
|
|
24
|
+
};
|
|
25
|
+
isDynamic: boolean;
|
|
26
|
+
is(obj: Object3D): boolean;
|
|
27
|
+
isEmpty(): boolean;
|
|
28
|
+
clone(): any;
|
|
29
|
+
getPath(): any;
|
|
30
|
+
add(child: USDZObject): any;
|
|
31
|
+
remove(child: USDZObject): any;
|
|
32
|
+
addEventListener(evt: string, listener: Function): any;
|
|
33
|
+
removeEventListener(evt: string, listener: Function): any;
|
|
34
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../engine-components/export/usdz/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { Animator } from "../../../Animator";
|
|
2
|
+
import { AnimationClip, KeyframeTrack } from "three";
|
|
3
|
+
import { GameObject } from "../../../Component";
|
|
4
|
+
import { getParam } from "../../../../engine/engine_utils";
|
|
5
|
+
const debug = getParam("debugusdz");
|
|
6
|
+
export function registerAnimatorsImplictly(root, ext) {
|
|
7
|
+
// collect animators and their clips
|
|
8
|
+
const animationClips = [];
|
|
9
|
+
const animators = GameObject.getComponentsInChildren(root, Animator);
|
|
10
|
+
// insert rest pose clip
|
|
11
|
+
let injectedRestPose = false;
|
|
12
|
+
if (debug)
|
|
13
|
+
console.log(animators);
|
|
14
|
+
for (const animator of animators) {
|
|
15
|
+
if (!animator || !animator.runtimeAnimatorController)
|
|
16
|
+
continue;
|
|
17
|
+
if (debug)
|
|
18
|
+
console.log(animator);
|
|
19
|
+
const clips = [];
|
|
20
|
+
for (const action of animator.runtimeAnimatorController.enumerateActions()) {
|
|
21
|
+
if (debug)
|
|
22
|
+
console.log(action);
|
|
23
|
+
const clip = action.getClip();
|
|
24
|
+
// we need to inject a rest pose clip so that the animation position is correct
|
|
25
|
+
// e.g. when the animation starts in the air and animates down we dont want the object to move under the ground
|
|
26
|
+
if (!injectedRestPose && clip.tracks.length > 0) {
|
|
27
|
+
injectedRestPose = true;
|
|
28
|
+
const track = clip.tracks[0];
|
|
29
|
+
const trackBaseName = track.name.substring(0, track.name.lastIndexOf("."));
|
|
30
|
+
const currentPositionTrack = new KeyframeTrack(trackBaseName + ".position", [0, .01], [0, 0, 0, 0, 0, 0]);
|
|
31
|
+
const currentRotationTrack = new KeyframeTrack(trackBaseName + ".quaternion", [0, .01], [0, 0, 0, 1, 0, 0, 0, 1]);
|
|
32
|
+
clips.push(new AnimationClip("rest", .01, [currentPositionTrack, currentRotationTrack]));
|
|
33
|
+
}
|
|
34
|
+
if (!clips.includes(clip))
|
|
35
|
+
clips.push(clip);
|
|
36
|
+
}
|
|
37
|
+
animationClips.push({ root: animator.gameObject, clips: clips });
|
|
38
|
+
}
|
|
39
|
+
if (debug)
|
|
40
|
+
console.log(animationClips);
|
|
41
|
+
for (const pair of animationClips) {
|
|
42
|
+
for (const clip of pair.clips)
|
|
43
|
+
ext.registerAnimation(pair.root, clip);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=animationutils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"animationutils.js","sourceRoot":"","sources":["../../../../../../engine-components/export/usdz/utils/animationutils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAmB,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEpC,MAAM,UAAU,0BAA0B,CAAC,IAAc,EAAE,GAAuB;IAE9E,oCAAoC;IACpC,MAAM,cAAc,GAAuD,EAAE,CAAC;IAC9E,MAAM,SAAS,GAAG,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAErE,wBAAwB;IACxB,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,IAAI,KAAK;QACL,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAC9B,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,yBAAyB;YAAE,SAAS;QAE/D,IAAI,KAAK;YACL,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE1B,MAAM,KAAK,GAA0B,EAAE,CAAC;QAGxC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,yBAAyB,CAAC,gBAAgB,EAAE,EAAE;YACxE,IAAI,KAAK;gBACL,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAE9B,+EAA+E;YAC/E,+GAA+G;YAC/G,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,gBAAgB,GAAG,IAAI,CAAC;gBACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3E,MAAM,oBAAoB,GAAG,IAAI,aAAa,CAAC,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1G,MAAM,oBAAoB,GAAG,IAAI,aAAa,CAAC,aAAa,GAAG,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClH,KAAK,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;aAC5F;YAED,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACrB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxB;QAED,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;KACpE;IAED,IAAI,KAAK;QACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEhC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK;YACzB,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;AACL,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
export function ensureQuicklookLinkIsCreated(context) {
|
|
2
|
+
const existingLink = context.domElement.querySelector("link[rel='ar']");
|
|
3
|
+
if (existingLink)
|
|
4
|
+
return existingLink;
|
|
5
|
+
/*
|
|
6
|
+
generating this:
|
|
7
|
+
<div class="menu">
|
|
8
|
+
<button id="open-in-ar">Open in QuickLook</button>
|
|
9
|
+
<a style="display:none;" id="link" rel="ar" href="" download="asset.usdz">
|
|
10
|
+
<img id="button" width="100" src="files/arkit.png">
|
|
11
|
+
</a>
|
|
12
|
+
</div>
|
|
13
|
+
*/
|
|
14
|
+
const div = document.createElement("div");
|
|
15
|
+
div.classList.add("menu");
|
|
16
|
+
div.classList.add("quicklook-menu");
|
|
17
|
+
div.style.display = "none";
|
|
18
|
+
div.style.visibility = "hidden";
|
|
19
|
+
const button = document.createElement("button");
|
|
20
|
+
button.id = "open-in-ar";
|
|
21
|
+
button.innerText = "Open in QuickLook";
|
|
22
|
+
div.appendChild(button);
|
|
23
|
+
const link = document.createElement("a");
|
|
24
|
+
link.id = "needle-usdz-link";
|
|
25
|
+
link.style.display = "none";
|
|
26
|
+
link.rel = "ar";
|
|
27
|
+
link.href = "";
|
|
28
|
+
div.appendChild(link);
|
|
29
|
+
const img = document.createElement("img");
|
|
30
|
+
img.id = "button";
|
|
31
|
+
// img.src = "files/arkit.png";
|
|
32
|
+
link.appendChild(img);
|
|
33
|
+
context.domElement.appendChild(div);
|
|
34
|
+
return link;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=quicklook.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quicklook.js","sourceRoot":"","sources":["../../../../../../engine-components/export/usdz/utils/quicklook.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,4BAA4B,CAAC,OAAgB;IACzD,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACxE,IAAG,YAAY;QAAE,OAAO,YAAiC,CAAC;IAE1D;;;;;;;;MAQE;IAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC1C,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACpC,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;IAC3B,GAAG,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;IAEhC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,GAAG,YAAY,CAAC;IACzB,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAC;IACvC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExB,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,GAAG,kBAAkB,CAAC;IAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;IAChB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;IACf,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEtB,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC1C,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC;IAClB,+BAA+B;IAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAEtB,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,OAAO,IAAyB,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function getFormattedDate(): string;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export function getFormattedDate() {
|
|
2
|
+
var date = new Date();
|
|
3
|
+
const month = date.getMonth() + 1;
|
|
4
|
+
const day = date.getDate();
|
|
5
|
+
const hour = date.getHours();
|
|
6
|
+
const min = date.getMinutes();
|
|
7
|
+
const sec = date.getSeconds();
|
|
8
|
+
const s_month = (month < 10 ? "0" : "") + month;
|
|
9
|
+
const s_day = (day < 10 ? "0" : "") + day;
|
|
10
|
+
const s_hour = (hour < 10 ? "0" : "") + hour;
|
|
11
|
+
const s_min = (min < 10 ? "0" : "") + min;
|
|
12
|
+
const s_sec = (sec < 10 ? "0" : "") + sec;
|
|
13
|
+
return date.getFullYear() + s_month + s_day + "-" + s_hour + s_min + s_sec;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=timeutils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeutils.js","sourceRoot":"","sources":["../../../../../../engine-components/export/usdz/utils/timeutils.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB;IAC5B,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IAEtB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAE9B,MAAM,OAAO,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;IAC1C,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IAC7C,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;IAC1C,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;IAE1C,OAAO,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,GAAG,KAAK,GAAG,GAAG,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAC/E,CAAC"}
|
|
@@ -34,6 +34,36 @@ export var Transition;
|
|
|
34
34
|
/// </summary>
|
|
35
35
|
Transition[Transition["Animation"] = 3] = "Animation";
|
|
36
36
|
})(Transition || (Transition = {}));
|
|
37
|
+
class ButtonColors {
|
|
38
|
+
colorMultiplier;
|
|
39
|
+
disabledColor;
|
|
40
|
+
fadeDuration;
|
|
41
|
+
highlightedColor;
|
|
42
|
+
normalColor;
|
|
43
|
+
pressedColor;
|
|
44
|
+
selectedColor;
|
|
45
|
+
}
|
|
46
|
+
__decorate([
|
|
47
|
+
serializable()
|
|
48
|
+
], ButtonColors.prototype, "colorMultiplier", void 0);
|
|
49
|
+
__decorate([
|
|
50
|
+
serializable(RGBAColor)
|
|
51
|
+
], ButtonColors.prototype, "disabledColor", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
serializable()
|
|
54
|
+
], ButtonColors.prototype, "fadeDuration", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
serializable(RGBAColor)
|
|
57
|
+
], ButtonColors.prototype, "highlightedColor", void 0);
|
|
58
|
+
__decorate([
|
|
59
|
+
serializable(RGBAColor)
|
|
60
|
+
], ButtonColors.prototype, "normalColor", void 0);
|
|
61
|
+
__decorate([
|
|
62
|
+
serializable(RGBAColor)
|
|
63
|
+
], ButtonColors.prototype, "pressedColor", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
serializable(RGBAColor)
|
|
66
|
+
], ButtonColors.prototype, "selectedColor", void 0);
|
|
37
67
|
export class Button extends Behaviour {
|
|
38
68
|
onClick;
|
|
39
69
|
_isHovered = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../engine-components/ui/Button.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAEtC,aAAa;AACb,oCAAoC;AACpC,cAAc;AACd,MAAM,CAAN,IAAY,UAiBX;AAjBD,WAAY,UAAU;IAClB,aAAa;IACb,kBAAkB;IAClB,cAAc;IACd,2CAAI,CAAA;IACJ,aAAa;IACb,iCAAiC;IACjC,cAAc;IACd,qDAAS,CAAA;IACT,aAAa;IACb,iCAAiC;IACjC,cAAc;IACd,uDAAU,CAAA;IACV,aAAa;IACb,gCAAgC;IAChC,cAAc;IACd,qDAAS,CAAA;AACb,CAAC,EAjBW,UAAU,KAAV,UAAU,QAiBrB;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../engine-components/ui/Button.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,8 @@ export declare class Graphic extends BaseUIComponent implements IGraphic {
|
|
|
26
26
|
protected onBeforeCreate(_opts: any): void;
|
|
27
27
|
protected onCreate(opts: any): void;
|
|
28
28
|
protected onAfterCreated(): void;
|
|
29
|
+
/** used internally to ensure textures assigned to UI use linear encoding */
|
|
30
|
+
static textureCache: Map<Texture, Texture>;
|
|
29
31
|
protected setTexture(tex: Texture | null | undefined): Promise<void>;
|
|
30
32
|
protected onAfterAddedToScene(): void;
|
|
31
33
|
}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { RGBAColor } from "../js-extensions/RGBAColor";
|
|
8
8
|
import { BaseUIComponent } from "./BaseUIComponent";
|
|
9
9
|
import { serializable } from '../../engine/engine_serialization_decorator';
|
|
10
|
+
import { LinearEncoding, sRGBEncoding } from 'three';
|
|
10
11
|
import { RectTransform } from './RectTransform';
|
|
11
12
|
import { onChange, scheduleAction } from "./Utils";
|
|
12
13
|
import { GameObject } from '../Component';
|
|
@@ -109,11 +110,25 @@ export class Graphic extends BaseUIComponent {
|
|
|
109
110
|
this.uiObject.name = this.name;
|
|
110
111
|
}
|
|
111
112
|
onAfterCreated() { }
|
|
113
|
+
/** used internally to ensure textures assigned to UI use linear encoding */
|
|
114
|
+
static textureCache = new Map();
|
|
112
115
|
async setTexture(tex) {
|
|
113
116
|
if (!tex)
|
|
114
117
|
return;
|
|
115
118
|
this.setOptions({ backgroundOpacity: 0 });
|
|
116
119
|
if (tex) {
|
|
120
|
+
// workaround for https://github.com/needle-tools/needle-engine-support/issues/109
|
|
121
|
+
if (tex.encoding === sRGBEncoding) {
|
|
122
|
+
if (Graphic.textureCache.has(tex)) {
|
|
123
|
+
tex = Graphic.textureCache.get(tex);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
const clone = tex.clone();
|
|
127
|
+
clone.encoding = LinearEncoding;
|
|
128
|
+
Graphic.textureCache.set(tex, clone);
|
|
129
|
+
tex = clone;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
117
132
|
this.setOptions({ backgroundTexture: tex, borderRadius: 0, backgroundOpacity: this.color.alpha, backgroundSize: "stretch" });
|
|
118
133
|
}
|
|
119
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Graphic.js","sourceRoot":"","sources":["../../../../engine-components/ui/Graphic.ts"],"names":[],"mappings":";;;;;;AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"Graphic.js","sourceRoot":"","sources":["../../../../engine-components/ui/Graphic.ts"],"names":[],"mappings":";;;;;;AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAS,cAAc,EAAE,YAAY,EAAW,MAAM,OAAO,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,MAAM,OAAO,OAAQ,SAAQ,eAAe;IAExC,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC;IAGhC,IAAI,KAAK;QACL,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,CAAC,GAAc;QACpB,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,CAAC;QACjJ,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC3C;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACS,cAAc;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,UAAU,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IACrH,CAAC;IAED,sBAAsB;IACtB,IAAY,OAAO;QACf,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAGD,aAAa,GAAY,IAAI,CAAC;IAEpB,QAAQ,GAA6B,IAAI,CAAC;IAC5C,MAAM,GAAc,IAAK,CAAC;IAG1B,KAAK,GAAyB,IAAI,CAAC;IAC3C,IAAc,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;SACxE;QACD,OAAO,IAAI,CAAC,KAAM,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAa;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,YAAY;YACZ,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACjC;IACL,CAAC;IAED,UAAU,CAAC,KAAa;QACpB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,YAAY;YACZ,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACnC;IACL,CAAC;IAED,UAAU,CAAC,IAAY;QACnB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,YAAY;YACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,SAAS;gBAChF,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtE;IACL,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,SAAS,EAAE,CAAC;QAEjB,4BAA4B;QAC5B,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,QAAQ;QACJ,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SAC9D;IAEL,CAAC;IAED,SAAS;QACL,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACrC,CAAC;IAEO,uBAAuB,GAAY,KAAK,CAAC;IACvC,SAAS;QACf,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,IAAI,CAAC,uBAAuB;YAAE,OAAO;QACzC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAEpC,MAAM,IAAI,GAAG;YACT,eAAe,EAAE,IAAI,CAAC,KAAK;YAC3B,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACnC,MAAM,EAAE,CAAC,EAAE,0CAA0C;SACxD,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACjC,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC;QACrC,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAES,cAAc,CAAC,KAAU,IAAI,CAAC;IAE9B,QAAQ,CAAC,IAAS;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACnC,CAAC;IACS,cAAc,KAAK,CAAC;IAE9B,4EAA4E;IAC5E,MAAM,CAAC,YAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IAE7C,KAAK,CAAC,UAAU,CAAC,GAA+B;QACtD,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,IAAI,CAAC,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,GAAG,EAAE;YACL,kFAAkF;YAClF,IAAG,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;gBAC9B,IAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC9B,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;iBACxC;qBAAM;oBACH,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;oBAC1B,KAAK,CAAC,QAAQ,GAAG,cAAc,CAAC;oBAChC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACrC,GAAG,GAAG,KAAK,CAAC;iBACf;aACJ;YACD,IAAI,CAAC,UAAU,CAAC,EAAE,iBAAiB,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;SAChI;IACL,CAAC;IAES,mBAAmB;QACzB,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,YAAY;YACZ,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;YAE9D,qCAAqC;YACrC,mBAAmB;YACnB,4CAA4C;YAC5C,0BAA0B;YAC1B,uDAAuD;YACvD,UAAU;YACV,WAAW;SACd;IACL,CAAC;;AApJD;IADC,YAAY,CAAC,SAAS,CAAC;oCAIvB;AAoBD;IADC,YAAY,EAAE;8CACe;AAgIlC,MAAM,OAAO,eAAgB,SAAQ,OAAO;IAE9B,cAAc;QACpB,aAAa;QACb,IAAI,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;CACJ"}
|