@reearth/core 0.0.6 → 0.0.7-alpha.1

package/src/engines/Cesium/index.tsx

@@ -36,6 +36,7 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
     className,
     style,
     property,
+    time,
     camera,
     small,
     ready,
@@ -66,48 +67,51 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
   ref,
 ) => {
   const {
-    backgroundColor,
     cesium,
-    cameraViewBoundaries,
-    cameraViewOuterBoundaries,
-    cameraViewBoundariesMaterial,
     mouseEventHandles,
     cesiumIonAccessToken,
     context,
-    light,
     layerSelectWithRectEventHandlers,
-    handleMount,
-    handleUnmount,
-    handleUpdate,
-    handleClick,
+    sceneLight,
+    sceneBackgroundColor,
+    sceneMsaaSamples,
+    sceneMode,
+    cameraViewBoundaries,
+    cameraViewOuterBoundaries,
+    cameraViewBoundariesMaterial,
     handleCameraChange,
     handleCameraMoveEnd,
+    handleUpdate,
+    handleClick,
+    handleMount,
+    handleUnmount,
   } = useHooks({
     ref,
     property,
-    camera,
+    time,
     selectedLayerId,
     selectionReason: layerSelectionReason,
-    isLayerDraggable,
-    isLayerDragging,
     meta,
     layersRef,
     featureFlags,
-    requestingRenderMode,
-    shouldRender,
     timelineManagerRef,
+    isLayerDraggable,
+    isLayerDragging,
+    shouldRender,
+    requestingRenderMode,
+    camera,
     cameraForceHorizontalRoll,
-    onLayerSelect,
-    onCameraChange,
     onLayerDrag,
     onLayerDrop,
+    onLayerSelect,
     onLayerEdit,
     onLayerSelectWithRectStart,
     onLayerSelectWithRectMove,
     onLayerSelectWithRectEnd,
-    onMount,
     onLayerVisibility,
     onLayerLoad,
+    onCameraChange,
+    onMount,
   });
 
   return (
@@ -137,7 +141,7 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
         cursor: isLayerDragging ? "grab" : undefined,
         ...style,
       }}
-      shadows={!!(property?.atmosphere?.shadows ?? property?.globeShadow?.globeShadow)}
+      shadows={!!property?.scene?.shadow?.enabled}
       onClick={handleClick}
       onDoubleClick={mouseEventHandles.doubleclick}
       onMouseDown={mouseEventHandles.mousedown}
@@ -196,20 +200,18 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
       </ScreenSpaceEventHandler>
       <ScreenSpaceCameraController
         maximumZoomDistance={
-          property?.cameraLimiter?.cameraLimitterEnabled
-            ? property.cameraLimiter?.cameraLimitterTargetArea?.height ?? Number.POSITIVE_INFINITY
+          property?.camera?.limiter?.enabled
+            ? property.camera?.limiter?.targetArea?.height ?? Number.POSITIVE_INFINITY
             : Number.POSITIVE_INFINITY
         }
-        enableCollisionDetection={
-          !(property?.default?.allowEnterGround ?? property?.camera?.allowEnterGround)
-        }
+        enableCollisionDetection={!property?.camera?.allowEnterGround}
       />
       <Camera
-        onChange={handleCameraChange}
         percentageChanged={0.2}
+        onChange={handleCameraChange}
         onMoveEnd={handleCameraMoveEnd}
       />
