diff --git a/packages/client/public/model/computer.glb b/packages/client/public/model/computer.glb new file mode 100644 index 0000000..cf7fd39 --- /dev/null +++ b/packages/client/public/model/computer.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2acd2ad993e0575f951559ca7e6ea56b1404cb0f99807934b6d730b616a4121 +size 154232 diff --git a/packages/client/public/model/plaza.glb b/packages/client/public/model/plaza.glb index 1dd8c71..af68db0 100644 --- a/packages/client/public/model/plaza.glb +++ b/packages/client/public/model/plaza.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8105a71c46331fd1b530fbc012dede45e8e9bdc6a357946a6100d3aa2129b6a -size 3040752 +oid sha256:c53c1e68c1ccc285e026d89bffab492683f44e75d4732cb62c7d622f420ef24a +size 4137952 diff --git a/packages/client/public/model/plaza_collision.glb b/packages/client/public/model/plaza_collision.glb index dd0b6e1..46c7688 100644 --- a/packages/client/public/model/plaza_collision.glb +++ b/packages/client/public/model/plaza_collision.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8321ccfdfcf4ea85ad3f8f4fef1ac45c74f025b6aa17f5d2064f36bf8170acf -size 34364 +oid sha256:2feeeffab32311190c899bbdcffff46b5e8d14f1f26d613592e322895a4970bf +size 102236 diff --git a/packages/client/src/3d/index.tsx b/packages/client/src/3d/index.tsx index 962eaad..bc90858 100644 --- a/packages/client/src/3d/index.tsx +++ b/packages/client/src/3d/index.tsx @@ -1,6 +1,7 @@ import React, { Suspense } from 'react' import { Physics } from '@react-three/cannon' -import { Stats } from '@react-three/drei' +import { Stats, Text } from '@react-three/drei' +import { Euler, Quaternion, Vector3 } from 'three' import World from './models/World' import WorldCollisions from './models/WorldCollisions' @@ -9,6 +10,22 @@ import Lighting from './Lighting' import Effects from './Effects' import Controls from './Controls' import Users from './Users' +import Computer from './models/Computer' + +const computerPositions = [ + { + rotation: [0, 0.9340353012084961, 0, 0.35718077421188354], + translation: [-26.65045738220215, 3.425341844558716, -113.49897766113281], + }, + { + rotation: [0, 0.9848144054412842, 0, 0.17361053824424744], + translation: [-17.151742935180664, 3.4566614627838135, -108.55608367919922], + }, + { + rotation: [0, 0, 0, 0], + translation: [-33.87189483642578, 3.452946424484253, -121.23444366455078], + }, +] const Scene: React.FC = () => { return ( @@ -34,7 +51,98 @@ const Scene: React.FC = () => { + + + ARTIFICIOS 2020 + + + + Aguyje Angirũ + + + + LOREM IPSUM DOLOR SIT AMET, CONSECTETUR ADIPISCING ELIT, SED DO EIUSMOD TEMPOR + INCIDIDUNT UT LABORE ET DOLORE MAGNA ALIQUA. UT ENIM AD MINIM VENIAM, QUIS + NOSTRUD EXERCITATION ULLAMCO LABORIS NISI UT ALIQUIP EX EA COMMODO CONSEQUAT. + + + + La Traicion de la Realidad + + + + No Requiem + + {computerPositions.map((computer, index) => ( + + ))} diff --git a/packages/client/src/3d/models/Computer.js b/packages/client/src/3d/models/Computer.js new file mode 100644 index 0000000..08393c3 --- /dev/null +++ b/packages/client/src/3d/models/Computer.js @@ -0,0 +1,28 @@ +/* +auto-generated by: https://github.com/pmndrs/gltfjsx +*/ +import React, { useRef } from 'react' +import { useGLTF } from '@react-three/drei/useGLTF' + +export default function Model(props) { + const group = useRef() + const { nodes, materials } = useGLTF('/model/computer.glb') + console.log(nodes) + return ( + + + + + + + + ) +} + +useGLTF.preload('/model/computer.glb') diff --git a/packages/client/src/3d/models/WorldCollisions.tsx b/packages/client/src/3d/models/WorldCollisions.tsx index 56ad1b3..8a0ba8b 100644 --- a/packages/client/src/3d/models/WorldCollisions.tsx +++ b/packages/client/src/3d/models/WorldCollisions.tsx @@ -37,7 +37,7 @@ export default function Model(props: JSX.IntrinsicElements['group']) { // @ts-ignore const [ref] = useTrimesh(() => ({ type: 'Static', - position: [1.73, 1.23, 8.19], + position: [-5.31, 1.23, -32.92], args: [vertices, indices], }))