Merge pull request #10 from marty-mcgee/threed-app-ts

🥕 v0.15.1-b.1 🌱 ThreeD Garden: Experience: Character Animation + Physics

README.md

@@ -1,4 +1,4 @@
-# [🥕 ThreeD Garden: 3D Object Environment w Next.JS React TypeScript Web3 ThreeJS Poimandres React-Three w Apollo State + Leva Control UI w Apollo Stores w MUI + Tailwind CSS](https://github.com/marty-mcgee/threed-garden/)
+# [🥕 ThreeD Garden: 3D Object Environment w Next.JS React TypeScript Web3 ThreeJS Poimandres React-Three w Apollo State + Leva Control UI w Apollo Stores w MUI + Tailwind](https://github.com/marty-mcgee/threed-garden/)
 
 3D Dev Environment w React, TypeScript, Three.js, React-Three (poimandres), on Next.js, Apollo Client, GraphQL, WordPress REST API, MUI + Tailwind. ThreeD Web3 Interface for Three-Dimensional JavaScript Objects with React Server + Client Components, Web3 Contracts ...
 

lib/threed/components/canvas/Experience.tsx

@@ -123,15 +123,22 @@ export default function Experience() {
 
             disableFollowCam={disableFollowCam}
           >
-            <group rotation={[0, 0, 0]} scale={0.7} position={[-1, 0, -1]}>
+
+            {/* THREED CHARACTER [0] -- DEMON / CHICKEN */}
+            {/* <group rotation={[0, 0, 0]} scale={0.7} position={[-1, 0.1, -1]}>
               <CharacterModel0 />
-            </group>
-            <group rotation={[0, 0, 0]} scale={1.0} position={[0, 0, 0]}>
+            </group> */}
+
+            {/* THREED CHARACTER [1] -- FLOATING PHYSICS CAPSULE*/}
+            <group rotation={[0, 0, 0]} scale={1.0} position={[1, 0.1, -1]}>
               <CharacterModel1 />
             </group>
-            <group rotation={[0, 0, 0]} scale={0.3} position={[0, 0, 0]}>
+
+            {/* THREED CHARACTER [2] -- FARMERS */}
+            <group rotation={[0, 0, 0]} scale={0.3} position={[0, 0.1, 0]}>
               <CharacterModel2 />
             </group>
+
           </Ecctrl>
         </KeyboardControls>
 

lib/threed/components/nouns/Character/Character.jsx

@@ -167,8 +167,8 @@ const Character = (props) => {
         /> */}
 
         {/* CHARACTER[S] */}
-        <Character1 />
-          {/* <Character2 /> */}
+        {/* <Character1 /> */}
+          <Character2 />
             {/* <Character3 /> */}
         {/* CHARACTER[S] */}
 

lib/threed/components/nouns/Character/CharacterModelFloating.tsx

@@ -17,7 +17,8 @@ import { BallCollider, RapierCollider, vec3 } from '@react-three/rapier'
 import { useFrame } from '@react-three/fiber'
 import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader'
 
-const theCharacterModelFile = '/Floating Character.glb'
+const theCharacterModelFile = '/CharacterModelFloating.glb'
+// const theCharacterModelFile = 'https://threedpublic.s3.us-west-2.amazonaws.com/assets/threeds/synty/polygon/farm/Characters/SK_Chr_Farmer_Male_01.glb'
 
 export default function CharacterModel(props: CharacterModelProps) {
   // Change the character src to yours

package.json

@@ -1,6 +1,6 @@
 {
   "name": "threed-garden",
-  "version": "0.15.1-beta.0",
+  "version": "0.15.1-beta.1",
   "description": "3D Dev Environment w React, TypeScript, Three.js, React-Three (poimandres), on Next.js, Apollo Client, GraphQL, WordPress REST API, MUI + Tailwind. ThreeD Web3 Interface for Three-Dimensional JavaScript Objects with React Server + Client Components, Web3 Contracts ...",
   "author": "Marty McGee <mcgee.marty@gmail.com> (https://github.com/marty-mcgee)",
   "license": "MIT",
@@ -48,24 +48,24 @@
     "@apollo/react-hooks": "^4.0.0",
     "@auth0/auth0-react": "^2.2.4",
     "@emotion/cache": "^11.11.0",
-    "@emotion/react": "^11.11.1",
+    "@emotion/react": "^11.11.4",
     "@emotion/server": "^11.11.0",
-    "@emotion/styled": "^11.11.0",
+    "@emotion/styled": "^11.11.5",
     "@heroicons/react": "^1.0.6",
-    "@mui/icons-material": "^5.15.10",
-    "@mui/lab": "^5.0.0-alpha.167",
-    "@mui/material": "^5.15.12",
-    "@mui/styled-engine": "^5.15.11",
-    "@mui/system": "^5.15.12",
-    "@mui/utils": "^5.15.12",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/lab": "^5.0.0-alpha.170",
+    "@mui/material": "^5.15.15",
+    "@mui/styled-engine": "^5.15.14",
+    "@mui/system": "^5.15.15",
+    "@mui/utils": "^5.15.14",
     "@mui/x-data-grid": "^6.19.6",
     "@react-spring/three": "^9.7.3",
     "@react-spring/web": "^9.7.3",
     "@react-three/cannon": "^6.6.0",
     "@react-three/drei": "^9.105.4",
     "@react-three/fiber": "^8.16.2",
     "@react-three/postprocessing": "^2.16.2",
-    "@react-three/rapier": "^1.3.0",
+    "@react-three/rapier": "^1.3.1",
     "@tweenjs/tween.js": "^18.6.4",
     "@use-gesture/core": "^10.3.1",
     "buffer": "^6.0.3",
@@ -81,7 +81,7 @@
     "graphql-tag": "^2.12.6",
     "leva": "^0.9.35",
     "mdi-material-ui": "^7.8.0",
-    "next": "^14.2.1",
+    "next": "^14.2.2",
     "next-auth": "^5.0.0-beta.16",
     "path": "^0.12.7",
     "pretty-time": "^1.1.0",
@@ -95,7 +95,7 @@
     "react-use": "^17.5.0",
     "regexp-to-ast": "^0.5.0",
     "scheduler": "^0.19.0",
-    "sharp": "^0.32.6",
+    "sharp": "^0.33.3",
     "styled-components": "^6.1.8",
     "swr": "^2.2.5",
     "three": "^0.163.0",
@@ -222,8 +222,6 @@
     "react-to-pdf": "1.0.1",
     "recharts": "2.8.0",
     "regenerator-runtime": "0.13.9",
-    "stylis": "^4.1.1",
-    "stylis-plugin-rtl": "github:marty-mcgee/stylis-plugin-rtl#main",
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.3.3",
     "tailwindcss-animate": "^1.0.7"