-      {cameraViewBoundaries && property?.cameraLimiter?.cameraLimitterShowHelper && (
+      {cameraViewBoundaries && property?.camera?.limiter?.showHelper && (
         <Entity>
           <PolylineGraphics
             positions={cameraViewBoundaries}
@@ -219,7 +221,7 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
           />
         </Entity>
       )}
-      {cameraViewOuterBoundaries && property?.cameraLimiter?.cameraLimitterShowHelper && (
+      {cameraViewOuterBoundaries && property?.camera?.limiter?.showHelper && (
         <Entity>
           <PolylineGraphics
             positions={cameraViewOuterBoundaries}
@@ -229,39 +231,35 @@ const Cesium: React.ForwardRefRenderFunction<EngineRef, EngineProps> = (
           />
         </Entity>
       )}
-      {/* NOTE: useWebVR={false} will crash Cesium */}
       <Scene
-        backgroundColor={backgroundColor}
-        useWebVR={!!property?.default?.vr || undefined}
-        light={light}
+        backgroundColor={sceneBackgroundColor}
+        light={sceneLight}
+        mode={sceneMode}
+        msaaSamples={sceneMsaaSamples}
         useDepthPicking={false}
-        debugShowFramesPerSecond={!!property?.render?.debugFramePerSecond}
-        verticalExaggerationRelativeHeight={property?.terrain?.terrainExaggerationRelativeHeight}
-        verticalExaggeration={property?.terrain?.terrainExaggeration}
+        useWebVR={!!property?.scene?.vr || undefined} // NOTE: useWebVR={false} will crash Cesium
+        debugShowFramesPerSecond={!!property?.debug?.showFramesPerSecond}
+        verticalExaggerationRelativeHeight={property?.scene?.verticalExaggerationRelativeHeight}
+        verticalExaggeration={property?.scene?.verticalExaggeration}
       />
-      <SkyBox show={property?.default?.skybox ?? property?.skyBox?.skyBox ?? true} />
-      <Fog
-        enabled={property?.atmosphere?.fog ?? true}
-        density={property?.atmosphere?.fog_density}
-      />
-      <Sun show={property?.atmosphere?.enable_sun ?? property?.sun?.sun ?? true} />
-      <Moon show={property?.atmosphere?.enableMoon ?? property?.moon?.moon ?? true} />
+      <SkyBox show={property?.sky?.skyBox?.show ?? true} />
+      <Fog enabled={property?.sky?.fog?.enabled ?? true} density={property?.sky?.fog?.density} />
+      <Sun show={property?.sky?.sun?.show ?? true} />
+      <Moon show={property?.sky?.moon?.show ?? true} />
       <SkyAtmosphere
-        show={
-          property?.atmosphere?.sky_atmosphere ?? property?.skyAtmosphere?.skyAtmosphere ?? true
-        }
-        saturationShift={property?.atmosphere?.skyboxSurturationShift}
-        atmosphereLightIntensity={property?.skyAtmosphere?.skyAtmosphereIntensity}
-        brightnessShift={property?.atmosphere?.skyboxBrightnessShift}
+        show={property?.sky?.skyAtmosphere?.show ?? true}
+        atmosphereLightIntensity={property?.sky?.skyAtmosphere?.lightIntensity}
+        saturationShift={property?.sky?.skyAtmosphere?.saturationShift}
+        brightnessShift={property?.sky?.skyAtmosphere?.brightnessShift}
       />
       <Globe property={property} cesiumIonAccessToken={cesiumIonAccessToken} />
       <featureContext.Provider value={context}>{ready ? children : null}</featureContext.Provider>
       <AmbientOcclusion
-        {...AMBIENT_OCCLUSION_QUALITY[property?.ambientOcclusion?.quality || "low"]}
-        enabled={!!property?.ambientOcclusion?.enabled}
-        intensity={property?.ambientOcclusion?.intensity ?? 100}
+        {...AMBIENT_OCCLUSION_QUALITY[property?.render?.ambientOcclusion?.quality || "low"]}
+        enabled={!!property?.render?.ambientOcclusion?.enabled}
+        intensity={property?.render?.ambientOcclusion?.intensity ?? 100}
         outputType={
-          property?.ambientOcclusion?.ambientOcclusionOnly
+          property?.render?.ambientOcclusion?.ambientOcclusionOnly
             ? AmbientOcclusionOutputType.Occlusion
             : null
         }

package/src/engines/index.ts

@@ -5,7 +5,7 @@ export type {
   EngineRef,
   EngineProps,
   LayerSelectionReason,
-  SceneProperty,
+  ViewerProperty,
   MouseEventProps,
   MouseEvents,
   Geometry,