@hello-terrain/react 0.0.0-alpha.13 → 0.0.0-alpha.14

package/dist/index.cjs

@@ -547,37 +547,44 @@ function InternalTerrain(props) {
     }
   );
 }
-function Terrain({
-  terrain: providedTerrain,
-  children,
-  rootSize,
-  origin,
-  maxLevel,
-  innerTileSegments,
-  skirtScale,
-  elevationScale,
-  radius,
-  elevation,
-  topology,
-  terrainFieldFilter,
-  getCameraOrigin,
-  cameraHysteresis,
-  tasks,
-  maxNodes,
-  ...primitiveProps
-}) {
+function Terrain(props) {
+  const { terrain: providedTerrain, children } = props;
   if (providedTerrain) {
+    const {
+      terrain: _terrain,
+      children: _children,
+      innerTileSegments: innerTileSegments2,
+      maxNodes: maxNodes2,
+      ...primitiveProps2
+    } = props;
     return /* @__PURE__ */ jsxRuntime.jsx(
       TerrainWithHandle,
       {
         terrain: providedTerrain,
-        innerTileSegments,
-        maxNodes,
-        ...primitiveProps,
+        innerTileSegments: innerTileSegments2,
+        maxNodes: maxNodes2,
+        ...primitiveProps2,
         children
       }
     );
   }
+  const {
+    rootSize,
+    origin,
+    maxLevel,
+    innerTileSegments,
+    skirtScale,
+    elevationScale,
+    radius,
+    elevation,
+    topology,
+    terrainFieldFilter,
+    getCameraOrigin,
+    cameraHysteresis,
+    tasks,
+    maxNodes,
+    ...primitiveProps
+  } = props;
   return /* @__PURE__ */ jsxRuntime.jsx(
     InternalTerrain,
     {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ElevationCallback, Topology, TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast } from '@hello-terrain/three';
+import { TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast, Topology, ElevationCallback } from '@hello-terrain/three';
 export { TerrainQuery, TerrainRaycast, TerrainRaycastResult, TerrainSample, TerrainSphereQuery, TerrainSurfaceSample, TerrainSurfaceSampleBatch, TerrainTile } from '@hello-terrain/three';
 import { Task } from '@hello-terrain/work';
 import { ThreeElements, RootState } from '@react-three/fiber';
@@ -50,12 +50,22 @@ interface TerrainOptions {
     tasks?: readonly TerrainTask[];
 }
 type TerrainPrimitiveProps = Omit<ThreeElements["primitive"], "object" | "children">;
-interface TerrainProps extends TerrainPrimitiveProps, TerrainOptions {
-    terrain?: TerrainHandle;
+type TerrainRenderProps = {
     children: (nodes: TerrainNodes) => ReactNode;
-}
+};
+/** Props when a pre-built terrain handle is supplied via `useTerrain`. */
+type TerrainPropsWithHandle = TerrainPrimitiveProps & TerrainRenderProps & {
+    terrain: TerrainHandle;
+    innerTileSegments?: number;
+    maxNodes?: number;
+};
+/** Props when `<Terrain>` should construct the handle internally. */
+type TerrainPropsWithoutHandle = TerrainPrimitiveProps & TerrainOptions & TerrainRenderProps & {
+    terrain?: undefined;
+};
+type TerrainProps = TerrainPropsWithHandle | TerrainPropsWithoutHandle;
 
-declare function Terrain({ terrain: providedTerrain, children, rootSize, origin, maxLevel, innerTileSegments, skirtScale, elevationScale, radius, elevation, topology, terrainFieldFilter, getCameraOrigin, cameraHysteresis, tasks, maxNodes, ...primitiveProps }: TerrainProps): react_jsx_runtime.JSX.Element;
+declare function Terrain(props: TerrainProps): react_jsx_runtime.JSX.Element;
 
 interface TerrainProviderProps {
     value: TerrainHandle;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ElevationCallback, Topology, TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast } from '@hello-terrain/three';
+import { TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast, Topology, ElevationCallback } from '@hello-terrain/three';
 export { TerrainQuery, TerrainRaycast, TerrainRaycastResult, TerrainSample, TerrainSphereQuery, TerrainSurfaceSample, TerrainSurfaceSampleBatch, TerrainTile } from '@hello-terrain/three';
 import { Task } from '@hello-terrain/work';
 import { ThreeElements, RootState } from '@react-three/fiber';
@@ -50,12 +50,22 @@ interface TerrainOptions {
     tasks?: readonly TerrainTask[];
 }
 type TerrainPrimitiveProps = Omit<ThreeElements["primitive"], "object" | "children">;
-interface TerrainProps extends TerrainPrimitiveProps, TerrainOptions {
-    terrain?: TerrainHandle;
+type TerrainRenderProps = {
     children: (nodes: TerrainNodes) => ReactNode;
-}
+};
+/** Props when a pre-built terrain handle is supplied via `useTerrain`. */
+type TerrainPropsWithHandle = TerrainPrimitiveProps & TerrainRenderProps & {
+    terrain: TerrainHandle;
+    innerTileSegments?: number;
+    maxNodes?: number;
+};
+/** Props when `<Terrain>` should construct the handle internally. */
+type TerrainPropsWithoutHandle = TerrainPrimitiveProps & TerrainOptions & TerrainRenderProps & {
+    terrain?: undefined;
+};
+type TerrainProps = TerrainPropsWithHandle | TerrainPropsWithoutHandle;
 
-declare function Terrain({ terrain: providedTerrain, children, rootSize, origin, maxLevel, innerTileSegments, skirtScale, elevationScale, radius, elevation, topology, terrainFieldFilter, getCameraOrigin, cameraHysteresis, tasks, maxNodes, ...primitiveProps }: TerrainProps): react_jsx_runtime.JSX.Element;
+declare function Terrain(props: TerrainProps): react_jsx_runtime.JSX.Element;
 
 interface TerrainProviderProps {
     value: TerrainHandle;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ElevationCallback, Topology, TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast } from '@hello-terrain/three';
+import { TerrainGraph, TerrainTasks, TerrainQuery, TerrainSurfaceQuery, TerrainSphereQuery, TerrainRaycast, Topology, ElevationCallback } from '@hello-terrain/three';
 export { TerrainQuery, TerrainRaycast, TerrainRaycastResult, TerrainSample, TerrainSphereQuery, TerrainSurfaceSample, TerrainSurfaceSampleBatch, TerrainTile } from '@hello-terrain/three';
 import { Task } from '@hello-terrain/work';
 import { ThreeElements, RootState } from '@react-three/fiber';
@@ -50,12 +50,22 @@ interface TerrainOptions {
     tasks?: readonly TerrainTask[];
 }
 type TerrainPrimitiveProps = Omit<ThreeElements["primitive"], "object" | "children">;
-interface TerrainProps extends TerrainPrimitiveProps, TerrainOptions {
-    terrain?: TerrainHandle;
+type TerrainRenderProps = {
     children: (nodes: TerrainNodes) => ReactNode;
-}
+};
+/** Props when a pre-built terrain handle is supplied via `useTerrain`. */
+type TerrainPropsWithHandle = TerrainPrimitiveProps & TerrainRenderProps & {
+    terrain: TerrainHandle;
+    innerTileSegments?: number;
+    maxNodes?: number;
+};
+/** Props when `<Terrain>` should construct the handle internally. */
+type TerrainPropsWithoutHandle = TerrainPrimitiveProps & TerrainOptions & TerrainRenderProps & {
+    terrain?: undefined;
+};
+type TerrainProps = TerrainPropsWithHandle | TerrainPropsWithoutHandle;
 
-declare function Terrain({ terrain: providedTerrain, children, rootSize, origin, maxLevel, innerTileSegments, skirtScale, elevationScale, radius, elevation, topology, terrainFieldFilter, getCameraOrigin, cameraHysteresis, tasks, maxNodes, ...primitiveProps }: TerrainProps): react_jsx_runtime.JSX.Element;
+declare function Terrain(props: TerrainProps): react_jsx_runtime.JSX.Element;
 
 interface TerrainProviderProps {
     value: TerrainHandle;

package/dist/index.mjs

@@ -545,37 +545,44 @@ function InternalTerrain(props) {
     }
   );
 }
-function Terrain({
-  terrain: providedTerrain,
-  children,
-  rootSize,
-  origin,
-  maxLevel,
-  innerTileSegments,
-  skirtScale,
-  elevationScale,
-  radius,
-  elevation,
-  topology,
-  terrainFieldFilter,
-  getCameraOrigin,
-  cameraHysteresis,
-  tasks,
-  maxNodes,
-  ...primitiveProps
-}) {
+function Terrain(props) {
+  const { terrain: providedTerrain, children } = props;
   if (providedTerrain) {
+    const {
+      terrain: _terrain,
+      children: _children,
+      innerTileSegments: innerTileSegments2,
+      maxNodes: maxNodes2,
+      ...primitiveProps2
+    } = props;
     return /* @__PURE__ */ jsx(
       TerrainWithHandle,
       {
         terrain: providedTerrain,
-        innerTileSegments,
-        maxNodes,
-        ...primitiveProps,
+        innerTileSegments: innerTileSegments2,
+        maxNodes: maxNodes2,
+        ...primitiveProps2,
         children
       }
     );
   }
+  const {
+    rootSize,
+    origin,
+    maxLevel,
+    innerTileSegments,
+    skirtScale,
+    elevationScale,
+    radius,
+    elevation,
+    topology,
+    terrainFieldFilter,
+    getCameraOrigin,
+    cameraHysteresis,
+    tasks,
+    maxNodes,
+    ...primitiveProps
+  } = props;
   return /* @__PURE__ */ jsx(
     InternalTerrain,
     {

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/kenjinp/hello-terrain.git"
   },
-  "version": "0.0.0-alpha.13",
+  "version": "0.0.0-alpha.14",
   "type": "module",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -22,7 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "@hello-terrain/three": "0.0.0-alpha.13",
+    "@hello-terrain/three": "0.0.0-alpha.14",
     "@hello-terrain/work": "0.3.0"
   },
   "devDependencies": {