threedviewer 0.3.1 → 0.4.1

package/README.md

@@ -1,3 +1,4 @@
+
 # ThreeDViewer
 
 ThreeDViewer is a React component library for easily integrating Three.js-based 3D viewers into your web applications. It provides a simple and customizable way to display and interact with 3D objects in your React projects.
@@ -9,6 +10,7 @@ ThreeDViewer is a React component library for easily integrating Three.js-based
 - Support for various 3D object formats
 - Built-in camera controls
 - Responsive design
+- Ability to handle external scenes and Three.js objects
 
 ## Installation
 
@@ -26,7 +28,7 @@ yarn add threedviewer
 
 ## Usage
 
-Here's a basic example of how to use the SimpleViewer component:
+Here's a basic example of how to use the `SimpleViewer` component:
 
 ```jsx
 import React from 'react';
@@ -34,21 +36,92 @@ import { SimpleViewer } from 'threedviewer';
 import * as THREE from 'three';
 
 function App() {
-  // Create a simple cube
-  const geometry = new THREE.BoxGeometry(1, 1, 1);
-  const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
-  const cube = new THREE.Mesh(geometry, material);
-
-  return (
-    <div style={{ width: '100%', height: '400px' }}>
-      <SimpleViewer object={cube} />
-    </div>
-  );
+   // Create a simple cube
+   const geometry = new THREE.BoxGeometry(1, 1, 1);
+   const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
+   const cube = new THREE.Mesh(geometry, material);
+
+   return (
+      <div style={{ width: '100%', height: '400px' }}>
+        <SimpleViewer object={cube} />
+      </div>
+   );
+}
+
+export default App;
+```
+
+## Handling External Scenes and Advanced Usage
+
+ThreeDViewer now supports handling external Three.js scenes and objects, allowing for more advanced configurations and custom controls. Here's an example that integrates external camera, scene, and controls:
+
+```tsx
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import * as THREE from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
+import { SimpleViewer, type SimpleViewerOptions, defaultOptions } from 'threedviewer';
+
+function App() {
+   const mountRef = useRef<HTMLDivElement | null>(null);
+   const rendererRef = useRef<THREE.WebGLRenderer | null>(null);
+   const cameraRef = useRef<THREE.PerspectiveCamera | null>(null);
+   const sceneRef = useRef<THREE.Scene | null>(null);
+   const controlsRef = useRef<OrbitControls | null>(null);
+   
+   const [camera, setCamera] = useState<THREE.PerspectiveCamera | null>(null);
+   const [scene, setScene] = useState<THREE.Scene | null>(null);
+   
+   useEffect(() => {
+      if (cameraRef.current) {
+        setCamera(cameraRef.current);
+      }
+      if (sceneRef.current) {
+        setScene(sceneRef.current);
+      }
+   }, []);
+   
+   const options: SimpleViewerOptions = useMemo(() => ({
+   ...defaultOptions,
+   staticScene: false,
+   backgroundColor: '#000000',
+   camera: {
+      ...defaultOptions.camera,
+      position: [12 * 6, 12 * 6, 12 * 6],
+      target: [0, 0, 0],
+      fov: 60,
+      autoFitToObject: false,
+    },
+   lights: {
+      ...defaultOptions.lights,
+      ambient: { intensity: 0.5 },
+      directional: { position: [10, 10, 5] },
+    },
+   helpers: {
+      ...defaultOptions.helpers,
+      grid: true,
+      axes: true,
+    },
+   threeBaseRefs: {
+      scene: sceneRef,
+      camera: cameraRef,
+      mountPoint: mountRef,
+      controls: controlsRef,
+      renderer: rendererRef,
+    },
+   }), []);
+   
+   return (
+      <div style={{ width: '100%', height: '100vh' }}>
+        <SimpleViewer object={null} options={options} />
+      </div>
+   );
 }
 
 export default App;
 ```
 
+In this example, we demonstrate how to use external scene references, handle camera controls, and customize the viewer options, allowing more flexibility in your 3D environment.
+
 ## API
 
 ### SimpleViewer
@@ -56,119 +129,83 @@ export default App;
 The main component for displaying 3D objects.
 
 Props:
-- `object` (required): A Three.js Object3D to be displayed in the viewer.
+- `object` (required): A Three.js `Object3D` to be displayed in the viewer.
 - `options` (optional): An object containing viewer options (see below).
 
 ## Configuration Options
 
