angular-three 2.0.0-beta.243 → 2.0.0-beta.244
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.
|
@@ -32,26 +32,30 @@ export function merge(objFn, toMerge, mode = 'override') {
|
|
|
32
32
|
return computed(() => ({ ...objFn(), ...toMerge }));
|
|
33
33
|
return computed(() => ({ ...toMerge, ...objFn() }));
|
|
34
34
|
}
|
|
35
|
-
export function vector2(options, key) {
|
|
35
|
+
export function vector2(options, key, keepUndefined = false) {
|
|
36
36
|
return computed(() => {
|
|
37
37
|
const value = options()[key];
|
|
38
|
+
if (keepUndefined && value == undefined)
|
|
39
|
+
return undefined;
|
|
38
40
|
if (typeof value === 'number')
|
|
39
41
|
return new Vector2(value, value);
|
|
40
42
|
else if (value)
|
|
41
43
|
return new Vector2(...value);
|
|
42
44
|
else
|
|
43
45
|
return new Vector2();
|
|
44
|
-
}, { equal: (a, b) => a.equals(b) });
|
|
46
|
+
}, { equal: (a, b) => !!a && !!b && a.equals(b) });
|
|
45
47
|
}
|
|
46
|
-
export function vector3(options, key) {
|
|
48
|
+
export function vector3(options, key, keepUndefined = false) {
|
|
47
49
|
return computed(() => {
|
|
48
50
|
const value = options()[key];
|
|
51
|
+
if (keepUndefined && value == undefined)
|
|
52
|
+
return undefined;
|
|
49
53
|
if (typeof value === 'number')
|
|
50
54
|
return new Vector3(value, value, value);
|
|
51
55
|
else if (value)
|
|
52
56
|
return new Vector3(...value);
|
|
53
57
|
else
|
|
54
58
|
return new Vector3();
|
|
55
|
-
}, { equal: (a, b) => a.equals(b) });
|
|
59
|
+
}, { equal: (a, b) => !!a && !!b && a.equals(b) });
|
|
56
60
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/utils/parameters.ts"],"names":[],"mappings":"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","sourcesContent":["import { Signal, computed } from '@angular/core';\nimport { Vector2, Vector2Tuple, Vector3, Vector3Tuple } from 'three';\nimport { NgtVector2, NgtVector3 } from '../three-types';\nimport { NgtAnyRecord } from '../types';\n\ntype KeysOfType<TObject extends object, TType> = Exclude<\n\t{\n\t\t[K in keyof TObject]: TObject[K] extends TType | undefined | null ? K : never;\n\t}[keyof TObject],\n\tundefined\n>;\n\nexport function omit<TObject extends object, TKeys extends (keyof TObject)[]>(\n\tobjFn: () => TObject,\n\tkeysToOmit: TKeys,\n): Signal<Omit<TObject, TKeys[number]>>;\nexport function omit(objFn: () => NgtAnyRecord, keysToOmit: string[]) {\n\treturn computed(() => {\n\t\tconst obj = objFn();\n\t\tconst result = {} as NgtAnyRecord;\n\n\t\tfor (const key of Object.keys(obj)) {\n\t\t\tif (keysToOmit.includes(key)) continue;\n\t\t\tObject.assign(result, { [key]: obj[key] });\n\t\t}\n\n\t\treturn result;\n\t});\n}\n\nexport function pick<TObject extends object, TKey extends keyof TObject>(\n\tobjFn: () => TObject,\n\tkey: TKey,\n): Signal<TObject[TKey]>;\nexport function pick<TObject extends object, TKeys extends (keyof TObject)[]>(\n\tobjFn: () => TObject,\n\tkeys: TKeys,\n): Signal<Pick<TObject, TKeys[number]>>;\nexport function pick(objFn: () => NgtAnyRecord, keyOrKeys: string | string[]) {\n\tif (Array.isArray(keyOrKeys)) {\n\t\treturn computed(() => {\n\t\t\tconst obj = objFn();\n\t\t\tconst result = {} as NgtAnyRecord;\n\t\t\tfor (const key of keyOrKeys) {\n\t\t\t\tif (!(key in obj)) continue;\n\t\t\t\tObject.assign(result, { [key]: obj[key] });\n\t\t\t}\n\t\t\treturn result;\n\t\t});\n\t}\n\n\treturn computed(() => objFn()[keyOrKeys]);\n}\n\nexport function merge<TObject extends object>(\n\tobjFn: () => TObject,\n\ttoMerge: Partial<TObject>,\n\tmode: 'override' | 'backfill' = 'override',\n) {\n\tif (mode === 'override') return computed(() => ({ ...objFn(), ...toMerge }));\n\treturn computed(() => ({ ...toMerge, ...objFn() }));\n}\n\nexport function vector2<TObject extends object>(\n\toptions: Signal<TObject>,\n\tkey: KeysOfType<TObject, NgtVector2>,\n): Signal<Vector2>;\nexport function vector2<TObject extends object>(\n\toptions: Signal<TObject>,\n\tkey: KeysOfType<TObject, NgtVector2>,\n\tkeepUndefined: true,\n): Signal<Vector2 | undefined>;\nexport function vector2(options: Signal<NgtAnyRecord>, key: string, keepUndefined = false) {\n\treturn computed(\n\t\t() => {\n\t\t\tconst value = options()[key];\n\t\t\tif (keepUndefined && value == undefined) return undefined;\n\t\t\tif (typeof value === 'number') return new Vector2(value, value);\n\t\t\telse if (value) return new Vector2(...(value as Vector2Tuple));\n\t\t\telse return new Vector2();\n\t\t},\n\t\t{ equal: (a, b) => !!a && !!b && a.equals(b) },\n\t);\n}\nexport function vector3<TObject extends object>(\n\toptions: Signal<TObject>,\n\tkey: KeysOfType<TObject, NgtVector3>,\n): Signal<Vector3>;\nexport function vector3<TObject extends object>(\n\toptions: Signal<TObject>,\n\tkey: KeysOfType<TObject, NgtVector3>,\n\tkeepUndefined: true,\n): Signal<Vector3 | undefined>;\nexport function vector3(options: Signal<NgtAnyRecord>, key: string, keepUndefined = false) {\n\treturn computed(\n\t\t() => {\n\t\t\tconst value = options()[key];\n\t\t\tif (keepUndefined && value == undefined) return undefined;\n\t\t\tif (typeof value === 'number') return new Vector3(value, value, value);\n\t\t\telse if (value) return new Vector3(...(value as Vector3Tuple));\n\t\t\telse return new Vector3();\n\t\t},\n\t\t{ equal: (a, b) => !!a && !!b && a.equals(b) },\n\t);\n}\n"]}
|
|
@@ -2824,27 +2824,31 @@ function merge(objFn, toMerge, mode = 'override') {
|
|
|
2824
2824
|
return computed(() => ({ ...objFn(), ...toMerge }));
|
|
2825
2825
|
return computed(() => ({ ...toMerge, ...objFn() }));
|
|
2826
2826
|
}
|
|
2827
|
-
function vector2(options, key) {
|
|
2827
|
+
function vector2(options, key, keepUndefined = false) {
|
|
2828
2828
|
return computed(() => {
|
|
2829
2829
|
const value = options()[key];
|
|
2830
|
+
if (keepUndefined && value == undefined)
|
|
2831
|
+
return undefined;
|
|
2830
2832
|
if (typeof value === 'number')
|
|
2831
2833
|
return new Vector2(value, value);
|
|
2832
2834
|
else if (value)
|
|
2833
2835
|
return new Vector2(...value);
|
|
2834
2836
|
else
|
|
2835
2837
|
return new Vector2();
|
|
2836
|
-
}, { equal: (a, b) => a.equals(b) });
|
|
2838
|
+
}, { equal: (a, b) => !!a && !!b && a.equals(b) });
|
|
2837
2839
|
}
|
|
2838
|
-
function vector3(options, key) {
|
|
2840
|
+
function vector3(options, key, keepUndefined = false) {
|
|
2839
2841
|
return computed(() => {
|
|
2840
2842
|
const value = options()[key];
|
|
2843
|
+
if (keepUndefined && value == undefined)
|
|
2844
|
+
return undefined;
|
|
2841
2845
|
if (typeof value === 'number')
|
|
2842
2846
|
return new Vector3(value, value, value);
|
|
2843
2847
|
else if (value)
|
|
2844
2848
|
return new Vector3(...value);
|
|
2845
2849
|
else
|
|
2846
2850
|
return new Vector3();
|
|
2847
|
-
}, { equal: (a, b) => a.equals(b) });
|
|
2851
|
+
}, { equal: (a, b) => !!a && !!b && a.equals(b) });
|
|
2848
2852
|
}
|
|
2849
2853
|
|
|
2850
2854
|
function resolveRef(ref) {
|