From 70dd803ab068598d38d8aebc378a9144c7a19712 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Fri, 2 Jun 2023 17:01:38 +0200
Subject: [PATCH] css
---
index.html | 2 +-
main.js | 14 +++++++-------
style.css | 15 ++++++++-------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/index.html b/index.html
index 07fefc4..029aa77 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
</head>
<body>
<div id="container"></div>
- <span id="end">Libre</span>
+ <span id="message">Libre !</span>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
diff --git a/main.js b/main.js
index 54c807b..a65481b 100644
--- a/main.js
+++ b/main.js
@@ -394,7 +394,7 @@ const playerDirection = new THREE.Vector3();
let playerOnFloor = false;
let jumping = false;
-let escaped = false;
+let stopAnimation = false;
const keyStates = {};
@@ -451,9 +451,9 @@ function onWindowResize() {
function playerCollisions() {
- if ( !escaped && raftOctree.capsuleIntersect( playerCollider ) ) {
+ if ( !stopAnimation && raftOctree.capsuleIntersect( playerCollider ) ) {
- end.className = "escaped";
+ message.className = "escaped";
}
@@ -478,8 +478,10 @@ function playerCollisions() {
}
addEventListener("animationend", (event) => {
- escaped = true;
+
+ stopAnimation = true;
document.exitPointerLock();
+
});
@@ -580,8 +582,6 @@ function teleportPlayerIfOob() {
camera.position.copy( playerCollider.end );
camera.rotation.set( 0, 0, 0 );
- escaped = false;
-
}
}
@@ -632,6 +632,6 @@ function animate() {
if ( showStats ) stats.update();
- if ( !escaped ) requestAnimationFrame( animate );
+ if ( !stopAnimation ) requestAnimationFrame( animate );
}
\ No newline at end of file
diff --git a/style.css b/style.css
index e7b747d..649de28 100644
--- a/style.css
+++ b/style.css
@@ -9,7 +9,7 @@ body {
cursor: pointer;
}
-canvas {
+#container {
position: absolute;
z-index: 0;
}
@@ -23,8 +23,12 @@ canvas {
}
}
-#end {
+#message {
display: none;
+}
+
+#message.escaped {
+ display: flex;
position: absolute;
left: 0;
width: 100%;
@@ -33,14 +37,11 @@ canvas {
font-family: Georgia, serif;
color: gray;
justify-content: center;
- z-index: 1;
-}
-
-#end.escaped {
- display: flex;
animation: escaped 5s;
height: 50vh;
padding-top: 50vh;
opacity: 100%;
background: white;
+ cursor: default;
+ z-index: 1;
}