Skip to content

Commit

Permalink
🥕 v0.15.1-b.1 🌱 ThreeD Garden: Experience: Character Animation + Physics
Browse files Browse the repository at this point in the history
  • Loading branch information
marty-mcgee committed Apr 18, 2024
1 parent 96ea6aa commit a174452
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 70 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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 ...

Expand Down
11 changes: 9 additions & 2 deletions lib/threed/components/canvas/Experience.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,22 @@ export default function Experience() {

disableFollowCam={disableFollowCam}
>
<group rotation={[0, 0, 0]} scale={0.7} position={[-1, 0.1, -1]}>

{/* THREED CHARACTER [0] -- DEMON / CHICKEN */}
{/* <group rotation={[0, 0, 0]} scale={0.7} position={[-1, 0.1, -1]}>
<CharacterModel0 />
</group>
</group> */}

{/* THREED CHARACTER [1] -- FLOATING PHYSICS CAPSULE*/}
<group rotation={[0, 0, 0]} scale={1.0} position={[1, 0.1, -1]}>
<CharacterModel1 />
</group>

{/* THREED CHARACTER [2] -- FARMERS */}
<group rotation={[0, 0, 0]} scale={0.3} position={[0, 0.1, 0]}>
<CharacterModel2 />
</group>

</Ecctrl>
</KeyboardControls>

Expand Down
4 changes: 2 additions & 2 deletions lib/threed/components/nouns/Character/Character.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ const Character = (props) => {
/> */}

{/* CHARACTER[S] */}
<Character1 />
{/* <Character2 /> */}
{/* <Character1 /> */}
<Character2 />
{/* <Character3 /> */}
{/* CHARACTER[S] */}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
File renamed without changes.
Binary file removed public/keyControls copy.png
Binary file not shown.
124 changes: 62 additions & 62 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,10 @@
prop-types "^15.8.1"
reselect "^4.1.8"

"@next/env@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.1.tgz#18b4fb5fd76bdda65369ad4ea5f33199ae708d2f"
integrity sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA==
"@next/env@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.2.tgz#6c36fe0b04a22ea78bd60a645ae77d53cd16d3ca"
integrity sha512-sk72qRfM1Q90XZWYRoJKu/UWlTgihrASiYw/scb15u+tyzcze3bOuJ/UV6TBOQEeUaxOkRqGeuGUdiiuxc5oqw==

"@next/eslint-plugin-next@13.5.6":
version "13.5.6"
Expand All @@ -857,50 +857,50 @@
dependencies:
glob "7.1.7"

"@next/swc-darwin-arm64@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.1.tgz#44ca580ccac1396fa45e2bcc6584238098491e71"
integrity sha512-kGjnjcIJehEcd3rT/3NAATJQndAEELk0J9GmGMXHSC75TMnvpOhONcjNHbjtcWE5HUQnIHy5JVkatrnYm1QhVw==

"@next/swc-darwin-x64@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.1.tgz#1747091f40fd3b0d8e072ba62203ec998619525f"
integrity sha512-dAdWndgdQi7BK2WSXrx4lae7mYcOYjbHJUhvOUnJjMNYrmYhxbbvJ2xElZpxNxdfA6zkqagIB9He2tQk+l16ew==

"@next/swc-linux-arm64-gnu@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.1.tgz#ede705718c316e65e3dd9ab31962824b8befb0cb"
integrity sha512-2ZctfnyFOGvTkoD6L+DtQtO3BfFz4CapoHnyLTXkOxbZkVRgg3TQBUjTD/xKrO1QWeydeo8AWfZRg8539qNKrg==

"@next/swc-linux-arm64-musl@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.1.tgz#ce50a5d94a7ba1f8e34a941f4ca076d8beebc79c"
integrity sha512-jazZXctiaanemy4r+TPIpFP36t1mMwWCKMsmrTRVChRqE6putyAxZA4PDujx0SnfvZHosjdkx9xIq9BzBB5tWg==

"@next/swc-linux-x64-gnu@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.1.tgz#ac3e8fa4d028fe7a9d9b7c33db3ab65679ae5fe2"
integrity sha512-VjCHWCjsAzQAAo8lkBOLEIkBZFdfW+Z18qcQ056kL4KpUYc8o59JhLDCBlhg+hINQRgzQ2UPGma2AURGOH0+Qg==

"@next/swc-linux-x64-musl@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.1.tgz#2beb7bee80dfb54a36d81392f21c599014018177"
integrity sha512-7HZKYKvAp4nAHiHIbY04finRqjeYvkITOGOurP1aLMexIFG/1+oCnqhGogBdc4lao/lkMW1c+AkwWSzSlLasqw==

"@next/swc-win32-arm64-msvc@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.1.tgz#b25df35a6ed99eb73bfed07822dd28a37aaab9f9"
integrity sha512-YGHklaJ/Cj/F0Xd8jxgj2p8po4JTCi6H7Z3Yics3xJhm9CPIqtl8erlpK1CLv+HInDqEWfXilqatF8YsLxxA2Q==

"@next/swc-win32-ia32-msvc@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.1.tgz#2cc67b93f0a71a8f3c1dd735676f4c9ddd4240ff"
integrity sha512-o+ISKOlvU/L43ZhtAAfCjwIfcwuZstiHVXq/BDsZwGqQE0h/81td95MPHliWCnFoikzWcYqh+hz54ZB2FIT8RA==

"@next/swc-win32-x64-msvc@14.2.1":
version "14.2.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.1.tgz#e5f4003930de4a150a8c2e7cf5c133cd99a686bd"
integrity sha512-GmRoTiLcvCLifujlisknv4zu9/C4i9r0ktsA8E51EMqJL4bD4CpO7lDYr7SrUxCR0tS4RVcrqKmCak24T0ohaw==
"@next/swc-darwin-arm64@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.2.tgz#55e395b0db6dd5ea2dc92818260ff3a399f1a056"
integrity sha512-3iPgMhzbalizGwHNFUcGnDhFPSgVBHQ8aqSTAMxB5BvJG0oYrDf1WOJZlbXBgunOEj/8KMVbejEur/FpvFsgFQ==

"@next/swc-darwin-x64@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.2.tgz#f96fb65510be798c03b0432129792c6ac8885bc8"
integrity sha512-x7Afi/jt0ZBRUZHTi49yyej4o8znfIMHO4RvThuoc0P+uli8Jd99y5GKjxoYunPKsXL09xBXEM1+OQy2xEL0Ag==

"@next/swc-linux-arm64-gnu@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.2.tgz#443f0d4ab9d1aa4338e40f77ca4e182d60e88448"
integrity sha512-zbfPtkk7L41ODMJwSp5VbmPozPmMMQrzAc0HAUomVeVIIwlDGs/UCqLJvLNDt4jpWgc21SjjyIn762lNGrMaUA==

"@next/swc-linux-arm64-musl@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.2.tgz#182c00b3d2f3ed4eaacdd385d07b230252c64de9"
integrity sha512-wPbS3pI/JU16rm3XdLvvTmlsmm1nd+sBa2ohXgBZcShX4TgOjD4R+RqHKlI1cjo/jDZKXt6OxmcU0Iys0OC/yg==

"@next/swc-linux-x64-gnu@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.2.tgz#e826a08085dcc61685ff42884ad4032e71ac154f"
integrity sha512-NqWOHqqq8iC9tuHvZxjQ2tX+jWy2X9y8NX2mcB4sj2bIccuCxbIZrU/ThFPZZPauygajZuVQ6zediejQHwZHwQ==

"@next/swc-linux-x64-musl@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.2.tgz#42f921ca6d93fdfb2b13de70cd8a44ba5526b318"
integrity sha512-lGepHhwb9sGhCcU7999+iK1ZZT+6rrIoVg40MP7DZski9GIZP80wORSbt5kJzh9v2x2ev2lxC6VgwMQT0PcgTA==

"@next/swc-win32-arm64-msvc@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.2.tgz#9c8f60da8e3882c4c66f21747abf944a627d05ff"
integrity sha512-TZSh/48SfcLEQ4rD25VVn2kdIgUWmMflRX3OiyPwGNXn3NiyPqhqei/BaqCYXViIQ+6QsG9R0C8LftMqy8JPMA==

"@next/swc-win32-ia32-msvc@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.2.tgz#fdb0b5f74e6dc0dcb34b7f7d24775ad034d915e8"
integrity sha512-M0tBVNMEBJN2ZNQWlcekMn6pvLria7Sa2Fai5znm7CCJz4pP3lrvlSxhKdkCerk0D9E0bqx5yAo3o2Q7RrD4gA==

"@next/swc-win32-x64-msvc@14.2.2":
version "14.2.2"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.2.tgz#95cc0dad2c7ac5177fa6eeab070dccfa30532353"
integrity sha512-a/20E/wtTJZ3Ykv3f/8F0l7TtgQa2LWHU2oNB9bsu0VjqGuGGHmm/q6waoUNQYTVPYrrlxxaHjJcDV6aiSTt/w==

"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
Expand Down Expand Up @@ -5918,28 +5918,28 @@ next-auth@^5.0.0-beta.16:
dependencies:
"@auth/core" "0.28.1"

next@^14.2.1:
version "14.2.1"
resolved "https://registry.yarnpkg.com/next/-/next-14.2.1.tgz#081509478156407e4c181ad4791fea0a43c6347d"
integrity sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag==
next@^14.2.2:
version "14.2.2"
resolved "https://registry.yarnpkg.com/next/-/next-14.2.2.tgz#707311b5e4bf973ada2305233f322bdd0cd9d579"
integrity sha512-oGwUaa2bCs47FbuxWMpOoXtBMPYpvTPgdZr3UAo+pu7Ns00z9otmYpoeV1HEiYL06AlRQQIA/ypK526KjJfaxg==
dependencies:
"@next/env" "14.2.1"
"@next/env" "14.2.2"
"@swc/helpers" "0.5.5"
busboy "1.6.0"
caniuse-lite "^1.0.30001579"
graceful-fs "^4.2.11"
postcss "8.4.31"
styled-jsx "5.1.1"
optionalDependencies:
"@next/swc-darwin-arm64" "14.2.1"
"@next/swc-darwin-x64" "14.2.1"
"@next/swc-linux-arm64-gnu" "14.2.1"
"@next/swc-linux-arm64-musl" "14.2.1"
"@next/swc-linux-x64-gnu" "14.2.1"
"@next/swc-linux-x64-musl" "14.2.1"
"@next/swc-win32-arm64-msvc" "14.2.1"
"@next/swc-win32-ia32-msvc" "14.2.1"
"@next/swc-win32-x64-msvc" "14.2.1"
"@next/swc-darwin-arm64" "14.2.2"
"@next/swc-darwin-x64" "14.2.2"
"@next/swc-linux-arm64-gnu" "14.2.2"
"@next/swc-linux-arm64-musl" "14.2.2"
"@next/swc-linux-x64-gnu" "14.2.2"
"@next/swc-linux-x64-musl" "14.2.2"
"@next/swc-win32-arm64-msvc" "14.2.2"
"@next/swc-win32-ia32-msvc" "14.2.2"
"@next/swc-win32-x64-msvc" "14.2.2"

node-fetch@^2.6.11, node-fetch@^2.6.12:
version "2.7.0"
Expand Down

1 comment on commit a174452

@vercel
Copy link

@vercel vercel bot commented on a174452 Apr 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.