remove all ridudent rigid bodies

C2DH · Jan 8, 2024 · bbf4e2b · bbf4e2b
1 parent f83a8f7
commit bbf4e2b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 90 deletions.
diff --git a/src/components/Balloon.jsx b/src/components/Balloon.jsx
@@ -225,35 +225,6 @@ const Balloon = ({ yMax = 20, yMin = 0.0, waitingTime = 5000, ...props }) => {
  </mesh>
  </RigidBody>
 
- {/* <Suspense fallback={null}>
- <group {...props} dispose={null}>
- <Text
- position={[1, 0.5, 0]}
- ref={textRef}
- scale={[0.1, 0.1, 0.1]}
- color="black" // default
- anchorX="center" // default
- anchorY="middle" // default
- >
- {CheckOutText}
- </Text>
- </group>
- </Suspense> */}
- {/* platform */}
- {/* <mesh
- position={[props.position[0], props.position[1] - 0.03, props.position[2]]}
- receiveShadow
- castShadow
- >
- <cylinderGeometry receiveShadow args={[1.5, 0.5, 0.1, 32]} />
- <meshBasicMaterial receiveShadow>
- <GradientTexture
- stops={[0, 1]} // As many stops as you want
- colors={['aquamarine', 'hotpink']} // Colors need to match the number of stops
- size={1024} // Size is optional, default = 1024
- />
- </meshBasicMaterial>
- </mesh> */}
  <group {...props} dispose={null} ref={balloonRef}>
  <mesh
  castShadow

diff --git a/src/components/House.jsx b/src/components/House.jsx
@@ -7,14 +7,6 @@ const House = (props, transparent = true, geometryPosition = [0, 0, 0]) => {
 
  return (
  <RigidBody colliders={'hull'} type={'fixed'}>
- <mesh position={geometryPosition}>
- <cylinderGeometry />
- <meshStandardMaterial
- color="green"
- transparent={transparent}
- opacity={transparent ? 0 : 0.7}
- />
- </mesh>
  <group {...props} dispose={null}>
  <mesh
  castShadow

diff --git a/src/components/IcescreamTruck.jsx b/src/components/IcescreamTruck.jsx
@@ -11,14 +11,6 @@ const IcescreamTruck = (props, transparent = true, geometryPosition = [0, 0, 0])
  }, [])
  return (
  <RigidBody colliders={'hull'} type={'fixed'}>
- <mesh position={geometryPosition}>
- <cylinderGeometry />
- <meshStandardMaterial
- color="green"
- transparent={transparent}
- opacity={transparent ? 0 : 0.7}
- />
- </mesh>
  <group {...props} dispose={null}>
  <mesh
  castShadow

diff --git a/src/components/Lighttower.jsx b/src/components/Lighttower.jsx
@@ -7,35 +7,31 @@ const Lighttower = ({ debug = true, ...props }) => {
  return (
  <group {...props} dispose={null}>
  <RigidBody type={'fixed'} colliders={'hull'}>
- <mesh position={[0, 0, 0]} rotation={[0, 0, 0]}>
- <cylinderGeometry args={[0.3, 0.7, 5, 8]} />
- <meshStandardMaterial color="green" transparent={!debug} opacity={debug ? 1 : 0} />
- </mesh>
+ <mesh
+ castShadow
+ receiveShadow
+ geometry={nodes.Lighthouse.geometry}
+ material={getFrontSideMaterial(materials.Walls)}
+ />
+ <mesh
+ castShadow
+ receiveShadow
+ geometry={nodes.Lighthouse_1.geometry}
+ material={getFrontSideMaterial(materials.Red)}
+ />
+ <mesh
+ castShadow
+ receiveShadow
+ geometry={nodes.Lighthouse_2.geometry}
+ material={materials.Blue}
+ />
+ <mesh
+ castShadow
+ receiveShadow
+ geometry={nodes.Lighthouse_3.geometry}
+ material={getFrontSideMaterial(materials.Base)}
+ />
  </RigidBody>
- <mesh
- castShadow
- receiveShadow
- geometry={nodes.Lighthouse.geometry}
- material={getFrontSideMaterial(materials.Walls)}
- />
- <mesh
- castShadow
- receiveShadow
- geometry={nodes.Lighthouse_1.geometry}
- material={getFrontSideMaterial(materials.Red)}
- />
- <mesh
- castShadow
- receiveShadow
- geometry={nodes.Lighthouse_2.geometry}
- material={materials.Blue}
- />
- <mesh
- castShadow
- receiveShadow
- geometry={nodes.Lighthouse_3.geometry}
- material={getFrontSideMaterial(materials.Base)}
- />
  </group>
  )
 }

diff --git a/src/components/ObservationTower.jsx b/src/components/ObservationTower.jsx
@@ -6,14 +6,6 @@ const ObservationTower = (props, transparent = true, geometryPosition = [0, 0, 0
 
  return (
  <RigidBody colliders={'hull'} type={'fixed'}>
- <mesh position={geometryPosition}>
- <cylinderGeometry />
- <meshStandardMaterial
- color="green"
- transparent={transparent}
- opacity={transparent ? 0 : 0.7}
- />
- </mesh>
  <group {...props} dispose={null}>
  <mesh
  castShadow

diff --git a/src/components/StoneBig.jsx b/src/components/StoneBig.jsx
@@ -6,15 +6,6 @@ const StoneBig = (props, transparent = true, geometryPosition = [0, 0, 0]) => {
  return (
  <>
  <RigidBody colliders={'hull'} type={'fixed'} castShadow receiveShadow>
- <mesh position={geometryPosition}>
- <cylinderGeometry />
- <meshStandardMaterial
- color="green"
- transparent={transparent}
- opacity={transparent ? 0 : 0.7}
- />
- </mesh>
-
  <group {...props} dispose={null}>
  <mesh
  castShadow