From aa01b67037e52c69301645adc0111352b1208dfb Mon Sep 17 00:00:00 2001 From: edbernar Date: Wed, 7 Aug 2024 16:22:47 +0200 Subject: [PATCH] Game - Added request when w or s pressed --- site/game/controls.js | 29 ++++++++++++------ site/game/light.js | 2 +- site/game/main.js | 5 +-- site/game/map.js | 4 +-- .../Class/__pycache__/User.cpython-310.pyc | Bin 3541 -> 0 bytes .../getPrivateListMessage.cpython-310.pyc | Bin 1081 -> 0 bytes .../getPrivateListUser.cpython-310.pyc | Bin 1125 -> 0 bytes .../__pycache__/login.cpython-310.pyc | Bin 2373 -> 0 bytes .../sendPrivateMessage.cpython-310.pyc | Bin 740 -> 0 bytes 9 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 websocket-server/Class/__pycache__/User.cpython-310.pyc delete mode 100644 websocket-server/typeRequets/__pycache__/getPrivateListMessage.cpython-310.pyc delete mode 100644 websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc delete mode 100644 websocket-server/typeRequets/__pycache__/login.cpython-310.pyc delete mode 100644 websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc diff --git a/site/game/controls.js b/site/game/controls.js index de664f4..03c8f8e 100644 --- a/site/game/controls.js +++ b/site/game/controls.js @@ -3,24 +3,29 @@ /* ::: :::::::: */ /* controls.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: hubourge +#+ +:+ +#+ */ +/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/07 15:20:55 by hubourge #+# #+# */ -/* Updated: 2024/08/07 15:58:16 by hubourge ### ########.fr */ +/* Updated: 2024/08/07 16:19:53 by edbernar ### ########.fr */ /* */ /* ************************************************************************** */ +import { sendRequest } from "./websocket.js"; import * as THREE from 'three'; class Moves { wPress = false; sPress = false; constructor() {}; + + } class MoveObject { #moves = null; #object = null; + #speed = 0.1; + constructor(object) { let key = ['w', 's']; @@ -39,12 +44,6 @@ class MoveObject { document.addEventListener("keydown", (event) => { for (let i = 0; i < key.length; i++) { - if (event.key == '-') - { - console.log(this.moves.wPress); - console.log(this.moves.sPress); - return ; - } if (event.key == key[i]) { (movesValueDown[i])(); @@ -64,7 +63,19 @@ class MoveObject { }); }; - update() {}; + update() + { + if (this.moves.wPress) + { + this.object.position.z -= this.#speed; + sendRequest("playerMove", {x: this.object.position.x, y: this.object.position.y, z: this.object.position.z}); + } + if (this.moves.sPress) + { + this.object.position.z += this.#speed; + sendRequest("playerMove", {x: this.object.position.x, y: this.object.position.y, z: this.object.position.z}); + } + }; } export { MoveObject }; \ No newline at end of file diff --git a/site/game/light.js b/site/game/light.js index 3b4cc34..ca3c3f8 100644 --- a/site/game/light.js +++ b/site/game/light.js @@ -6,7 +6,7 @@ /* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/30 13:50:46 by edbernar #+# #+# */ -/* Updated: 2024/07/30 13:50:47 by edbernar ### ########.fr */ +/* Updated: 2024/08/07 16:20:11 by edbernar ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/site/game/main.js b/site/game/main.js index ef43954..78ccede 100644 --- a/site/game/main.js +++ b/site/game/main.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: hubourge +#+ +:+ +#+ */ +/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/30 13:50:49 by edbernar #+# #+# */ -/* Updated: 2024/08/07 15:54:56 by hubourge ### ########.fr */ +/* Updated: 2024/08/07 16:21:01 by edbernar ### ########.fr */ /* */ /* ************************************************************************** */ @@ -78,6 +78,7 @@ function animate() { ball.position.x = Math.sin(Date.now() * 0.001) * 2; ball.position.z = Math.cos(Date.now() * 0.001) * 2; renderer.render(scene, camera); + controlBall.update(); stats.end(); } diff --git a/site/game/map.js b/site/game/map.js index eaf2888..cd2c71b 100644 --- a/site/game/map.js +++ b/site/game/map.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* map.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: hubourge +#+ +:+ +#+ */ +/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/30 13:50:51 by edbernar #+# #+# */ -/* Updated: 2024/08/07 15:34:12 by hubourge ### ########.fr */ +/* Updated: 2024/08/07 16:20:08 by edbernar ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/websocket-server/Class/__pycache__/User.cpython-310.pyc b/websocket-server/Class/__pycache__/User.cpython-310.pyc deleted file mode 100644 index 3d2c99dec4fa0acd83c4da50d15e9c62192a8bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3541 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 RM$Mnh`cL`Y`eo1N?cb9Q0T}=Q diff --git a/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc deleted file mode 100644 index 9f73101392660fcc038777073ca37879da74e524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1125 zcmb7C&2AG(5S|%NY$p(Y!p{QYjx03pvGZr6)ryD&2m&ih$iT{fs_Lrx$QgbGjQn};)L=Bz=4_xULmct5IUg%nxSFaWji$oDNIMb{M`O?G9OA zCEYay>#NG+5m zv7f|X_Hz)r;aT5IGGS}q*QRiQklgy58j99@5q2-30Qv$_ymRzrygoA`BOoJ{3Lt_H zgqBp3O~vvQcMr(UvnN~o&oq_5Fqx1{kg*s5&P$j86CMdo3f`yUc`h)1D9p}jZI7|E zJ&b5(6T9?Zcc6-1;cvi&B_CXUyg zSvR%ilvL%)6_5y0dO_-qKY$w-?%d|eDMzkFsJu68H*H8@SNnG6%{M>xz3+V+W-@&Y zuletOUjF?kV}DTR)yv1u6h3+t4KUy}wh+Jh0tW#OxZptolG`5mkb*wwhqUcwU;vK5 zARMLMJ!e6{5FGoOEjVx-PT<>xVK|9z4@Te=z7ud7&fq%jgD77kT8n%+g#NRO??i`aOK)wgL?tiyg_KZ<~FiioZ94ySN` zW9x1eL%t@kG7_cs*_9}2=nrzaaw8ZIkn-j6LLOxz_aL7`fyqoaqm@tv?Q#@^^>*@x zEGwzTvfLzBWErH=yT9SCS;zQ_$fYA~oO?1d{W>Z~O}%7`!Zk@-G=;oznyRMW#wj#G zH^Ms7b6-F*NY`LF=42s%3$Z$lMr^sfPq;4zoIXe8&~Z2uAK_@1iSOX&nvCzhN&DLF)R4nX!qhtlys``UM-0dHdryXdqC@ zk40E&9sWf06!;6Pz+Hrchzl6x!x1hbCL?hmg6%l;w|%;AZI?xEYmu`}!CCt#7BeOX z{Em3)?499DJjJGXBq-o=zW#b6u* z-agVB=rTFDgkG#>QaxLFHgG0IGCo7U1e2P1Sd|T`jI5*HAej9V@copwELg;GP0Ap) zgqOyA^qvthz|V7kOT4hStgo`Pl+CnNlDz|19#HyXUhNf*ZQ*gTtgf$z(5%UiNG5av cji2_p=o37?-M@r?aNGUUAMrDI_oe&)0SjLO&Hw-a diff --git a/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc deleted file mode 100644 index c69613897273ebd94f4c72b5d57aefc720ae9e4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmZWlL5mYH6i(8#o!0J(?yk7EqRe50?%;J15wy@fbXja!X)k4VlDb_xNlm7$Eiu7coS5J6v3#RW6uoA-6L2;kOb(UoE-52#_bR z^<4ml7#^bp^$|vlu)=%P$BcGRQ2Y*66ky}ADCOxW;jumVcNHP9ZN9+P9{}Fr<%0|} zypM8{q7}{vBWseAjI7|=HO>j6P%rKyz>>owz+-Z>iO9qB)+UpmuDiHNM>QdksHn_^j)<4*m9_ z-#PGy{pGe}b)SWP68b%}BlvtUQKK0=c#v?dqnF&!p^}LqsWjzSij<2qpvt};_<1A* zAFHxu)Q%}2&~Y*0F16e}60>MLV)Z|F)isn6Lmi$=XdQBP#+8Uv z_)Nyr1U%^Qq}y%|x+)SnhReB#c{t~1TE?$<+JFu-u0s2e=lu1QgWg&=*-WOr8O*_C zVQ&AQz6s5B9e`XC&%-rb#RQk!M{xD$ozgbGhrLVkOYMQ^I3R8ijyU7jU>5|&dz45v P9rMQ+n5F==T8;b$2xPu{