@ntalmagor/3drize-viewer 0.1.23 → 0.1.25

package/dist/components/AnimatedObject.js

@@ -17,7 +17,7 @@ visible = true, children, parentRef, handleObjectClick, onPointerEnter, onPointe
     const stepEase = useRef('linear');
     const animProgress = useRef(0);
     const hasHoverFunctionalities = hasHoverAnimation(createdObject.animations);
-    const hasMouseInteraction = createdObject.interactions && createdObject.interactions.actions.length > 0;
+    const hasMouseInteraction = (createdObject.actions?.length ?? 0) > 0;
     const baseRef = useRef({ position: [...position], scale: [...scale], rotation: [...rotation] });
     const targetRef = useRef({
         position: targetPosition ? [...targetPosition] : [...position],

package/dist/components/Clouds.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import type { CloudsSettings, TimeSettings } from '@ntalmagor/3drize-core';
+import type { TimeSettings, CreatedObjectSettings } from '@ntalmagor/3drize-core';
 export interface CloudsProps {
-    settings: CloudsSettings;
-    timeSettings: TimeSettings;
+    settings: CreatedObjectSettings;
+    timeSettings?: TimeSettings;
 }
 declare const Clouds: React.FC<CloudsProps>;
 export default Clouds;

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

@@ -1 +1 @@
-{"version":3,"file":"Clouds.d.ts","sourceRoot":"","sources":["../../src/components/Clouds.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAOnD,OAAO,KAAK,EAAE,cAAc,EAAoB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoB7F,MAAM,WAAW,WAAW;IAE1B,QAAQ,EAAE,cAAc,CAAA;IACxB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAmLjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Clouds.d.ts","sourceRoot":"","sources":["../../src/components/Clouds.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAOnD,OAAO,KAAK,EAGV,YAAY,EAIZ,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AA+BhC,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAgFD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAuNjC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/components/Clouds.js

@@ -2,12 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useRef, useCallback } from 'react';
 import * as THREE from 'three';
 import { useThree, useFrame } from '@react-three/fiber';
-import { useMaterialApplication } from '../hooks/useMaterialApplication.js';
 import { useSkySystem } from '../hooks/useSkySystem.js';
 import { useAnimationEvents } from '../hooks/useAnimationEvents.js';
 import { useNumericAnimation } from '../hooks/useNumericAnimation.js';
-import { applySingleProperty } from '@ntalmagor/3drize-core';
-import { useMouseHandlers } from '../hooks/useMouseHandlers.js';
+import { calculateTimeProgress, applyEasing, gsapEasingMap, interpolateValue, handleTransformMouseMove, handleMaterialMouseMove, interpolateMouseMoveProperty, } from '@ntalmagor/3drize-core';
 const CLOUD_COLORS = {
     night: new THREE.Color(0.1, 0.1, 0.2),
     sunrise: new THREE.Color(0.8, 0.4, 0.4),
@@ -22,20 +20,101 @@ const DEFAULT_MATERIAL = {
     u_cameraPos: [0, 0, 0],
     u_cloudColor: [1.0, 1.0, 1.0],
 };
-const Clouds = ({ settings, timeSettings, }) => {
-    const { visible = true, position = [0, 400, 0], scale = 15000, speed = 1, materialSettings = DEFAULT_MATERIAL, handlers } = settings;
-    const height = position?.[1] ?? 400;
+// =============================================================================
+// Per-domain helpers (clouds-specific writes for the `clouds` domain)
+// =============================================================================
+function applyCloudsKeyframeAnimations(animations, startValuesCache, config, override, currentTime) {
+    if (!animations?.length)
+        return;
+    override.speed = undefined; // reset before each pass
+    for (const anim of animations) {
+        const { property, to, duration, ease, loop = false, yoyo = false, active } = anim;
+        if (!active || to === undefined)
+            continue;
+        if (property !== 'speed')
+            continue;
+        let from = anim.from;
+        if (from === undefined) {
+            from = startValuesCache[property] ??= (config.speed ?? 1);
+        }
+        let p = calculateTimeProgress(currentTime, duration, yoyo, loop);
+        if (ease) {
+            const fn = gsapEasingMap[ease] || ease;
+            p = applyEasing(fn, p);
+        }
+        override.speed = interpolateValue(property, from, to, p);
+    }
+}
+function applyCloudsMouseMove(properties, config, override, pointer) {
+    if (!properties?.length)
+        return;
+    override.speed = undefined;
+    for (const { property, enabled, propertySettings } of properties) {
+        if (!enabled || property !== 'speed')
+            continue;
+        const { axis = 'both', sensitivity = 1, inverted = false, min, max } = propertySettings || {};
+        const base = config.speed ?? 1;
+        override.speed = interpolateMouseMoveProperty(base, min, max, pointer, axis, sensitivity, inverted);
+    }
+}
+// Project legacy flat `handlers.onMouseMove.properties[]` shape into per-domain
+// buckets so we can route it through the new handlers without a save migration.
+function projectLegacyHandlersToDomain(legacy) {
+    const transform = [];
+    const material = [];
+    const clouds = [];
+    if (!legacy)
+        return { transform, material, clouds };
+    for (const cfg of legacy) {
+        const enabledP = { property: cfg.property, enabled: cfg.enabled ?? true, propertySettings: cfg.propertySettings };
+        if (cfg.property === 'speed')
+            clouds.push(enabledP);
+        else if (cfg.property === 'position' || cfg.property === 'rotation' || cfg.property === 'scale')
+            transform.push(enabledP);
+        else
+            material.push(enabledP);
+    }
+    return { transform, material, clouds };
+}
+// =============================================================================
+// MAIN COMPONENT
+// =============================================================================
+const defaultTimeSettings = {
+    enabled: false,
+    timescale: 1,
+    timeOfDay: 12,
+    syncWithRealTime: false,
+    autoAnimate: false,
+};
+const Clouds = ({ settings, timeSettings = defaultTimeSettings }) => {
+    const visible = settings.meshSettings.visible ?? true;
+    const meshSettings = settings.meshSettings;
+    const config = settings.config;
+    const materialSettings = settings.materialSettings;
+    const position = meshSettings.position;
+    const scale = meshSettings.scale;
+    // console.log(config.speed)
+    const baseSpeed = config.speed ?? 1;
+    // console.log(baseSpeed)
+    const height = position[1];
+    const planeSize = config?.planeSize || [10000, 10000];
+    const planeSegments = config?.planeSegments || 64;
     const meshRef = useRef(null);
     const cloudAnimTime = useRef(0);
     const { camera } = useThree();
-    const { interpolateProperty } = useMouseHandlers();
     const cloudColorRef = useRef(new THREE.Color(1, 1, 1));
     const targetCloudColorRef = useRef(new THREE.Color(1, 1, 1));
+    // Sequence-driven numeric anims (legacy `useAnimationEvents` path)
     const numericOverrideRef = useRef(null);
-    const mouseOverrideRef = useRef({});
     const { animateNumeric } = useNumericAnimation();
-    const effectiveMaterialSettings = materialSettings ?? DEFAULT_MATERIAL;
-    useMaterialApplication(meshRef.current, effectiveMaterialSettings, true);
+    // Per-domain animation + mouseMove overrides
+    const animatedOverrideRef = useRef({});
+    const mouseOverrideRef = useRef({});
+    // Keyframe-animation start-value caches (one per domain that uses them)
+    const transformAnimCacheRef = useRef({});
+    const materialAnimCacheRef = useRef({});
+    const cloudsAnimCacheRef = useRef({});
+    // useMaterialApplication(visible ? (meshRef.current as any) : null, materialSettings, true);
     const handleTimeUpdate = useCallback((state) => {
         const { normalizedTime, isDaytime, delta } = state;
         if (isDaytime) {
@@ -66,6 +145,7 @@ const Clouds = ({ settings, timeSettings, }) => {
         onTimeUpdate: handleTimeUpdate,
         enabled: visible,
     });
+    // Legacy sequence-driven `speed`/`scale` anims via `useAnimationEvents`
     useAnimationEvents({
         onStepStart: (event) => {
             if (!event.step?.transitions)
@@ -75,20 +155,18 @@ const Clouds = ({ settings, timeSettings, }) => {
                     continue;
                 const toProps = transition.properties.to || {};
                 const fromProps = transition.properties.from || {};
-                // visible — immediate boolean switch on the Three.js mesh
-                if (toProps.visible !== undefined) {
+                if (toProps.visible !== undefined)
                     meshRef.current.visible = toProps.visible;
-                }
-                // numeric: speed, scale
-                const CLOUDS_NUMERIC_KEYS = ['speed', 'scale'];
+                const KEYS = ['speed', 'scale'];
                 const from = {};
                 const to = {};
-                for (const key of CLOUDS_NUMERIC_KEYS) {
-                    const toVal = toProps[key];
+                for (const k of KEYS) {
+                    const toVal = toProps[k];
                     if (toVal === undefined)
                         continue;
-                    to[key] = toVal;
-                    from[key] = fromProps[key] ?? settings[key] ?? toVal;
+                    to[k] = toVal;
+                    const sourceFallback = k === 'speed' ? baseSpeed : scale;
+                    from[k] = fromProps[k] ?? sourceFallback;
                 }
                 if (Object.keys(to).length > 0) {
                     animateNumeric(from, to, (updated) => {
@@ -100,44 +178,61 @@ const Clouds = ({ settings, timeSettings, }) => {
             }
         },
     });
-    const handleMouseMove = (mouse) => {
-        if (!handlers?.onMouseMove?.enabled)
-            return;
-        if (!handlers.onMouseMove.properties.length)
-            return;
-        if (!meshRef.current)
-            return;
-        handlers.onMouseMove.properties.forEach((cfg) => {
-            const { property, propertySettings } = cfg;
-            const { min: minValue, max: maxValue, axis, sensitivity = 1, inverted = false } = propertySettings;
-            if (property === 'speed' || property === 'scale') {
-                const key = property;
-                const baseValue = settings[key];
-                if (baseValue === undefined)
-                    return;
-                const interpolated = interpolateProperty(baseValue, minValue, maxValue, mouse, axis, sensitivity, inverted);
-                mouseOverrideRef.current[key] = interpolated;
-                return;
-            }
-            const baseValue = settings.materialSettings?.[property];
-            if (baseValue === undefined)
-                return;
-            const interpolated = interpolateProperty(baseValue, minValue, maxValue, mouse, axis, sensitivity, inverted);
-            applySingleProperty(meshRef.current.material, property, interpolated);
-        });
-    };
     useFrame((state) => {
-        if ((meshRef.current && !meshRef.current.visible) || !meshRef.current?.material)
+        const mesh = meshRef.current;
+        if (!mesh || !mesh.visible || !mesh.material)
             return;
-        const material = meshRef.current.material;
+        const material = mesh.material;
         const uniforms = material?.uniforms;
         if (!uniforms)
             return;
-        const effectiveSpeed = numericOverrideRef.current?.speed
+        const now = Date.now();
+        const pointer = state.pointer;
+        // ── PER-DOMAIN ANIMATIONS ────────────────────────────────────────────────
+        const mm = settings.mouseMove;
+        // const isPerDomain = mm && ('transform' in mm || 'material' in mm || 'edges' in mm || 'light' in mm || 'clouds' in mm);
+        // transform: position / rotation / scale
+        // const transformAnims = settings.animations?.transform?.animations;
+        // if (transformAnims?.length) {
+        //   handleTransformAnimations(
+        //     { object: mesh, meshSettings: meshSettings as any, pathIsActive: false },
+        //     transformAnims,
+        //     now,
+        //     false,
+        //   );
+        // }
+        // // material: shader uniforms
+        // const materialAnims = settings.animations?.material?.animations;
+        // if (materialAnims?.length) {
+        //   handleMaterialAnimations(
+        //     { object: mesh, materialSettings: materialSettings as any, startValuesCache: materialAnimCacheRef.current },
+        //     materialAnims,
+        //     now,
+        //     false,
+        //   );
+        // }
+        // clouds: speed
+        applyCloudsKeyframeAnimations(settings.animations?.clouds?.animations, cloudsAnimCacheRef.current, config, animatedOverrideRef.current, now);
+        // ── PER-DOMAIN MOUSE-MOVE ─────────────────────────────────────────────────
+        if (mm) {
+            const perDomain = mm;
+            if (perDomain.transform?.enabled && perDomain.transform.properties?.length) {
+                handleTransformMouseMove({ object: mesh, meshSettings: meshSettings }, perDomain.transform.properties, pointer);
+            }
+            if (perDomain.material?.enabled && perDomain.material.properties?.length) {
+                handleMaterialMouseMove({ object: mesh, materialSettings: materialSettings }, perDomain.material.properties, pointer);
+            }
+            applyCloudsMouseMove(perDomain.clouds?.enabled ? perDomain.clouds.properties : undefined, config, mouseOverrideRef.current, pointer);
+        }
+        // ── EFFECTIVE SPEED + UNIFORM UPDATES ─────────────────────────────────────
+        const effectiveSpeed = animatedOverrideRef.current.speed
+            ?? numericOverrideRef.current?.speed
             ?? mouseOverrideRef.current.speed
-            ?? speed;
+            ?? baseSpeed;
+        // console.log(effectiveSpeed)
+        // console.log(effectiveSpeed)
         cloudAnimTime.current += 0.02 * effectiveSpeed;
-        const mouse = state.pointer;
+        // console.log(cloudAnimTime.current)
         if (uniforms.u_time)
             uniforms.u_time.value = cloudAnimTime.current;
         if (uniforms.u_cameraPos) {
@@ -160,14 +255,16 @@ const Clouds = ({ settings, timeSettings, }) => {
                 ? uniforms.u_sunPosition.value.copy(sunDirection)
                 : (uniforms.u_sunPosition.value = sunDirection.clone());
         }
-        handleMouseMove(mouse);
-        const effectiveScale = numericOverrideRef.current?.scale
-            ?? mouseOverrideRef.current.scale;
-        if (effectiveScale !== undefined) {
-            meshRef.current.scale.setScalar(effectiveScale);
+        // Apply scale override (sequence-driven path only — per-domain transform anims
+        // already mutate mesh.scale through handleTransformAnimations).
+        if (numericOverrideRef.current?.scale !== undefined) {
+            mesh.scale.setScalar(numericOverrideRef.current.scale);
         }
     });
-    // if (!visible) return null;
-    return (_jsx("mesh", { ref: meshRef, name: "SkyClouds", userData: { id: '3drise-clouds' }, position: [0, height, 0], rotation: [Math.PI / 2, 0, 0], scale: scale, renderOrder: -1, frustumCulled: false, visible: visible, children: _jsx("planeGeometry", { args: [2, 2] }) }));
+    return (_jsx("mesh", { ref: meshRef, name: "SkyClouds", userData: { id: '3drise-clouds' }, 
+        // position={[0, height, 0]}
+        // rotation={[Math.PI / 2, 0, 0]}
+        // scale={scale}
+        renderOrder: -1, frustumCulled: false, visible: visible, children: _jsx("planeGeometry", { args: [planeSize[0], planeSize[1], planeSegments, planeSegments] }) }));
 };
 export default Clouds;

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

@@ -1 +1 @@
-{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAC;AAEjE,OAAO,KAAK,EAAG,qBAAqB,EAAkC,MAAM,wBAAwB,CAAC;AAOrG,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWrD,UAAU,kBAAkB;IAC1B,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvE,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAElH;AAED,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAwJ9C,CAAC;AAIH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAC;AAEjE,OAAO,KAAK,EAAG,qBAAqB,EAAkC,MAAM,wBAAwB,CAAC;AAQrG,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWrD,UAAU,kBAAkB;IAC1B,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvE,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAElH;AAED,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA0J9C,CAAC;AAIH,eAAe,aAAa,CAAC"}

package/dist/components/CreatedObject.js

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useRef, useEffect, useState, memo } from "react";
 import { DEFAULT_EDGES_SETTINGS } from "@ntalmagor/3drize-core";
 import { useMaterialApplication } from "../hooks/useMaterialApplication.js";
+import { useShadowApplication } from "../hooks/useShadowApplication.js";
 import { useTransformControls } from "../hooks/useTransformControls.js";
 import { RigidBody } from '@react-three/rapier';
 import { cameraManager } from "../utils/CameraSingleton.js";
@@ -25,9 +26,10 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
     const { controllersRef } = useTransformControls();
     const { handlePointerEnter, handlePointerLeave, hovered } = useFrameEffects(isSelected);
     const [mountedObject, setMountedObject] = useState(null);
-    useObjectEdges(meshRef.current, createdObject.edgesSettings ?? DEFAULT_EDGES_SETTINGS);
+    useObjectEdges(createdObject.id, createdObject.edgesSettings ?? DEFAULT_EDGES_SETTINGS);
     // useObjectGenerativeEffects(mountedObject, createdObject.effects);
     useMaterialApplication(meshRef.current, createdObject.materialSettings, shouldApply3driseMaterial);
+    useShadowApplication(meshRef.current, createdObject.meshSettings.castShadow, createdObject.meshSettings.receiveShadow);
     const anchoredPosition = cameraManager.getAnchorPosition(createdObject.meshSettings.anchor?.anchor || 'center', 0, createdObject.meshSettings.anchor?.offset || { y: 0, x: 0, z: 0 }, createdObject.meshSettings.anchor?.padding || 0);
     useEffect(() => {
         if (meshRef.current) {
@@ -68,7 +70,7 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
             return;
         // e.stopPropagation();
         handlePointerEnter(e);
-        if (createdObject.interactions) {
+        if (createdObject.actions?.length || createdObject.mouseMove?.enabled) {
             document.body.style.cursor = 'pointer';
         }
     };
@@ -83,10 +85,6 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
         e.stopPropagation();
     };
     const anchorEnabled = createdObject.meshSettings.anchor && createdObject.meshSettings.anchor.enabled;
-    // console.log("createdObject.meshSettings", createdObject.meshSettings)
-    // console.log("Rendered CreatedObject:", createdObject.rigidBodySettings);
-    const stateKey = createdObject.meshSettings.name;
-    // console.log({stateKey})
     return (_jsx(AnimatedObject
     // animationId={createdObject.animationId || ''}
     , { 

package/dist/components/CustomPrimitive.js

@@ -1,47 +1,51 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useRef, useEffect, memo, useState } from "react";
-import { ObjectManager, findById } from "@ntalmagor/3drize-core";
-// import ObjectManager from "~/utils/ObjectManager";
-import { useMaterialApplication } from "../hooks/useMaterialApplication.js";
+import { useRef, memo } from "react";
+import { ObjectManager } from "@ntalmagor/3drize-core";
 import MaterialLibrary from "./MaterialLibrary.js";
-// import type { AnimatedTransform } from "~/types/mesh";
-import CreatedObject from "./CreatedObject.js";
 const CustomPrimitive = memo(({ createdObject, onObjectReady, handleObjectClick, }) => {
     // const { handleObjectClick } = useSceneClick();
     // console.log("Rendering CustomPrimitive with settings:", createdObject.name, createdObject);
     const meshRef = useRef(null);
-    const effectStateRef = useRef(null);
-    const [animatedTransform, setAnimatedTransform] = React.useState({
-        position: createdObject.meshSettings.position,
-        rotation: createdObject.meshSettings.rotation,
-        scale: createdObject.meshSettings.scale,
-    });
+    // const effectStateRef = useRef<EffectState | null>(null);
+    // const [animatedTransform, setAnimatedTransform] = React.useState<AnimatedTransform>({
+    //   position: createdObject.meshSettings.position,
+    //   rotation: createdObject.meshSettings.rotation,
+    //   scale: createdObject.meshSettings.scale,
+    // });
     // Initialize transform controls
     // const { handlePointerEnter, handlePointerLeave, hovered } = useFrameEffects(true);
-    useEffect(() => {
-        setAnimatedTransform({
-            position: createdObject.meshSettings.position,
-            rotation: createdObject.meshSettings.rotation,
-            scale: createdObject.meshSettings.scale,
-        });
-    }, [createdObject.meshSettings.position, createdObject.meshSettings.rotation, createdObject.meshSettings.scale]);
+    // useEffect(() => {
+    //   setAnimatedTransform({
+    //     position: createdObject.meshSettings.position,
+    //     rotation: createdObject.meshSettings.rotation,
+    //     scale: createdObject.meshSettings.scale,
+    //   });
+    // }, [createdObject.meshSettings.position, createdObject.meshSettings.rotation, createdObject.meshSettings.scale]);
     const useDreiMaterials = createdObject.materialSettings.materialType === "advanced";
-    const apply3driseMaterials = !useDreiMaterials;
-    const willApplyMaterial = apply3driseMaterials && !!createdObject.materialSettings.materialVariant;
-    const [materialReady, setMaterialReady] = useState(!willApplyMaterial);
+    // const apply3driseMaterials = !useDreiMaterials;
+    // const willApplyMaterial = apply3driseMaterials && !!createdObject.materialSettings.materialVariant;
+    // const [materialReady, setMaterialReady] = useState(!willApplyMaterial);
     // get initial object from ObjectManager to add to scene with primitive, then use findById to get updated reference with materials applied by useMaterialApplication
     const obj = ObjectManager.getObject(createdObject.id);
-    const object = findById(createdObject.id);
-    useMaterialApplication(object ?? null, createdObject.materialSettings, apply3driseMaterials, () => setMaterialReady(true));
+    // const object = findById(createdObject.id);
+    // useMaterialApplication(object ?? null, createdObject.materialSettings, apply3driseMaterials, () => setMaterialReady(true));
     if (!obj) {
         // console.warn(`CustomPrimitive - Object with ID ${createdObject.id} not found.`);
         return null;
     }
     return (
     // <Select enabled={isSelected}>
-    _jsx(CreatedObject, { createdObject: createdObject, shouldApply3driseMaterial: false, handleObjectClick: handleObjectClick, onObjectReady: (object, ref) => {
-            onObjectReady && onObjectReady(object, ref);
-        }, children: _jsx("primitive", { ref: meshRef, name: obj.name, object: obj.object, visible: materialReady && createdObject.meshSettings.visible, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: useDreiMaterials && createdObject.type === 'mesh' && createdObject.meshSettings.visible && (_jsx(MaterialLibrary, { materialSettings: createdObject.materialSettings })) }, obj.id) })
+    // <CreatedObject createdObject={createdObject}
+    //   shouldApply3driseMaterial={false}  // Material is owned by useMaterialApplication above (applied to obj.object directly)
+    //   handleObjectClick={handleObjectClick}
+    //   onObjectReady={(object, ref) => {
+    //     onObjectReady && onObjectReady(object, ref);
+    //   }}
+    // >
+    _jsx("primitive", { ref: meshRef, name: obj.name, object: obj.object, visible: createdObject.meshSettings.visible, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: useDreiMaterials && createdObject.type === 'mesh' && createdObject.meshSettings.visible && (_jsx(MaterialLibrary, { materialSettings: createdObject.materialSettings })) }, obj.id)
+    // {/* <LineEdges object={obj.object} />
+    // <MeshEdges object={obj.object} /> */}
+    // </CreatedObject>
     // {/* </Select> */}
     );
 });

package/dist/components/EffectsGroup.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { CreatedObjectSettings } from '@ntalmagor/3drize-core';
+import { type CreatedObjectSettings } from '@ntalmagor/3drize-core';
 interface EffectsGroupProps {
     createdObject: CreatedObjectSettings;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"EffectsGroup.d.ts","sourceRoot":"","sources":["../../src/components/EffectsGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGpE,UAAU,iBAAiB;IACzB,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAS7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"EffectsGroup.d.ts","sourceRoot":"","sources":["../../src/components/EffectsGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG3F,UAAU,iBAAiB;IACzB,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAU7C,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/EffectsGroup.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { GEREATIVE_EFFECTS_KEY } from '@ntalmagor/3drize-core';
 import EffectsGenerator from './EffectsGenerator.js';
 const EffectsGroup = ({ createdObject }) => {
     if (!createdObject.effects || createdObject.effects.length === 0)
         return null;
-    return (_jsx("group", { name: `${createdObject.id}-effects`, children: createdObject.effects.map((effect, index) => (_jsx(EffectsGenerator, { settings: effect }, index))) }));
+    return (_jsx("group", { name: `${createdObject.id}-effects`, userData: { [GEREATIVE_EFFECTS_KEY]: true }, children: createdObject.effects.map((effect, index) => (_jsx(EffectsGenerator, { settings: effect }, index))) }));
 };
 export default EffectsGroup;

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

@@ -1 +1 @@
-{"version":3,"file":"Frame.d.ts","sourceRoot":"","sources":["../../src/components/Frame.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAmC,QAAQ,EAAsB,MAAM,OAAO,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAgB,MAAM,wBAAwB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMrE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,cAAc,EAAE,qBAAqB,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,iBAAiB,CAAC,EAAE,CAClB,aAAa,EAAE,qBAAqB,EACpC,GAAG,EAAE,QAAQ,EACb,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC1C;AAED,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAC5B,GAAG,EACH,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,SAAoB,EACpB,aAAa,EACb,gBAAqB,EACrB,YAAiB,EACjB,cAAc,EACd,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,GAClB,EAAE,UAAU,kDAoFZ"}
+{"version":3,"file":"Frame.d.ts","sourceRoot":"","sources":["../../src/components/Frame.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAmC,QAAQ,EAAsB,MAAM,OAAO,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAgB,MAAM,wBAAwB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMrE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,cAAc,EAAE,qBAAqB,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,iBAAiB,CAAC,EAAE,CAClB,aAAa,EAAE,qBAAqB,EACpC,GAAG,EAAE,QAAQ,EACb,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC1C;AAED,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAC5B,GAAG,EACH,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,SAAoB,EACpB,aAAa,EACb,gBAAqB,EACrB,YAAiB,EACjB,cAAc,EACd,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,GAClB,EAAE,UAAU,kDAuFZ"}

package/dist/components/Frame.js

@@ -48,5 +48,7 @@ export default function Frame({ url, isActive, createdObject, position, rotation
     };
     if (!texture)
         return null;
-    return (_jsx("mesh", { name: url, ref: frameRef, position: position, rotation: rotation, scale: scale, raycast: () => null, onPointerEnter: handlePointerEnter, onPointerLeave: handlePointerLeave, onClick: onClick, children: children ? children : (_jsxs(_Fragment, { children: [_jsx(FrameGeometry, { shapeType: 'rectangle', layoutSettings: layoutSettings, scale: layoutSettings.outerFrameScale }), _jsx(MaterialLibrary, { materialSettings: materialSettings }), showFront && (_jsx(FrameImage, { ref: imageRef, texture: texture, shapeType: 'rectangle', position: [0, 0, 0.02] })), showBack && (_jsx(FrameImage, { texture: texture, shapeType: 'rectangle', position: [0, 0, -0.02], rotation: [0, Math.PI, 0], isBack: true }))] })) }));
+    return (_jsx("mesh", { name: url, ref: frameRef, position: position, rotation: rotation, scale: scale, raycast: () => null, onPointerEnter: handlePointerEnter, onPointerLeave: handlePointerLeave, onClick: onClick, userData: {
+            url,
+        }, children: children ? children : (_jsxs(_Fragment, { children: [_jsx(FrameGeometry, { shapeType: 'rectangle', layoutSettings: layoutSettings, scale: layoutSettings.outerFrameScale }), _jsx(MaterialLibrary, { materialSettings: materialSettings }), showFront && (_jsx(FrameImage, { ref: imageRef, texture: texture, shapeType: 'rectangle', position: [0, 0, 0.02] })), showBack && (_jsx(FrameImage, { texture: texture, shapeType: 'rectangle', position: [0, 0, -0.02], rotation: [0, Math.PI, 0], isBack: true }))] })) }));
 }

package/dist/components/Galaxy.d.ts

@@ -1,7 +1,9 @@
 import React from 'react';
-import type { StarsSettings } from '@ntalmagor/3drize-core';
+import type { StarsSettings, TimeSettings } from '@ntalmagor/3drize-core';
 export interface GalaxyProps {
     settings: StarsSettings;
+    timeSettings?: TimeSettings;
+    sunSystemEnabled?: boolean;
 }
 declare const Galaxy: React.FC<GalaxyProps>;
 export default Galaxy;

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

@@ -1 +1 @@
-{"version":3,"file":"Galaxy.d.ts","sourceRoot":"","sources":["../../src/components/Galaxy.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAI5D,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,aAAa,CAAC;CACzB;AAED,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CASjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Galaxy.d.ts","sourceRoot":"","sources":["../../src/components/Galaxy.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAI1E,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAajC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/components/Galaxy.js

@@ -1,8 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import Stars from './Stars.js';
-import ShootingStars from './ShootingStars.js';
-const Galaxy = ({ settings }) => {
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+const Galaxy = ({ settings, timeSettings, sunSystemEnabled }) => {
     // if (!settings.visible) return null;
-    return (_jsxs(_Fragment, { children: [_jsx(Stars, { settings: settings }), _jsx(ShootingStars, { settings: settings.shootingStars })] }));
+    return (_jsx(_Fragment, {}));
 };
 export default Galaxy;

package/dist/components/LightObject.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { CreatedObjectSettings } from '@ntalmagor/3drize-core';
+type LightObjectProps = {
+    createdObject: CreatedObjectSettings;
+};
+declare const LightObject: React.FC<LightObjectProps>;
+export default LightObject;
+//# sourceMappingURL=LightObject.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LightObject.d.ts","sourceRoot":"","sources":["../../src/components/LightObject.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAQjD,OAAO,KAAK,EAEV,qBAAqB,EAKtB,MAAM,wBAAwB,CAAC;AAKhC,KAAK,gBAAgB,GAAG;IACtB,aAAa,EAAE,qBAAqB,CAAC;CACtC,CAAC;AA8EF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAsB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/components/LightObject.js

@@ -0,0 +1,65 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useRef } from 'react';
+import { useThree } from '@react-three/fiber';
+import { useLightShadow } from '../hooks/useLightShadow.js';
+import { useLightAnimation } from '../hooks/useLightAnimation.js';
+import { useLightMouseMove } from '../hooks/useLightMouseMove.js';
+const DirectionalLightR3F = ({ config, animations, mouseMove }) => {
+    const lightRef = useRef(null);
+    useLightShadow(lightRef, config.shadow);
+    useLightAnimation(lightRef, animations);
+    useLightMouseMove(lightRef, mouseMove, { lightConfig: config });
+    return (_jsx("directionalLight", { ref: lightRef, color: config.color || '#ffffff', intensity: config.intensity ?? 1 }));
+};
+const SpotLightR3F = ({ config, animations, mouseMove }) => {
+    const { scene } = useThree();
+    const lightRef = useRef(null);
+    const targetRef = useRef(null);
+    const [tx, ty, tz] = config.targetPosition ?? [0, 0, 0];
+    useEffect(() => {
+        const light = lightRef.current;
+        if (!light)
+            return;
+        if (!targetRef.current) {
+            targetRef.current = light.target;
+            scene.add(targetRef.current);
+        }
+        targetRef.current.position.set(tx, ty, tz);
+        targetRef.current.updateMatrixWorld();
+        return () => {
+            if (targetRef.current) {
+                scene.remove(targetRef.current);
+                targetRef.current = null;
+            }
+        };
+    }, [scene, tx, ty, tz]);
+    useLightShadow(lightRef, config.shadow);
+    useLightAnimation(lightRef, animations);
+    useLightMouseMove(lightRef, mouseMove, { lightConfig: config });
+    return (_jsx("spotLight", { ref: lightRef, color: config.color || '#ffffff', intensity: config.intensity ?? 1, angle: config.angle ?? Math.PI / 4, penumbra: config.penumbra ?? 0.1, decay: config.decay ?? 1, distance: config.distance ?? 0 }));
+};
+const PointLightR3F = ({ config, animations, mouseMove }) => {
+    const lightRef = useRef(null);
+    useLightShadow(lightRef, config.shadow);
+    useLightAnimation(lightRef, animations);
+    useLightMouseMove(lightRef, mouseMove, { lightConfig: config });
+    return (_jsx("pointLight", { ref: lightRef, color: config.color || '#ffffff', intensity: config.intensity ?? 1, decay: config.decay ?? 1, distance: config.distance ?? 0 }));
+};
+const LightObject = ({ createdObject }) => {
+    const config = createdObject.config;
+    if (!config || config.enabled === false)
+        return null;
+    const animations = createdObject.animations?.light?.animations;
+    const mouseMove = createdObject.mouseMove?.light;
+    switch (config.type) {
+        case 'directional':
+            return _jsx(DirectionalLightR3F, { config: config, animations: animations, mouseMove: mouseMove });
+        case 'spot':
+            return _jsx(SpotLightR3F, { config: config, animations: animations, mouseMove: mouseMove });
+        case 'point':
+            return _jsx(PointLightR3F, { config: config, animations: animations, mouseMove: mouseMove });
+        default:
+            return null;
+    }
+};
+export default LightObject;

package/dist/components/LightsManager.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
-import type { LightConfig } from '@ntalmagor/3drize-core';
+import type { SceneLightConfig } from '@ntalmagor/3drize-core';
 export interface LightsManagerProps {
-    lights: LightConfig[];
-    selectedLight?: string | null;
+    config: SceneLightConfig;
 }
 declare const LightsManager: React.FC<LightsManagerProps>;
 export default LightsManager;

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

@@ -1 +1 @@
-{"version":3,"file":"LightsManager.d.ts","sourceRoot":"","sources":["../../src/components/LightsManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqC,MAAM,OAAO,CAAC;AAI1D,OAAO,KAAK,EAAmB,WAAW,EAAqC,MAAM,wBAAwB,CAAC;AAc9G,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AA6BD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAkM/C,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"LightsManager.d.ts","sourceRoot":"","sources":["../../src/components/LightsManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAGjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAS/D,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAID,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA4H/C,CAAC;AAEF,eAAe,aAAa,CAAC"}