@ntalmagor/3drize-viewer 0.1.13 → 0.1.14

package/dist/components/ProductionScene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductionScene.d.ts","sourceRoot":"","sources":["../../src/components/ProductionScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,KAAK,EAAsC,oBAAoB,EAAG,MAAM,wBAAwB,CAAC;AAexG,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA2HnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ProductionScene.d.ts","sourceRoot":"","sources":["../../src/components/ProductionScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,KAAK,EAAsC,oBAAoB,EAAG,MAAM,wBAAwB,CAAC;AAUxG,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAkCnD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/components/ProductionScene.js

@@ -2,34 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { OrbitControls } from "@react-three/drei";
 import { Physics } from "@react-three/rapier";
 import { Vector3 } from "three";
-import LightsManager from "./LightsManager.js";
-import EnvironmentManager from "./EnvironmentManager.js";
-import CameraController from "./CameraController.js";
-import Ocean from "./Ocean.js";
-import ObjectsRenderer from "./ObjectsRenderer.js";
-import { useInteraction } from "../hooks/useInteraction.js";
-const ProductionScene = ({ onObjectsReady, onObjectClick, gridSettings, hdr, physicsSettings, generalObjectSettings, ocean, cameraSettings, selectedLight, objects, lighting, controls, geometry, structure, sky, timeSettings, starsSettings, clouds, rainSettings, fogSettings, animationSequences, }) => {
-    const sunSystem = sky.sunSystem;
-    const mode = 'default';
-    // console.log({animationSequences})
+const ProductionScene = ({ physicsSettings, controls, children, }) => {
     // Interaction hook
-    const { executeInteraction, currentAnimatedRef, glowingObjects, vanishedObjects } = useInteraction({
-        cameraSettings,
-        sequences: animationSequences,
-    });
-    function filterInteractionsByEvent(interactions, mouseEvent) {
-        if (!interactions)
-            return [];
-        return interactions.filter((interaction) => interaction.mouseEvent === mouseEvent);
-    }
-    const handleObjectClick = (createdObject, ref, event) => {
-        console.log('[ProductionScene] handleObjectClick:', createdObject.id);
-        const clickInteractions = filterInteractionsByEvent(createdObject.interactions?.actions, 'click');
-        clickInteractions.forEach((interaction) => {
-            executeInteraction({ interaction, ref, createdObject });
-        });
-        onObjectClick && onObjectClick(createdObject, ref, event);
-    };
-    return (_jsxs(Physics, { gravity: physicsSettings.gravity, paused: !physicsSettings.enabled, debug: physicsSettings.debug, children: [_jsx(LightsManager, { lights: lighting, selectedLight: selectedLight }), _jsx(EnvironmentManager, { hdrSettings: hdr, timeSettings: timeSettings, visible: true, sunSystemVisible: sunSystem.visible, sunSize: sunSystem.sunSize, moonSize: sunSystem.moonSize, sunIntensity: sunSystem.intensity, castShadow: sunSystem.castShadow, shadowMapSize: sunSystem.shadowMapSize, starsSettings: starsSettings, skyControllerSettings: sky.visible && !sunSystem.visible ? sky : undefined, cloudsSettings: clouds, cloudsMaterialSettings: clouds.materialSettings, rainSettings: rainSettings, fogSettings: fogSettings }), _jsx(CameraController, { settings: cameraSettings }), _jsx(Ocean, { settings: ocean }), _jsx(ObjectsRenderer, { cameraSettings: cameraSettings, generalObjectSettings: generalObjectSettings, createdObjects: objects, onObjectsReady: onObjectsReady, handleObjectClick: handleObjectClick }), _jsx(OrbitControls, { makeDefault: true, enabled: controls.enabled, target: new Vector3(...controls.target), enablePan: controls.enablePan, enableRotate: controls.enableRotate, autoRotate: controls.autoRotate, autoRotateSpeed: controls.autoRotateSpeed, zoomSpeed: controls.zoomSpeed, panSpeed: controls.panSpeed, rotateSpeed: controls.rotateSpeed, minDistance: controls.minDistance, maxDistance: controls.maxDistance, minPolarAngle: controls.minPolarAngle ? controls.minPolarAngle : -Infinity, maxPolarAngle: controls.maxPolarAngle ? controls.maxPolarAngle : Infinity, minAzimuthAngle: controls.minAzimuthAngle ? controls.minAzimuthAngle : -Infinity, maxAzimuthAngle: controls.maxAzimuthAngle ? controls.maxAzimuthAngle : Infinity })] }));
+    return (_jsxs(Physics, { gravity: physicsSettings.gravity, paused: !physicsSettings.enabled, debug: physicsSettings.debug, children: [children, _jsx(OrbitControls, { makeDefault: true, enabled: controls.enabled, target: new Vector3(...controls.target), enablePan: controls.enablePan, enableRotate: controls.enableRotate, autoRotate: controls.autoRotate, autoRotateSpeed: controls.autoRotateSpeed, zoomSpeed: controls.zoomSpeed, panSpeed: controls.panSpeed, rotateSpeed: controls.rotateSpeed, minDistance: controls.minDistance, maxDistance: controls.maxDistance, minPolarAngle: controls.minPolarAngle ? controls.minPolarAngle : -Infinity, maxPolarAngle: controls.maxPolarAngle ? controls.maxPolarAngle : Infinity, minAzimuthAngle: controls.minAzimuthAngle ? controls.minAzimuthAngle : -Infinity, maxAzimuthAngle: controls.maxAzimuthAngle ? controls.maxAzimuthAngle : Infinity })] }));
 };
 export default ProductionScene;

package/dist/components/SceneBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SceneBuilder.d.ts","sourceRoot":"","sources":["../../src/components/SceneBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,OAAO,KAAK,EAAa,iBAAiB,EAAe,MAAM,wBAAwB,CAAC;AAQxF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAyK7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SceneBuilder.d.ts","sourceRoot":"","sources":["../../src/components/SceneBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,OAAO,KAAK,EAEV,iBAAiB,EAIlB,MAAM,wBAAwB,CAAC;AAWhC,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAoM7C,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/SceneBuilder.js

@@ -1,14 +1,17 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { Canvas } from "@react-three/fiber";
-// import type { SceneBuilderProps } from "~/types/types";
 import useMeshController from "../hooks/useMeshController.js";
 import { loadAssets } from "@ntalmagor/3drize-core";
 import { NoToneMapping } from "three";
 import ProductionScene from "./ProductionScene.js";
-// import UiController from "./UiController";
-// import type { HtmlElement } from "~/types/uiController";
-const SceneBuilder = ({ project, width = "100%", height = "100vh", style = {}, className = '', onSceneInitialized, onUiElementClick, onObjectClick, }) => {
+import LightsManager from "./LightsManager.js";
+import EnvironmentManager from "./EnvironmentManager.js";
+import CameraController from "./CameraController.js";
+import Ocean from "./Ocean.js";
+import ObjectsRenderer from "./ObjectsRenderer.js";
+import { useInteraction } from "../hooks/useInteraction.js";
+const SceneBuilder = ({ project, width = "100%", height = "100vh", style = {}, className = "", onSceneInitialized, onUiElementClick, onObjectClick, }) => {
     const sceneSettings = (project.sceneSettingsData || {});
     const meshController = useMeshController();
     const [isThreeJsMounted, setIsThreeJsMounted] = useState(false);
@@ -45,13 +48,13 @@ const SceneBuilder = ({ project, width = "100%", height = "100vh", style = {}, c
         minAzimuthAngle: -Infinity,
         maxAzimuthAngle: Infinity,
     };
-    const { shadows, antialias, dpr, gl, backgroundColor, } = sceneCanvas;
-    const { position, orientation, fov, near, far, } = camera;
+    const { shadows, antialias, dpr, gl, backgroundColor } = sceneCanvas;
+    const { position, orientation, fov, near, far } = camera;
     const containerStyle = {
         width,
         height,
-        position: 'relative',
-        overflow: 'hidden',
+        position: "relative",
+        overflow: "hidden",
         ...style,
     };
     useEffect(() => {
@@ -81,12 +84,30 @@ const SceneBuilder = ({ project, width = "100%", height = "100vh", style = {}, c
             onUiElementClick(element);
         }
     };
+    function filterInteractionsByEvent(interactions, mouseEvent) {
+        if (!interactions)
+            return [];
+        return interactions.filter((interaction) => interaction.mouseEvent === mouseEvent);
+    }
+    const { executeInteraction } = useInteraction({
+        cameraSettings: camera,
+        sequences: animationSequences,
+    });
+    const handleObjectClickHandler = (createdObject, ref, event) => {
+        const clickInteractions = filterInteractionsByEvent(createdObject.interactions?.actions, "click");
+        clickInteractions.forEach((interaction) => {
+            executeInteraction({ interaction, ref, createdObject });
+        });
+        if (onObjectClick) {
+            onObjectClick(createdObject, ref, event);
+        }
+    };
     return (_jsx("div", { className: className, style: containerStyle, children: _jsx(Canvas, { style: {
                 backgroundColor: backgroundColor,
             }, shadows: shadows, dpr: dpr, gl: {
                 antialias,
                 alpha: true,
-                powerPreference: 'high-performance',
+                powerPreference: "high-performance",
                 ...gl,
             }, camera: {
                 fov,
@@ -100,6 +121,6 @@ const SceneBuilder = ({ project, width = "100%", height = "100vh", style = {}, c
                 if (onSceneInitialized) {
                     onSceneInitialized();
                 }
-            }, children: _jsx(ProductionScene, { device: "desktop", onObjectsReady: undefined, gridSettings: environment.grid, hdr: environment.hdr, physicsSettings: physicsSettings, generalObjectSettings: generalObjectSettings, ocean: environment.ocean, cameraSettings: camera, selectedLight: null, objects: sceneObjects, lighting: project.lights || [], controls: controls, geometry: project.settings?.materialCreator?.geometry || null, structure: project.settings?.structure || null, sky: environment.sky, timeSettings: timeSettings, starsSettings: environment.stars, clouds: environment.clouds, rainSettings: environment.rain, fogSettings: environment.fog, onObjectClick: onObjectClick, animationSequences: animationSequences }) }) }));
+            }, children: _jsxs(ProductionScene, { physicsSettings: physicsSettings, controls: controls, children: [_jsx(LightsManager, { lights: project.lights || [] }), _jsx(EnvironmentManager, { hdrSettings: environment.hdr, timeSettings: timeSettings, visible: true, sunSystemVisible: environment.sky.sunSystem.visible, sunSize: environment.sky.sunSystem.sunSize, moonSize: environment.sky.sunSystem.moonSize, sunIntensity: environment.sky.sunSystem.intensity, castShadow: environment.sky.sunSystem.castShadow, shadowMapSize: environment.sky.sunSystem.shadowMapSize, starsSettings: environment.stars, skyControllerSettings: environment.sky.visible && !environment.sky.sunSystem.visible ? environment.sky : undefined, cloudsSettings: environment.clouds, cloudsMaterialSettings: environment.clouds.materialSettings, rainSettings: environment.rain, fogSettings: environment.fog }), _jsx(CameraController, { settings: camera }), _jsx(Ocean, { settings: environment.ocean }), _jsx(ObjectsRenderer, { cameraSettings: camera, generalObjectSettings: generalObjectSettings, createdObjects: sceneObjects, onObjectsReady: undefined, handleObjectClick: handleObjectClickHandler })] }) }) }));
 };
 export default SceneBuilder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntalmagor/3drize-viewer",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",