little fixes

- new loading screen
- huge loading time reducing by simplifiying ocean
2024-03-13 03:18:35 +01:00 · 2024-03-13 02:29:02 +01:00 · 2024-02-26 23:59:36 +01:00 · 2024-02-24 15:14:35 +01:00 · 2024-02-22 23:18:34 +01:00 · 2024-02-22 23:16:43 +01:00
57 changed files with 586 additions and 562 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+textures/old/
--- a/MazeMesh.js
+++ b/MazeMesh.js
@ -12,19 +12,18 @@ export default class MazeMesh extends THREE.InstancedMesh {
        this.map = new Array(length).fill().map(() => new Array(width).fill(1))
        this.start = new THREE.Vector3(width/2, .1, length/2)
        this.exit = new THREE.Vector3(Math.floor(width/2), 0, 1)
-        this.count = length * width - 2

        this.dig(this.exit)
        this.dig(new THREE.Vector3(Math.floor(width/2), 0, 0))
        this.build ( this.exit )
        let matrix = new THREE.Matrix4()
-        let i=0
+        this.count = 0
        this.map.forEach((row, z) => {
            row.forEach((isWall, x) => {
                if (isWall) {
                    matrix.setPosition( x + .5 - width/2, 0.5, z + .5 - length/2)
-                    this.setMatrixAt( i, matrix );
-                    i++
+                    this.setMatrixAt( this.count, matrix );
+                    this.count++
                }
            })
        })
@ -55,6 +54,7 @@ export default class MazeMesh extends THREE.InstancedMesh {

    isWall(position) {
        if (0 <= position.x && position.x < this.width &&
+            0 <= position.y &&
            0 <= position.z && position.z < this.length) {
            return this.map[Math.floor(position.z)][Math.floor(position.x)]
        } else {
@ -62,6 +62,10 @@ export default class MazeMesh extends THREE.InstancedMesh {
        }
    }

+    collision(position) {
+        return this.isWall(this.worldToLocal(position))
+    }
+
    toString() {
        return this.map.map(row => 
            row.map(isWall => isWall? "██":"  ").join("")
--- a/favicon.ico
+++ b/favicon.ico
--- a/favicon.php
+++ b/favicon.php
@ -2,43 +2,15 @@
 header('Content-Type: image/x-icon');

 const SIZE = 16;
-const WALL = 1;
-const GROUND = 0;

-$favicon     = imagecreatetruecolor(SIZE, SIZE);
-$wallColor   = imagecolorallocate($favicon, 165, 80, 30);
-$groundColor = imagecolorallocate($favicon, 203, 162, 133);
+$x = filter_input(INPUT_GET, "x", FILTER_SANITIZE_NUMBER_INT);
+$y = filter_input(INPUT_GET, "y", FILTER_SANITIZE_NUMBER_INT);

-imagefill($favicon, 0, 0, $wallColor);
+$favicon = imagecreatefrombmp("favicon.ico");

-$maze = array();
-for ($y = 0; $y < SIZE; $y++) {
-    $maze[$y] = array();
-    for ($x = 0; $x < SIZE; $x++) {
-        $maze[$y][$x] = WALL;
-    }
-}
+$red = imagecolorallocate($favicon, 255, 0, 0);
+imagesetpixel($favicon, $x, $y, $red);

-function dig($position) {
-    global $maze;
-    global $favicon;
-    global $groundColor;
-    $directions = [[0, 1], [0, -1], [1, 0], [-1, 0]];
-    shuffle($directions);
-    foreach ($directions as $direction) {
-        $step1 = [$position[0] + $direction[0], $position[1] + $direction[1]];
-        $step2 = [$step1[0] + $direction[0], $step1[1] + $direction[1]];
-        if (0 <= $step2[1] and $step2[1] < SIZE and 0 <= $step2[0] and $step2[0] < SIZE and $maze[$step2[1]][$step2[0]] == WALL) {
-            $maze[$step1[1]][$step1[0]] = GROUND;
-            imagesetpixel($favicon, $step1[0], $step1[1], $groundColor);
-            $maze[$step2[1]][$step2[0]] = GROUND;
-            imagesetpixel($favicon, $step2[0], $step2[1], $groundColor);
-            dig($step2);
-        }
-    }
-}
-
-dig([1, 1]);
 imagebmp($favicon);
 imagedestroy($favicon);
 ?>
--- a/index.html
+++ b/index.html
@ -1,19 +1,20 @@
 <!DOCTYPE html>
 <html lang="fr">
 	<head>
-		<title>Daedalus</title>
 		<meta charset=utf-8 />
+		<title>Daedalus</title>
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-		<link rel="shortcut icon" type="image/x-icon" href="favicon.php"/>
+		<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" id="favicon"/>
 		<link rel="stylesheet" href="style.css">
 		<!-- Import maps polyfill -->
 		<!-- Remove this when import maps will be widely supported -->
-		<script async src="https://unpkg.com/es-module-shims@1.6.3/dist/es-module-shims.js"></script>
+		<script async src="https://cdn.jsdelivr.net/npm/es-module-shims@1.8.3/dist/es-module-shims.min.js"></script>
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.153/build/three.module.js?module",
-					"three/addons/": "https://unpkg.com/three@0.153/examples/jsm/"
+					"three": "https://cdn.jsdelivr.net/npm/three@0.161.0/build/three.module.min.js",
+					"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.161.0/examples/jsm/",
+					"three-hex-tiling": "https://cdn.jsdelivr.net/npm/three-hex-tiling@0.1.1/dist/index.js"
 				}
 			}
 		</script>
@ -142,16 +143,18 @@
 		</script>
 	</head>
 	<body>
-		<div id="container"></div>
-		<span id="message" class="loading">
+		<div id="loading">
+			<table id="labyTable"></table>
+			<div id="loadingMessage">Construction du labyrinthe : <span id="progress">0</span>%</div>
 			<div>
 				Se déplacer : ↑←↓→, ZQSD ou clic<br/>
 				Sauter : ESPACE<br/>
 				Regarder : Souris
 			</div>
-			<div id="progressCircle" style="--progress: 0deg;">0%</div>
-		</span>
+		</div>
+		<div id="container"></div>
+		<span id="message"></span>

-		<script type="module" src="main.js"></script>
+		<script type="module" src="./main.js"></script>
 	</body>
 </html>
--- a/main.js
+++ b/main.js
--- a/style.css
+++ b/style.css
@ -1,9 +1,47 @@
 body {
  margin: 0;
-  background-color: #000;
-  color: #fff;
-  font-family: Georgia, serif;
+  background-color: #041626;
+  font-size: 1.3em;
  overscroll-behavior: none;
+  cursor: wait;
+}
+
+#loading {
+  width: fit-content;
+  color: #2c5c88;
+  font-size: 1.3em;
+  top: 20vh;
+  margin: auto;
+}
+
+#loadingMessage {
+  margin-bottom: 0.5em;
+}
+
+#labyTable {
+  width: 230px;
+  height: 230px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 20vh;
+  margin-bottom: 5vh;
+  border-collapse: collapse;
+}
+
+#labyTable td {
+  width: 10px;
+  height: 10px;
+  transition: background-color 1s;
+  border: 0;
+  padding: 0;
+}
+
+.wall {
+  background-color: transparent;
+}
+
+.ground {
+  background-color: #214464;
 }

 #container {
