added clipboard for paddle

Rice-Tech · Jan 29, 2024 · 3ea7ca7 · 3ea7ca7
1 parent 16499ed
commit 3ea7ca7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/resources/Props_3D/Clipboard.glb → public/Clipboard.glb b/src/resources/Props_3D/Clipboard.glb → public/Clipboard.glb
diff --git a/src/components/Ball.tsx b/src/components/Ball.tsx
@@ -19,7 +19,7 @@ export function Ball(props: Props) {
       return;
     }
     const ball = rigidBodyRef.current;
-    if (ball.translation().y < -3) {
+    if (ball.translation().y < -4.6) {
       rigidBodyRef.current.setTranslation({ x: 0, y: 5, z: 0 }, true);
       rigidBodyRef.current.setLinvel({ x: 0, y: 5, z: 0 }, true);
       state.api.reset();

diff --git a/src/components/Clipboard.tsx → src/components/Clipboard2.tsx b/src/components/Clipboard.tsx → src/components/Clipboard2.tsx
@@ -1,8 +1,3 @@
-/*
-Auto-generated by: https://github.com/pmndrs/gltfjsx
-Command: npx gltfjsx@6.2.16 src/resources/Props_3D/Clipboard.glb -t 
-*/
-
 import * as THREE from "three";
 import { useGLTF } from "@react-three/drei";
 import { GLTF } from "three-stdlib";
@@ -16,16 +11,18 @@ type GLTFResult = GLTF & {
   };
 };
 
-export function ClipboardModel(props: JSX.IntrinsicElements["group"]) {
+export function Clipboard2(props: JSX.IntrinsicElements["group"]) {
   const { nodes, materials } = useGLTF("/Clipboard.glb") as GLTFResult;
   return (
-    <group {...props} dispose={null}>
+    <group {...props} dispose={null} scale={[25,25,25]}>
       <mesh
+        castShadow
+        receiveShadow
         geometry={nodes.Clipboard.geometry}
         material={materials.Clipboard}
       />
     </group>
   );
 }
 
-useGLTF.preload("../resources/Props_3D/Clipboard.glb");
+useGLTF.preload("/Clipboard.glb");
diff --git a/src/components/Paddle.tsx b/src/components/Paddle.tsx
@@ -2,7 +2,7 @@ import { Text } from "@react-three/drei";
 import { useFrame } from "@react-three/fiber";
 import {
   ContactForcePayload,
-  CylinderCollider,
+  CuboidCollider,
   RapierRigidBody,
   RigidBody,
 } from "@react-three/rapier";
@@ -11,9 +11,8 @@ import { useCallback, useRef } from "react";
 import * as THREE from "three";
 import { useSnapshot } from "valtio";
 import { state } from "@/MiniGame1";
-import { PingPong } from "./Pingpong";
 import { useGatherWords } from "../contexts/GatherWordsContext";
-//import { ClipboardModel } from "./Clipboard";
+import { Clipboard2 } from "./Clipboard2";
 
 export function Paddle({
   vec = new THREE.Vector3(),
@@ -65,23 +64,23 @@ export function Paddle({
       colliders={false}
       onContactForce={contactForce}
     >
-      <CylinderCollider args={[0.15, 1.75]} />
+      <CuboidCollider args={[2.3,0.5,3]} position={[0,-0.3,0]} />
       <group ref={model} position={[0, 2, 0]} scale={0.15}>
         <Text
           anchorX="center"
           anchorY="middle"
           rotation={[-Math.PI / 2, 0, 0]}
-          position={[-3, 1, 0]}
+          position={[-1, 1, 0]}
           fontSize={5}
+          color={"black"}
         >
           {count + "\n"}
           {contextWords
             .map((word, index) => `${index + 1}) ${word.word}`)
             .join("\n")}
         </Text>
         <group rotation={[0, -0.04, 0]} scale={1}>
-          <PingPong></PingPong>
-          {/* <ClipboardModel /> */}
+          <Clipboard2 position={[0,0,0]}/>
         </group>
       </group>
     </RigidBody>