-SimpleViewer accepts an `options` prop for customization. Here's an overview of available options:
+`SimpleViewer` accepts an `options` prop for customization. Here's an overview of available options:
 
 ```javascript
 const defaultOptions = {
-  staticScene: true, // This param will stop rendering if there is no activity
-  backgroundColor: '#f0f0f7',
-  camera: {
-    position: [6, 2, 1.2],
-    target: [0, 0, 0],
-    fov: 75,
-    near: 0.1,
-    far: 100000
-  },
-  lights: {
-    ambient: { color: '#404040', intensity: 1 },
-    hemisphere: { 
-      skyColor: '#ffffbb', 
-      groundColor: '#080820', 
-      intensity: 1 
+   staticScene: true, // Stops rendering if there is no activity
+   backgroundColor: '#f0f0f7',
+   camera: {
+      position: [6, 2, 1.2],
+      target: [0, 0, 0],
+      fov: 75,
+      near: 0.1,
+      far: 100000
+    },
+   lights: {
+      ambient: { color: '#404040', intensity: 1 },
+      hemisphere: { skyColor: '#ffffbb', groundColor: '#080820', intensity: 1 },
+      directional: { color: '#ffffff', intensity: 1, position: [6, 6, 6], castShadow: true }
+    },
+   controls: {
+      enableDamping: true,
+      dampingFactor: 0.25,
+      enableZoom: true,
+      enableRotate: true,
+      enablePan: true
+    },
+   helpers: {
+      grid: true,
+      axes: false,
+      boundingBox: true
     },
-    directional: {
-      color: '#ffffff',
-      intensity: 1,
-      position: [6, 6, 6],
-      castShadow: true
-    }
-  },
-  controls: {
-    enableDamping: true,
-    dampingFactor: 0.25,
-    enableZoom: true,
-    enableRotate: true,
-    enablePan: true
-  },
-  helpers: {
-    grid: true,
-    axes: false,
-    boundingBox: true
-  },
-  animationLoop: null // External animation function
+   animationLoop: null, // External animation function
 }
 ```
 
-To use custom options:
-
-```jsx
-import React from 'react';
-import { SimpleViewer, defaultOptions } from 'threedviewer';
-import * as THREE from 'three';
-
-function App() {
-  const geometry = new THREE.BoxGeometry(1, 1, 1);
-  const material = new THREE.MeshStandardMaterial({ color: 0x00ff00 });
-  const cube = new THREE.Mesh(geometry, material);
-
-  const customOptions = {
-      ...defaultOptions,
-      backgroundColor: '#000000',
-      camera: {
-        ...defaultOptions.camera,
-        cameraPosition: [12 * 6, 12 * 6, 12 * 6],
-        cameraTarget: [0, 0, 0],
-        fov: 60,
-        autoFitToObject: false,
-      },
-      lights: {
-        ambient: { intensity: 0.5 },
-        directional: { position: [10, 10, 5] }
-      },
-  };
-
-  return (
-    <div style={{ width: '100%', height: '400px' }}>
-      <SimpleViewer object={cube} options={customOptions} />
-    </div>
-  );
-}
-
-export default App;
+To use custom options, simply pass them to the `options` prop:
+
+```tsx
+const customOptions = {
+   ...defaultOptions,
+   backgroundColor: '#000000',
+   camera: {
+      ...defaultOptions.camera,
+      position: [12 * 6, 12 * 6, 12 * 6],
+      target: [0, 0, 0],
+      fov: 60,
+   },
+};
 ```
 
-This example demonstrates how to override specific options while leaving others at their default values. You only need to specify the options you want to change.
-
-For detailed explanations of each option, please refer to our [API documentation](link-to-api-docs).
-
 ## Development
 
 To set up the project for development:
 
 1. Clone the repository:
    ```
-   git clone https://github.com/your-username/ThreeDViewer.git
+   git clone https://github.com/LEMing/threedviewer.git
    ```
 
 2. Install dependencies:
    ```
    cd ThreeDViewer
-   npm install
+   make install
    ```
 
 3. Run the development server:
    ```
-   npm run dev
+   make dev
    ```
 
 4. Build the project:
    ```
-   npm run build
+   make build
    ```
 
 ## Testing
@@ -176,7 +213,7 @@ To set up the project for development:
 Run the test suite with:
 
 ```bash
-npm test
+make test
 ```
 
 ## Contributing
@@ -185,9 +222,9 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+This project is licensed under the MIT License
 
 ## Acknowledgments
 
-- Three.js for providing the 3D rendering capabilities
-- React for the component-based architecture
+- [Three.js](https://threejs.org/) for providing the 3D rendering capabilities
+- [React](https://reactjs.org/) for the component-based architecture

package/dist/ThreeSceneSetup/HexGrid/HexGrid.d.ts

@@ -3,7 +3,8 @@ import * as THREE from 'three';
 declare class HexGrid {
     radius: number;
     tileSize: number;
-    constructor(radius: number, tileSize: number);
+    private readonly color;
+    constructor(radius: number, tileSize: number, color: string);
     generateGrid(): HexTile[];
     addToScene(scene: THREE.Scene): void;
 }

package/dist/ThreeSceneSetup/HexGrid/HexTile.d.ts

@@ -2,7 +2,8 @@ import * as THREE from 'three';
 declare class HexTile {
     position: THREE.Vector3;
     size: number;
-    constructor(position: THREE.Vector3, size: number);
+    color: string;
+    constructor(position: THREE.Vector3, size: number, color: string);
     createMesh(): THREE.LineSegments;
 }
 export default HexTile;