@ -32,58 +70,18 @@ body {
  justify-content: center;
  z-index: 1;
  color: gray;
-}
-
-#message.loading {
-  display: flex;
-  flex-direction: column;
-  top: 20vh;
-  width: 100%;
-  margin: auto;
-  align-items: center;
-  gap: 5rem;
-  text-align: center;
-  font-size: 1.7em;
-}
-
-#progressCircle {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-  width: 200px;
-  height: 200px;
-  border: 4px solid dimgray;
-  border-radius: 50%;
-  font-size: 0;
-  font-size: 3vh;
-  font-weight: 700;
-  font-family: system-ui;
-  text-align: center;
-}
-
-#progressCircle::after {
-  content: "";
-  display: flex;
-  position: absolute;
-  width: 200px;
-  height: 200px;
-  top: -4px;
-  left: -4px;
-  border: 4px solid #1da8b7;
-  border-radius: 50%;
-  mask: conic-gradient(black var(--progress), transparent var(--progress));
+  font-family: Times, "Times New Roman", Georgia, serif;
 }

 #message a {
-  text-decoration: none;
  color: inherit;
 }

 #message.escaped {
-  display: flex;
+  display: block; 
  opacity: 100%;
-  font-size: 10vh;
+  font-size: 4vh;
+  text-align: center;
  top: 30vh;
  animation: escaped 5s;
 }
