Merge branch 'master' of https://git.malingrey.fr/adrien/daedalus

little fixes
- new loading screen
2024-03-13 03:20:26 +01:00 · 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
46 changed files with 438 additions and 491 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+textures/old/
--- a/index.html
+++ b/index.html
@ -1,19 +1,19 @@
 <!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.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.158/build/three.module.js?module",
-					"three/addons/": "https://unpkg.com/three@0.158/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"
 				}
 			}
@ -143,15 +143,17 @@
 		</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>
 	</body>
--- 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,48 +70,7 @@ 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;
-  cursor: progress;
-}
-
-#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 {
--- a/textures/Poly-cobblestone-wall/ao_map.webp
+++ b/textures/Poly-cobblestone-wall/ao_map.webp
--- a/textures/Poly-cobblestone-wall/color_map.webp
+++ b/textures/Poly-cobblestone-wall/color_map.webp
--- a/textures/Poly-cobblestone-wall/displacement_map.webp
+++ b/textures/Poly-cobblestone-wall/displacement_map.webp
--- 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.webp
+++ b/textures/Poly-cobblestone-wall/render_map.webp
--- a/textures/Poly-cobblestone-wall/roughness_map.webp
+++ b/textures/Poly-cobblestone-wall/roughness_map.webp
--- a/textures/Poly-stone-retaining-wall/Made
+++ b/textures/Poly-stone-retaining-wall/Made
@ -1,3 +0,0 @@
-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-stone-retaining-wall/ao_map.jpg
+++ b/textures/Poly-stone-retaining-wall/ao_map.jpg
--- a/textures/Poly-stone-retaining-wall/color_map.jpg
+++ b/textures/Poly-stone-retaining-wall/color_map.jpg
--- a/textures/Poly-stone-retaining-wall/displacement_map.jpg
+++ b/textures/Poly-stone-retaining-wall/displacement_map.jpg
--- a/textures/Poly-stone-retaining-wall/normal_map_opengl.jpg
+++ b/textures/Poly-stone-retaining-wall/normal_map_opengl.jpg
--- a/textures/Poly-stone-retaining-wall/render_map.jpg
+++ b/textures/Poly-stone-retaining-wall/render_map.jpg
--- a/textures/Poly-stone-retaining-wall/roughness_map.jpg
+++ b/textures/Poly-stone-retaining-wall/roughness_map.jpg
--- a/textures/Poly-stone-retaining-wall/settings.json
+++ b/textures/Poly-stone-retaining-wall/settings.json
@ -1,23 +0,0 @@
-{
-  "prompt_text": "stone retaining wall, extreme fine details",
-  "patch": {
-    "ext": "png",
-    "dtype": "uint8",
-    "width": 512,
-    "height": 512,
-    "url": "https://static-dev.withpoly.com/v3-voronoi/textures/patches/909585e0-8b3f-4659-ae84-03f58ceaaaeb.png",
-    "patch_id": "EbJzaafatu"
-  },
-  "seamless_prompt_text": "stone retaining wall, extreme fine details",
-  "seamless_patch_scale": 0.8,
-  "upscale_prompt_text": "stone retaining wall, extreme fine details",
-  "upscale_resolution": 4096,
-  "is_seamless": true,
-  "pbr_mode": "organic",
-  "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/Poly-wood/ao_map.webp
+++ b/textures/Poly-wood/ao_map.webp
--- a/textures/Poly-wood/color_map.webp
+++ b/textures/Poly-wood/color_map.webp
--- a/textures/Poly-wood/displacement_map.webp
+++ b/textures/Poly-wood/displacement_map.webp
--- a/textures/Poly-wood/normal_map_opengl.webp
+++ b/textures/Poly-wood/normal_map_opengl.webp
--- a/textures/Poly-wood/render_map.webp
+++ b/textures/Poly-wood/render_map.webp
--- a/textures/Poly-wood/roughness_map.webp
+++ b/textures/Poly-wood/roughness_map.webp
--- 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	1fb8296bcd	Merge branch 'master' of https://git.malingrey.fr/adrien/daedalus	2024-03-13 03:20:26 +01:00
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