From 1d25c6092606e6dc409ca1e029ccdb63f42f9a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CIsaac?= <isaac@isaacmason.com>
Date: Sun, 14 Apr 2024 15:55:56 +1000
Subject: [PATCH] feat: move Floor component to @react-three/jolt-addons

---
 apps/examples/src/examples/CubeHeap.tsx                         | 2 +-
 apps/examples/src/examples/JustBoxes.tsx                        | 2 +-
 apps/examples/src/examples/RaycastSimpleDemo.tsx                | 2 +-
 apps/examples/tsconfig.json                                     | 2 +-
 packages/react-three-jolt-addons/rollup.config.mjs              | 1 +
 .../react-three-jolt-addons}/src/components/Floor.tsx           | 1 +
 packages/react-three-jolt-addons/src/components/index.ts        | 1 +
 packages/react-three-jolt-addons/src/index.ts                   | 2 +-
 packages/react-three-jolt-controllers/rollup.config.mjs         | 1 +
 9 files changed, 9 insertions(+), 5 deletions(-)
 rename {apps/examples => packages/react-three-jolt-addons}/src/components/Floor.tsx (95%)
 create mode 100644 packages/react-three-jolt-addons/src/components/index.ts

diff --git a/apps/examples/src/examples/CubeHeap.tsx b/apps/examples/src/examples/CubeHeap.tsx
index fb6683a..c319d90 100644
--- a/apps/examples/src/examples/CubeHeap.tsx
+++ b/apps/examples/src/examples/CubeHeap.tsx
@@ -6,10 +6,10 @@ import {
   useJolt,
   useSetInterval,
 } from '@react-three/jolt';
+import { Floor } from '@react-three/jolt-addons';
 import { useControls } from 'leva';
 import { useEffect, useRef } from 'react';
 import * as THREE from 'three';
-import { Floor } from '../components/Floor';
 
 // this is going to be the instancedMesh version
 export function CubeHeap() {
diff --git a/apps/examples/src/examples/JustBoxes.tsx b/apps/examples/src/examples/JustBoxes.tsx
index b33e0e4..c0e48cc 100644
--- a/apps/examples/src/examples/JustBoxes.tsx
+++ b/apps/examples/src/examples/JustBoxes.tsx
@@ -1,5 +1,5 @@
 import { RigidBody } from '@react-three/jolt';
-import { Floor } from '../components/Floor';
+import { Floor } from '@react-three/jolt-addons';
 
 export function JustBoxes() {
   //const { physicsSystem } = useJolt();
diff --git a/apps/examples/src/examples/RaycastSimpleDemo.tsx b/apps/examples/src/examples/RaycastSimpleDemo.tsx
index a25da5f..cf9f66a 100644
--- a/apps/examples/src/examples/RaycastSimpleDemo.tsx
+++ b/apps/examples/src/examples/RaycastSimpleDemo.tsx
@@ -10,9 +10,9 @@ import {
   useSetTimeout,
   useUnmount,
 } from '@react-three/jolt';
+import { Floor } from '@react-three/jolt-addons';
 import { useEffect, useRef } from 'react';
 import * as THREE from 'three';
-import { Floor } from '../components/Floor';
 
 export function RaycastSimpleDemo() {
   const raycaster: Raycaster = useRaycaster();
diff --git a/apps/examples/tsconfig.json b/apps/examples/tsconfig.json
index f6614fa..904edf6 100644
--- a/apps/examples/tsconfig.json
+++ b/apps/examples/tsconfig.json
@@ -20,6 +20,6 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src", "public/jolt"],
+  "include": ["src", "public/jolt", "../../packages/react-three-jolt-addons/src/components/Floor.tsx"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/react-three-jolt-addons/rollup.config.mjs b/packages/react-three-jolt-addons/rollup.config.mjs
index 59c4b48..c312b2d 100644
--- a/packages/react-three-jolt-addons/rollup.config.mjs
+++ b/packages/react-three-jolt-addons/rollup.config.mjs
@@ -5,6 +5,7 @@ import path from 'path';
 import filesize from 'rollup-plugin-filesize';
 
 const external = [
+    '@react-three/jolt',
     'jolt-physics',
     '@react-three/fiber',
     '@react-three/drei',
diff --git a/apps/examples/src/components/Floor.tsx b/packages/react-three-jolt-addons/src/components/Floor.tsx
similarity index 95%
rename from apps/examples/src/components/Floor.tsx
rename to packages/react-three-jolt-addons/src/components/Floor.tsx
index 8682e6b..a875dfb 100644
--- a/apps/examples/src/components/Floor.tsx
+++ b/packages/react-three-jolt-addons/src/components/Floor.tsx
@@ -1,4 +1,5 @@
 import { RigidBody } from '@react-three/jolt';
+import React from 'react';
 import * as THREE from 'three';
 
 export const Floor = (props: any) => {
diff --git a/packages/react-three-jolt-addons/src/components/index.ts b/packages/react-three-jolt-addons/src/components/index.ts
new file mode 100644
index 0000000..48fbeca
--- /dev/null
+++ b/packages/react-three-jolt-addons/src/components/index.ts
@@ -0,0 +1 @@
+export * from './Floor';
diff --git a/packages/react-three-jolt-addons/src/index.ts b/packages/react-three-jolt-addons/src/index.ts
index 9f72870..a6203ce 100644
--- a/packages/react-three-jolt-addons/src/index.ts
+++ b/packages/react-three-jolt-addons/src/index.ts
@@ -1,3 +1,3 @@
 import * as _fiber from '@react-three/fiber';
 
-export const placeholder = 0;
+export * from './components';
diff --git a/packages/react-three-jolt-controllers/rollup.config.mjs b/packages/react-three-jolt-controllers/rollup.config.mjs
index 59c4b48..c312b2d 100644
--- a/packages/react-three-jolt-controllers/rollup.config.mjs
+++ b/packages/react-three-jolt-controllers/rollup.config.mjs
@@ -5,6 +5,7 @@ import path from 'path';
 import filesize from 'rollup-plugin-filesize';
 
 const external = [
+    '@react-three/jolt',
     'jolt-physics',
     '@react-three/fiber',
     '@react-three/drei',