--- a/textures/Poly-cobblestone-wall/Made
+++ b/textures/Poly-cobblestone-wall/Made
@ -0,0 +1,3 @@
+This asset was made with Poly, an AI-generated design asset marketplace that lets you find and create incredibly life-like, detailed, and artistic assets for your next project, in seconds.
+
+Get started for free at https://withpoly.com
--- a/textures/Poly-cobblestone-wall/ao_map.jpg
+++ b/textures/Poly-cobblestone-wall/ao_map.jpg
--- a/textures/Poly-cobblestone-wall/ao_map.webp
+++ b/textures/Poly-cobblestone-wall/ao_map.webp
--- a/textures/Poly-cobblestone-wall/color_map.jpg
+++ b/textures/Poly-cobblestone-wall/color_map.jpg
--- a/textures/Poly-cobblestone-wall/color_map.webp
+++ b/textures/Poly-cobblestone-wall/color_map.webp
--- a/textures/Poly-cobblestone-wall/displacement_map.jpg
+++ b/textures/Poly-cobblestone-wall/displacement_map.jpg
--- a/textures/Poly-cobblestone-wall/displacement_map.webp
+++ b/textures/Poly-cobblestone-wall/displacement_map.webp
--- a/textures/Poly-cobblestone-wall/normal_map_opengl.jpg
+++ b/textures/Poly-cobblestone-wall/normal_map_opengl.jpg
--- a/textures/Poly-cobblestone-wall/normal_map_opengl.webp
+++ b/textures/Poly-cobblestone-wall/normal_map_opengl.webp
--- a/textures/Poly-cobblestone-wall/render_map.jpg
+++ b/textures/Poly-cobblestone-wall/render_map.jpg
--- a/textures/Poly-cobblestone-wall/render_map.webp
+++ b/textures/Poly-cobblestone-wall/render_map.webp
--- a/textures/Poly-cobblestone-wall/roughness_map.jpg
+++ b/textures/Poly-cobblestone-wall/roughness_map.jpg
--- a/textures/Poly-cobblestone-wall/roughness_map.webp
+++ b/textures/Poly-cobblestone-wall/roughness_map.webp
--- a/textures/Poly-cobblestone-wall/settings.json
+++ b/textures/Poly-cobblestone-wall/settings.json
@ -0,0 +1,23 @@
+{
+  "prompt_text": "cobblestone wall with grass and flowers between rocks",
+  "patch": {
+    "ext": "png",
+    "dtype": "uint8",
+    "width": 512,
+    "height": 512,
+    "url": "https://static-dev.withpoly.com/v3-voronoi/textures/patches/486f8eed-0dfd-4bdc-9dee-3776fc72b1f1.png",
+    "patch_id": "GVpEsGuQ8S"
+  },
+  "seamless_prompt_text": "cobblestone wall with grass and flowers between rocks",
+  "seamless_patch_scale": 0.98,
+  "upscale_prompt_text": "cobblestone wall with grass and flowers between rocks",
+  "upscale_resolution": 4096,
+  "is_seamless": true,
+  "pbr_mode": "organic",
+  "pbr_use_render_as_color": true,
+  "pbr_generate_normal": true,
+  "pbr_generate_height": true,
+  "pbr_generate_ao": true,
+  "pbr_generate_roughness": true,
+  "pbr_generate_metallic": false
+}
--- a/textures/Poly-wood/Made
+++ b/textures/Poly-wood/Made
@ -0,0 +1,3 @@
+This asset was made with Poly, an AI-generated design asset marketplace that lets you find and create incredibly life-like, detailed, and artistic assets for your next project, in seconds.
+
+Get started for free at https://withpoly.com
--- a/textures/Poly-wood/ao_map.jpg
+++ b/textures/Poly-wood/ao_map.jpg
--- a/textures/Poly-wood/ao_map.webp
+++ b/textures/Poly-wood/ao_map.webp
--- a/textures/Poly-wood/color_map.jpg
+++ b/textures/Poly-wood/color_map.jpg
--- a/textures/Poly-wood/color_map.webp
+++ b/textures/Poly-wood/color_map.webp
--- a/textures/Poly-wood/displacement_map.jpg
+++ b/textures/Poly-wood/displacement_map.jpg
--- a/textures/Poly-wood/displacement_map.webp
+++ b/textures/Poly-wood/displacement_map.webp
--- a/textures/Poly-wood/normal_map_opengl.jpg
+++ b/textures/Poly-wood/normal_map_opengl.jpg
--- a/textures/Poly-wood/normal_map_opengl.webp
+++ b/textures/Poly-wood/normal_map_opengl.webp
--- a/textures/Poly-wood/render_map.jpg
+++ b/textures/Poly-wood/render_map.jpg
--- a/textures/Poly-wood/render_map.webp
+++ b/textures/Poly-wood/render_map.webp
--- a/textures/Poly-wood/roughness_map.jpg
+++ b/textures/Poly-wood/roughness_map.jpg
--- a/textures/Poly-wood/roughness_map.webp
+++ b/textures/Poly-wood/roughness_map.webp
--- a/textures/Poly-wood/settings.json
+++ b/textures/Poly-wood/settings.json
@ -0,0 +1,23 @@
+{
+  "prompt_text": "wood, planks, wooden, green paint, painted wood, paint, scrathes, raw wood, peeling paint",
+  "patch": {
+    "ext": "png",
+    "dtype": "uint8",
+    "width": 512,
+    "height": 512,
+    "url": "https://static-dev.withpoly.com/v3-voronoi/textures/patches/0ddfc901-a5dd-40f0-993b-8de3ccefb7f7.png",
+    "patch_id": "a79eceALs5"
+  },
+  "seamless_prompt_text": "wood, planks, wooden, green paint, painted wood, paint, scrathes, raw wood, peeling paint",
+  "seamless_patch_scale": 0.8,
+  "upscale_prompt_text": "wood, planks, wooden, green paint, painted wood, paint, scrathes, raw wood, peeling paint",
+  "upscale_resolution": 4096,
+  "is_seamless": true,
+  "pbr_mode": "matte",
+  "pbr_generate_color": true,
+  "pbr_generate_normal": true,
+  "pbr_generate_height": true,
+  "pbr_generate_ao": true,
+  "pbr_generate_roughness": true,
+  "pbr_generate_metallic": false
+}
--- a/textures/angled-blocks-vegetation/albedo.webp
+++ b/textures/angled-blocks-vegetation/albedo.webp
--- a/textures/angled-blocks-vegetation/ao-roughness-metalness.png
+++ b/textures/angled-blocks-vegetation/ao-roughness-metalness.png
--- a/textures/angled-blocks-vegetation/ao-roughness-metalness.webp
+++ b/textures/angled-blocks-vegetation/ao-roughness-metalness.webp
--- a/textures/angled-blocks-vegetation/ao.webp
+++ b/textures/angled-blocks-vegetation/ao.webp
--- a/textures/angled-blocks-vegetation/height.webp
+++ b/textures/angled-blocks-vegetation/height.webp
--- a/textures/angled-blocks-vegetation/metallic.webp
+++ b/textures/angled-blocks-vegetation/metallic.webp
--- a/textures/angled-blocks-vegetation/normal-dx.webp
+++ b/textures/angled-blocks-vegetation/normal-dx.webp
--- a/textures/angled-blocks-vegetation/roughness.webp
+++ b/textures/angled-blocks-vegetation/roughness.webp
--- a/textures/calm-sea-skybox/bk.webp
+++ b/textures/calm-sea-skybox/bk.webp
--- a/textures/calm-sea-skybox/dn.webp
+++ b/textures/calm-sea-skybox/dn.webp
--- a/textures/calm-sea-skybox/ft.webp
+++ b/textures/calm-sea-skybox/ft.webp
--- a/textures/calm-sea-skybox/lf.webp
+++ b/textures/calm-sea-skybox/lf.webp
--- a/textures/calm-sea-skybox/rt.webp
+++ b/textures/calm-sea-skybox/rt.webp
--- a/textures/calm-sea-skybox/up.webp
+++ b/textures/calm-sea-skybox/up.webp
--- a/textures/stonewall/albedo.png
+++ b/textures/stonewall/albedo.png
--- a/textures/stonewall/ao.png
+++ b/textures/stonewall/ao.png
--- a/textures/stonewall/height2.png
+++ b/textures/stonewall/height2.png
--- a/textures/stonewall/metalness.png
+++ b/textures/stonewall/metalness.png
--- a/textures/stonewall/normal.png
+++ b/textures/stonewall/normal.png
--- a/textures/stonewall/roughness.png
+++ b/textures/stonewall/roughness.png
--- a/textures/waternormals.webp
+++ b/textures/waternormals.webp
--- a/textures/wood.jpg
+++ b/textures/wood.jpg
Author	SHA1	Message	Date
adrien	1b8e4b2676	little fixes	2024-03-13 03:18:35 +01:00
adrien	dd8361cf33	- new loading screen - huge loading time reducing by simplifiying ocean	2024-03-13 02:29:02 +01:00
adrien	4f20dce37f	loading circle before instructions	2024-02-26 23:59:36 +01:00
adrien	eb36acac39	fov	2024-02-24 15:14:35 +01:00
adrien	ebe7c41578	use webp textures	2024-02-22 23:18:34 +01:00
adrien	97172aedf3	use cdn.jsdelivr.net	2024-02-22 23:16:43 +01:00
adrien	6ddf3b2949	use avif to reduce textures size	2024-02-19 15:18:55 +01:00
adrien	4722783018	remove hex tiling	2023-11-20 01:44:03 +01:00
adrien	96d485aabb	format	2023-11-20 00:30:56 +01:00
adrien	d53b6a97c9	rename pressedMouseButtons	2023-11-18 16:33:38 +01:00
adrien	eb5b39529a	combine ao roughness and metalness maps in one file for ground material	2023-11-18 16:31:40 +01:00
adrien	af8fdfd30e	cleanup	2023-11-18 15:49:36 +01:00
adrien	2adbecea71	cleanup	2023-11-18 15:49:35 +01:00
adrien	a0b2aa96ad	use three-hex-tiling for ground material	2023-11-18 12:45:50 +01:00
adrien	cb1b0bb541	import hexTiling	2023-11-18 11:38:19 +01:00
adrien	6e51b2f115	fix favicon and click	2023-10-15 09:50:36 +02:00
adrien	738e92c16b	"you are here" in favicon (idea from Yves)	2023-10-11 20:44:26 +02:00
adrien	938160f053	deeper ground	2023-08-09 20:46:26 +02:00
adrien	75a173d0af	threejs V155	2023-07-30 15:01:43 +02:00
adrien	3bb43edcee	cursor	2023-07-30 14:32:25 +02:00
adrien	b318adb469	learn to swim	2023-07-29 17:46:07 +02:00
adrien	cee4d886c0	new texture again	2023-07-28 22:35:12 +02:00
adrien	cd313b363c	tunning	2023-07-28 19:12:02 +02:00
adrien	acca8eb92b	use Poly textures	2023-07-28 19:10:13 +02:00
adrien	75f70a1bac	instancedMesh.count	2023-07-13 21:05:40 +02:00
adrien	5a85c0cae2	three v154	2023-07-08 17:41:27 +02:00
adrien	3f84ddd8df	debug	2023-06-30 02:02:31 +02:00
adrien	f95f23562e	fix Uncaught TypeError?	2023-06-30 01:45:06 +02:00
adrien	8732caef73	rename mazeCollisionner	2023-06-29 22:12:41 +02:00
adrien	dde4848101	collisions	2023-06-29 22:07:24 +02:00