abstract-3d 2.3.23 → 2.3.24
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/lib/renderers/react/react-group.d.ts +2 -3
- package/lib/renderers/react/react-group.d.ts.map +1 -1
- package/lib/renderers/react/react-group.js +13 -7
- package/lib/renderers/react/react-group.js.map +1 -1
- package/lib/renderers/react/react-hotspot.d.ts +2 -6
- package/lib/renderers/react/react-hotspot.d.ts.map +1 -1
- package/lib/renderers/react/react-hotspot.js +7 -6
- package/lib/renderers/react/react-hotspot.js.map +1 -1
- package/lib/renderers/react/react-image-material.d.ts +3 -4
- package/lib/renderers/react/react-image-material.d.ts.map +1 -1
- package/lib/renderers/react/react-image-material.js +3 -4
- package/lib/renderers/react/react-image-material.js.map +1 -1
- package/lib/renderers/react/react-material.d.ts +5 -5
- package/lib/renderers/react/react-material.d.ts.map +1 -1
- package/lib/renderers/react/react-material.js +11 -19
- package/lib/renderers/react/react-material.js.map +1 -1
- package/lib/renderers/react/react-scene.d.ts.map +1 -1
- package/lib/renderers/react/react-scene.js +2 -9
- package/lib/renderers/react/react-scene.js.map +1 -1
- package/package.json +2 -2
- package/src/renderers/react/react-group.tsx +37 -35
- package/src/renderers/react/react-hotspot.tsx +11 -14
- package/src/renderers/react/react-image-material.tsx +7 -10
- package/src/renderers/react/react-material.tsx +18 -27
- package/src/renderers/react/react-scene.tsx +1 -10
|
@@ -2,10 +2,9 @@ import React from "react";
|
|
|
2
2
|
import { ThreeEvent } from "@react-three/fiber";
|
|
3
3
|
import { Group as Group_1 } from "../../abstract-3d.js";
|
|
4
4
|
import { MaterialState } from "./react-material.js";
|
|
5
|
-
export declare function ReactGroup({ g, materialStateImages,
|
|
5
|
+
export declare function ReactGroup({ g, materialStateImages, hoveredIdExternal, selectedIds, hotSpotsActive, activeComponents, useAlphaTest, id, rootData, onClickGroup, onHoverGroup, onContextMenuGroup, createGroupKey, }: {
|
|
6
6
|
readonly g: Group_1;
|
|
7
7
|
readonly materialStateImages?: Record<string, string>;
|
|
8
|
-
readonly hoveredId: string | undefined;
|
|
9
8
|
readonly hoveredIdExternal: string | undefined;
|
|
10
9
|
readonly selectedIds: Record<string, boolean> | undefined;
|
|
11
10
|
readonly hotSpotsActive: boolean;
|
|
@@ -14,7 +13,7 @@ export declare function ReactGroup({ g, materialStateImages, hoveredId, hoveredI
|
|
|
14
13
|
readonly id: string | undefined;
|
|
15
14
|
readonly rootData: Record<string, string> | undefined;
|
|
16
15
|
readonly onClickGroup?: (id: string | undefined, rootData: Record<string, string> | undefined, data: Record<string, string> | undefined, e: ThreeEvent<MouseEvent>) => void;
|
|
17
|
-
readonly onHoverGroup
|
|
16
|
+
readonly onHoverGroup?: (id: string | undefined, rootData: Record<string, string> | undefined, data: Record<string, string> | undefined, e: ThreeEvent<MouseEvent>) => void;
|
|
18
17
|
readonly onContextMenuGroup?: (id: string, rootData: Record<string, string> | undefined, data: Record<string, string> | undefined, left: number, top: number, e: ThreeEvent<MouseEvent>) => void;
|
|
19
18
|
readonly createGroupKey?: (g: Group_1, idx: number, rootData: Record<string, string> | undefined, id: string) => string;
|
|
20
19
|
}): React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-group.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,KAAK,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAiB,MAAM,qBAAqB,CAAC;AAInE,wBAAgB,UAAU,CAAC,EACzB,CAAC,EACD,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"react-group.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,KAAK,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAiB,MAAM,qBAAqB,CAAC;AAInE,wBAAgB,UAAU,CAAC,EACzB,CAAC,EACD,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,EAAE,EACF,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,GACf,EAAE;IACD,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC1D,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACrE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,YAAY,CAAC,EAAE,CACtB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACxC,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,KACtB,IAAI,CAAC;IACV,QAAQ,CAAC,YAAY,CAAC,EAAE,CACtB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACxC,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,KACtB,IAAI,CAAC;IACV,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACxC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,KACtB,IAAI,CAAC;IACV,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,CAAC,EAAE,OAAO,EACV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC5C,EAAE,EAAE,MAAM,KACP,MAAM,CAAC;CACb,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAuGpB"}
|
|
@@ -4,7 +4,7 @@ import { useFrame } from "@react-three/fiber";
|
|
|
4
4
|
import { ReactMaterial } from "./react-material.js";
|
|
5
5
|
import { ReactMesh } from "./react-mesh.js";
|
|
6
6
|
import { ImageMaterial } from "./react-image-material.js";
|
|
7
|
-
export function ReactGroup({ g, materialStateImages,
|
|
7
|
+
export function ReactGroup({ g, materialStateImages, hoveredIdExternal, selectedIds, hotSpotsActive, activeComponents, useAlphaTest, id, rootData, onClickGroup, onHoverGroup, onContextMenuGroup, createGroupKey, }) {
|
|
8
8
|
const ref = React.useRef(undefined);
|
|
9
9
|
useFrame(({ invalidate }, delta) => {
|
|
10
10
|
if (g.animation) {
|
|
@@ -22,6 +22,9 @@ export function ReactGroup({ g, materialStateImages, hoveredId, hoveredIdExterna
|
|
|
22
22
|
ref.current.position.z = g.pos.z;
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
|
+
const [hovered, setHovered] = React.useState(false);
|
|
26
|
+
const hoveredFinal = hovered || hoveredIdExternal === id;
|
|
27
|
+
const selected = selectedIds?.[id ?? ""];
|
|
25
28
|
const materialState = activeComponents?.[id ?? ""];
|
|
26
29
|
const disabled = hotSpotsActive && materialState !== "Accept";
|
|
27
30
|
return (_jsxs("group", { rotation: [g.rot?.x ?? 0, g.rot?.y ?? 0, g.rot?.z ?? 0], position: [g.pos.x, g.pos.y, g.pos.z], ref: ref, ...(id &&
|
|
@@ -35,11 +38,17 @@ export function ReactGroup({ g, materialStateImages, hoveredId, hoveredIdExterna
|
|
|
35
38
|
onPointerOver: (e) => {
|
|
36
39
|
e.stopPropagation();
|
|
37
40
|
document.body.style.cursor = "pointer";
|
|
38
|
-
onHoverGroup
|
|
41
|
+
if (onHoverGroup) {
|
|
42
|
+
onHoverGroup(id, rootData, g.data, e);
|
|
43
|
+
}
|
|
44
|
+
setHovered(true);
|
|
39
45
|
},
|
|
40
46
|
onPointerOut: (e) => {
|
|
41
47
|
document.body.style.cursor = "auto";
|
|
42
|
-
|
|
48
|
+
setHovered(false);
|
|
49
|
+
if (onHoverGroup) {
|
|
50
|
+
onHoverGroup(undefined, undefined, undefined, e);
|
|
51
|
+
}
|
|
43
52
|
},
|
|
44
53
|
onContextMenu: (e) => {
|
|
45
54
|
if (onContextMenuGroup) {
|
|
@@ -47,9 +56,6 @@ export function ReactGroup({ g, materialStateImages, hoveredId, hoveredIdExterna
|
|
|
47
56
|
onContextMenuGroup(id, rootData, g.data, e.nativeEvent.x, e.nativeEvent.y, e);
|
|
48
57
|
}
|
|
49
58
|
},
|
|
50
|
-
}), children: [g.groups?.map((g, i) => (_jsx(ReactGroup, { g: g, selectedIds: selectedIds, hotSpotsActive: hotSpotsActive, activeComponents: activeComponents, materialStateImages: materialStateImages,
|
|
51
|
-
const hoveredIdFinal = hoveredId || hoveredIdExternal;
|
|
52
|
-
return (_jsx(ReactMesh, { mesh: m, children: m.geometry.type === "Image" ? (_jsx(ImageMaterial, { image: m.geometry.image, materialStateImages: materialStateImages, material: m.material, useAlphaTest: useAlphaTest, id: id, hoveredId: hoveredIdFinal, materialState: materialState, selectedIds: selectedIds })) : (_jsx(ReactMaterial, { material: m.material, id: id, selectedIds: selectedIds, isText: m.geometry.type === "Text", hoveredId: hoveredIdFinal, disabled: disabled, materialState: materialState })) }, `mesh_${i}`));
|
|
53
|
-
})] }));
|
|
59
|
+
}), children: [g.groups?.map((g, i) => (_jsx(ReactGroup, { g: g, selectedIds: selectedIds, hotSpotsActive: hotSpotsActive, activeComponents: activeComponents, materialStateImages: materialStateImages, hoveredIdExternal: hoveredIdExternal, onClickGroup: onClickGroup, onHoverGroup: onHoverGroup, onContextMenuGroup: onContextMenuGroup, id: id, rootData: rootData, createGroupKey: createGroupKey, useAlphaTest: useAlphaTest }, createGroupKey ? createGroupKey(g, i, rootData, id ?? "") : i))), g.meshes?.map((m, i) => (_jsx(ReactMesh, { mesh: m, children: m.geometry.type === "Image" ? (_jsx(ImageMaterial, { image: m.geometry.image, materialStateImages: materialStateImages, material: m.material, useAlphaTest: useAlphaTest, hovered: hoveredFinal, materialState: materialState, selected: selected })) : (_jsx(ReactMaterial, { material: m.material, selected: selected, isText: m.geometry.type === "Text", hovered: hoveredFinal, disabled: disabled, materialState: materialState })) }, `mesh_${i}`)))] }));
|
|
54
60
|
}
|
|
55
61
|
//# sourceMappingURL=react-group.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-group.js","sourceRoot":"","sources":["../../../src/renderers/react/react-group.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAc,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAiB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,UAAU,UAAU,CAAC,EACzB,CAAC,EACD,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"react-group.js","sourceRoot":"","sources":["../../../src/renderers/react/react-group.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,24 +8,20 @@ export interface HotSpotInfo {
|
|
|
8
8
|
readonly replaceToId: string;
|
|
9
9
|
readonly replaceInlet: string;
|
|
10
10
|
}
|
|
11
|
-
export declare const ReactHotSpots: React.MemoExoticComponent<({ hotSpots, showHotSpotTexts, hotSpotTexts, hotSpotZAdjPos, activeHotSpots,
|
|
11
|
+
export declare const ReactHotSpots: React.MemoExoticComponent<({ hotSpots, showHotSpotTexts, hotSpotTexts, hotSpotZAdjPos, activeHotSpots, onClickHotSpot, }: {
|
|
12
12
|
readonly hotSpots?: ReadonlyArray<HotSpot>;
|
|
13
13
|
readonly showHotSpotTexts: boolean;
|
|
14
14
|
readonly hotSpotZAdjPos: number;
|
|
15
15
|
readonly hotSpotTexts?: Record<string, string>;
|
|
16
16
|
readonly activeHotSpots: Record<string, HotSpotInfo> | undefined;
|
|
17
|
-
readonly hoveredId: string | undefined;
|
|
18
17
|
readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: ThreeEvent<MouseEvent>) => void;
|
|
19
|
-
readonly setHoveredId: (id: string | undefined) => void;
|
|
20
18
|
}) => React.JSX.Element>;
|
|
21
|
-
export declare function ReactHotSpot({ h, hotSpotZAdjPos, showHotSpotTexts, hotSpotTexts, activeHotSpots,
|
|
19
|
+
export declare function ReactHotSpot({ h, hotSpotZAdjPos, showHotSpotTexts, hotSpotTexts, activeHotSpots, onClickHotSpot, }: {
|
|
22
20
|
readonly h: HotSpot;
|
|
23
21
|
readonly hotSpotZAdjPos: number;
|
|
24
22
|
readonly showHotSpotTexts: boolean;
|
|
25
23
|
readonly hotSpotTexts?: Record<string, string>;
|
|
26
24
|
readonly activeHotSpots: Record<string, HotSpotInfo> | undefined;
|
|
27
|
-
readonly hoveredId: string | undefined;
|
|
28
25
|
readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: ThreeEvent<MouseEvent>) => void;
|
|
29
|
-
readonly setHoveredId: (id: string | undefined) => void;
|
|
30
26
|
}): React.JSX.Element;
|
|
31
27
|
//# sourceMappingURL=react-hotspot.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-hotspot.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-hotspot.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAO,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"react-hotspot.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-hotspot.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAO,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,aAAa,4HAQrB;IACD,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACrF,KAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAiBtB,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAC3B,CAAC,EACD,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,cAAc,GACf,EAAE;IACD,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACrF,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAqDpB"}
|
|
@@ -4,10 +4,11 @@ import { Html } from "@react-three/drei";
|
|
|
4
4
|
import { vec3Scale, vec3Zero } from "../../abstract-3d.js";
|
|
5
5
|
import { ReactMesh } from "./react-mesh.js";
|
|
6
6
|
import { ReactMaterial } from "./react-material.js";
|
|
7
|
-
export const ReactHotSpots = React.memo(({ hotSpots, showHotSpotTexts, hotSpotTexts, hotSpotZAdjPos, activeHotSpots,
|
|
8
|
-
return (_jsx(_Fragment, { children: hotSpots?.map((h) => (_jsx(ReactHotSpot, { h: h, hotSpotZAdjPos: hotSpotZAdjPos, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts,
|
|
7
|
+
export const ReactHotSpots = React.memo(({ hotSpots, showHotSpotTexts, hotSpotTexts, hotSpotZAdjPos, activeHotSpots, onClickHotSpot, }) => {
|
|
8
|
+
return (_jsx(_Fragment, { children: hotSpots?.map((h) => (_jsx(ReactHotSpot, { h: h, hotSpotZAdjPos: hotSpotZAdjPos, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts, onClickHotSpot: onClickHotSpot, showHotSpotTexts: showHotSpotTexts }, h.id))) }));
|
|
9
9
|
});
|
|
10
|
-
export function ReactHotSpot({ h, hotSpotZAdjPos, showHotSpotTexts, hotSpotTexts, activeHotSpots,
|
|
10
|
+
export function ReactHotSpot({ h, hotSpotZAdjPos, showHotSpotTexts, hotSpotTexts, activeHotSpots, onClickHotSpot, }) {
|
|
11
|
+
const [hovered, setHovered] = React.useState(false);
|
|
11
12
|
const hotSpot = activeHotSpots ? activeHotSpots[h.id] : undefined;
|
|
12
13
|
const hsPos = h.mesh.geometry.type === "Box" ? h.mesh.geometry.pos : vec3Zero;
|
|
13
14
|
const text = hotSpotTexts?.[h.id];
|
|
@@ -22,15 +23,15 @@ export function ReactHotSpot({ h, hotSpotZAdjPos, showHotSpotTexts, hotSpotTexts
|
|
|
22
23
|
onPointerOver: (e) => {
|
|
23
24
|
e.stopPropagation();
|
|
24
25
|
document.body.style.cursor = "pointer";
|
|
25
|
-
|
|
26
|
+
setHovered(true);
|
|
26
27
|
},
|
|
27
28
|
onPointerOut: (_e) => {
|
|
28
29
|
document.body.style.cursor = "auto";
|
|
29
|
-
|
|
30
|
+
setHovered(false);
|
|
30
31
|
},
|
|
31
32
|
onContextMenu: (e) => {
|
|
32
33
|
e.stopPropagation();
|
|
33
34
|
},
|
|
34
|
-
}), children: [_jsx(ReactMesh, { mesh: h.mesh, children: _jsx(ReactMaterial, {
|
|
35
|
+
}), children: [_jsx(ReactMesh, { mesh: h.mesh, children: _jsx(ReactMaterial, { isText: false, isHotSpot: true, material: h.mesh.material, hovered: hovered }) }), _jsx(ReactMesh, { mesh: { ...h.mesh, geometry: { ...geo, size: vec3Scale(geo.size, 1.0125) } }, children: _jsx(ReactMaterial, { isText: false, isHotSpot: true, drawBackOnly: true, material: { normal: "rgb(0, 0, 0)", opacity: 1.0 }, hovered: hovered }) })] }), hotSpotTexts && text && (_jsx(Html, { position: [hsPos.x, hsPos.y, hotSpotZAdjPos], center: true, children: _jsx("div", { className: `air-states-container ${showHotSpotTexts ? "" : "air-states-container-hidden"}`, children: _jsx("span", { className: "air-states-text", children: text }) }) }))] }));
|
|
35
36
|
}
|
|
36
37
|
//# sourceMappingURL=react-hotspot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-hotspot.js","sourceRoot":"","sources":["../../../src/renderers/react/react-hotspot.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAgB,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CACrC,CAAC,EACC,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"react-hotspot.js","sourceRoot":"","sources":["../../../src/renderers/react/react-hotspot.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,12 @@ export type TextureFilter = {
|
|
|
16
16
|
readonly min: MinificationFilter;
|
|
17
17
|
readonly mag: MagnificationFilter;
|
|
18
18
|
};
|
|
19
|
-
export declare function ImageMaterial({ image, materialStateImages, material,
|
|
19
|
+
export declare function ImageMaterial({ image, materialStateImages, material, useAlphaTest, hovered, selected, materialState, }: {
|
|
20
20
|
readonly image: A3dImage;
|
|
21
21
|
readonly material: Material;
|
|
22
|
-
readonly id: string | undefined;
|
|
23
22
|
readonly materialStateImages: Record<string, string> | undefined;
|
|
24
|
-
readonly
|
|
25
|
-
readonly
|
|
23
|
+
readonly hovered: boolean;
|
|
24
|
+
readonly selected: boolean | undefined;
|
|
26
25
|
readonly useAlphaTest: boolean | undefined;
|
|
27
26
|
readonly materialState: MaterialState | undefined;
|
|
28
27
|
}): React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-image-material.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-image-material.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"react-image-material.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-image-material.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAA6B,aAAa,EAA+C,MAAM,OAAO,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAA6C,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE1G,eAAO,MAAM,aAAa,eAAsB,CAAC;AAEjD,oBAAY,kBAAkB;IAC5B,OAAO,OAAO;IACd,MAAM,OAAO;IACb,YAAY,OAAO;CACpB;AAED,oBAAY,mBAAmB;IAC7B,OAAO,OAAO;IACd,MAAM,OAAO;CACd;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,mBAAmB,CAAC;CACnC,CAAC;AAKF,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,mBAAmB,EACnB,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,aAAa,GACd,EAAE;IACD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;CACnD,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAmBpB"}
|
|
@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { suspend } from "suspend-react";
|
|
3
3
|
import { createSVG } from "abstract-image";
|
|
4
4
|
import { CanvasTexture, DoubleSide, PlaneGeometry, SRGBColorSpace, TextureLoader } from "three";
|
|
5
|
-
import { ERROR_IMG_KEY, getColor, materialDefaults } from "./react-material.js";
|
|
5
|
+
import { ERROR_IMG_KEY, getColor, materialDefaults, selectMat } from "./react-material.js";
|
|
6
6
|
export const planeGeometry = new PlaneGeometry();
|
|
7
7
|
export var MinificationFilter;
|
|
8
8
|
(function (MinificationFilter) {
|
|
@@ -17,15 +17,14 @@ export var MagnificationFilter;
|
|
|
17
17
|
})(MagnificationFilter || (MagnificationFilter = {}));
|
|
18
18
|
const filter = { min: MinificationFilter.LinearMipmap, mag: MagnificationFilter.Linear };
|
|
19
19
|
const textureCache = new Map();
|
|
20
|
-
export function ImageMaterial({ image, materialStateImages, material,
|
|
20
|
+
export function ImageMaterial({ image, materialStateImages, material, useAlphaTest, hovered, selected, materialState, }) {
|
|
21
21
|
const url = materialState === "Error" && materialStateImages?.[ERROR_IMG_KEY]
|
|
22
22
|
? materialStateImages[ERROR_IMG_KEY]
|
|
23
23
|
: image.type === "AbstractImage"
|
|
24
24
|
? `data:image/svg+xml,${createSVG(image.image)}`
|
|
25
25
|
: image.url;
|
|
26
|
-
const color = getColor(selectedIds, id, hoveredId, material);
|
|
27
26
|
const texture = suspend(urlIsSvg(url) ? loadSvg(url, filter) : loadNormal(url, filter), [url]);
|
|
28
|
-
return (_jsx("meshBasicMaterial", { color:
|
|
27
|
+
return (_jsx("meshBasicMaterial", { color: getColor(selected, hovered, material, selectMat), side: DoubleSide, alphaTest: useAlphaTest ?? true ? 0.8 : undefined, map: texture, ...(material.opacity !== undefined && material.opacity < 1 ? { opacity: material.opacity } : materialDefaults), transparent: true }));
|
|
29
28
|
}
|
|
30
29
|
function urlIsSvg(url) {
|
|
31
30
|
return url.startsWith("data:image/svg+xml") || url.endsWith(".svg") || url.includes(".svg?");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-image-material.js","sourceRoot":"","sources":["../../../src/renderers/react/react-image-material.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAgB,aAAa,EAAE,MAAM,OAAO,CAAC;AAE9G,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAiB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"react-image-material.js","sourceRoot":"","sources":["../../../src/renderers/react/react-image-material.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,10 @@ import { type MaterialParameters } from "three";
|
|
|
3
3
|
import { Material } from "../../abstract-3d.js";
|
|
4
4
|
export type MaterialState = "Accept" | "Error" | "Warning";
|
|
5
5
|
export declare const ERROR_IMG_KEY = "error";
|
|
6
|
-
export declare function ReactMaterial({ material,
|
|
6
|
+
export declare function ReactMaterial({ material, selected, hovered, disabled, materialState, isText, isHotSpot, drawBackOnly, }: {
|
|
7
7
|
readonly material: Material;
|
|
8
|
-
readonly
|
|
9
|
-
readonly
|
|
10
|
-
readonly selectedIds?: Record<string, boolean> | undefined;
|
|
8
|
+
readonly hovered?: boolean | undefined;
|
|
9
|
+
readonly selected?: boolean;
|
|
11
10
|
readonly disabled?: boolean;
|
|
12
11
|
readonly materialState?: MaterialState | undefined;
|
|
13
12
|
readonly isText: boolean;
|
|
@@ -15,5 +14,6 @@ export declare function ReactMaterial({ material, id, selectedIds, hoveredId, di
|
|
|
15
14
|
readonly drawBackOnly?: boolean;
|
|
16
15
|
}): React.JSX.Element;
|
|
17
16
|
export declare const materialDefaults: MaterialParameters;
|
|
18
|
-
export declare
|
|
17
|
+
export declare const selectMat: Material;
|
|
18
|
+
export declare function getColor(selected: boolean | undefined, hovered: boolean | undefined, mat: Material, selectedMat: Material): string | undefined;
|
|
19
19
|
//# sourceMappingURL=react-material.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-material.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-material.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,OAAO,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAC3D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"react-material.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-material.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,OAAO,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAC3D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,MAAM,EACN,SAAS,EACT,YAAY,GACb,EAAE;IACD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;CACjC,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAmDpB;AAED,eAAO,MAAM,gBAAgB,EAAE,kBAK9B,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,QAAqF,CAAC;AAK9G,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,OAAO,GAAG,SAAS,EAC7B,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,GAAG,EAAE,QAAQ,EACb,WAAW,EAAE,QAAQ,GACpB,MAAM,GAAG,SAAS,CAQpB"}
|
|
@@ -3,7 +3,7 @@ import { BackSide, DoubleSide, FrontSide } from "three";
|
|
|
3
3
|
import { shade } from "../../utils.js";
|
|
4
4
|
const decreasedOpacity = 0.125;
|
|
5
5
|
export const ERROR_IMG_KEY = "error";
|
|
6
|
-
export function ReactMaterial({ material,
|
|
6
|
+
export function ReactMaterial({ material, selected, hovered, disabled, materialState, isText, isHotSpot, drawBackOnly, }) {
|
|
7
7
|
const mat = !materialState
|
|
8
8
|
? material
|
|
9
9
|
: materialState === "Accept"
|
|
@@ -11,22 +11,14 @@ export function ReactMaterial({ material, id = "", selectedIds, hoveredId, disab
|
|
|
11
11
|
: materialState === "Error"
|
|
12
12
|
? errorMar
|
|
13
13
|
: warningMat;
|
|
14
|
-
const color = getColor(selectedIds, id, hoveredId, mat);
|
|
15
|
-
const colorText = selectedIds?.[id]
|
|
16
|
-
? hoveredId === id
|
|
17
|
-
? shade(-0.4, textSelectMat.normal)
|
|
18
|
-
: textSelectMat.normal
|
|
19
|
-
: hoveredId === id
|
|
20
|
-
? shade(-0.4, mat.normal)
|
|
21
|
-
: mat.normal;
|
|
22
14
|
const opacity = material.opacity !== undefined ? material.opacity : materialDefaults.opacity;
|
|
23
15
|
if (isText) {
|
|
24
|
-
return (_jsx("meshBasicMaterial", { color:
|
|
16
|
+
return (_jsx("meshBasicMaterial", { color: getColor(selected, hovered, mat, textSelectMat), side: FrontSide, transparent: true, ...(opacity < 1 ? { opacity } : materialDefaults) }, `mesh_material_text}`));
|
|
25
17
|
}
|
|
26
18
|
if (isHotSpot) {
|
|
27
|
-
return (_jsx("meshBasicMaterial", { color:
|
|
19
|
+
return (_jsx("meshBasicMaterial", { color: getColor(selected, hovered, mat, selectMat), side: drawBackOnly === true ? BackSide : DoubleSide, depthTest: true, depthWrite: true, transparent: false, opacity: 1.0 }, "mesh_material_hotspot"));
|
|
28
20
|
}
|
|
29
|
-
return (_jsx("meshStandardMaterial", { color:
|
|
21
|
+
return (_jsx("meshStandardMaterial", { color: getColor(selected, hovered, mat, selectMat), roughness: mat.roughness, metalness: mat.metalness, side: DoubleSide, ...(opacity < 1 || disabled
|
|
30
22
|
? {
|
|
31
23
|
transparent: true,
|
|
32
24
|
depthWrite: false,
|
|
@@ -42,16 +34,16 @@ export const materialDefaults = {
|
|
|
42
34
|
opacity: 1.0,
|
|
43
35
|
};
|
|
44
36
|
const acceptMat = { normal: "rgb(0,148,91)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
45
|
-
const selectMat = { normal: "rgb(14,82,184)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
37
|
+
export const selectMat = { normal: "rgb(14,82,184)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
46
38
|
const textSelectMat = { normal: "rgb(0, 26, 65)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
47
39
|
const errorMar = { normal: "#b82f3a", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
48
40
|
const warningMat = { normal: "rgb(240, 197, 48)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
49
|
-
export function getColor(
|
|
50
|
-
return
|
|
51
|
-
?
|
|
52
|
-
? shade(-0.4,
|
|
53
|
-
:
|
|
54
|
-
:
|
|
41
|
+
export function getColor(selected, hovered, mat, selectedMat) {
|
|
42
|
+
return selected
|
|
43
|
+
? hovered
|
|
44
|
+
? shade(-0.4, selectedMat.normal)
|
|
45
|
+
: selectedMat.normal
|
|
46
|
+
: hovered
|
|
55
47
|
? shade(-0.4, mat.normal)
|
|
56
48
|
: mat.normal;
|
|
57
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-material.js","sourceRoot":"","sources":["../../../src/renderers/react/react-material.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAA2B,MAAM,OAAO,CAAC;AAEjF,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAG/B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC;AAErC,MAAM,UAAU,aAAa,CAAC,EAC5B,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"react-material.js","sourceRoot":"","sources":["../../../src/renderers/react/react-material.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-scene.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"react-scene.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import React from "react";
|
|
3
2
|
import { ReactHotSpots } from "./react-hotspot.js";
|
|
4
3
|
import { ReactDimensions } from "./react-dimension.js";
|
|
5
4
|
import { ReactGroup } from "./react-group.js";
|
|
6
5
|
import { Html } from "@react-three/drei";
|
|
7
6
|
export function ReactScene({ scene, selectedIds, hoveredIdExternal, activeHotSpots, activeComponents, hotSpotTexts, showHotSpotTexts, showDimensions, useAlphaTest, materialStateImages, reactPopovers, onClickGroup, onHoverGroup, onContextMenuGroup, onClickHotSpot, createGroupKey, createGroupId, }) {
|
|
8
|
-
const [hoveredId, setHoveredId] = React.useState(undefined);
|
|
9
7
|
return (_jsxs("group", { rotation: [
|
|
10
8
|
scene.rotation_deprecated?.x ?? 0,
|
|
11
9
|
scene.rotation_deprecated?.y ?? 0,
|
|
@@ -16,12 +14,7 @@ export function ReactScene({ scene, selectedIds, hoveredIdExternal, activeHotSpo
|
|
|
16
14
|
-(scene.center_deprecated?.z ?? 0),
|
|
17
15
|
], children: [scene.groups.map((g, i) => {
|
|
18
16
|
const id = createGroupId ? createGroupId(g) : "";
|
|
19
|
-
return (_jsx(ReactGroup, { g: g, selectedIds: selectedIds, hotSpotsActive: activeHotSpots !== undefined, activeComponents: activeComponents, materialStateImages: materialStateImages,
|
|
20
|
-
|
|
21
|
-
if (onHoverGroup) {
|
|
22
|
-
onHoverGroup(id, rootData, data, e);
|
|
23
|
-
}
|
|
24
|
-
}, onContextMenuGroup: onContextMenuGroup, createGroupKey: createGroupKey, id: id, useAlphaTest: useAlphaTest, rootData: g.data }, createGroupKey ? createGroupKey(g, 0, g.data, id) : i));
|
|
25
|
-
}), _jsx(ReactDimensions, { dimensions: scene.dimensions_deprecated, showDimensions: showDimensions, sceneRotation: scene.rotation_deprecated, sceneCenter: scene.center_deprecated }), _jsx(ReactHotSpots, { hotSpots: scene.hotSpots_deprecated, hotSpotZAdjPos: scene.size_deprecated.z / 2, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts, hoveredId: hoveredId, onClickHotSpot: onClickHotSpot, setHoveredId: setHoveredId, showHotSpotTexts: showHotSpotTexts }), reactPopovers?.map((p) => (_jsx(Html, { position: [p.pos.x, p.pos.y, p.pos.z], center: true, pointerEvents: "none", children: p.content }, p.id)))] }));
|
|
17
|
+
return (_jsx(ReactGroup, { g: g, selectedIds: selectedIds, hotSpotsActive: activeHotSpots !== undefined, activeComponents: activeComponents, materialStateImages: materialStateImages, hoveredIdExternal: hoveredIdExternal, onClickGroup: onClickGroup, onHoverGroup: onHoverGroup, onContextMenuGroup: onContextMenuGroup, createGroupKey: createGroupKey, id: id, useAlphaTest: useAlphaTest, rootData: g.data }, createGroupKey ? createGroupKey(g, 0, g.data, id) : i));
|
|
18
|
+
}), _jsx(ReactDimensions, { dimensions: scene.dimensions_deprecated, showDimensions: showDimensions, sceneRotation: scene.rotation_deprecated, sceneCenter: scene.center_deprecated }), _jsx(ReactHotSpots, { hotSpots: scene.hotSpots_deprecated, hotSpotZAdjPos: scene.size_deprecated.z / 2, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts, onClickHotSpot: onClickHotSpot, showHotSpotTexts: showHotSpotTexts }), reactPopovers?.map((p) => (_jsx(Html, { position: [p.pos.x, p.pos.y, p.pos.z], center: true, pointerEvents: "none", children: p.content }, p.id)))] }));
|
|
26
19
|
}
|
|
27
20
|
//# sourceMappingURL=react-scene.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-scene.js","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"react-scene.js","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAe,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAUzC,MAAM,UAAU,UAAU,CAAC,EACzB,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,aAAa,GAoCd;IACC,OAAO,CACL,iBACE,QAAQ,EAAE;YACR,KAAK,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC;YACjC,KAAK,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC;YACjC,KAAK,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC;SAClC,EACD,QAAQ,EAAE;YACR,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;SACnC,aAEA,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzB,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,OAAO,CACL,KAAC,UAAU,IAET,CAAC,EAAE,CAAC,EACJ,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,KAAK,SAAS,EAC5C,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,EAAE,EACN,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,CAAC,CAAC,IAAI,IAbX,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAc1D,CACH,CAAC;YACJ,CAAC,CAAC,EACF,KAAC,eAAe,IACd,UAAU,EAAE,KAAK,CAAC,qBAAqB,EACvC,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,KAAK,CAAC,mBAAmB,EACxC,WAAW,EAAE,KAAK,CAAC,iBAAiB,GACpC,EACF,KAAC,aAAa,IACZ,QAAQ,EAAE,KAAK,CAAC,mBAAmB,EACnC,cAAc,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAC3C,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,GAClC,EACD,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACzB,KAAC,IAAI,IAAY,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,QAAC,aAAa,EAAC,MAAM,YAChF,CAAC,CAAC,OAAO,IADD,CAAC,CAAC,EAAE,CAER,CACR,CAAC,IACI,CACT,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-3d",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.24",
|
|
4
4
|
"description": "Abstract 3D",
|
|
5
5
|
"author": "Divid AB <info@divid.se>",
|
|
6
6
|
"repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-3d",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"@types/three": "^0.180.0",
|
|
66
66
|
"react": "^19.2.6"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "ca5a4948ca4bda9573d611a750d3eae5909c9888"
|
|
69
69
|
}
|
|
@@ -9,7 +9,6 @@ import { ImageMaterial } from "./react-image-material.js";
|
|
|
9
9
|
export function ReactGroup({
|
|
10
10
|
g,
|
|
11
11
|
materialStateImages,
|
|
12
|
-
hoveredId,
|
|
13
12
|
hoveredIdExternal,
|
|
14
13
|
selectedIds,
|
|
15
14
|
hotSpotsActive,
|
|
@@ -24,7 +23,6 @@ export function ReactGroup({
|
|
|
24
23
|
}: {
|
|
25
24
|
readonly g: Group_1;
|
|
26
25
|
readonly materialStateImages?: Record<string, string>;
|
|
27
|
-
readonly hoveredId: string | undefined;
|
|
28
26
|
readonly hoveredIdExternal: string | undefined;
|
|
29
27
|
readonly selectedIds: Record<string, boolean> | undefined;
|
|
30
28
|
readonly hotSpotsActive: boolean;
|
|
@@ -38,7 +36,7 @@ export function ReactGroup({
|
|
|
38
36
|
data: Record<string, string> | undefined,
|
|
39
37
|
e: ThreeEvent<MouseEvent>
|
|
40
38
|
) => void;
|
|
41
|
-
readonly onHoverGroup
|
|
39
|
+
readonly onHoverGroup?: (
|
|
42
40
|
id: string | undefined,
|
|
43
41
|
rootData: Record<string, string> | undefined,
|
|
44
42
|
data: Record<string, string> | undefined,
|
|
@@ -75,6 +73,10 @@ export function ReactGroup({
|
|
|
75
73
|
ref.current.position.z = g.pos.z;
|
|
76
74
|
}
|
|
77
75
|
});
|
|
76
|
+
const [hovered, setHovered] = React.useState<boolean>(false);
|
|
77
|
+
const hoveredFinal = hovered || hoveredIdExternal === id;
|
|
78
|
+
const selected = selectedIds?.[id ?? ""];
|
|
79
|
+
|
|
78
80
|
const materialState = activeComponents?.[id ?? ""];
|
|
79
81
|
const disabled = hotSpotsActive && materialState !== "Accept";
|
|
80
82
|
return (
|
|
@@ -93,11 +95,17 @@ export function ReactGroup({
|
|
|
93
95
|
onPointerOver: (e) => {
|
|
94
96
|
e.stopPropagation();
|
|
95
97
|
document.body.style.cursor = "pointer";
|
|
96
|
-
onHoverGroup
|
|
98
|
+
if (onHoverGroup) {
|
|
99
|
+
onHoverGroup(id, rootData, g.data, e);
|
|
100
|
+
}
|
|
101
|
+
setHovered(true);
|
|
97
102
|
},
|
|
98
103
|
onPointerOut: (e) => {
|
|
99
104
|
document.body.style.cursor = "auto";
|
|
100
|
-
|
|
105
|
+
setHovered(false);
|
|
106
|
+
if (onHoverGroup) {
|
|
107
|
+
onHoverGroup(undefined, undefined, undefined, e);
|
|
108
|
+
}
|
|
101
109
|
},
|
|
102
110
|
onContextMenu: (e) => {
|
|
103
111
|
if (onContextMenuGroup) {
|
|
@@ -115,7 +123,6 @@ export function ReactGroup({
|
|
|
115
123
|
hotSpotsActive={hotSpotsActive}
|
|
116
124
|
activeComponents={activeComponents}
|
|
117
125
|
materialStateImages={materialStateImages}
|
|
118
|
-
hoveredId={hoveredId}
|
|
119
126
|
hoveredIdExternal={hoveredIdExternal}
|
|
120
127
|
onClickGroup={onClickGroup}
|
|
121
128
|
onHoverGroup={onHoverGroup}
|
|
@@ -126,35 +133,30 @@ export function ReactGroup({
|
|
|
126
133
|
useAlphaTest={useAlphaTest}
|
|
127
134
|
/>
|
|
128
135
|
))}
|
|
129
|
-
{g.meshes?.map((m, i) =>
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
/>
|
|
154
|
-
)}
|
|
155
|
-
</ReactMesh>
|
|
156
|
-
);
|
|
157
|
-
})}
|
|
136
|
+
{g.meshes?.map((m, i) => (
|
|
137
|
+
<ReactMesh key={`mesh_${i}`} mesh={m}>
|
|
138
|
+
{m.geometry.type === "Image" ? (
|
|
139
|
+
<ImageMaterial
|
|
140
|
+
image={m.geometry.image}
|
|
141
|
+
materialStateImages={materialStateImages}
|
|
142
|
+
material={m.material}
|
|
143
|
+
useAlphaTest={useAlphaTest}
|
|
144
|
+
hovered={hoveredFinal}
|
|
145
|
+
materialState={materialState}
|
|
146
|
+
selected={selected}
|
|
147
|
+
/>
|
|
148
|
+
) : (
|
|
149
|
+
<ReactMaterial
|
|
150
|
+
material={m.material}
|
|
151
|
+
selected={selected}
|
|
152
|
+
isText={m.geometry.type === "Text"}
|
|
153
|
+
hovered={hoveredFinal}
|
|
154
|
+
disabled={disabled}
|
|
155
|
+
materialState={materialState}
|
|
156
|
+
/>
|
|
157
|
+
)}
|
|
158
|
+
</ReactMesh>
|
|
159
|
+
))}
|
|
158
160
|
</group>
|
|
159
161
|
);
|
|
160
162
|
}
|
|
@@ -20,18 +20,14 @@ export const ReactHotSpots = React.memo(
|
|
|
20
20
|
hotSpotTexts,
|
|
21
21
|
hotSpotZAdjPos,
|
|
22
22
|
activeHotSpots,
|
|
23
|
-
hoveredId,
|
|
24
23
|
onClickHotSpot,
|
|
25
|
-
setHoveredId,
|
|
26
24
|
}: {
|
|
27
25
|
readonly hotSpots?: ReadonlyArray<HotSpot>;
|
|
28
26
|
readonly showHotSpotTexts: boolean;
|
|
29
27
|
readonly hotSpotZAdjPos: number;
|
|
30
28
|
readonly hotSpotTexts?: Record<string, string>;
|
|
31
29
|
readonly activeHotSpots: Record<string, HotSpotInfo> | undefined;
|
|
32
|
-
readonly hoveredId: string | undefined;
|
|
33
30
|
readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: ThreeEvent<MouseEvent>) => void;
|
|
34
|
-
readonly setHoveredId: (id: string | undefined) => void;
|
|
35
31
|
}): React.JSX.Element => {
|
|
36
32
|
return (
|
|
37
33
|
<>
|
|
@@ -42,9 +38,7 @@ export const ReactHotSpots = React.memo(
|
|
|
42
38
|
hotSpotZAdjPos={hotSpotZAdjPos}
|
|
43
39
|
activeHotSpots={activeHotSpots}
|
|
44
40
|
hotSpotTexts={hotSpotTexts}
|
|
45
|
-
hoveredId={hoveredId}
|
|
46
41
|
onClickHotSpot={onClickHotSpot}
|
|
47
|
-
setHoveredId={setHoveredId}
|
|
48
42
|
showHotSpotTexts={showHotSpotTexts}
|
|
49
43
|
/>
|
|
50
44
|
))}
|
|
@@ -59,19 +53,16 @@ export function ReactHotSpot({
|
|
|
59
53
|
showHotSpotTexts,
|
|
60
54
|
hotSpotTexts,
|
|
61
55
|
activeHotSpots,
|
|
62
|
-
hoveredId,
|
|
63
56
|
onClickHotSpot,
|
|
64
|
-
setHoveredId,
|
|
65
57
|
}: {
|
|
66
58
|
readonly h: HotSpot;
|
|
67
59
|
readonly hotSpotZAdjPos: number;
|
|
68
60
|
readonly showHotSpotTexts: boolean;
|
|
69
61
|
readonly hotSpotTexts?: Record<string, string>;
|
|
70
62
|
readonly activeHotSpots: Record<string, HotSpotInfo> | undefined;
|
|
71
|
-
readonly hoveredId: string | undefined;
|
|
72
63
|
readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: ThreeEvent<MouseEvent>) => void;
|
|
73
|
-
readonly setHoveredId: (id: string | undefined) => void;
|
|
74
64
|
}): React.JSX.Element {
|
|
65
|
+
const [hovered, setHovered] = React.useState<boolean>(false);
|
|
75
66
|
const hotSpot = activeHotSpots ? activeHotSpots[h.id] : undefined;
|
|
76
67
|
const hsPos = h.mesh.geometry.type === "Box" ? h.mesh.geometry.pos : vec3Zero;
|
|
77
68
|
const text = hotSpotTexts?.[h.id];
|
|
@@ -90,11 +81,11 @@ export function ReactHotSpot({
|
|
|
90
81
|
onPointerOver: (e) => {
|
|
91
82
|
e.stopPropagation();
|
|
92
83
|
document.body.style.cursor = "pointer";
|
|
93
|
-
|
|
84
|
+
setHovered(true);
|
|
94
85
|
},
|
|
95
86
|
onPointerOut: (_e) => {
|
|
96
87
|
document.body.style.cursor = "auto";
|
|
97
|
-
|
|
88
|
+
setHovered(false);
|
|
98
89
|
},
|
|
99
90
|
onContextMenu: (e) => {
|
|
100
91
|
e.stopPropagation();
|
|
@@ -102,10 +93,16 @@ export function ReactHotSpot({
|
|
|
102
93
|
})}
|
|
103
94
|
>
|
|
104
95
|
<ReactMesh mesh={h.mesh}>
|
|
105
|
-
<ReactMaterial
|
|
96
|
+
<ReactMaterial isText={false} isHotSpot={true} material={h.mesh.material} hovered={hovered} />
|
|
106
97
|
</ReactMesh>
|
|
107
98
|
<ReactMesh mesh={{ ...h.mesh, geometry: { ...geo, size: vec3Scale(geo.size, 1.0125) } }}>
|
|
108
|
-
<ReactMaterial
|
|
99
|
+
<ReactMaterial
|
|
100
|
+
isText={false}
|
|
101
|
+
isHotSpot={true}
|
|
102
|
+
drawBackOnly={true}
|
|
103
|
+
material={{ normal: "rgb(0, 0, 0)", opacity: 1.0 }}
|
|
104
|
+
hovered={hovered}
|
|
105
|
+
/>
|
|
109
106
|
</ReactMesh>
|
|
110
107
|
</group>
|
|
111
108
|
{hotSpotTexts && text && (
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import React
|
|
1
|
+
import React from "react";
|
|
2
2
|
import { suspend } from "suspend-react";
|
|
3
3
|
import { createSVG } from "abstract-image";
|
|
4
4
|
import { CanvasTexture, DoubleSide, PlaneGeometry, SRGBColorSpace, type Texture, TextureLoader } from "three";
|
|
5
5
|
import { Material, Image as A3dImage } from "../../abstract-3d.js";
|
|
6
|
-
import { ERROR_IMG_KEY, getColor, materialDefaults, MaterialState } from "./react-material.js";
|
|
6
|
+
import { ERROR_IMG_KEY, getColor, materialDefaults, MaterialState, selectMat } from "./react-material.js";
|
|
7
7
|
|
|
8
8
|
export const planeGeometry = new PlaneGeometry();
|
|
9
9
|
|
|
@@ -30,18 +30,16 @@ export function ImageMaterial({
|
|
|
30
30
|
image,
|
|
31
31
|
materialStateImages,
|
|
32
32
|
material,
|
|
33
|
-
id,
|
|
34
33
|
useAlphaTest,
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
hovered,
|
|
35
|
+
selected,
|
|
37
36
|
materialState,
|
|
38
37
|
}: {
|
|
39
38
|
readonly image: A3dImage;
|
|
40
39
|
readonly material: Material;
|
|
41
|
-
readonly id: string | undefined;
|
|
42
40
|
readonly materialStateImages: Record<string, string> | undefined;
|
|
43
|
-
readonly
|
|
44
|
-
readonly
|
|
41
|
+
readonly hovered: boolean;
|
|
42
|
+
readonly selected: boolean | undefined;
|
|
45
43
|
readonly useAlphaTest: boolean | undefined;
|
|
46
44
|
readonly materialState: MaterialState | undefined;
|
|
47
45
|
}): React.JSX.Element {
|
|
@@ -51,12 +49,11 @@ export function ImageMaterial({
|
|
|
51
49
|
: image.type === "AbstractImage"
|
|
52
50
|
? `data:image/svg+xml,${createSVG(image.image)}`
|
|
53
51
|
: image.url;
|
|
54
|
-
const color = getColor(selectedIds, id, hoveredId, material);
|
|
55
52
|
const texture = suspend(urlIsSvg(url) ? loadSvg(url, filter) : loadNormal(url, filter), [url]) as Texture | null;
|
|
56
53
|
|
|
57
54
|
return (
|
|
58
55
|
<meshBasicMaterial
|
|
59
|
-
color={
|
|
56
|
+
color={getColor(selected, hovered, material, selectMat)}
|
|
60
57
|
side={DoubleSide}
|
|
61
58
|
alphaTest={useAlphaTest ?? true ? 0.8 : undefined}
|
|
62
59
|
map={texture}
|
|
@@ -10,9 +10,8 @@ export const ERROR_IMG_KEY = "error";
|
|
|
10
10
|
|
|
11
11
|
export function ReactMaterial({
|
|
12
12
|
material,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
hoveredId,
|
|
13
|
+
selected,
|
|
14
|
+
hovered,
|
|
16
15
|
disabled,
|
|
17
16
|
materialState,
|
|
18
17
|
isText,
|
|
@@ -20,9 +19,8 @@ export function ReactMaterial({
|
|
|
20
19
|
drawBackOnly,
|
|
21
20
|
}: {
|
|
22
21
|
readonly material: Material;
|
|
23
|
-
readonly
|
|
24
|
-
readonly
|
|
25
|
-
readonly selectedIds?: Record<string, boolean> | undefined;
|
|
22
|
+
readonly hovered?: boolean | undefined;
|
|
23
|
+
readonly selected?: boolean;
|
|
26
24
|
readonly disabled?: boolean;
|
|
27
25
|
readonly materialState?: MaterialState | undefined;
|
|
28
26
|
readonly isText: boolean;
|
|
@@ -36,20 +34,13 @@ export function ReactMaterial({
|
|
|
36
34
|
: materialState === "Error"
|
|
37
35
|
? errorMar
|
|
38
36
|
: warningMat;
|
|
39
|
-
|
|
40
|
-
const colorText = selectedIds?.[id]
|
|
41
|
-
? hoveredId === id
|
|
42
|
-
? shade(-0.4, textSelectMat.normal)
|
|
43
|
-
: textSelectMat.normal
|
|
44
|
-
: hoveredId === id
|
|
45
|
-
? shade(-0.4, mat.normal)
|
|
46
|
-
: mat.normal;
|
|
37
|
+
|
|
47
38
|
const opacity = material.opacity !== undefined ? material.opacity : materialDefaults.opacity!;
|
|
48
39
|
if (isText) {
|
|
49
40
|
return (
|
|
50
41
|
<meshBasicMaterial
|
|
51
42
|
key={`mesh_material_text}`}
|
|
52
|
-
color={
|
|
43
|
+
color={getColor(selected, hovered, mat, textSelectMat)}
|
|
53
44
|
side={FrontSide}
|
|
54
45
|
transparent
|
|
55
46
|
{...(opacity < 1 ? { opacity } : materialDefaults)}
|
|
@@ -60,7 +51,7 @@ export function ReactMaterial({
|
|
|
60
51
|
return (
|
|
61
52
|
<meshBasicMaterial
|
|
62
53
|
key="mesh_material_hotspot"
|
|
63
|
-
color={
|
|
54
|
+
color={getColor(selected, hovered, mat, selectMat)}
|
|
64
55
|
side={drawBackOnly === true ? BackSide : DoubleSide}
|
|
65
56
|
depthTest={true}
|
|
66
57
|
depthWrite={true}
|
|
@@ -72,7 +63,7 @@ export function ReactMaterial({
|
|
|
72
63
|
return (
|
|
73
64
|
<meshStandardMaterial
|
|
74
65
|
key={`mesh_material_standard_${mat.normal}_${mat.metalness}_${mat.opacity}_${mat.roughness}`}
|
|
75
|
-
color={
|
|
66
|
+
color={getColor(selected, hovered, mat, selectMat)}
|
|
76
67
|
roughness={mat.roughness}
|
|
77
68
|
metalness={mat.metalness}
|
|
78
69
|
side={DoubleSide}
|
|
@@ -96,22 +87,22 @@ export const materialDefaults: MaterialParameters = {
|
|
|
96
87
|
};
|
|
97
88
|
|
|
98
89
|
const acceptMat: Material = { normal: "rgb(0,148,91)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
99
|
-
const selectMat: Material = { normal: "rgb(14,82,184)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
90
|
+
export const selectMat: Material = { normal: "rgb(14,82,184)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
100
91
|
const textSelectMat: Material = { normal: "rgb(0, 26, 65)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
101
92
|
const errorMar: Material = { normal: "#b82f3a", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
102
93
|
const warningMat: Material = { normal: "rgb(240, 197, 48)", opacity: 1.0, metalness: 0.5, roughness: 0.5 };
|
|
103
94
|
|
|
104
95
|
export function getColor(
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
96
|
+
selected: boolean | undefined,
|
|
97
|
+
hovered: boolean | undefined,
|
|
98
|
+
mat: Material,
|
|
99
|
+
selectedMat: Material
|
|
109
100
|
): string | undefined {
|
|
110
|
-
return
|
|
111
|
-
?
|
|
112
|
-
? shade(-0.4,
|
|
113
|
-
:
|
|
114
|
-
:
|
|
101
|
+
return selected
|
|
102
|
+
? hovered
|
|
103
|
+
? shade(-0.4, selectedMat.normal)
|
|
104
|
+
: selectedMat.normal
|
|
105
|
+
: hovered
|
|
115
106
|
? shade(-0.4, mat.normal)
|
|
116
107
|
: mat.normal;
|
|
117
108
|
}
|
|
@@ -68,7 +68,6 @@ export function ReactScene({
|
|
|
68
68
|
readonly createGroupKey?: (g: Group, idx: number, rootData: Record<string, string> | undefined, id: string) => string;
|
|
69
69
|
readonly createGroupId?: (g: Group) => string;
|
|
70
70
|
}): React.JSX.Element {
|
|
71
|
-
const [hoveredId, setHoveredId] = React.useState<string | undefined>(undefined);
|
|
72
71
|
return (
|
|
73
72
|
<group
|
|
74
73
|
rotation={[
|
|
@@ -92,15 +91,9 @@ export function ReactScene({
|
|
|
92
91
|
hotSpotsActive={activeHotSpots !== undefined}
|
|
93
92
|
activeComponents={activeComponents}
|
|
94
93
|
materialStateImages={materialStateImages}
|
|
95
|
-
hoveredId={hoveredId}
|
|
96
94
|
hoveredIdExternal={hoveredIdExternal}
|
|
97
95
|
onClickGroup={onClickGroup}
|
|
98
|
-
onHoverGroup={
|
|
99
|
-
setHoveredId(id);
|
|
100
|
-
if (onHoverGroup) {
|
|
101
|
-
onHoverGroup(id, rootData, data, e);
|
|
102
|
-
}
|
|
103
|
-
}}
|
|
96
|
+
onHoverGroup={onHoverGroup}
|
|
104
97
|
onContextMenuGroup={onContextMenuGroup}
|
|
105
98
|
createGroupKey={createGroupKey}
|
|
106
99
|
id={id}
|
|
@@ -120,9 +113,7 @@ export function ReactScene({
|
|
|
120
113
|
hotSpotZAdjPos={scene.size_deprecated.z / 2}
|
|
121
114
|
activeHotSpots={activeHotSpots}
|
|
122
115
|
hotSpotTexts={hotSpotTexts}
|
|
123
|
-
hoveredId={hoveredId}
|
|
124
116
|
onClickHotSpot={onClickHotSpot}
|
|
125
|
-
setHoveredId={setHoveredId}
|
|
126
117
|
showHotSpotTexts={showHotSpotTexts}
|
|
127
118
|
/>
|
|
128
119
|
{reactPopovers?.map((p) => (
|