From 9efe9860ae701112e477c554bcfb4e0d779e51db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:42:53 -0600
Subject: [PATCH] feat: static grid
---
package.json | 3 +-
.../tankopedia/[id]/components/SceneProps.tsx | 34 +++------
src/components/InfiniteGridHelper.tsx | 76 -------------------
3 files changed, 13 insertions(+), 100 deletions(-)
delete mode 100644 src/components/InfiniteGridHelper.tsx
diff --git a/package.json b/package.json
index e48ad6e1d..b4f9ff3f3 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
"lint:version": "vite-node --script scripts/checkVersionMissMatch",
"knip": "knip",
"update": "yarn upgrade --latest",
- "setup:depotdownloader": "vite-node --script scripts/setupDepotDownloader"
+ "setup:depotdownloader": "vite-node --script scripts/setupDepotDownloader",
+ "tunnel": "cloudflared tunnel --url http://localhost:3000"
},
"license": "MIT",
"dependencies": {
diff --git a/src/app/tools/tankopedia/[id]/components/SceneProps.tsx b/src/app/tools/tankopedia/[id]/components/SceneProps.tsx
index 2be3155b5..1866a9973 100644
--- a/src/app/tools/tankopedia/[id]/components/SceneProps.tsx
+++ b/src/app/tools/tankopedia/[id]/components/SceneProps.tsx
@@ -1,32 +1,20 @@
-import { Color } from 'three';
-import InfiniteGridHelper from '../../../../../components/InfiniteGridHelper';
+import { useLoader } from '@react-three/fiber';
+import { TextureLoader } from 'three';
import { useTankopediaPersistent } from '../../../../../stores/tankopedia';
export function SceneProps() {
- const showGrid = useTankopediaPersistent(
- (state) => state.model.visual.showGrid,
- );
- const showEnvironment = useTankopediaPersistent(
- (state) => state.model.visual.showEnvironment,
+ const show = useTankopediaPersistent(
+ (state) =>
+ state.model.visual.showGrid && !state.model.visual.showEnvironment,
);
+ const texture = useLoader(TextureLoader, 'https://i.imgur.com/6QjSn1e.png');
- if (!showGrid || showEnvironment) return null;
+ if (!show) return null;
return (
- <>
-
-
- >
+
+
+
+
);
}
diff --git a/src/components/InfiniteGridHelper.tsx b/src/components/InfiniteGridHelper.tsx
deleted file mode 100644
index f6b4dc298..000000000
--- a/src/components/InfiniteGridHelper.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { MeshProps } from '@react-three/fiber';
-import { forwardRef } from 'react';
-import { DoubleSide, Mesh } from 'three';
-
-interface InfiniteGridHelperProps extends MeshProps {
- size1?: number;
- size2?: number;
- color?: THREE.Color;
- distance?: number;
-}
-/**
- * Thanks, Fyrestar, for [THREE.InfiniteGridHelper](https://github.com/Fyrestar/THREE.InfiniteGridHelper/)!
- */
-const InfiniteGridHelper = forwardRef(
- ({ size1, size2, color, distance, ...props }, ref) => {
- return (
-
-
-
-
- );
- },
-);
-export default InfiniteGridHelper;