Compare commits

...

312 Commits

Author SHA1 Message Date
MarcEricMartel
535d6f7745 Fair enough 2023-12-18 15:26:44 -05:00
MarcEricMartel
40e90fe12d !!!!!!!!!!! 2023-12-18 15:24:06 -05:00
MarcEricMartel
6076b55267 HP! 2023-12-18 15:12:15 -05:00
MarcEricMartel
f799e689d2 woups 2023-12-18 14:54:14 -05:00
MarcEricMartel
6d07285f43 Test pickup 2023-12-18 14:50:18 -05:00
MarcEricMartel
25b5c1e492 oooooooooo 2023-12-18 14:24:43 -05:00
MarcEricMartel
f1bb7447f9 almoos dere 2023-12-18 13:29:38 -05:00
MarcEricMartel
68d03c1eac Merge branch 'SQC19_Booster' into online_boosts 2023-12-18 11:19:52 -05:00
MarcEricMartel
cf831e339f Ça s'ra pas long. Non non non non non. 2023-12-18 11:18:42 -05:00
MarcEricMartel
9a669acd9c !!!! 2023-12-18 11:10:10 -05:00
MarcEricMartel
2c346139d5 Merge branch 'master' of git.frereschasseurs.studio:memartel_loc/SQCSimulator2023 2023-12-18 07:47:08 -05:00
MarcEricMartel
82747990d9
Merge pull request #43 from CegepSTH/SQC-15_online
Sqc 15 online
2023-12-16 16:56:31 -05:00
MarcEricMartel
0782f37e0a Might as well jump, JUMP! 2023-12-16 16:43:25 -05:00
MarcEricMartel
75f745efb8 Update player.cpp 2023-12-16 16:23:47 -05:00
MarcEricMartel
6efda6122d LETS TRY WITHOUT DAS JOOMP 2023-12-16 16:21:25 -05:00
MarcEricMartel
678776d6e6 Remove the dead code. 2023-12-16 16:13:20 -05:00
MarcEricMartel
4df53a5f9b Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-16 15:52:47 -05:00
MarcEricMartel
90892ce7d3 pop. 2023-12-16 15:52:39 -05:00
Claudel-D-Roy
5e1e8366ce j'push des choses 2023-12-16 15:52:27 -05:00
MarcEricMartel
7f9462881c Oops, all changes! 2023-12-16 15:27:20 -05:00
MarcEricMartel
2eacc0477b ?! 2023-12-16 15:15:25 -05:00
MarcEricMartel
745f40bc37 REVERT. 2023-12-16 15:11:48 -05:00
MarcEricMartel
ba6b383251 erratum 2023-12-16 15:05:26 -05:00
MarcEricMartel
1065357e70 Eh? 2023-12-16 15:05:06 -05:00
MarcEricMartel
4a4f353250 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-16 14:41:07 -05:00
MarcEricMartel
63d1f997ca blob 2023-12-16 14:41:01 -05:00
Claudel-D-Roy
da94565c3e EL NIINIOOO 2023-12-16 14:41:00 -05:00
Frederic Leger
f2c5f8b636 booster fonctionnel
manque la distribution booster sur la map
2023-12-16 14:38:01 -05:00
MarcEricMartel
1c2a691638 Bullet Time is slow. 2023-12-16 14:01:08 -05:00
MarcEricMartel
7803f46a6b WE ARE THE WORLD. 2023-12-16 13:14:37 -05:00
MarcEricMartel
38bab49806 Log de se faire tirer 2023-12-16 13:05:04 -05:00
MarcEricMartel
547d0fb3f8 Ça devrait crier moins 2023-12-16 12:57:04 -05:00
MarcEricMartel
dec9da6395 no more whoosh 2023-12-16 12:48:08 -05:00
MarcEricMartel
f564e37544 YYYAAAAAAARRRGGHH? 2023-12-16 12:32:54 -05:00
MarcEricMartel
ca1ab7301d Merge branch 'master' into SQC-15_online 2023-12-16 12:09:23 -05:00
Claudel-D-Roy
7a7ba94cbd Merge branch 'RepairWhoosh' 2023-12-16 12:09:04 -05:00
MarcEricMartel
ac50a044c7 Merge branch 'master' into SQC-15_online 2023-12-16 12:06:41 -05:00
MarcEricMartel
8062d8e31d lol 2023-12-16 12:05:57 -05:00
MarcEricMartel
4d278dfdea Pow pow t'es mow. 2023-12-16 12:05:14 -05:00
MarcEricMartel
da9fd2477d Update documents 2023-12-16 09:32:42 -05:00
Frederic Leger
2364fb9c1f booster quasi fonctionnel
affichage seulement visible a travers un autre booster.
ne se ramasse pas encore.
2023-12-15 23:02:20 -05:00
Frederic Leger
570bef266c merge conflict 2023-12-15 15:40:13 -05:00
MarcEricMartel
de8fe3c1c5 Merge branch 'master' into SQC-15_online 2023-12-15 07:13:16 -05:00
MarcEricMartel
5ee3fd143b Update engine.cpp 2023-12-15 07:11:35 -05:00
MarcEricMartel
77a982b1fa
Merge pull request #41 from CegepSTH/ConnexionVariablesMenuOptions
Connexion variables menu options
2023-12-15 07:02:09 -05:00
MarcEricMartel
e4316e7d8d Mis le son qui joue après que le volume soit changé pour les contrôles de volume 2023-12-15 06:39:18 -05:00
mduval76
935a977bdf Push options resolution fonctionnels. 2023-12-14 21:20:21 -05:00
mduval76
82bae1c21a Push background transparent pour menu options Graphics 2023-12-14 20:34:59 -05:00
mduval76
58c06f9f84 Push menu Lobby pour single player (entree du username seulement) 2023-12-14 19:33:25 -05:00
MarcEricMartel
8e77565bb4 Merge branch 'master' into SQC-15_online 2023-12-14 19:17:37 -05:00
mduval76
e5b0c742dd Push back button dans le lobbymenu 2023-12-14 18:25:15 -05:00
MarcEricMartel
1af88ba3e3 correction sfx 2023-12-14 14:02:29 -05:00
mduval76
383a19cbd2 Push mainvolume et musicvolume sliders fonctionnels. Bug sfx 2023-12-14 00:08:07 -05:00
mduval76
67270a0b21 Push options volume musique modifiable fonctionnel 2023-12-13 19:59:01 -05:00
mduval76
b101add0e7 Push sans les logs. 2023-12-13 19:13:02 -05:00
mduval76
0a0c70883b Push avec sensibilité souris - version fusionnée au master courant. 2023-12-13 19:12:22 -05:00
mduval76
879f93e2cd Validation des changements indexes... 2023-12-13 19:08:07 -05:00
mduval76
f7934be7f9 push ajustement de mp3 a wav pour sons 2023-12-13 19:02:17 -05:00
mduval76
0b4546eee9 Push sensibilite souris fonctionnelle. 2023-12-13 17:50:15 -05:00
mduval76
6ba316aa2d Push mouse sensitivity 2023-12-13 17:15:58 -05:00
Claudel-D-Roy
bb247d0afe Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 16:32:49 -05:00
Claudel-D-Roy
26d03ca5cc horriblé 2023-12-13 16:32:43 -05:00
MarcEricMartel
b8899b8f86 NO CHEATING! 2023-12-13 16:30:20 -05:00
MarcEricMartel
325c6b60f9 keep in sync when dead 2023-12-13 16:29:13 -05:00
MarcEricMartel
7b350fa403 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 16:10:34 -05:00
MarcEricMartel
71691c55c8 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 16:10:25 -05:00
MarcEricMartel
49374a7dea Let's all die! 2023-12-13 16:10:23 -05:00
Claudel-D-Roy
5a3ce00cb2 kjhg 2023-12-13 16:10:21 -05:00
Claudel-D-Roy
136f589975 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:45:25 -05:00
Claudel-D-Roy
6d4f592278 k. 2023-12-13 15:45:17 -05:00
MarcEricMartel
37a86d42a3 lol infinite loop 2023-12-13 15:29:12 -05:00
Rynort
a08a6c7db3 Update doc_dev.docx 2023-12-13 15:25:48 -05:00
MarcEricMartel
2f3260b16a Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:23:20 -05:00
MarcEricMartel
08204934c8 No more 1. 2023-12-13 15:23:14 -05:00
Claudel-D-Roy
74875709af Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:21:36 -05:00
Claudel-D-Roy
28dc760cba potatoes 2023-12-13 15:21:23 -05:00
MarcEricMartel
c7c38ed44d Suicide is NOT the answer. 2023-12-13 15:21:19 -05:00
Claudel-D-Roy
53e0af3f94 PUSHING STUFF INTO THE VOID 2023-12-13 15:18:17 -05:00
Claudel-D-Roy
a11c52cf77 AH BEN TABARNOUCHE 2023-12-13 15:14:38 -05:00
MarcEricMartel
b1fc9d7d92 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:04:10 -05:00
MarcEricMartel
a85c5cc626 🔫 2023-12-13 15:04:08 -05:00
Claudel-D-Roy
4c3803c02e pleurer en animation 2023-12-13 14:46:53 -05:00
MarcEricMartel
5e09305398 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 14:27:18 -05:00
MarcEricMartel
fd1fe66d13 SYNC_ACC CMOD_ACC GLOBALS 2023-12-13 14:27:11 -05:00
Claudel-D-Roy
edebad86a6 Blahblahblah 2023-12-13 14:26:46 -05:00
MarcEricMartel
2dbaf84844 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 14:06:29 -05:00
MarcEricMartel
e31e670720 Yaya 2023-12-13 14:06:22 -05:00
Claudel-D-Roy
d8cbc27ca9 ALLO 2023-12-13 14:06:11 -05:00
Claudel-D-Roy
c801877a0c polipocket 2023-12-13 13:53:10 -05:00
Claudel-D-Roy
f4347d35df secret 2023-12-13 13:51:37 -05:00
MarcEricMartel
f509b01827 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 13:47:41 -05:00
MarcEricMartel
18d6d58203 There's a bullet without my name on it. 2023-12-13 13:47:34 -05:00
Claudel-D-Roy
83fc600ce2 l;kjhgfd 2023-12-13 13:46:57 -05:00
Claudel-D-Roy
0e45b2b81e essaie no. 89657657457 2023-12-13 13:33:44 -05:00
Claudel-D-Roy
d3c6353f17 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 13:18:28 -05:00
Claudel-D-Roy
8fbb92ec5b ghfudk 2023-12-13 13:17:29 -05:00
MarcEricMartel
64655856e9 gniah. 2023-12-13 13:13:34 -05:00
MarcEricMartel
a6b6ac870a Update sync plus vite. 2023-12-13 13:01:52 -05:00
MarcEricMartel
5ef6ab5006 Merge branch 'master' into SQC-15_online 2023-12-13 12:57:41 -05:00
MarcEricMartel
7ffccc8bf8 woups^2 2023-12-13 12:39:24 -05:00
MarcEricMartel
c9ebfd348c woups 2023-12-13 12:38:19 -05:00
Claudel-D-Roy
ae247a58a8 Merge branch 'SQC_MenuMusic' 2023-12-13 12:15:39 -05:00
MarcEricMartel
2f53f74ca9 Erratum 2 2023-12-13 11:21:42 -05:00
MarcEricMartel
3d0b35123a Erratum 2023-12-13 11:11:14 -05:00
MarcEricMartel
aacfb880f0 + son de clic quand on clique. 2023-12-13 10:55:58 -05:00
Jonathan Trottier
6c68114fbb
Merge pull request #39 from CegepSTH/PauseMenuFieldsAndOnline
Beaucoup de belles choses
2023-12-12 19:28:28 -05:00
MarcEricMartel
b840e3ad19 Erratum 2023-12-12 09:31:56 -05:00
MarcEricMartel
7a30e43001 Merge branch 'SQC-15_online' into PauseMenuFieldsAndOnline 2023-12-12 09:31:01 -05:00
mduval76
c099a3b8eb Push menu pause fonctionnel 2023-12-11 21:41:40 -05:00
MarcEricMartel
7498076d7a Corrections timer 2023-12-11 07:31:20 -05:00
MarcEricMartel
7c1f70646a Correction bug de switch de fullscreen 2023-12-11 05:35:29 -05:00
4255830d4f Merge pull request 'SQC-15_online' (#1) from SQC-15_online into master
Reviewed-on: https://git.frereschasseurs.studio/memartel_loc/SQCSimulator2023/pulls/1
2023-12-10 17:41:24 -05:00
MarcEricMartel
5b0be2d985 Gossage de musique 2023-12-09 16:51:43 -05:00
MarcEricMartel
c176fddea1 Update engine.cpp 2023-12-09 16:25:24 -05:00
MarcEricMartel
46298f8256 Oh yeah. 2023-12-09 15:54:06 -05:00
MarcEricMartel
461a8aa11b Merge remote-tracking branch 'origin/InputFields' into SQC_mergeFieldsAndOnline 2023-12-09 15:23:44 -05:00
MarcEricMartel
9aaad6426c 🚫 👂 🐆 2023-12-09 12:02:04 -05:00
mduval76
09979f1e72 Push connexion multiplayer. 2023-12-09 00:00:52 -05:00
mduval76
c88143c2bc Push inputs username et server address fonctionnels. 2023-12-08 23:42:01 -05:00
mduval76
ff10207257 Push backspace fonctionnel 2023-12-08 23:06:33 -05:00
mduval76
06cd890506 Push input rejette touches non valides. 2023-12-08 22:34:17 -05:00
mduval76
850f5a59d8 Push string accumule comme il faut 2023-12-08 22:15:10 -05:00
mduval76
9562dc00b8 Push SimulateKeyboard différencie MAJ et MIN 2023-12-08 21:45:19 -05:00
mduval76
d6b1870b5b Push fake keyboard - Simulatekeyboard 2023-12-08 19:55:59 -05:00
MarcEricMartel
63d70be488 Make player spawn point random working? 2023-12-08 05:07:05 -05:00
MarcEricMartel
3da68297e4 Cleanup + client. 2023-12-08 04:58:27 -05:00
MarcEricMartel
34976ef7ec /* delete[] mess */ Well there's your mem leak. 2023-12-08 04:55:00 -05:00
MarcEricMartel
7d46536acc Can now clean bullets off the forest. 2023-12-08 04:31:10 -05:00
mduval76
721fef57e2 Push lobby labels. 2023-12-07 16:31:43 -05:00
MarcEricMartel
7e98eeb852 whyyyyyyyyy 2023-12-07 15:47:31 -05:00
MarcEricMartel
db95c6ef10 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 15:14:24 -05:00
MarcEricMartel
486c823da1 OH 2023-12-07 15:14:16 -05:00
Claudel-D-Roy
fcd1c869b9 Enlever les commentaires 2023-12-07 15:13:45 -05:00
MarcEricMartel
8bfee4a9ff :Q 2023-12-07 14:24:09 -05:00
Claudel-D-Roy
58c97587bf Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 14:04:38 -05:00
Claudel-D-Roy
d1f02c34e9 FaCkInG HeLL 2023-12-07 14:04:31 -05:00
MarcEricMartel
ab87da7d88 Ehm. 2023-12-07 14:03:58 -05:00
mduval76
c66e49ab0c Push de quoi 2023-12-07 13:55:44 -05:00
MarcEricMartel
33bcdea06f IT'S LEAKING! 2023-12-07 13:34:58 -05:00
MarcEricMartel
4d44d57a5a Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 13:06:00 -05:00
MarcEricMartel
f6c5379a8c °Oo. 2023-12-07 13:05:52 -05:00
Claudel-D-Roy
bc865dd9b5 Bacon ‼️ 2023-12-07 13:05:21 -05:00
MarcEricMartel
5696e20452 Gériboire! 2023-12-07 12:51:17 -05:00
MarcEricMartel
4e0a9cea35 Crosby, Still, Jump and Shoot 2023-12-07 12:48:48 -05:00
MarcEricMartel
f0afdf828e Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:43:49 -05:00
MarcEricMartel
11458214d0 Update connection.cpp 2023-12-07 12:43:40 -05:00
Claudel-D-Roy
1905c31923 Push && Pull 2023-12-07 12:43:16 -05:00
MarcEricMartel
99a5054c8f Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:32:45 -05:00
MarcEricMartel
74b808f46b Jump and Shoot! 🎶 2023-12-07 12:32:36 -05:00
Claudel-D-Roy
0a08a22c60 Jump && shoot 2023-12-07 12:31:04 -05:00
Claudel-D-Roy
4e287702c3 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:22:58 -05:00
Claudel-D-Roy
3e8497f43b 💫 2023-12-07 12:22:49 -05:00
MarcEricMartel
e9e2a56be6 OOPS I DID IT AGAIN. I PLAYED WITH THE CODE, GOT LOST IN THE MORT. 2023-12-07 12:21:21 -05:00
MarcEricMartel
b7b6a8cc7b I hurt myself today ... because of the serveur. 2023-12-07 12:15:57 -05:00
MarcEricMartel
948597361f Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:10:56 -05:00
MarcEricMartel
76256115d1 Oh là là. 2023-12-07 12:10:47 -05:00
Claudel-D-Roy
1d48242147 Update remoteplayer.cpp 2023-12-07 12:10:17 -05:00
Claudel-D-Roy
18f08feb68 2023-12-06 17:02:36 -05:00
Claudel-D-Roy
57bfacf942 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:49:34 -05:00
Claudel-D-Roy
51bd6440f0 JUMPSHOOT 2023-12-06 16:49:26 -05:00
MarcEricMartel
c8c82770b7 Mr. Clean? 2023-12-06 16:48:53 -05:00
MarcEricMartel
84249ef84c YÉ TÔRD 2023-12-06 16:42:09 -05:00
MarcEricMartel
cb0dad3e31 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:36:29 -05:00
MarcEricMartel
e8a475419f 2112 by PUSH. 2023-12-06 16:36:21 -05:00
Claudel-D-Roy
9eac62c44a 🚷 2023-12-06 16:35:39 -05:00
MarcEricMartel
481b5a284c skibidi 🚽 2023-12-06 16:23:09 -05:00
Claudel-D-Roy
d80281231b 🚽 2023-12-06 16:22:05 -05:00
Claudel-D-Roy
8eb2de4cd9 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:21:06 -05:00
MarcEricMartel
d1805f2309 Pleurer en chat. 2023-12-06 16:20:59 -05:00
Claudel-D-Roy
89fafb100e Pleurer en animation 2023-12-06 16:20:52 -05:00
MarcEricMartel
449e12ca5a GOT THE TIME TICK TICK TICKIN' IN MY HEAD 2023-12-06 16:01:29 -05:00
MarcEricMartel
9924c12ccd Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 15:52:08 -05:00
MarcEricMartel
0fb5c85660 Everything is false. 2023-12-06 15:52:00 -05:00
Claudel-D-Roy
bf0306f018 👊 2023-12-06 15:51:55 -05:00
MarcEricMartel
db854c77b2 👌 2023-12-06 15:47:14 -05:00
MarcEricMartel
7077b617be Rollover Beethoven 2023-12-06 15:37:08 -05:00
MarcEricMartel
6178604d95 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 14:49:45 -05:00
MarcEricMartel
a60156bf2c badaboum 2023-12-06 14:49:36 -05:00
Claudel-D-Roy
2596a35af4 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 14:31:13 -05:00
MarcEricMartel
242250f251 Oh oh oh oh oh!!! 2023-12-06 14:31:05 -05:00
Claudel-D-Roy
a79bf0d1eb 🚍 2023-12-06 14:31:04 -05:00
MarcEricMartel
42ea83d73e Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 13:50:00 -05:00
MarcEricMartel
59d3060444 eh? 2023-12-06 13:49:59 -05:00
Claudel-D-Roy
dc61488809 cout out 2023-12-06 13:49:11 -05:00
MarcEricMartel
58a1f5437a Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 13:46:50 -05:00
MarcEricMartel
f835853605 Chamone 2023-12-06 13:46:43 -05:00
Claudel-D-Roy
3760e140ae HiiIIIiiiIiI 2023-12-06 13:46:24 -05:00
MarcEricMartel
64b40023aa Ah ben lol. 2023-12-06 13:43:33 -05:00
MarcEricMartel
c47b36726b :> 2023-12-06 13:42:15 -05:00
MarcEricMartel
1762043757 Bonne idée. 2023-12-06 13:23:33 -05:00
mduval76
63d8a62429 Push tin toé 2023-12-06 13:14:51 -05:00
MarcEricMartel
3b0f9650d4 What a big mess. 2023-12-06 12:32:26 -05:00
MarcEricMartel
adf36c8905 Whooooooooo are you? 2023-12-06 12:25:34 -05:00
MarcEricMartel
f29abe8046 Merge branch 'master' into SQC-15_online 2023-12-06 12:18:01 -05:00
MarcEricMartel
988b2c330c Before the merge.... 2023-12-06 12:17:47 -05:00
MarcEricMartel
4841e8d5ba Make Debug Great Again 2023-12-06 12:08:44 -05:00
MarcEricMartel
6c7369a8be Merge branch 'RUNNINGREALLYFAST' into SQC-15_online 2023-12-06 11:19:02 -05:00
MarcEricMartel
c975265901 Timer iznogoud. 2023-12-06 11:16:39 -05:00
Claudel-D-Roy
7a7dc1fad6 DomoAriGato 2023-12-06 11:16:30 -05:00
Claudel-D-Roy
0856f913d2 yay 2023-12-06 10:48:04 -05:00
MarcEricMartel
9c1cd885cf Tehe. 2023-12-05 15:02:31 -05:00
MarcEricMartel
b11a484a5a 😎 2023-12-05 14:25:21 -05:00
MarcEricMartel
464ba131c4 Corrections merge de master
hell.
2023-12-05 13:44:54 -05:00
MarcEricMartel
4775de01d8 Merge branch 'master' into SQC-15_online 2023-12-05 06:34:51 -05:00
MarcEricMartel
e8a0f7e4fb
Merge pull request #38 from CegepSTH/Améloration_Gen_Monde
Améloration gen monde
2023-12-05 06:29:41 -05:00
MarcEricMartel
2446b90bff bulletadd 2023-12-05 06:25:48 -05:00
Claudel-D-Roy
16e9f6aefe GG le push 2023-12-04 19:05:36 -05:00
Rynort
d9152a721c Création de la dock 2023-12-04 17:41:05 -05:00
Louis-CharlesG
2c73a2ed00 Correction des arbres. 2023-12-04 17:17:15 -05:00
Claudel-D-Roy
e98bd03192 GG EN ROTATION 2023-12-04 17:02:15 -05:00
Claudel-D-Roy
e6e93ef6d0 YAY 2023-12-04 16:45:46 -05:00
Louis-CharlesG
d444b4de30 Re-Changement des textures. 2023-12-04 16:17:59 -05:00
Louis-CharlesG
bb100fd5cb ajustement texture. 2023-12-04 16:12:02 -05:00
Louis-CharlesG
a137666546 Merge branch 'master' into Améloration_Gen_Monde 2023-12-04 15:44:22 -05:00
Louis-CharlesG
841947bc7a Changment pour lac/arbre 2023-12-04 15:05:27 -05:00
MarcEricMartel
bc5c28a373
Merge pull request #34 from CegepSTH/MenusMenusMenus
Menus menus menus
2023-12-04 13:25:55 -05:00
MarcEricMartel
754130ec39
Merge pull request #36 from CegepSTH/revert-35-SQC-15_paquets
Revert "IGNORE THIS"
2023-12-04 13:16:03 -05:00
MarcEricMartel
8569e17c93
Revert "IGNORE THIS" 2023-12-04 13:14:54 -05:00
MarcEricMartel
c5700ae9fd
Merge pull request #35 from CegepSTH/SQC-15_paquets
IGNORE THIS
2023-12-04 13:14:33 -05:00
MarcEricMartel
78b3ed85cb
Merge branch 'MenusMenusMenus' into SQC-15_paquets 2023-12-04 13:13:54 -05:00
mduval76
4b6c641c97 Push replacer Render 2023-12-04 13:02:28 -05:00
MarcEricMartel
9ed8ef3273 Moar random? 2023-12-03 11:14:08 -05:00
mduval76
8b448f5072 Push pre-gamestate Pause 2023-12-03 00:47:04 -05:00
mduval76
a67499049b Push gros paquets de menus. Nouvelle hierarchie Clean up de larborescence des textures pour elements des menus. 2023-12-03 00:15:18 -05:00
Claudel-D-Roy
df0a142b12 ishhh 2023-12-02 15:19:46 -05:00
MarcEricMartel
0af76b3f2e
Merge pull request #33 from CegepSTH/SQC32_sauveParams
Sqc32 sauve params
2023-12-02 15:09:14 -05:00
MarcEricMartel
b2c73c930e
Merge pull request #32 from CegepSTH/SQC-35_nouvelles_structures
Sqc 35 nouvelles structures
2023-12-02 14:59:21 -05:00
MarcEricMartel
4aa0aedd61 Update connector.cpp 2023-12-02 14:52:25 -05:00
MarcEricMartel
e52dbd3705 Merge branch 'master' into SQC-15_paquets 2023-12-02 14:05:41 -05:00
MarcEricMartel
5a491c5446 omg 💣 2023-12-02 11:05:00 -05:00
MarcEricMartel
20eb410b08 Hahaha il manquait les ChunkMods dans netprot :finnadie: 2023-12-02 10:04:18 -05:00
MarcEricMartel
c44d1453ae Oh wow 2023-12-02 09:23:26 -05:00
MarcEricMartel
37ea09aaf3 Merge branch 'SQC-15_paquets' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_paquets 2023-12-02 09:06:54 -05:00
MarcEricMartel
62b7719eb4 Erratas! 2023-12-02 09:06:41 -05:00
mduval76
3842ca3485 Push bouton pour retourner au menu principal. Makeover des anciens boutons. 2023-12-01 20:26:52 -05:00
mduval76
98390c878f Push pourcentage dynamique pour sliders menu options 2023-12-01 19:20:55 -05:00
mduval76
def1ab284e Push sliders fonctionnels (x4) 2023-12-01 17:55:25 -05:00
mduval76
90e736a14c push ajouts des barres pour "sliders" 2023-12-01 15:46:08 -05:00
mduval76
ac3628ec0b Push zones cliquables sliders et checks 2023-12-01 14:37:12 -05:00
mduval76
3e3a7650e8 Push options Volume et Resolution de base 2023-12-01 13:48:48 -05:00
mduval76
28082a018d Push menu options de base 2023-12-01 09:49:00 -05:00
681ac61a74 ajouts dans les cmakelists pour leenuqs 2023-11-29 19:02:16 -05:00
38cfa95297 ajouts dans les cmakelists pour leenuqs 2023-11-29 18:59:58 -05:00
34ad4724f2 Tibug + Linux 2023-11-28 19:19:24 -05:00
MarcEricMartel
12ef911e79 Delete the world... delete the children... 2023-11-28 11:53:21 -05:00
MarcEricMartel
5c346c48e6 🏥 2023-11-28 11:38:38 -05:00
MarcEricMartel
e89b5914fb Sync ees almöss de voork! 2023-11-27 17:44:52 -05:00
mduval76
15882dc506 Merge branch 'master' into SQC32_sauveParams 2023-11-27 17:14:53 -05:00
mduval76
6db90a3a16 Push reajustements apres merge 31 2023-11-27 17:07:51 -05:00
mduval76
b23b2c6838
Merge pull request #31 from CegepSTH/SQC-31
Sqc 31 smerge
2023-11-27 16:55:31 -05:00
mduval76
a26929fe66
Merge branch 'master' into SQC-31 2023-11-27 16:54:58 -05:00
Louis-CharlesG
e3b59e37eb Les arbres avec le seed. 2023-11-27 16:47:10 -05:00
MarcEricMartel
10b8d77734 ehm 2023-11-27 16:43:18 -05:00
MarcEricMartel
e8ca08ecab Superman + Alfred 2023-11-27 16:12:12 -05:00
mduval76
4a9ad70d48 Push changement pour Parametres -> Settings 2023-11-27 16:03:06 -05:00
Jonathan Trottier
e330f5dd67 Merge branch 'master' into SQC-35_nouvelles_structures 2023-11-27 15:58:34 -05:00
Jonathan Trottier
2f5579875e little modif 2023-11-27 15:57:31 -05:00
Jonathan Trottier
114c1631a8 randomness no more random 2023-11-27 15:56:47 -05:00
MarcEricMartel
cfc7f7e01d Ça s'ra pas long. 2023-11-27 15:15:21 -05:00
MarcEricMartel
0b5c30b693 123457 💯 2023-11-27 15:03:53 -05:00
MarcEricMartel
f9c3571ab2 1080p 2023-11-27 14:56:43 -05:00
MarcEricMartel
2a7fe7e806 LA CLAN PANNETON POUR DÉMÉNAGER FAUT SIGNALER LE (/&)&)&! 2023-11-27 14:53:23 -05:00
MarcEricMartel
8ea5af6ef9 16 tons. 2023-11-27 14:48:18 -05:00
MarcEricMartel
841b0176f6 HAHAHAHA HEY! MOSKAU MOSKAU BADDABADBADBABDBAD 2023-11-27 14:42:56 -05:00
MarcEricMartel
702a65c5b0 EEEEEEEH BO DEREK, EH 2023-11-27 14:24:11 -05:00
MarcEricMartel
b6d5975648 I know what boys like. 2023-11-27 13:52:49 -05:00
MarcEricMartel
6e556b4f84 IDBENOGOOD 2023-11-27 13:29:59 -05:00
MarcEricMartel
e6b3f2fb1c UDP to the rescue 2023-11-27 13:21:50 -05:00
MarcEricMartel
5e57a13820 Fuck around and find out 2023-11-27 13:15:39 -05:00
MarcEricMartel
9a7d25c1d9 EH LALA. 2023-11-27 13:11:24 -05:00
MarcEricMartel
c24123362a ah. 2023-11-27 12:42:46 -05:00
MarcEricMartel
6c0d65ea22 Info. 2023-11-27 12:39:36 -05:00
Rynort
9bb8b1c9e5 Ajout de la page Option
Pas de bouton encore
2023-11-27 02:57:22 -05:00
MarcEricMartel
35a5ddd9bd static_cast? 2023-11-26 12:40:08 -05:00
MarcEricMartel
85ab712032 Summary (required) 2023-11-26 12:31:17 -05:00
MarcEricMartel
0f1a864282 🎶 If you want to destroy my renderrrrrrrrrr... 2023-11-26 12:23:17 -05:00
MarcEricMartel
0200f77be8 Johnny B. NoGood! 🎶 2023-11-26 12:19:05 -05:00
MarcEricMartel
935216e9c3 Ça plane pour pasmoi. 2023-11-26 12:12:09 -05:00
mduval76
1ab83a85a7 Transfert classe Paramteres de common à SQCSim 2021 2023-11-25 14:05:47 -05:00
mduval76
2ab201e93c Validation changements indexes. Fusion main vers sauveparams 2023-11-25 13:59:51 -05:00
MarcEricMartel
ea3d2ffc34 2023-11-24 15:56:58 -05:00
MarcEricMartel
775c8cf26f 440hz 2023-11-24 15:32:53 -05:00
MarcEricMartel
0c1714dd14 INXS 2023-11-24 15:25:40 -05:00
MarcEricMartel
981d66c730 M*SYNCs 2023-11-24 15:24:46 -05:00
MarcEricMartel
bd3f677118 PATATE PLAY 2023-11-24 15:11:16 -05:00
MarcEricMartel
35c55f2e26 -__- 2023-11-24 15:01:32 -05:00
MarcEricMartel
9bf5188e0f 5 2023-11-24 14:54:38 -05:00
MarcEricMartel
e8d456cc09 -danse de la pluie- 2023-11-24 14:36:55 -05:00
MarcEricMartel
3043b1ff6b débébitter 2023-11-24 14:33:48 -05:00
MarcEricMartel
7ccecdfd4a if notaire break. 2023-11-24 14:27:11 -05:00
MarcEricMartel
6f13e8fb70 🔡 2023-11-24 14:22:05 -05:00
MarcEricMartel
d1c3d17055 ayoye bobo 2023-11-24 14:18:37 -05:00
MarcEricMartel
573316682b Jim Babwe 2023-11-24 14:15:40 -05:00
MarcEricMartel
bd14cd3962 Cleanup II 2023-11-24 13:47:47 -05:00
MarcEricMartel
480521ebaf Cleanup 2023-11-24 13:47:24 -05:00
MarcEricMartel
312542857a united states of remoteplayer 2023-11-24 13:46:16 -05:00
MarcEricMartel
c1aa321f2b 💩 2023-11-24 13:42:53 -05:00
MarcEricMartel
d7bd36d134 DE 🐛 2023-11-24 13:05:17 -05:00
MarcEricMartel
ce2d03c354 Render other players 2023-11-24 12:58:06 -05:00
MarcEricMartel
2e30995f1b Merge branch 'SQC-15_animation' into SQC-15_paquets 2023-11-24 12:46:04 -05:00
Claudel-D-Roy
9572a7d6fd push des textures Atlas des animations 2023-11-24 12:45:17 -05:00
MarcEricMartel
f22c405915 Erratum. 2023-11-24 12:43:09 -05:00
MarcEricMartel
bc7127ef7d Eh baswell 2023-11-24 12:41:20 -05:00
MarcEricMartel
06a5bb67d3 :clock: côté client 2023-11-24 12:36:01 -05:00
Rynort
83e438583f Avancement Page Option 2023-11-20 17:34:39 -05:00
Rynort
75a32270b5 mini-push 2023-11-20 15:45:08 -05:00
Louis-CharlesG
732f74de91 Changement dans le chunk a ajout des arbes avec le seed. 2023-11-20 15:39:11 -05:00
mduval76
8e041a314d Push premiere esquisse des parametres de sauvegarde 2023-11-16 23:39:44 -05:00
mduval76
6bb3ee9667 push changement de location 2023-11-16 20:47:20 -05:00
mduval76
f654c5effa Push initial pour sauvegarde des paramètres 2023-11-16 18:01:00 -05:00
Rynort
3ca941f0ce Update engine.cpp 2023-11-13 17:20:33 -05:00
Rynort
4c695fbe47 mini changement 2023-11-13 15:42:04 -05:00
84 changed files with 4174 additions and 1559 deletions

View File

@ -131,6 +131,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="booster.h" />
<ClInclude Include="array2d.h" />
<ClInclude Include="array3d.h" />
<ClInclude Include="blockinfo.h" />
@ -147,6 +148,7 @@
<ClInclude Include="world.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="booster.cpp" />
<ClCompile Include="blockinfo.cpp" />
<ClCompile Include="boostinfo.cpp" />
<ClCompile Include="bullet.cpp" />

View File

@ -54,6 +54,9 @@
<ClInclude Include="transformation.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="booster.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="boostinfo.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
@ -83,6 +86,9 @@
<ClCompile Include="transformation.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="booster.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="boostinfo.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>

39
SQCSim-common/booster.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "booster.h"
Booster::Booster()
{
}
Booster::Booster(Vector3f tpos, BOOST_TYPE ttype, uint64_t id): m_id(id), pos(tpos), type(ttype){}
Booster::~Booster()
{
}
Vector3f Booster::GetPosition()
{
return pos;
}
BOOST_TYPE Booster::GetType()
{
return type;
}
uint64_t Booster::GetId() const
{
return m_id;
}
bool Booster::GetAvailability()
{
return available;
}
void Booster::SetAvailability(bool value)
{
available = value;
modified = true;
}

23
SQCSim-common/booster.h Normal file
View File

@ -0,0 +1,23 @@
#ifndef BOOSTER_H__
#define BOOSTER_H__
#include "define.h"
#include "vector3.h"
class Booster {
public:
Booster();
Booster(Vector3f tpos, BOOST_TYPE ttype, uint64_t id);
~Booster();
Vector3f GetPosition();
BOOST_TYPE GetType();
uint64_t GetId() const;
bool GetAvailability();
void SetAvailability(bool value);
bool modified = true;
private:
Vector3f pos;
BOOST_TYPE type;
uint64_t m_id;
bool available = true;
};
#endif

View File

@ -3,19 +3,45 @@
Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {}
Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_tid(tid) {}
Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t shooter_id) : m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_shooter_id(shooter_id) {}
Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t shooter_id, bool canhurt): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_shooter_id(shooter_id), m_canhurt(canhurt) {}
Bullet::~Bullet() {}
bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer) {
bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer, netprot::ChunkMod** chunkmod) {
int max = 100 / perframe;
float damage = 0.057f;
Player* shooter = nullptr;
float damage = 0.098f;
if (mapPlayer.count(m_shooter_id)) {
shooter = mapPlayer.at(m_shooter_id);
damage = shooter->boostdamage ? 0.123f : 0.098f;
}
for (int x = 0; x < max; ++x) {
m_currentpos += m_velocity * elapsedtime;
for (auto& [key, player] : mapPlayer) {
if ((m_currentpos - player->GetPosition()).Length() < .4f) {
player->InflictDamage(damage);
if (key == m_shooter_id)
continue;
bool hit = false;
if ((m_currentpos - player->GetPosition()).Length() < 1.5f) {
hit = true;
}
else if ((m_currentpos - player->GetPOV()).Length() < .7f) {
damage *= 2; // HEADSHOT!
hit = true;
}
if (hit && !player->AmIDead()) {
if (m_canhurt && !player->boostinvincible)
player->InflictDamage(damage);
player->m_hit = true;
if (player->AmIDead())
player->Killer = m_shooter_id;
return true;
}
}
@ -23,7 +49,17 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordere
if (!world->ChunkAt(m_currentpos))
return true;
else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
if (m_canhurt) {
if (chunkmod) {
using namespace netprot;
*chunkmod = new ChunkMod();
(*chunkmod)->old_b_type = world->BlockAt(m_currentpos);
(*chunkmod)->b_type = BTYPE_AIR;
(*chunkmod)->pos = m_currentpos;
}
world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
}
return true;
}
else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
@ -47,6 +83,6 @@ Vector3f Bullet::getVel() const {
return m_velocity;
}
uint64_t Bullet::getTeamID(){
return m_tid;
}
//uint64_t Bullet::getTeamID(){
// return m_tid;
//}

View File

@ -5,7 +5,7 @@
#include "define.h"
#include "vector3.h"
#include "player.h"
#include "netprotocol.h"
class World;
class Player;
@ -14,19 +14,22 @@ class Bullet {
public:
Bullet(Vector3f pos, Vector3f dir);
Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
Bullet(Vector3f pos, Vector3f dir, uint64_t tid, bool canhurt);
~Bullet();
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer);
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer, netprot::ChunkMod** chunkmod);
void Transpose(int& x, int& z);
Vector3f getPos() const;
Vector3f getVel() const;
uint64_t getTeamID();
//uint64_t getTeamID();
private:
Vector3f m_startpos,
m_currentpos,
m_velocity;
uint64_t m_tid = 0;
uint64_t m_shooter_id = 0;
bool m_canhurt = true;
};

View File

@ -1,54 +1,86 @@
#include "chunk.h"
#include "world.h"
#include <random>
Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y) {
//std::ostringstream pos; // Vérifie l'existence d'un fichier .chunk avec sa position.
//std::ostringstream pos; // V<EFBFBD>rifie l'existence d'un fichier .chunk avec sa position.
//pos << CHUNK_PATH << x << '_' << y << ".chunk";
//std::ifstream input(pos.str(), std::fstream::binary);
//if (input.fail()) {
OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
int ratio = 0;
ratio = x * y % 7;
m_blocks.Reset(BTYPE_AIR);
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes
#pragma region Montagnes et Grass des montagnes
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
float xnoiz, ynoiz;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4096.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4096.;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4796.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4796.;
double height = 0;
for (int x = 0; x < 39; ++x) {
height += simplex.eval(xnoiz, ynoiz);
height *= .79;
xnoiz *= 1.139;
ynoiz *= 1.139;
xnoiz *= 1.1305;
ynoiz *= 1.1305;
}
height = height * 2000. * simplex.eval((double)(ix + x * CHUNK_SIZE_X) / 512., (double)(iz + y * CHUNK_SIZE_Z) / 512.);
height /= (CHUNK_SIZE_Y / 1.9);
height += 15.;
for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy)
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
float xnoiz, ynoiz;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
SetBlock(ix, iy, iz, BTYPE_GREENGRASS, nullptr);
if (iy < 20)
{
//std::cout << "" << ynoiz << std::endl;
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else if (iy == 20 || iy == 21) {
double fractionalPart = ynoiz - static_cast<int>(ynoiz);
if (iy == 20) {
if (fractionalPart < 0.3) {
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else {
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
else if (iy == 21) {
if (fractionalPart < 0.6) {
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else {
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
}
else
{
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
}
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Lacs"
#pragma endregion
#pragma region Lacs
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
for (int iy = 0; iy < 13; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
if (iy < 5 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
}
else if (iy >= 5 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
}
}
}
#pragma endregion
int rnd = rand() % 15;
if (rnd == 4)
//int rnd = rand() % 15;
if (ratio == 1)
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
for (int iy = 0; iy < 14; ++iy) {
@ -57,16 +89,16 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
Structure(ix, iy, iz, 2);
}
}
if (rnd == 3)
if (ratio == 3)
for (int ix = 0; ix < CHUNK_SIZE_Z; ++ix) // structure
for (int iz = 0; iz < CHUNK_SIZE_X; ++iz) {
for (int iy = 0; iy < 14; ++iy) {
if (iz == 4)
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
Structure(ix, iy, iz, 2);
Structure(ix, iy, iz, 1);
}
}
if (rnd == 6)
if (ratio == 5)
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
for (int iy = 0; iy < 14; ++iy) {
@ -77,38 +109,146 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
}
//for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Arbres"
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
// float xnoiz, ynoiz;
// xnoiz = (double)(iz * CHUNK_SIZE_Y + x * CHUNK_SIZE_X) / 256.;
// ynoiz = (double)(ix * CHUNK_SIZE_Y + y * CHUNK_SIZE_Z) / 256.;
// bool tree = (int)(abs(simplex.eval(xnoiz, ynoiz)) * 17933.f) % CHUNK_SIZE_Y > 126 ? true : false;
// for (int iy = 0; iy < CHUNK_SIZE_Y - 10; ++iy)
// if (GetBlock(ix, iy, iz) == BTYPE_AIR)
// if (GetBlock(ix, iy - 1, iz) == BTYPE_GRASS)
// if (tree) {
// for (int i = 0; i < (int)(abs(simplex.eval(xnoiz, ynoiz) * 4)) % 42 + 1; ++i)
// SetBlock(ix, iy + i, iz, BTYPE_DIRT, nullptr);
// break;
// }
// }
/* }
else {
input.seekg(0, std::ios_base::end);
int size = input.tellg();
input.seekg(0, std::ios_base::beg);
char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z];
input.read(data, size);
input.close();
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz)
for (int iy = 0; iy < CHUNK_SIZE_Y; ++iy)
m_blocks.Set(ix, iy, iz, data[ix + (iz * CHUNK_SIZE_X) + (iy * CHUNK_SIZE_Z * CHUNK_SIZE_X)]);
}*/
#pragma region Arbre
double valeurRnd = 0;
int treeheight = 10;
int lastTreeX = -1;
int lastTreeZ = -1;
int minDistanceBetweenTrees = 10; // Définir la distance minimale entre les arbres
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) {
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
if (GetBlock(ix, 0, iz) != BTYPE_ICE) {
float xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4796.;
float ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4796.;
double height = 0;
for (int i = 0; i < 39; ++i) {
height += simplex.eval(xnoiz, ynoiz);
height *= .79;
xnoiz *= 1.1305;
ynoiz *= 1.1305;
}
height = height * 2000. * simplex.eval((double)(ix + x * CHUNK_SIZE_X) / 512., (double)(iz + y * CHUNK_SIZE_Z) / 512.);
height /= (CHUNK_SIZE_Y / 1.9);
height += 15.;
if (GetBlock(ix, (int)height, iz) == BTYPE_GRASS || (GetBlock(ix, (int)height, iz) == BTYPE_METAL)) {
valeurRnd = simplex.eval(xnoiz, ynoiz);
int distanceThreshold = 20;
// Vérifie si l'emplacement n'est pas à l'intérieur des lacs
bool isInsideLake = false;
for (int iy = 0; iy < 13; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_ICE) {
isInsideLake = true;
break;
}
}
if (!isInsideLake && ((valeurRnd > -0.4 && valeurRnd < -0.38) || (valeurRnd > -0.35 && valeurRnd < -0.31)
|| (valeurRnd > 0.3 && valeurRnd < 0.32) || (valeurRnd > 0.37 && valeurRnd < 0.39))
) {
if (lastTreeX == -1 || abs(ix - lastTreeX) > minDistanceBetweenTrees || abs(iz - lastTreeZ) > minDistanceBetweenTrees) {
if (valeurRnd < 0.1)
treeheight = 10;
else {
treeheight = valeurRnd * 20;
if (treeheight < 5)
treeheight = 5;
}
PlaceTree(ix, height, iz, treeheight);
lastTreeX = ix;
lastTreeZ = iz;
}
}
}
}
}
}
#pragma endregion
//else {
// input.seekg(0, std::ios_base::end);
// int size = input.tellg();
// input.seekg(0, std::ios_base::beg);
// char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z];
// input.read(data, size);
// input.close();
// for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz)
// for (int iy = 0; iy < CHUNK_SIZE_Y; ++iy)
// m_blocks.Set(ix, iy, iz, data[ix + (iz * CHUNK_SIZE_X) + (iy * CHUNK_SIZE_Z * CHUNK_SIZE_X)]);
//}*/
//for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
// float xnoiz, ynoiz;
// xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
// ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
// float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
// for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
// if (iy < 10 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
// SetBlock(ix, iy, iz, BTYPE_METAL, nullptr); // Collines
// }
// else if (iy >= 10 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
// SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr); // Grass des collines
// }
// }
// }
}
void Chunk::PlaceTree(int x, int y, int z, int height) {
// Vérifie si les coordonnées x, y, z sont dans les limites du chunk
if (x < 0 || x >= CHUNK_SIZE_X || y < 0 || y >= CHUNK_SIZE_Y || z < 0 || z >= CHUNK_SIZE_Z) {
// Coordonnées hors limites du chunk, sortie anticipée pour éviter tout accès non valide
return;
}
// Place la tige de l'arbre
for (int iy = 0; iy < height + 1; ++iy) {
if (y + iy < CHUNK_SIZE_Y) { // Vérifie si la hauteur est à l'intérieur des limites du chunk
SetBlock(x, y + iy, z, BTYPE_DIRT, nullptr);
}
}
// Place les feuilles de l'arbre
int foliageHeight = height / 2;
for (int dy = 0; dy < foliageHeight; ++dy) {
for (int dx = -4; dx <= 4; ++dx) {
for (int dz = -4; dz <= 4; ++dz) {
// Vérifie que les coordonnées se trouvent à l'intérieur des limites du chunk
if (x + dx >= 0 && x + dx < CHUNK_SIZE_X && y + height + dy >= 0 && y + height + dy < CHUNK_SIZE_Y &&
z + dz >= 0 && z + dz < CHUNK_SIZE_Z) {
// Vérifie si le bloc est à une distance acceptable du centre des feuilles pour les placer
double distanceSquared = dx * dx + dy * dy + dz * dz;
if (distanceSquared < 20) {
SetBlock(x + dx, y + height + dy, z + dz, BTYPE_GREENGRASS, nullptr);
}
}
}
}
}
}
Chunk::~Chunk() {
/*if (m_isModified) {
char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z];
@ -135,7 +275,7 @@ void Chunk::RemoveBlock(int x, int y, int z, World* world) {
void Chunk::SetBlock(int x, int y, int z, BlockType type, World* world) {
m_blocks.Set(x, y, z, type);
if (world) CheckNeighbors(x, z, world); // Si nullptr, ne pas vérifier les chunks voisines.
if (world) CheckNeighbors(x, z, world); // Si nullptr, ne pas v<EFBFBD>rifier les chunks voisines.
m_isDirty = true;
}
@ -163,6 +303,10 @@ void Chunk::CheckNeighbors(unsigned int x, unsigned int z, World* world) {
void Chunk::GetPosition(unsigned int& x, unsigned int& y) const { x = m_posX; y = m_posY; }
bool Chunk::IsDirty() const { return m_isDirty; }
void Chunk::MakeDirty() { m_isDirty = true; }
@ -174,28 +318,8 @@ void Chunk::MakeModified() { m_isModified = true; }
void Chunk::Structure(int x, int y, int z,int height)
{
for (int i = 0; i < height; i++)
{
SetBlock(x, i + y, z, BTYPE_GRASS, nullptr);
}
}

View File

@ -27,6 +27,7 @@ class Chunk {
BlockType GetBlock(int x, int y, int z);
void CheckNeighbors(unsigned int x, unsigned int z, World* world);
void GetPosition(unsigned int& x, unsigned int& y) const;
void PlaceTree(int x, int y, int z, int height);
void Structure(int x, int y, int z, int height);
bool IsDirty() const;

View File

@ -31,24 +31,32 @@
#define TEXTURE_SIZE 512
#define MAX_BULLETS 512
#define NB_BOOST 2
#define TIME_SPEED_BOOST 10 //secondes
#define TIME_DAMAGE_BOOST 10 //secondes
#define TIME_INVINCIBLE_BOOST 4 //secondes
#define STRENGTH_SPEED_BOOST 10 //Pourcentage
#define BULLET_TIME .1
#define STRENGTH_SPEED_BOOST 1000 //Pourcentage
#define BULLET_TIME .2 //secondes
#define SYNC_ACC 600 // ms
#define CMOD_ACC 1000 // ms
typedef uint8_t BlockType;
enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_GREENGRASS, BTYPE_LAST };
typedef uint8_t BoostType;
enum BOOST_TYPE { BTYPE_SPEED, BTYPE_HEAL, BTYPE_DAMAGE, BTYPE_INVINCIBLE, BTYPE_BOOST_LAST };
//anim
enum ANIM_TYPE { STILL = 0, SHOOTING = 8, JUMPING = 16, JUMPINGSHOOTING = 24, DEAD = 32, TYPE_LAST = 40};
enum ANIM_POS {FRONT, QUARTER_FRONT_LEFT, QUATER_FRONT_RIGHT, PROFIL_LEFT, PROFIL_RIGHT, QUARTER_BACK_LEFT, QUARTER_BACK_RIGHT, BACK , POS_LAST};
typedef uint64_t Timestamp;
#ifdef _WIN32
#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
#pragma comment(lib,"ws2_32.lib")
#include <ws2tcpip.h>
#include <Windows.h>
#include <cstdio>
@ -73,6 +81,7 @@ typedef uint64_t Timestamp;
#include <arpa/inet.h>
#include <netinet/in.h>
#include <cstring>
#include <poll.h>
#define flag_t unsigned int
#define addrlen_t unsigned int

View File

@ -29,13 +29,13 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
Keys keys = in->keys;
uint8_t keys8 = // Reste un bit.
keys.forward & 0b10000000 |
keys.backward & 0b01000000 |
keys.left & 0b00100000 |
keys.right & 0b00010000 |
keys.jump & 0b00001000 |
keys.shoot & 0b00000100 |
keys.block & 0b00000010;
(keys.forward ? 0b10000000 : 0) |
(keys.backward ? 0b01000000 : 0) |
(keys.left ? 0b00100000 : 0) |
(keys.right ? 0b00010000 : 0) |
(keys.jump ? 0b00001000 : 0) |
(keys.shoot ? 0b00000100 : 0) |
(keys.block ? 0b00000010 : 0);
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
@ -90,14 +90,14 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
States states = out->states;
uint8_t states8 =
states.jumping & 0b10000000 |
states.shooting & 0b01000000 |
states.hit & 0b00100000 |
states.powerup & 0b00010000 |
states.dead & 0b00001000 |
states.still & 0b00000100 |
states.jumpshot & 0b00000010 |
states.running & 0b00000001;
(states.jumping ? 0b10000000 : 0) |
(states.shooting ? 0b01000000 : 0) |
(states.hit ? 0b00100000 : 0) |
(states.powerup ? 0b00010000 : 0) |
(states.dead ? 0b00001000 : 0) |
(states.still ? 0b00000100 : 0) |
(states.jumpshot ? 0b00000010 : 0) |
(states.running ? 0b00000001 : 0);
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
@ -181,8 +181,6 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + 1, ammo8, sizeof(uint16_t));
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, &sync->hp, sizeof(uint8_t));
uint32_t vec[3];
memcpy(vec, &sync->position, sizeof(Vector3f)); // Pour d<>naturer les floats.
@ -200,9 +198,28 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 2, vec8, sizeof(uint32_t) * 3);
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, vec8, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
uint32_t hp;
memcpy(&hp, &sync->hp, sizeof(float));
uint8_t hp8[4] = {
(uint8_t)((hp >> 24) & 0xFF),
(uint8_t)((hp >> 16) & 0xFF),
(uint8_t)((hp >> 8) & 0xFF),
(uint8_t)(hp & 0xFF) };
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 1, hp8, sizeof(float));
Boosts boost = sync->boost;
uint8_t boost8 = // Reste 6 bits.
(boost.invincible ? 0b10000000 : 0) |
(boost.damage ? 0b01000000 : 0);
memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + 1, &boost8, sizeof(uint8_t));
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + sizeof(float) + 2;
}
void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
@ -210,7 +227,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
size_t namesize = std::strlen(tinfo->name) + 1;
memcpy(*buf + 1, &tinfo->name, namesize);
strcpy(*buf + 1, namesize, tinfo->name);
uint64_t tid = tinfo->id;
uint8_t tid8[sizeof(uint64_t)] = {
(uint8_t)((tid >> 56) & 0xFF),
@ -233,7 +251,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
size_t namesize = std::strlen(linfo->name) + 1;
memcpy(*buf + 1, &linfo->name, namesize);
strcpy(*buf + 1, namesize, linfo->name);
uint64_t sid = linfo->sid;
uint8_t sid8[sizeof(uint64_t)] = {
(uint8_t)((sid >> 56) & 0xFF),
@ -270,7 +289,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
size_t namesize = std::strlen(pinfo->name) + 1;
memcpy(*buf + 1, &pinfo->name, namesize);
strcpy(*buf + 1, namesize, pinfo->name);
uint64_t id = pinfo->id;
uint8_t id8[sizeof(uint64_t)] = {
(uint8_t)((id >> 56) & 0xFF),
@ -397,11 +417,157 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
size_t messize = std::strlen(chat->mess) + 1;
memcpy(*buf + 1 + sizeof(uint64_t) * 3, &chat->mess, messize);
strcpy(*buf + 1 + sizeof(uint64_t) * 3, messize, chat->mess);
*buflen = messize + sizeof(uint64_t) * 3 + 2;
}
void netprot::Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::CHUNKMOD;
uint32_t vec[3];
memcpy(vec, &chmod->pos, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + 1, vec8, sizeof(uint32_t) * 3);
memcpy(*buf + sizeof(uint32_t) * 3 + 1, &chmod->b_type, sizeof(BlockType));
memcpy(*buf + sizeof(uint32_t) * 3 + 2, &chmod->old_b_type, sizeof(BlockType));
*buflen = sizeof(uint32_t) * 3 + 3;
}
void netprot::Serialize(BulletAdd* bull, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::BULLET;
uint64_t tstamp = bull->tstamp;
uint8_t ts8[sizeof(uint64_t)] = {
(uint8_t)((tstamp >> 56) & 0xFF),
(uint8_t)((tstamp >> 48) & 0xFF),
(uint8_t)((tstamp >> 40) & 0xFF),
(uint8_t)((tstamp >> 32) & 0xFF),
(uint8_t)((tstamp >> 24) & 0xFF),
(uint8_t)((tstamp >> 16) & 0xFF),
(uint8_t)((tstamp >> 8) & 0xFF),
(uint8_t)(tstamp & 0xFF)
};
memcpy(*buf + 1, ts8, sizeof(uint64_t));
uint64_t tid = bull->id;
uint8_t tid8[sizeof(uint64_t)] = {
(uint8_t)((tid >> 56) & 0xFF),
(uint8_t)((tid >> 48) & 0xFF),
(uint8_t)((tid >> 40) & 0xFF),
(uint8_t)((tid >> 32) & 0xFF),
(uint8_t)((tid >> 24) & 0xFF),
(uint8_t)((tid >> 16) & 0xFF),
(uint8_t)((tid >> 8) & 0xFF),
(uint8_t)(tid & 0xFF)
};
memcpy(*buf + 1 + sizeof(uint64_t), tid8, sizeof(uint64_t));
uint32_t vec[3];
memcpy(vec, &bull->pos, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + 1 + sizeof(uint64_t) * 2, vec8, sizeof(uint32_t) * 3);
memcpy(vec, &bull->dir, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t dir8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + 1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3, dir8, sizeof(uint32_t) * 3);
*buflen = 1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 6;
}
void netprot::Serialize(PickupMod* pmod, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::PICKUPMOD;
uint64_t id = pmod->id;
uint8_t id8[sizeof(uint64_t)] = { (uint8_t)((id >> 56) & 0xFF),
(uint8_t)((id >> 48) & 0xFF),
(uint8_t)((id >> 40) & 0xFF),
(uint8_t)((id >> 32) & 0xFF),
(uint8_t)((id >> 24) & 0xFF),
(uint8_t)((id >> 16) & 0xFF),
(uint8_t)((id >> 8) & 0xFF),
(uint8_t)(id & 0xFF) };
memcpy(*buf + 1, id8, sizeof(uint64_t));
uint32_t vec[3];
memcpy(vec, &pmod->pos, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + sizeof(uint64_t) + 2, vec8, sizeof(uint32_t) * 3);
Boosts boost = pmod->boost;
uint8_t boost8 = // Reste 5 bits.
(boost.invincible ? 0b10000000 : 0) |
(boost.damage ? 0b01000000 : 0) |
(boost.hp ? 0b00100000 : 0);
memcpy(*buf + sizeof(uint64_t) + sizeof(uint32_t) * 3 + 1, &boost8, sizeof(uint8_t));
memcpy(*buf + 2 + sizeof(uint64_t) + sizeof(uint32_t) * 3, &pmod->available, sizeof(bool));
*buflen = 2 + sizeof(uint64_t) + sizeof(uint32_t) * 3 + 3;
}
void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::ERRLOG;
@ -416,7 +582,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(Input* in, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(Input))
return false;
@ -476,7 +643,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(Output* out, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(Output))
return false;
@ -508,10 +675,12 @@ bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
out->states.jumping = states & 0b10000000;
out->states.shooting = states & 0b01000000;
out->states.hit = states & 0b00100000;
out->states.dead = states & 0b00010000;
out->states.still = states & 0b00001000;
out->states.jumpshot = states & 0b00000100;
out->states.running = states & 0b00000010;
out->states.powerup = states & 0b00010000;
out->states.dead = states & 0b00001000;
out->states.still = states & 0b00000100;
out->states.jumpshot = states & 0b00000010;
out->states.running = states & 0b00000001;
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
@ -553,7 +722,7 @@ bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(Sync* sync, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(Sync))
return false;
@ -592,10 +761,9 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
(uint16_t)diff[0] << 8 |
(uint16_t)diff[1];
memcpy(&sync->hp, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t));
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
@ -612,12 +780,28 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
uint8_t hp8[4];
memcpy(&hp8, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t)], sizeof(uint32_t));
uint32_t hp = (uint32_t)hp8[0] << 24 |
(uint32_t)hp8[1] << 16 |
(uint32_t)hp8[2] << 8 |
(uint32_t)hp8[3];
memcpy(&sync->hp, &hp, sizeof(float));
uint8_t boost = 0;
memcpy(&boost, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t)], sizeof(uint8_t));
sync->boost.invincible = boost & 0b10000000;
sync->boost.damage = boost & 0b01000000;
*buflen = 2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + sizeof(float);
return true;
}
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(LoginInfo))
return false;
@ -626,7 +810,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
if (namesize > 32)
return false;
memcpy(&tinfo->name, &buf[1], namesize);
strcpy(tinfo->name, namesize, &buf[1]);
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@ -645,7 +829,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(LoginInfo))
return false;
@ -654,7 +838,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
if (namesize > 32)
return false;
memcpy(&linfo->name, &buf[1], namesize);
strcpy(linfo->name, namesize, &buf[1]);
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@ -684,7 +868,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(PlayerInfo))
return false;
@ -693,7 +877,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
if (namesize > 32)
return false;
memcpy(&pinfo->name, &buf[1], namesize);
strcpy(pinfo->name, namesize, &buf[1]);
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@ -723,7 +907,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(GameInfo))
return false;
@ -766,7 +950,7 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(Chat* chat, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(Chat))
return false;
@ -806,19 +990,119 @@ bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
(uint64_t)dstt[6] << 8 |
(uint64_t)dstt[7];
size_t messsize = std::strlen(buf + sizeof(uint64_t) * 3) + 1;
size_t messsize = std::strlen(&buf[sizeof(uint64_t) * 3]) + 1;
if (messsize > 140)
return false;
memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
char* ciboire = &buf[1 + sizeof(uint64_t) * 3];
strcpy(chat->mess, 140, ciboire);
//*buflen = messsize + sizeof(uint64_t) * 3 + 1;
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
return true;
}
bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
bool netprot::Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(ChunkMod))
return false;
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[1], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&chmod->pos, vec, sizeof(uint32_t) * 3);
memcpy(&chmod->b_type, &buf[1 + sizeof(uint8_t) * 12], sizeof(BlockType));
memcpy(&chmod->old_b_type, &buf[2 + sizeof(uint8_t) * 12], sizeof(BlockType));
*buflen = sizeof(uint32_t) * 3 + 3;
return true;
}
bool netprot::Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(BulletAdd))
return false;
uint8_t tst[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(tst, &buf[1], sizeof(uint64_t));
bull->tstamp =
(uint64_t)tst[0] << 56 |
(uint64_t)tst[1] << 48 |
(uint64_t)tst[2] << 40 |
(uint64_t)tst[3] << 32 |
(uint64_t)tst[4] << 24 |
(uint64_t)tst[5] << 16 |
(uint64_t)tst[6] << 8 |
(uint64_t)tst[7];
memcpy(tst, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
bull->id =
(uint64_t)tst[0] << 56 |
(uint64_t)tst[1] << 48 |
(uint64_t)tst[2] << 40 |
(uint64_t)tst[3] << 32 |
(uint64_t)tst[4] << 24 |
(uint64_t)tst[5] << 16 |
(uint64_t)tst[6] << 8 |
(uint64_t)tst[7];
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&bull->pos, vec, sizeof(uint32_t) * 3);
memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint8_t) * 12], sizeof(uint8_t) * 12);
uint32_t dir[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&bull->dir, dir, sizeof(uint32_t) * 3);
*buflen = 1 + sizeof(uint64_t) * 2 + sizeof(uint8_t) * 24;
return true;
}
bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(ErrorLog))
return false;
@ -835,6 +1119,53 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(PickupMod* pmod, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(PickupMod))
return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(diff, &buf[1], sizeof(uint64_t));
pmod->id =
(uint64_t)diff[0] << 56 |
(uint64_t)diff[1] << 48 |
(uint64_t)diff[2] << 40 |
(uint64_t)diff[3] << 32 |
(uint64_t)diff[4] << 24 |
(uint64_t)diff[5] << 16 |
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[2 + sizeof(uint64_t)], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&pmod->pos, vec, sizeof(uint32_t) * 3);
uint8_t boosts = 0;
memcpy(&boosts, &buf[1 + sizeof(uint64_t) + sizeof(uint32_t) * 3], sizeof(uint8_t));
pmod->boost.invincible = boosts & 0b10000000;
pmod->boost.damage = boosts & 0b01000000;
pmod->boost.hp = boosts & 0b00100000;
memcpy(&pmod->available, &buf[2 + sizeof(uint64_t) + sizeof(uint32_t) * 3], sizeof(bool));
*buflen = 3 + sizeof(uint64_t) + sizeof(uint32_t) * 3;
return true;
}
netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
@ -845,7 +1176,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
return (netprot::PACKET_TYPE)buf[0];
}
netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
netprot::Packet netprot::getPack(char* buf, uint32_t* buflen) {
Packet pck = { nullptr, PACKET_TYPE::ERR };
Input* in = nullptr;
Output* out = nullptr;
@ -911,9 +1242,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
return pck;
}
netprot::Packet netprot::getPack(netprot::Buffer* buf) {
return netprot::getPack(buf->ptr, &buf->len);
}
netprot::Packet netprot::getPack(netprot::Buffer* buf) { return netprot::getPack(buf->ptr, &buf->len); }
bool netprot::emptyPack(netprot::Packet pck) {
switch (pck.type) {
@ -950,13 +1279,12 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
return pck;
}
std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
std::vector<char*> lsPck;
int len = buf->tmp? buf->tmp - buf->ptr: 0,
void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) {
int len = buf->tmp ? buf->tmp - buf->ptr : 0,
end = 0;
char * cursor = buf->tmp ? buf->tmp: nullptr ,
* next = buf->tmp ? buf->tmp + 1: buf->ptr,
* last = buf->tmp ? buf->tmp: buf->ptr;
char* cursor = buf->tmp ? buf->tmp : nullptr,
* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
* last = buf->tmp ? buf->tmp : buf->ptr;
bool ended = true;
struct pollfd fds[1];
@ -967,15 +1295,15 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
if (!poll(fds, 1, 0)) {
if (ended)
buf->tmp = nullptr;
return lsPck;
return;
}
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
if (ended)
buf->tmp = nullptr;
return lsPck;
}
return;
}
len += bytes;
end = len;
@ -998,24 +1326,14 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
if (cmp == 0) {
if (!outbuf) {
lsPck.push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
else {
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
lsPck.push_back(&outbuf->ptr[cursor - last]);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
lsPck->push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
}
else {
if (!outbuf)
buf->tmp = last;
buf->tmp = last;
cursor = &buf->ptr[len];
next = cursor + 1;
break;
@ -1024,8 +1342,7 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
}
}
std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
std::vector<char*> lsPck;
void netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck) {
int len = buf->tmp ? buf->tmp - buf->ptr : 0,
end = 0;
char* cursor = buf->tmp ? buf->tmp : nullptr,
@ -1043,14 +1360,14 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
if (!poll(fds, 1, 0)) {
if (ended)
buf->tmp = nullptr;
return lsPck;
return;
}
int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
if (ended)
buf->tmp = nullptr;
return lsPck;
return;
}
len += bytes;
end = len;
@ -1074,24 +1391,14 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
if (cmp == 0) {
if (!outbuf) {
lsPck.push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
else {
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
lsPck.push_back(&outbuf->ptr[cursor - last]);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
lsPck->push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
}
else {
if (!outbuf)
buf->tmp = last;
buf->tmp = last;
cursor = &buf->ptr[len];
next = cursor + 1;
break;

View File

@ -12,14 +12,14 @@ namespace netprot {
ERR, INPUT, OUTPUT, SYNC,
TEAMINF, SELFINF, PLAYINF, LOGINF,
CHUNKMOD, PLAYERMOD, PICKUPMOD,
GAMEINFO, ENDINFO , CHAT, ERRLOG,
LAST_PACK
GAMEINFO, ENDINFO , BULLET,
CHAT, ERRLOG, LAST_PACK
};
/* Structures */
struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
char *ptr = new char[BUFFER_LENGTH] { 1 }, *tmp = nullptr;
uint32_t len = BUFFER_LENGTH;
~Buffer() { delete[] ptr; }
@ -27,7 +27,7 @@ namespace netprot {
};
struct Packet { // Pour pouvoir recevoir les paquets du recv() sans avoir à les aiguiller dans la même thread.
void* ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
void *ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
PACKET_TYPE type = PACKET_TYPE::ERR;
};
@ -38,24 +38,30 @@ namespace netprot {
/* Sous-structures */
struct Keys {
bool forward,
backward,
left,
right,
jump,
shoot,
block;
bool forward = false,
backward = false,
left = false,
right = false,
jump = false,
shoot = false,
block = false;
};
struct States {
bool jumping,
shooting,
hit,
powerup,
dead,
still,
jumpshot,
running;
bool jumping = false,
shooting = false,
hit = false,
powerup = false,
dead = false,
still = false,
jumpshot = false,
running = false;
};
struct Boosts {
bool invincible = false,
damage = false,
hp = false;
};
/* Structures de paquets */
@ -80,37 +86,38 @@ namespace netprot {
uint64_t sid = 0;
uint32_t timer = 0;
uint16_t ammo = 0;
uint8_t hp = 0;
Boosts boost;
float hp = 0;
Vector3f position;
Sync() {}
Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position) {}
Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position), boost(sync->boost) {}
};
struct TeamInfo { // cli <-> srv TCP once
char name[32];
char *name = new char[32];
uint64_t id = 0;
TeamInfo() {}
TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(tem->name, name); }
TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(name, 32, tem->name); }
~TeamInfo() { delete[] name; }
};
struct LoginInfo { // cli <-> srv TCP once
char name[32];
char *name = new char[32];
uint64_t sid = 0,
tid = 0;
LoginInfo() {}
LoginInfo(LoginInfo* ply): sid(ply->sid), tid(ply->tid) { strcpy(ply->name, name); }
LoginInfo(LoginInfo* log): sid(log->sid), tid(log->tid) { strcpy(name, 32, log->name); }
~LoginInfo() { delete[] name; }
};
struct PlayerInfo { // cli <-> srv TCP once
char name[32];
char *name = new char[32];
uint64_t id = 0,
tid = 0;
PlayerInfo() {}
PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
strcpy(log->name, name);
};
PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
}
PlayerInfo(PlayerInfo* ply) : id(ply->id), tid(ply->tid) { strcpy(name, 32, ply->name); };
PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { strcpy(name, 32, strname.c_str()); }
~PlayerInfo() { delete[] name; }
};
struct GameInfo { // cli <-> srv TCP event (before game start)/ once
@ -121,20 +128,42 @@ namespace netprot {
GameInfo(GameInfo* gam) : seed(gam->seed), countdown(gam->countdown), gameType(gam->gameType) {}
};
struct PickupMod {
uint64_t id;
Vector3f pos;
Boosts boost;
bool available = true;
PickupMod() {}
PickupMod(PickupMod* pmod) : id(pmod->id), pos(pmod->pos), boost(pmod->boost), available(pmod->available) {}
};
struct Chat { // cli <-> srv TCP event
uint64_t src_id = 0,
dest_id = 0,
dest_team_id = 0;
char mess[140]; // Good 'nough for twitr, good 'nough for me.
char *mess = new char[140]; // Good 'nough for twitr, good 'nough for me.
Chat() {}
Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(cha->mess, mess); }
Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(mess, 140, cha->mess); }
~Chat() { delete[] mess; }
};
struct ChunkMod {
Vector3f pos;
BlockType b_type, old_b_type;
};
struct BulletAdd {
Timestamp tstamp;
Vector3f pos, dir;
uint64_t id;
};
struct ErrorLog { // srv -> cli TCP event
char mess[140];
bool is_fatal;
char *mess = new char[140];
bool is_fatal = false;
ErrorLog() {};
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(mess, 140, err->mess); }
~ErrorLog() { delete[] mess; }
};
/* Fonctions */
@ -147,6 +176,9 @@ namespace netprot {
void Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen); // srv
void Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen); // srv
void Serialize(PickupMod* chmod, char* buf[], uint32_t* buflen); // srv
void Serialize(BulletAdd* bull, char* buf[], uint32_t* buflen); // srv
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
@ -157,6 +189,9 @@ namespace netprot {
bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
bool Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen); // cli
bool Deserialize(PickupMod* chmod, char* buf, uint32_t* buflen); // cli
bool Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen); // cli
bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
PACKET_TYPE getType(char* buf, uint32_t buflen);
@ -176,8 +211,8 @@ namespace netprot {
template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
void recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck);
void recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck);
/* Templates */

View File

@ -4,61 +4,72 @@
Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
m_velocity = Vector3f(0, 0, 0);
m_airborne = true;
m_hp = 1.0f; //TODO: Remettre <20> 1.0f
m_hp = 1.0f;
m_sensitivity = 0.5f;
m_username = "Zelda Bee-Bop56";
}
Player::~Player() {}
void Player::TurnLeftRight(float value) {
m_rotY += value;
void Player::TurnLeftRight(float value, float sensitivity) {
m_rotY += value * sensitivity;
if (m_rotY > 360) m_rotY = 0;
else if (m_rotY < -360) m_rotY = 0;
}
void Player::TurnTopBottom(float value) {
m_rotX += value;
if (m_rotX > 80) m_rotX = 80;
else if (m_rotX < -80) m_rotX = -80;
}
Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
Vector3f delta = Vector3f(0, 0, 0);
float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
float xrotrad = (m_rotX / 57.2957795056f);
m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-sin(xrotrad),
cos(xrotrad) * -cos(yrotrad));
-sin(xrotrad),
cos(xrotrad) * -cos(yrotrad));
m_direction.Normalize();
}
void Player::TurnTopBottom(float value, float sensitivity) {
m_rotX += value * sensitivity;
if (m_rotX > 80) m_rotX = 80;
else if (m_rotX < -80) m_rotX = -80;
float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
float xrotrad = (m_rotX / 57.2957795056f);
m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-sin(xrotrad),
cos(xrotrad) * -cos(yrotrad));
m_direction.Normalize();
}
Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
Vector3f delta = Vector3f(0, 0, 0);
Vector3f dir = m_direction;
dir.y = 0;
if (front) {
delta.x += float(sin(yrotrad)) * elapsedTime * 10.f;
delta.z += float(-cos(yrotrad)) * elapsedTime * 10.f;
delta += dir;
}
else if (back) {
delta.x += float(-sin(yrotrad)) * elapsedTime * 10.f;
delta.z += float(cos(yrotrad)) * elapsedTime * 10.f;
delta -= dir;
}
if (left) {
delta.x += float(-cos(yrotrad)) * elapsedTime * 10.f;
delta.z += float(-sin(yrotrad)) * elapsedTime * 10.f;
delta.x += dir.z;
delta.z += -dir.x;
}
else if (right) {
delta.x += float(cos(yrotrad)) * elapsedTime * 10.f;
delta.z += float(sin(yrotrad)) * elapsedTime * 10.f;
delta.x -= dir.z;
delta.z -= -dir.x;
}
delta.Normalize();
delta.x *= .6f;
delta.z *= .6f;
if ((jump || shoot ) && !m_airborne) {
delta.y += jump? .32f: shoot? .1f : 0.f;
if ((jump || shoot) && !m_airborne) {
delta.y += jump ? .32f : shoot ? .1f : 0.f;
m_airborne = true;
}
if (boostspeed)
@ -68,7 +79,7 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
}
if (shoot) // Recoil!
TurnTopBottom(-1);
TurnTopBottom(-1, 1.0f);
return delta;
}
@ -112,32 +123,18 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
bt1 = world->BlockAt(GetPosition().x + input.x, GetPosition().y, GetPosition().z);
bt2 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 0.9f, GetPosition().z);
bt3 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 1.7f, GetPosition().z);
if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
if (input.x > 0)
input.x = m_velocity.x = 0.5f;
else
input.x = m_velocity.x = -0.5f;
m_velocity.y = 0.3;
m_velocity.z *= .5f;
}
else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
input.x = m_velocity.x = 0;
if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
m_velocity.y += .04f;
m_velocity.z *= .5f;
m_velocity.x *= .5f;
}
bt1 = world->BlockAt(GetPosition().x, GetPosition().y, GetPosition().z + input.z);
bt2 = world->BlockAt(GetPosition().x, GetPosition().y - 0.9f, GetPosition().z + input.z);
bt3 = world->BlockAt(GetPosition().x, GetPosition().y - 1.7f, GetPosition().z + input.z);
if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
if (input.z > 0)
input.z = m_velocity.z = 0.5f;
else
input.z = m_velocity.z = -0.5f;
m_velocity.y = 0.3;
m_velocity.x *= .5f;
}
else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
input.z = m_velocity.z = 0;
if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
m_velocity.y += .04f;
m_velocity.z *= .5f;
m_velocity.x *= .5f;
}
@ -145,8 +142,8 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
/* Gestion de la friction */
if (!m_airborne) {
m_velocity.x += input.x * 2.f * elapsedTime;
m_velocity.z += input.z * 2.f * elapsedTime;
m_velocity.x += input.x * (boostspeed ? 2.5f : 2.f) * elapsedTime;
m_velocity.z += input.z * (boostspeed ? 2.5f : 2.f) * elapsedTime;
if (input.x == 0.f)
m_velocity.x *= .8f;
@ -164,7 +161,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
/* Fin gestion de la friction */
float vy = m_velocity.y;
m_velocity.y = 1.f; // Padding pour limiter le x et z lors du Normalize().
m_velocity.y = boostspeed ? 0.f: 1.f; // Padding pour limiter le x et z lors du Normalize().
if (m_velocity.Length() >= 1.f) m_velocity.Normalize(); // Limiteur de vitesse en x/z.
m_velocity.y = 0;
if (m_velocity.Length() < .005f) m_velocity.Zero(); // Threshold en x/z.
@ -191,33 +188,51 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
return snd;
}
void Player::Put(Vector3f pos) {
m_position = pos;
}
void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
if (rel) transformation.ApplyTranslation(-GetPOV());
if (!rot) {
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
}
}
void Player::GetBooster(Booster boosttype)
uint64_t Player::TakeBooster(std::unordered_map<uint64_t, Booster*> booster_table, float elapsedtime)
{
if (boosttype == SPEED)
uint64_t boostid = 0;
Vector3f playerpos = GetPosition();
for (auto& [key, booster]: booster_table) {
Vector3f pos = booster->GetPosition();
if (booster->GetAvailability() && abs(playerpos.x - pos.x) <= 0.5f && abs(playerpos.y - pos.y) <= 1.0f && abs(playerpos.z - pos.z) <= 0.5f)
{
boostid = booster->GetId();
GetBooster(booster->GetType(), elapsedtime);
booster->SetAvailability(false);
break;
}
}
return boostid;
}
void Player::GetBooster(BOOST_TYPE boosttype, float elapsedtime)
{
if (boosttype == BTYPE_SPEED)
{
boostspeed = true;
timeboostspeed = 0;
}
if (boosttype == HEAL)
if (boosttype == BTYPE_HEAL)
{
m_hp = 100;
m_hp = 1.0f;
}
if (boosttype == DAMAGE)
if (boosttype == BTYPE_DAMAGE)
{
boostdamage = true;
timeboostdamage = 0;
}
if (boosttype == INVINCIBLE)
if (boosttype == BTYPE_INVINCIBLE)
{
boostinvincible = true;
boostinvincible = 0;
@ -228,26 +243,28 @@ void Player::RemoveBooster(float elapsedtime)
if (boostspeed)
{
timeboostspeed += elapsedtime;
if (timeboostspeed >= TIME_SPEED_BOOST)
if (timeboostspeed >= TIME_SPEED_BOOST && boostspeed == true)
boostspeed = false;
}
if (boostdamage)
{
timeboostdamage += elapsedtime;
if (timeboostdamage >= TIME_DAMAGE_BOOST)
if (timeboostdamage >= TIME_DAMAGE_BOOST && boostdamage == true)
boostdamage = false;
}
if (boostinvincible)
{
timeboostinvincible += elapsedtime;
if (timeboostinvincible >= TIME_INVINCIBLE_BOOST)
if (timeboostinvincible >= TIME_INVINCIBLE_BOOST && boostinvincible == true)
boostinvincible = false;
}
}
void Player::SetDirection(Vector3f dir) { m_direction = dir; }
void Player::Move(Vector3f diff) { m_position -= diff; }
Vector3f Player::GetPosition() const { return Vector3f(m_position.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_position.y, m_position.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2); }
Vector3f Player::GetPositionAbs() const { return m_position; }
Vector3f Player::GetVelocity() const { return m_velocity; }
Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); }
@ -256,32 +273,43 @@ Vector3f Player::GetDirection() const { return m_direction; }
std::string Player::GetUsername() const { return m_username; }
void Player::SetUsername(std::string username) {
m_username = username;
}
float Player::GetSensitivity() const {
return m_sensitivity;
}
void Player::SetSensitivity(float sensitivity) {
m_sensitivity = sensitivity;
}
float Player::GetHP() const { return m_hp; }
void Player::SetHP(float hp) {
m_hp = hp;
}
void Player::Teleport(int& x, int& z) {
m_position.x -= x * CHUNK_SIZE_X;
m_position.z -= z * CHUNK_SIZE_Z;
}
bool Player::AmIDead()
{
return m_hp <= 0;
}
bool Player::GetIsAirborne() const { return m_airborne; }
bool Player::AmIDead() { return m_hp <= 0; }
void Player::InflictDamage(float hitPoints)
{
void Player::InflictDamage(float hitPoints) {
m_hp -= hitPoints;
if (AmIDead())
{ // Quand le joueur est mort.
}
if (m_hp < 0)
m_hp == 0;
}
int Player::getScore() const { return m_score; }
void Player::addPoint() { ++m_score; }
uint64_t Player::getId() const { return id; }

View File

@ -2,8 +2,11 @@
#define PLAYER_H__
#include <cmath>
#include <unordered_map>
#include "transformation.h"
#include "vector3.h"
#include "booster.h"
#include "define.h"
class World;
@ -11,30 +14,51 @@ class World;
class Player {
public:
enum Sound { NOSOUND, STEP, FALL };
enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
//enum BoosterType { SPEED, HEAL, DAMAGE, INVINCIBLE };
Player(const Vector3f& position, float rotX = 0, float rotY = 0);
~Player();
void TurnLeftRight(float value);
void TurnTopBottom(float value);
void TurnLeftRight(float value, float sensitivity);
void TurnTopBottom(float value, float sensitivity);
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
void GetBooster(Booster boosttype);
uint64_t TakeBooster(std::unordered_map<uint64_t, Booster*> booster_table, float elapsedTime);
void GetBooster(BOOST_TYPE boosttype, float elapsedTime);
void RemoveBooster(float elapsedtime);
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
void SetDirection(Vector3f dir);
void Move(Vector3f diff);
Vector3f GetPosition() const;
Vector3f GetPositionAbs() const;
Vector3f GetDirection() const;
Vector3f GetVelocity() const;
Vector3f GetPOV() const;
std::string GetUsername() const;
void SetUsername(std::string username);
float GetSensitivity() const;
void SetSensitivity(float sensitivity);
float GetHP() const;
void SetHP(float hp);
void Teleport(int& x, int& z);
bool GetIsAirborne() const;
bool AmIDead();
void InflictDamage(float hitPoints);
int getScore() const;
void addPoint();
uint64_t Killer = 0;
std::string m_username;
bool m_hit = false;
bool Eulogy = false;
bool boostspeed = false;
bool boostdamage = false;
bool boostinvincible = false;
void Put(Vector3f pos);
private:
uint64_t getId() const;
@ -44,8 +68,8 @@ protected:
Vector3f m_velocity;
Vector3f m_direction;
std::string m_username;
uint64_t id = 0;
int m_score = 0;
float m_rotX = 0;
float m_rotY = 0;
@ -53,15 +77,11 @@ protected:
float timeboostspeed;
float timeboostdamage;
float timeboostinvincible;
float m_sensitivity;
float m_hp;
bool m_airborne;
bool boostspeed;
bool boostdamage;
bool boostinvincible;
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
};

View File

@ -49,8 +49,6 @@ void World::RemoveChunk(int nbReduit)
if (x > WORLD_SIZE_X - nbReduit)
chk = m_chunks.Remove(x, y);
// TODO: MakeDirty() les voisins pour qu'ils se redessinent.
if (!chk)
continue;
@ -167,33 +165,27 @@ void World::GetScope(unsigned int& x, unsigned int& y) {
void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
UpdateWorld(player_pos, blockinfo);
//TransposeWorld(player_pos, bullets);
}
//
//void World::UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]) {
// if (updates == 0 && ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// ChunkAt(chx, 1, chy)->Update(blockinfo, this);
// updates = FRAMES_UPDATE_CHUNKS;
// }
//
//}
void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block) {
netprot::ChunkMod* World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net) {
Vector3f currentPos = player_pos;
Vector3f currentBlock = currentPos;
Vector3f ray = player_dir;
BlockType oldbtype;
netprot::ChunkMod* cmod = nullptr;
bool found = false;
if (block) return;
if (block) return cmod;
while ((currentPos - currentBlock).Length() <= MAX_SELECTION_DISTANCE && !found) {
currentBlock += ray / 10.f;
BlockType bt = BlockAt(currentBlock);
if (bt != BTYPE_AIR)
if (bt != BTYPE_AIR) {
found = true;
oldbtype = bt;
}
}
if (found)
@ -219,21 +211,30 @@ void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos,
(By == PyA ||
By == PyB ||
By == PyC) &&
Bz == Pz))
Bz == Pz)) {
found = true;
oldbtype = bt;
}
}
}
}
if (found && (int)currentBlock.y < CHUNK_SIZE_Y) {
if (net) {
cmod = new netprot::ChunkMod();
cmod->old_b_type = oldbtype;
cmod->b_type = blockType;
cmod->pos = currentBlock;
}
int bx = (int)currentBlock.x % CHUNK_SIZE_X;
int by = (int)currentBlock.y % CHUNK_SIZE_Y;
int bz = (int)currentBlock.z % CHUNK_SIZE_Z;
ChunkAt(currentBlock)->SetBlock(bx, by, bz, blockType, this);
ChunkAt(currentBlock)->MakeModified();
block = true;
}
return cmod;
}
void World::ChangeBlockAtPosition(BlockType blockType, Vector3f pos) {
@ -254,7 +255,6 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
int side = 0;
int threads = 0;
std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS];
//std::future<void> delThList[THREADS_DELETE_CHUNKS];
if (frameGenerate > 0) --frameGenerate;
if (frameUpdate > 0) --frameUpdate;
@ -345,101 +345,6 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
side = 0;
threads = 0;
//if (!frameUpdate)
// while (side * CHUNK_SIZE_X <= VIEW_DISTANCE * 2) {
// int tx = -side, ty = -side;
// for (; tx <= side; ++tx) {
// if (frameUpdate)
// break;
// unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
// if (ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// updateThList[threads++] =
// std::async(std::launch::async,
// [](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
// chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
// if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
// }
// }
// for (; ty <= side; ++ty) {
// if (frameUpdate)
// break;
// unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
// if (ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// updateThList[threads++] =
// std::async(std::launch::async,
// [](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
// chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
// if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
// }
// }
// for (; tx >= -side; --tx) {
// if (frameUpdate)
// break;
// unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
// if (ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// updateThList[threads++] =
// std::async(std::launch::async,
// [](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
// chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
// if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
// }
// }
// for (; ty >= -side; --ty) {
// if (frameUpdate)
// break;
// unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
// if (ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// updateThList[threads++] =
// std::async(std::launch::async,
// [](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
// chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
// if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
// }
// }
// if (frameUpdate)
// break;
// ++side;
// }
//if (threads > 0) {
// for (int i = 0; i < threads; ++i) {
// updateThList[i].wait();
// Chunk* chunk = updateThList[i].get();
// chunk->FlushMeshToVBO();
// }
//}
threads = 0;
//int del = THREADS_DELETE_CHUNKS;
//while (!m_tbDeleted.empty() && del--) { // Moins rapide que le bout en dessous, mais -beaucoup- plus stable.
// m_tbDeleted.back()->FlushVBO();
// m_tbDeleted.back()->~Chunk();
// m_tbDeleted.pop_back();
//}
/*while (!m_tbDeleted.empty() && !frameDelete) {
if (m_tbDeleted.back()) {
m_tbDeleted.back()->FlushVBO();
delThList[threads] =
std::async(std::launch::async,
[](Chunk* chunk) { delete chunk; }, m_tbDeleted.back());
m_tbDeleted.pop_back();
if (++threads > THREADS_DELETE_CHUNKS) frameDelete = FRAMES_DELETE_CHUNKS;
}
else m_tbDeleted.pop_back();
}*/
/*for (int x = 0; x < threads; ++x) {
delThList[x].wait();
delThList[x].get();
}*/
}
int World::GettbDeleted() const { return m_tbDeleted.size(); }

View File

@ -11,6 +11,7 @@
#include "array2d.h"
#include "bullet.h"
#include "chunk.h"
#include "netprotocol.h"
class Chunk;
class Bullet;
@ -37,7 +38,7 @@ public:
void GetScope(unsigned int& x, unsigned int& y);
void ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block);
netprot::ChunkMod* ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net);
void ChangeBlockAtPosition(BlockType blockType, Vector3f pos);
void CleanUpWorld(int& deleteframes, bool clear);
int GettbDeleted() const;

View File

@ -2,26 +2,28 @@
Connection::Connection(SOCKET sock,
sockaddr_in sockaddr,
LoginInfo log,
PlayerInfo play):
m_sock(sock),
m_addr(sockaddr),
m_loginfo(log),
m_playinfo(play) {
Connection::Connection(SOCKET sock,
sockaddr_in sockaddr,
LoginInfo *log,
PlayerInfo *play) :
m_sock(sock),
m_addr(sockaddr),
m_loginfo(*log),
m_playinfo(*play) {
}
Connection::~Connection() { closesocket(m_sock); }
Connection::~Connection() {
delete player;
closesocket(m_sock); }
uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; }
uint64_t Connection::GetHash(bool self) const { return self ? m_loginfo.sid : m_playinfo.id; }
uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
std::string Connection::GetName() const { return m_loginfo.name; }
void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); }
void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); m_input_vector.push_back(in); }
Output* Connection::getOutput(Timestamp time) {
auto out = m_output_manifest.find(time);
@ -50,70 +52,196 @@ sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
void Connection::getPacks(SOCKET sock) {
std::vector<char*> lsPck;
Input in;
while (true) {
lsPck = recvPacksFrom(sock, &m_buf, m_addr);
for (auto& pck : lsPck) {
uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
case INPUT:
if (Deserialize(&in, pck, &bsize))
m_input_manifest[in.timestamp] = in;
Sync sync;
recvPacksFrom(sock, &m_buf, m_addr, &lsPck);
for (auto& pck : lsPck) {
uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
case INPUT:
if (player->AmIDead())
break;
default: break;
else if (Deserialize(&in, pck, &bsize)) {
m_input_manifest[in.timestamp] = in;
m_input_vector.push_back(in);
}
break;
case SYNC:
if (Deserialize(&sync, pck, &bsize))
m_nsync = true;
break;
default: break;
}
lsPck.clear();
}
lsPck.clear();
}
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {
while (m_last_out < m_output_manifest.size()) {
Output out = m_output_manifest.at(m_last_out++);
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer) {
static int outs = 0;
static Timestamp last = 0;
static uint32_t lasttimer = timer;
if (m_output_vector.empty() && player->AmIDead()) {
if (timer != lasttimer) {
lasttimer = timer;
Sync sync;
sync.timestamp = sync.sid = m_loginfo.sid;
sync.hp = 0;
sync.ammo = -1;
sync.timer = timer;
sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
}
}
while (!m_output_vector.empty()) {
Output out = m_output_vector.front();
for (auto& [key, conn] : conns) {
if (m_playinfo.id == conn->GetHash(true))
if (m_playinfo.id == conn->GetHash(false))
continue;
sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
}
++outs;
[[unlikely]] if (last == 0) // !
last = out.timestamp;
outs += out.timestamp + last;
static bool syncdead = false;
bool dead = player->AmIDead();
if (outs >= SYNC_ACC || (!syncdead && dead)) {
Sync sync;
outs -= SYNC_ACC;
sync.timestamp = out.timestamp;
sync.position = out.position;
sync.sid = m_loginfo.sid;
sync.timer = timer;
sync.timestamp = out.timestamp;
sync.ammo = -1;
sync.hp = player->GetHP();
if (dead) {
sync.timestamp = m_loginfo.sid;
syncdead = true;
}
sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
}
m_output_vector.pop_front();
}
}
void Connection::Run(World* world) {
Timestamp Connection::Run(World* world, std::unordered_map<uint64_t, Booster*> boosters) {
Input in, last;
Output out;
Timestamp tstamp = 0;
float el;
if (m_input_manifest.size() < 2)
return;
bool dead = player->AmIDead();
while (m_last_in < m_input_manifest.size()) {
in = m_input_manifest.at(m_last_in + 1);
last = m_input_manifest.at(m_last_in);
if (m_input_manifest.size() < 2 && !dead)
return tstamp;
el = (float)(in.timestamp - last.timestamp) / 1000.;
player.get()->SetDirection(in.direction);
player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward,
in.keys.backward,
in.keys.left,
in.keys.right,
in.keys.jump, false, el), world, el);
while (m_last_in < m_input_vector.size() - 1 || dead) {
if (!dead) {
in = m_input_vector.at(m_last_in + 1);
last = m_input_vector.at(m_last_in);
if (in.timestamp <= m_tstamp) {
++m_last_in;
continue;
}
el = (double)(in.timestamp - last.timestamp) / 1000.;
if (m_shoot_acc > 0.) {
m_shoot_acc -= el;
if (m_shoot_acc < 0.)
m_shoot_acc = 0.;
}
player->SetDirection(in.direction);
}
else {
el = 1. / 60.;
in = Input();
}
player->ApplyPhysics(player->GetInput(in.keys.forward,
in.keys.backward,
in.keys.left,
in.keys.right,
in.keys.jump, false, el),
world, el);
out.position = player.get()->GetPosition();
player->TakeBooster(boosters, el);
if (player->GetPosition().y < -20.) {
player->InflictDamage(9000.);
player->Killer = GetHash(true);
}
out.states.jumping = player->GetIsAirborne();
Vector3f horSpeed = player->GetVelocity();
horSpeed.y = 0;
out.states.running = horSpeed.Length() > .2f;
out.states.still = !out.states.running && !out.states.jumping;
out.states.hit = player->m_hit;
player->m_hit = false;
if (player->AmIDead()) {
in.keys.shoot = false;
in.keys.block = false;
out.states.dead = true;
}
static bool toggle = false;
if (in.keys.block) {
if (!toggle) {
toggle = true;
bool block = false;
ChunkMod* cmod = world->ChangeBlockAtCursor(BLOCK_TYPE::BTYPE_METAL,
player->GetPosition(),
player->GetDirection(),
block, true);
if (cmod)
ChunkDiffs.push_back(std::move(cmod));
}
}
else toggle = false;
out.states.shooting = in.keys.shoot;
if (out.states.jumping && out.states.shooting)
out.states.jumpshot = true;
else out.states.jumpshot = false;
if (in.keys.shoot && m_shoot_acc <= 0.) {
Bullets.emplace_back(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true)));
m_shoot_acc = BULLET_TIME;
}
out.position = player->GetPositionAbs();
out.direction = in.direction;
out.timestamp = in.timestamp;
out.id = m_playinfo.id;
m_output_manifest[out.timestamp] = out;
m_output_vector.push_back(out);
m_tstamp = tstamp = out.timestamp;
++m_last_in;
if (!dead)
++m_last_in;
dead = false;
}
return tstamp;
}
void Connection::CleanInputManifest(Timestamp time) {
auto wat = m_input_manifest.find(time);
// auto wat = m_input_manifest.find(time);
while (wat != m_input_manifest.begin())
m_input_manifest.erase(wat--);
// while (wat != m_input_manifest.begin())
// m_input_manifest.erase(wat--);
}
Timestamp Connection::GetTStamp() const { return m_tstamp; }

View File

@ -16,11 +16,11 @@ public:
Connection(
SOCKET sock,
sockaddr_in sockaddr,
LoginInfo log,
PlayerInfo play);
LoginInfo *log,
PlayerInfo *play);
~Connection();
std::unique_ptr<Player> player = nullptr;
Player* player = nullptr;
uint64_t GetHash(bool self = true) const;
uint64_t GetTeamHash() const;
@ -34,16 +34,29 @@ public:
sockaddr_in* getAddr() const;
void getPacks(SOCKET sock);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
void Run(World* world);
Timestamp Run(World* world, std::unordered_map<uint64_t, Booster*> boosters);
void CleanInputManifest(Timestamp time);
bool m_nsync = true;
std::vector<Bullet*> Bullets;
std::vector<ChunkMod*> ChunkDiffs;
Timestamp GetTStamp() const;
private:
std::unordered_map<Timestamp, Input> m_input_manifest;
std::vector<Input> m_input_vector;
std::unordered_map<Timestamp, Output> m_output_manifest;
std::deque<Output> m_output_vector;
std::unordered_map<Timestamp, Chat> m_chatlog;
float m_shoot_acc = 0;
Timestamp m_tstamp = 0;
SOCKET m_sock;
sockaddr_in m_addr;
LoginInfo m_loginfo;

View File

@ -11,4 +11,21 @@
#define ID_LIST_SIZE 127
#define SRV_MANUAL_SETUP true
// @ = Dead guy, $ = Killer.
const std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker.",
"@ has bit the dust, if you know what I mean.",
"@ has ceased to be.",
"@ is no more.",
"@ is like, super dead.",
"Requiescat In Pace, @.",
"So long, @, and thanks for all the lols!",
"@ has a bad case of being dead.",
"@ has finally seen the light!",
"$ sees dead people; in this case they see a dead @.",
"Thought @ was hot; guess what? He's not. He is dead, dead, dead.",
"@ did not want to live forever.",
"$ made @ die for their country.",
"$ has become death, destroyer of @.",
"$ did not make @ feel lucky." };
#endif

View File

@ -3,6 +3,11 @@
int main() {
std::unique_ptr<Server> server = std::make_unique<Server>();
if (server->Init() == 0)
if (server->Ready() == 0)
while (server->Ready() == 0) {
server->Run();
if (!server->NewGameRequested())
break;
server->Cleanup();
}
server->DeInit();
}

View File

@ -17,10 +17,11 @@ Server::~Server() {
if (m_sock_udp)
closesocket(m_sock_udp);
if (m_sock_tcp)
closesocket(m_sock_tcp);
for (const auto& [key, player] : m_players)
closesocket(player->getSock());
m_players.clear();
closesocket(m_sock_tcp);
for (const auto& [key, player] : m_conns)
closesocket(player->getSock());
m_conns.clear();
delete m_world;
#ifdef _WIN32
WSACleanup();
#endif
@ -68,25 +69,28 @@ int Server::Init() {
}
int Server::Ready() {
int nbrjoueurs = 0,
int nbrjoueurs = 0,
nbrconn = 0;
bool readystart = false;
do {
Log("Entrez la duree de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
try {
m_game.countdown = std::stoi(m_buf.ptr);
} catch(const std::exception& e) {
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_game.countdown = 0;
}
} while (m_game.countdown < 1);
// m_game.seed = 9370707;
do {
Log("Entrez le seed de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
try {
m_game.seed = std::stoi(m_buf.ptr);
} catch(const std::exception& e) {
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_game.seed = 0;
}
@ -94,16 +98,27 @@ int Server::Ready() {
do {
Log("Entrez le nombre de joueurs: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
try {
nbrjoueurs = std::stoi(m_buf.ptr);
} catch(const std::exception& e) {
}
catch (const std::exception& e) {
Log(e.what(), true, false);
nbrjoueurs = 0;
}
if (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS)
Log("Nombre de joueurs invalide.", true, false);
} while (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS);
do {
Log("Entrez le nombre de boosters: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
m_boostcount = std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_boostcount = -1;
}
} while (m_boostcount < 0);
m_game.gameType = 1;
if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) {
@ -112,9 +127,9 @@ int Server::Ready() {
}
buildIdList(ID_LIST_SIZE);
Log("A l'ecoute sur le port: " + std::to_string(SRV_PORT), false, false);
while (!readystart) {
sockaddr_in sockad;
addrlen_t addrlen = sizeof(sockad);
@ -127,14 +142,14 @@ int Server::Ready() {
str.append(inet_ntop(AF_INET, &sockad.sin_addr, m_buf.ptr, m_buf.len)).append(": ").append(std::to_string(sockad.sin_port));
if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
PlayerInfo play;
PlayerInfo* play = new PlayerInfo();
m_buf.len = BUFFER_LENGTH;
Packet pck = getPack(&m_buf);
if (pck.type != PACKET_TYPE::LOGINF) {
Log("Paquet invalide.", true, false);
if (pck.type != PACKET_TYPE::ERR)
netprot::emptyPack(pck);
netprot::emptyPack(pck);
continue; // Passer au prochain appel si c'est pas un LoginInfo ou un LoginInfo invalide qui rentre.
}
LoginInfo* log = (LoginInfo*)pck.ptr;
@ -144,33 +159,36 @@ int Server::Ready() {
Log(str.append(" Nom: ").append(log->name), false, false);
str.clear();
Log(str.append(log->name).append(" SID: [").append(std::to_string(log->sid).append("]")), false, false);
sendPack<LoginInfo>(sock, log, &m_buf);
play.id = getUniqueId();
strcpy(play.name, log->name);
play.tid = log->tid;
sendPack<GameInfo>(sock, &m_game, &m_buf);
Connection* conn = new Connection(sock, sockad, *log, play);
sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
for (auto& [key, player] : m_players) {
sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s
sendPack<PlayerInfo>(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur.
}
play->id = getUniqueId();
play->tid = log->tid;
strcpy(play->name, 32, log->name);
m_players[log->sid] = std::move(conn);
Log(str.append(play->name).append(" SID: [").append(std::to_string(log->sid)).append("]")
.append(" ID: [").append(std::to_string(play->id)).append("]")
.append(" TID: [").append(std::to_string(play->tid)).append("]"), false, false);
play->tid = log->tid;
delete log;
sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
Connection* conn = new Connection(sock, sockad, log, play);
m_conns[log->sid] = conn;
if (++nbrconn >= nbrjoueurs)
readystart = true;
}
}
}
for (auto& [keyin, playin] : m_conns) // Not pretty, but it works.
for (auto& [keyout, playout] : m_conns) {
if (keyin == keyout)
continue;
sendPackTo<PlayerInfo>(m_sock_udp, playout->getInfo(), &m_buf, playin->getAddr()); // et envoyer les infos des joueurs distants au nouveau joueur.
}
return 0;
}
@ -179,65 +197,326 @@ void Server::Run() {
Input in;
sockaddr_in sockad;
addrlen_t socklen = sizeof(sockad);
Log("Debut de la partie...", false, false);
int players = m_players.size();
int players = m_conns.size();
m_world = new World();
m_world->SetSeed(m_game.seed);
m_world->GetChunks().Reset(nullptr);
m_world->BuildWorld();
for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
for (auto& [key, conn] : m_conns) { // Creation des instances de joueurs et premier sync.
if (!conn) {
m_conns.erase(key);
continue;
}
int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 4,
y = (rand() % (CHUNK_SIZE_Z * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Z * WORLD_SIZE_Y / 2)) / 4;
conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
conn->player->m_username = conn->GetName();
m_players[key] = conn->player;
Sync sync;
sync.position = conn->player->GetPosition();
sync.position = conn->player->GetPositionAbs();
sync.hp = conn->player->GetHP();
sync.sid = key;
sync.ammo = 0;
sync.timestamp = 0;
sync.timer = m_game.countdown;
sendPack<Sync>(conn->getSock(), &sync, &m_buf);
sendPackTo<Sync>(m_sock_udp, &sync, &m_buf, conn->getAddr());
}
int timer = m_game.countdown, timer_acc = 0, deadplayers = 0;
std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
Timestamp last = 0;
std::vector<Chat*> chatlog;
std::vector<ChunkMod*> chunkdiffs;
std::vector<Bullet*> bullets;
std::vector<std::vector<Bullet*>::iterator> bullit;
std::vector<BulletAdd*> netbull;
std::vector<PickupMod*> netboosters;
std::vector<char*> lsPck;
while (!endgame) {
for (auto& [key, conn] : m_players) {
conn->getPacks(m_sock_udp);
conn->Run(m_world);
conn->sendPacks(m_sock_udp, m_players);
int max = 0;
for (int64_t x = 0; x < m_boostcount; ++x) {
Vector3f pos = Vector3f(rand() % (WORLD_SIZE_X * CHUNK_SIZE_X) + .5f, rand() % CHUNK_SIZE_Y + .5f, rand() % (WORLD_SIZE_Y * CHUNK_SIZE_Z) + .5f);
if (m_world->BlockAt(pos) == BTYPE_AIR && m_world->BlockAt(Vector3f(pos.x, pos.y - 2, pos.z)) != BTYPE_AIR) {
Booster* boost = new Booster(pos, (BOOST_TYPE)(rand() % BTYPE_BOOST_LAST), getUniqueId());
m_boosters[boost->GetId()] = boost;
}
else --x;
if (++max > 100000)
break;
}
//while (true) {
// if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
// Packet pck = getPack(&m_buf);
// switch (pck.type) {
// using enum netprot::PACKET_TYPE;
// case ERR: std::puts("ERROR!"); break;
// case INPUT: std::puts("INPUT!"); break;
// case OUTPUT: std::puts("OUTPUT!"); break;
// case SYNC: std::puts("SYNC!"); break;
// case TEAMINF: std::puts("TEAMINF!"); break;
// case SELFINF: std::puts("SELFINF!"); break;
// case PLAYINF: std::puts("PLAYINF!"); break;
// case LOGINF: std::puts("LOGINF!"); break;
// case CHUNKMOD: std::puts("CHUNKMOD!"); break;
// case PLAYERMOD: std::puts("PLAYERMOD!"); break;
// case PICKUPMOD: std::puts("PICKUPMOD!"); break;
// case GAMEINFO: std::puts("GAMEINFO!"); break;
// case ENDINFO: std::puts("ENDINFO!"); break;
// case CHAT: std::puts("CHAT!"); break;
// case ERRLOG: std::puts("ERRLOG!"); break;
// case LAST_PACK: [[falltrough]];
// default: std::puts("wtf?!"); break;
// }
// netprot::emptyPack(pck);
// }
//}
Chat* startchat = new Chat();
startchat->src_id = 0;
char startmess[] = "How would -YOU- like to die today, motherf-words?";
float endtime = 0.;
strcpy(startchat->mess, 140, startmess);
chatlog.emplace_back(startchat);
while (!endgame && endtime < 1.) {
using namespace std::chrono;
Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - start).count();
if (last == 0)
last = tstamp;
timer_acc += tstamp - last;
if (timer_acc >= 1000) {
while (timer_acc >= 1000)
timer_acc -= 1000;
if (!endgame)
--timer;
std::string str = "Timer: ";
Log(str.append(std::to_string(timer)), false, false);
}
last = tstamp;
for (auto& [key, conn] : m_conns) {
/* In */
Input in; Sync sync;
recvPacks(m_sock_udp, &m_buf, &lsPck);
for (auto& pck : lsPck) {
uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
case INPUT:
if (Deserialize(&in, pck, &bsize)) {
if (m_conns.count(in.sid))
m_conns[in.sid]->AddInput(in);
}
break;
case SYNC:
if (Deserialize(&sync, pck, &bsize)) {}
break;
default: break;
}
}
if (!lsPck.empty())
lsPck.clear();
/* Process */
if (conn->m_nsync) {
Timestamp tstamp = conn->Run(m_world, m_boosters);
if (conn->player->AmIDead() && !conn->player->Eulogy) {
Chat* chat = new Chat();
chat->dest_id = chat->dest_team_id = chat->src_id = 0;
Player* murderer = m_conns.at(conn->player->Killer)->player;
if (murderer != conn->player)
murderer->addPoint();
std::string killer = murderer->GetUsername();
std::string mess = getDeathMessage(conn->player->GetUsername(), killer);
strcpy(chat->mess, 140, mess.c_str());
chatlog.emplace_back(chat);
++deadplayers;
conn->player->Eulogy = true;
conn->m_nsync = false;
}
else {
for (auto& chmo : conn->ChunkDiffs)
chunkdiffs.emplace_back(std::move(chmo));
if (!conn->ChunkDiffs.empty())
conn->ChunkDiffs.clear();
for (auto& bull : conn->Bullets) {
bullets.emplace_back(bull);
BulletAdd* nbul = new BulletAdd();
nbul->pos = bull->getPos();
nbul->dir = bull->getVel();
nbul->id = key;
nbul->tstamp = tstamp;
netbull.emplace_back(std::move(nbul));
}
if (!conn->Bullets.empty())
conn->Bullets.clear();
}
}
/* Out */
conn->sendPacks(m_sock_udp, m_conns, timer);
if ((deadplayers == players - 1 && deadplayers != 0) || timer < 0) {
if (!endgame) {
Chat* gameover = new Chat();
gameover->dest_id = gameover->dest_team_id = gameover->src_id = 0;
std::string winner, winmess;
int score = 0;
bool plural = false;
for (auto& [key, conn] : m_conns) {
if (conn->player->getScore() > score) {
winner = conn->player->GetUsername();
score = conn->player->getScore();
plural = false;
}
else if (conn->player->getScore() == score) {
winner = winner.append(" and ").append(conn->player->GetUsername());
plural = true;
}
}
winmess = "And the winner";
if (!plural)
winmess = winmess.append(" is ");
else winmess = winmess.append("s are ");
winmess = winmess.append(winner).append(" with ").append(std::to_string(score)).append(" point");
if (score > 1)
winmess = winmess.append("s.");
else winmess = winmess.append(".");
strcpy(gameover->mess, 140, winmess.c_str());
chatlog.emplace_back(gameover);
}
endgame = true;
endtime += .001;
}
}
int max = 0;
for (auto& [key, booster] : m_boosters) {
if (booster->modified) {
PickupMod pmod;
pmod.available = booster->GetAvailability();
pmod.id = booster->GetId();
pmod.pos = booster->GetPosition();
Boosts boost;
switch (booster->GetType()) {
case BTYPE_DAMAGE:
boost.damage = true;
break;
case BTYPE_HEAL:
boost.hp = true;
break;
case BTYPE_INVINCIBLE:
boost.invincible = true;
break;
default: continue;
}
pmod.boost = boost;
booster->modified = false;
for (auto& [key, conn] : m_conns)
sendPackTo<PickupMod>(m_sock_udp, &pmod, &m_buf, conn->getAddr());
max++;
if (max > 5)
break;
}
}
for (auto& bull : netbull) {
for (auto& [key, conn] : m_conns)
if (bull->id != conn->GetHash(false)) // Pour pas repitcher au joueur sa propre balle.
sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
delete bull;
}
if (!netbull.empty())
netbull.clear();
for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
ChunkMod* cmod = nullptr;
Bullet* bullet = *bull;
if (bullet->Update(m_world, (1. / 60.), 50, m_players, &cmod)) {
if (cmod)
chunkdiffs.emplace_back(cmod);
bullit.push_back(bull);
}
}
for (auto& bull : bullit) {
delete* bull;
bullets.erase(bull);
}
if (!bullit.empty())
bullit.clear();
for (auto& chat : chatlog) {
Log(chat->mess, false, false);
for (auto& [key, conn] : m_conns)
sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr());
delete chat;
}
if (!chatlog.empty())
chatlog.clear();
for (auto& chmo : chunkdiffs) {
for (auto& [key, conn] : m_conns)
sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr());
delete chmo;
}
if (!chunkdiffs.empty())
chunkdiffs.clear();
}
Chat end;
end.src_id = 0;
char endmess[] = "Game over, man. Game over.";
strcpy(end.mess, 140, endmess);
for (auto& [key, conn] : m_conns) {
std::string str = conn->player->GetUsername();
Log(str.append(" ").append(std::to_string(conn->player->getScore())), false, false);
}
for (auto& [key, conn] : m_conns)
sendPackTo<Chat>(m_sock_udp, &end, &m_buf, conn->getAddr());
// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
char* ch = new char[2];
std::cout << "Nouvelle partie? [o/N] ";
std::cin.getline(ch, 2);
std::cout << std::endl;
m_exit = true;
if (ch[0] == 'o' || ch[0] == 'O')
m_exit = false;
delete[] ch;
}
void Server::Cleanup() {
for (auto& [key, conn] : m_conns)
delete conn;
m_conns.clear();
m_players.clear();
delete m_world;
m_world = nullptr;
}
void Server::DeInit() {
if (m_logfile.is_open())
m_logfile.close();
if (m_sock_udp)
closesocket(m_sock_udp);
if (m_sock_tcp)
closesocket(m_sock_tcp);
#ifdef _WIN32
WSACleanup();
#endif
}
bool Server::NewGameRequested() const { return !m_exit; }
inline std::string Server::LogTimestamp() {
time_t rawtime;
tm timeinfo;
@ -260,13 +539,13 @@ inline std::string Server::LogTimestamp() {
void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
switch (m_log) {
using enum LOG_DEST; // C++20!
case LOGFILE:
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break;
case CONSOLE: [[fallthrough]]; // Pour dire que c'est voulu que ça traverse vers le case en dessous (C++17!)
default:
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break;
case LOGFILE:
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break;
case CONSOLE: [[fallthrough]]; // Pour dire que c'est voulu que ça traverse vers le case en dessous (C++17!)
default:
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break;
}
if (is_fatal) {
@ -276,10 +555,11 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
closesocket(m_sock_udp);
if (m_sock_tcp)
closesocket(m_sock_tcp);
for (const auto& [key, player] : m_players) {
for (const auto& [key, player] : m_conns)
closesocket(player->getSock());
}
m_players.clear();
delete m_world;
m_conns.clear();
#ifdef _WIN32
WSACleanup();
#endif
@ -293,7 +573,7 @@ void Server::buildIdList(size_t size) {
srand(time(NULL));
do lst.insert(((uint64_t)rand() << 32 | rand()));
while (lst.size() < size);
m_ids = std::vector<uint64_t>(lst.begin(), lst.end());
}
@ -302,3 +582,34 @@ uint64_t Server::getUniqueId() {
m_ids.pop_back();
return id;
}
std::string Server::getDeathMessage(std::string username, std::string killer) const {
std::string mess;
std::string temp = DEATHMESSAGES.at(rand() % DEATHMESSAGES.size());
size_t ind = temp.find('@');
size_t indk = temp.find('$');
bool bypass = false;
if (indk == std::string::npos)
bypass = true;
if (ind < indk || bypass) {
mess.append(temp.substr(0, ind));
mess.append(username);
if (!bypass) {
mess.append(temp.substr(ind + 1, indk - 1));
mess.append(killer);
mess.append(temp.substr(indk + 1));
}
else mess.append(temp.substr(ind + 1));
}
else {
mess.append(temp.substr(0, indk));
mess.append(killer);
mess.append(temp.substr(indk + 1, ind - 1));
mess.append(username);
mess.append(temp.substr(ind + 1));
}
return mess;
}

View File

@ -1,6 +1,7 @@
#ifndef SERVER_H__
#define SERVER_H__
#include <cstdlib>
#include <fstream>
#include <vector>
#include <set>
@ -23,6 +24,9 @@ public:
int Init();
int Ready();
void Run();
void Cleanup();
void DeInit();
bool NewGameRequested() const;
private:
@ -36,19 +40,24 @@ private:
Buffer m_buf;
std::unordered_map<uint64_t, Connection*> m_players;
std::unordered_map<uint64_t, Player*> m_players;
std::unordered_map<uint64_t, Connection*> m_conns;
std::unordered_map<Timestamp, Chat> m_chatlog;
std::unordered_map<uint64_t, Booster*> m_boosters;
std::vector<uint64_t> m_ids;
GameInfo m_game;
World* m_world = nullptr;
const bool m_manual_setup = SRV_MANUAL_SETUP;
bool m_exit = true;
int64_t m_boostcount = -1;
std::string LogTimestamp();
void Log(std::string str, bool is_error, bool is_fatal);
void buildIdList(size_t size);
uint64_t getUniqueId();
std::string getDeathMessage(std::string username, std::string killer) const;
};

View File

@ -20,13 +20,13 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="audio.h" />
<ClInclude Include="booster.h" />
<ClInclude Include="connector.h" />
<ClInclude Include="define.h" />
<ClInclude Include="engine.h" />
<ClInclude Include="mesh.h" />
<ClInclude Include="openglcontext.h" />
<ClInclude Include="remoteplayer.h" />
<ClInclude Include="settings.h" />
<ClInclude Include="shader.h" />
<ClInclude Include="skybox.h" />
<ClInclude Include="texture.h" />
@ -37,13 +37,13 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="audio.cpp" />
<ClCompile Include="booster.cpp" />
<ClCompile Include="connector.cpp" />
<ClCompile Include="engine.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="mesh.cpp" />
<ClCompile Include="openglcontext.cpp" />
<ClCompile Include="remoteplayer.cpp" />
<ClCompile Include="settings.cpp" />
<ClCompile Include="shader.cpp" />
<ClCompile Include="skybox.cpp" />
<ClCompile Include="texture.cpp" />
@ -194,7 +194,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>

View File

@ -53,7 +53,7 @@
<ClInclude Include="remoteplayer.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="booster.h">
<ClInclude Include="settings.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
</ItemGroup>
@ -100,7 +100,7 @@
<ClCompile Include="remoteplayer.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="booster.cpp">
<ClCompile Include="settings.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup>

View File

@ -2,26 +2,40 @@
Audio::Audio() {
m_engine = irrklang::createIrrKlangDevice();
m_engine->setDopplerEffectParameters(10);
m_engine->setRolloffFactor(2);
m_engine->setDefault3DSoundMinDistance(.1);
m_engine->setDopplerEffectParameters(1);
m_engine->setRolloffFactor(1);
m_engine->setDefault3DSoundMinDistance(1);
m_engine->setDefault3DSoundMaxDistance(1000);
}
Audio::Audio(const char * music) {
Audio::Audio(const char * music, const char* menumusic) {
m_engine = irrklang::createIrrKlangDevice();
m_engine->setDopplerEffectParameters(1);
m_engine->setRolloffFactor(2);
m_engine->setDefault3DSoundMinDistance(.1);
m_engine->setDefault3DSoundMaxDistance(1000);
m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING);
m_engine->setRolloffFactor(1);
m_engine->setDefault3DSoundMinDistance(1);
m_engine->setDefault3DSoundMaxDistance(100);
m_music = m_engine->play2D(music, true, true, true, irrklang::ESM_STREAMING);
m_menumusic = m_engine->play2D(menumusic, true, true, true, irrklang::ESM_STREAMING);
m_music->setVolume(.5);
m_menumusic->setVolume(.5);
m_mainvolume = 0.5f;
m_engine->setSoundVolume(m_mainvolume);
m_sfxvolume = 0.5f;
}
Audio::~Audio() {
if (m_music) m_music->drop();
if (m_menumusic) m_menumusic->drop();
if (m_engine) m_engine->drop();
}
void Audio::playSound(const char* name, float volume = 1.) {
irrklang::ISound* sfx = m_engine->play2D(name, false, true);
sfx->setVolume(volume);
sfx->setIsPaused(false);
m_sfxes.push_back(sfx);
}
void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
m_engine->setListenerPosition(irrklang::vec3df(pos.x, pos.y, pos.z),
irrklang::vec3df(dir.x, dir.y, dir.z),
@ -29,9 +43,10 @@ void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
}
irrklang::ISound* Audio::Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped = false, float volume = 1) {
sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), is_looped, false, true, is_looped? irrklang::ESM_STREAMING: irrklang::ESM_NO_STREAMING, true);
sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), is_looped, true, true, is_looped? irrklang::ESM_STREAMING: irrklang::ESM_NO_STREAMING, true);
sound->setVelocity(irrklang::vec3df(vel.x, vel.y, vel.z));
sound->setVolume(volume);
sound->setIsPaused(false);
return sound;
}
@ -45,6 +60,76 @@ void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& v
// m_music = m_engine->play2D(music, false, false, false, irrklang::ESM_STREAMING);
//}
void Audio::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
void Audio::CleanupSFX() {
while (!m_sfxes.empty()) {
irrklang::ISound* sfx = m_sfxes.back();
if (sfx->isFinished()) {
sfx->drop(); // drop() fait deja la job du delete sfx.
}
else break;
m_sfxes.pop_back();
}
}
void Audio::ToggleMusicState(GameState state) {
if (m_music_on) {
switch (state) {
case PLAY:
m_music->setIsPaused(false);
m_menumusic->setIsPaused(true);
break;
case PAUSE:
m_music->setIsPaused(true);
m_menumusic->setIsPaused(true);
break;
default:
m_music->setIsPaused(true);
m_menumusic->setIsPaused(false);
break;
}
}
else {
m_music->setIsPaused(true);
m_menumusic->setIsPaused(true);
}
}
void Audio::SetMusic(bool ison, GameState state) {
m_music_on = state;
if (!state) {
m_music->setIsPaused(true);
m_menumusic->setIsPaused(true);
}
else ToggleMusicState(state);
}
bool Audio::GetMusic() {
return m_music_on;
}
void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
float Audio::GetMusicVolume() const {
return m_music->getVolume();
}
void Audio::SetMusicVolume(float volume) {
m_music->setVolume(volume);
m_menumusic->setVolume(volume);
}
float Audio::GetMainVolume() const {
return m_engine->getSoundVolume();
}
void Audio::SetMainVolume(float volume) {
m_engine->setSoundVolume(volume);
}
float Audio::GetSfxVolume() const {
return m_sfxvolume;
}
void Audio::SetSfxVolume(float volume) {
m_sfxvolume = volume;
}

View File

@ -15,24 +15,46 @@
class Audio {
private:
irrklang::ISound* m_music;
irrklang::ISound* m_menumusic;
float m_mainvolume;
float m_sfxvolume;
bool m_music_on = true;
std::vector<irrklang::ISound*> m_sfxes;
public:
Audio();
Audio(const char* music);
Audio(const char* music, const char* menumusic);
~Audio();
irrklang::ISoundEngine* m_engine;
void Update3DAudio(Vector3f pos, Vector3f dir, Vector3f speed);
irrklang::ISound* Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped, float volume);
void Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& vel, float volume);
//void PlaySong(const char* music);
void ToggleMusicState();
void CleanupSFX();
void ToggleMusicState(GameState state);
void playSound(const char* sound, float volume);
void SetMusic(bool ison, GameState state);
bool GetMusic();
void PauseEngine();
float GetMainVolume() const;
void SetMainVolume(float volume);
float GetMusicVolume() const;
void SetMusicVolume(float volume);
float GetSfxVolume() const;
void SetSfxVolume(float volume);
};
#endif // AUDIO_H__

View File

@ -1,46 +0,0 @@
#include "booster.h";
void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran)
{
//
//Vector3f playerToQuad = m_player.GetPosition() - m_position;
//playerToQuad.Normalize();
//Vector3f targetPosition = m_player.GetPosition() + playerToQuad * 10.0f;
//Matrix4f rotationMatrix;
//rotationMatrix.SetLookAt(m_position, targetPosition, Vector3f(0, 1, 0));
//glMultMatrixf(rotationMatrix.GetInternalValues());
float x = pos.x;
float y = pos.y;
float z = pos.z;
float width = 1.0f;
float height = 1.0f;
//Pt override les collisions.. a ce point la je sais pas quoi faire
//Matrix4 mat4 = tran.GetMatrix();
//mat4 VP = pMatrix * vMatrix;
//Vector3f CameraRight = Vector3f(mat4.Get11(), mat4.Get21(), mat4.Get31());
//Vector3f CameraUp = Vector3f(mat4.Get12(), mat4.Get22(), mat4.Get32());
//Vector3f v1 = (m_position + CameraRight * 0.5 * width + CameraUp * -0.5 * width);
//Vector3f v2 = (m_position + CameraRight * 0.5 * width + CameraUp * 0.5 * width);
//Vector3f v4 = (m_position + CameraRight * -0.5 * width + CameraUp * -0.5 * width);
//Vector3f v3 = (m_position + CameraRight * -0.5 * width + CameraUp * 0.5 * width);
//tran.ApplyTranslation(m_position);
float u, v, w, h;
//glDisable(GL_DEPTH_TEST);
shader.Use();
textureAtlas.Bind();
textureAtlas.TextureIndexToCoord(8, u, v, w, h);
//glLoadIdentity();
glLoadMatrixf(tran.GetMatrix().GetInternalValues());
glBegin(GL_QUADS);
glTexCoord2f(u, v); glVertex3f(x - width / 2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
glTexCoord2f(u + w, v); glVertex3f(x + width / 2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
glTexCoord2f(u + w, v + h); glVertex3f(x + width / 2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
glTexCoord2f(u, v + h); glVertex3f(x - width / 2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
glEnd();
shader.Disable();
//tran.ApplyTranslation(-m_position);
//glEnable(GL_DEPTH_TEST);
}

View File

@ -1,14 +0,0 @@
#ifndef BOOSTER_H__
#define BOOSTER_H__
#include "define.h"
#include "textureatlas.h"
#include "shader.h"
#include "../SQCSim-common/vector3.h"
#include "../SQCSim-common/transformation.h"
class Booster {
public:
void RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran);
};
#endif

View File

@ -28,6 +28,7 @@ include_directories(
add_library(SQCSim-common
"${SQCSIM_COMMON_DIR}boostinfo.cpp"
"${SQCSIM_COMMON_DIR}blockinfo.cpp"
"${SQCSIM_COMMON_DIR}bullet.cpp"
"${SQCSIM_COMMON_DIR}chunk.cpp"
@ -40,6 +41,7 @@ add_library(SQCSim-common
add_executable(SQCSim-client
"../audio.cpp"
"../booster.cpp"
"../connector.cpp"
"../engine.cpp"
"../mesh.cpp"

View File

@ -65,20 +65,15 @@ int Connector::Connect(const char* srv_addr, std::string name) {
netprot::Buffer bf;
netprot::LoginInfo log;
strcpy(log.name, name.c_str());
strcpy(log.name, 32, name.c_str());
netprot::sendPack(m_sock_tcp, &log, &bf);
//using namespace std::chrono_literals;
//std::this_thread::sleep_for(100ms);
memset(bf.ptr, '\0', BUFFER_LENGTH);
bool ready = false;
int errors = 0;
std::vector<char*> lsPck;
while (!ready) {
lsPck = netprot::recvPacks(m_sock_tcp, &bf);
netprot::recvPacks(m_sock_udp, &bf, &lsPck);
for (auto& pck : lsPck) {
uint32_t bsize = bf.len - (pck - bf.ptr);
@ -97,7 +92,10 @@ int Connector::Connect(const char* srv_addr, std::string name) {
pl = new netprot::PlayerInfo();
if (!netprot::Deserialize(pl, pck, &bsize))
++errors;
else m_players[pl->id] = pl;
else {
m_players[pl->id] = pl;
std::cout << "A challenger appears! " << pl->name << std::endl;
}
break;
case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.

View File

@ -25,16 +25,40 @@
#define BULLET_UPDATES_PER_FRAME 20
#define BASE_WIDTH 640
#define BASE_HEIGHT 480
#define BASE_WIDTH 1280
#define BASE_HEIGHT 720
#define ANIME_PATH_JUMP "./media/textures/AssetOtherPlayer/FinalPNGJumping/"
#define ANIME_PATH_STILL "./media/textures/AssetOtherPlayer/FinalPNGStanding/"
//1 = jump shoot sans anim, 2 = jump shoot avec anim
#define ANIM_PATH_JSHOOT1 "./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/"
#define ANIM_PATH_JSHOOT2 "./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/"
//1 = shoot sans anim, 2 = shoot avec anim
#define ANIM_PATH_SSHOOT1 "./media/textures/AssetOtherPlayer/FinalPNGShooting/"
#define ANIM_PATH_SSHOOT2 "./media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/"
#define TEXTURE_PATH "./media/textures/"
#define SHADER_PATH "./media/shaders/"
#define AUDIO_PATH "./media/audio/"
#define CHUNK_PATH "./media/chunks/"
#define MENU_ITEM_PATH "./media/menu_items/"
#define BOOSTER_TEXTURE_PATH "./media/textures/Booster/"
enum GameState {
MAIN_MENU,
SPLASH,
LOBBY,
OPTIONS,
PLAY,
PAUSE
};
enum Resolution {
HD = 0, // 1280x720 (High Definition)
FHD, // 1920x1080 (Full HD)
QHD, // 2560x1440 (Quad HD)
UHD, // 3840x2160 (Ultra HD)
};
#endif // DEFINE_H__

View File

@ -1 +0,0 @@

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,7 @@
#include <chrono>
#include <cmath>
#include <unordered_map>
#include <set>
#include "../SQCSim-common/array2d.h"
#include "../SQCSim-common/blockinfo.h"
#include "../SQCSim-common/boostinfo.h"
@ -13,6 +14,7 @@
#include "../SQCSim-common/world.h"
#include "../SQCSim-common/transformation.h"
#include "../SQCSim-common/player.h"
#include "../SQCSim-common/booster.h"
#include "define.h"
#include "openglcontext.h"
#include "texture.h"
@ -23,16 +25,15 @@
#include "connector.h"
#include "renderer.h"
#include "remoteplayer.h"
#include "booster.h"
#include "settings.h"
class Engine : public OpenglContext {
public:
Engine();
virtual ~Engine();
virtual void DrawMenu();
virtual void DrawPause();
virtual void DrawSplachScreen();
virtual void Init();
virtual void DeInit();
virtual void LoadResource();
@ -41,96 +42,158 @@ public:
virtual void KeyPressEvent(unsigned char key);
virtual void KeyReleaseEvent(unsigned char key);
virtual void MouseMoveEvent(int x, int y);
virtual void MousePressEvent(const MOUSE_BUTTON &button, int x, int y);
virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
virtual void MousePressEvent(const MOUSE_BUTTON& button, int x, int y);
virtual void MouseReleaseEvent(const MOUSE_BUTTON& button, int x, int y);
private:
int GetFps(float elapsedTime) const;
int GetCountdown(float elapsedTime);
int GetOptionsChoice();
bool StartMultiplayerGame();
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
void ChangeResolution(Resolution resolution);
void InstantDamage();
void SystemNotification(std::string systemLog);
void KillNotification(Player killer, Player killed);
void DisplayNotification(std::string message);
void ProcessNotificationQueue();
void DisplayCrosshair();
void DisplayPovGun();
void DisplayCurrentItem();
void DisplayHud(int timer);
void DisplayInfo(float elapsedTime, BlockType bloc);
void DisplaySingleOrMultiplayerMenu();
void DrawHud(float elapsedTime, BlockType bloc);
void DisplayInfo(float elapsedTime, BlockType bloc);
void DisplaySplashScreen();
void DisplayMainMenu();
void DrawButtonBackgrounds(float centerX, float centerY, int iterations);
void DrawMainMenuButtons(float centerX, float centerY);
void DrawSingleMultiButtons(float centerX, float centerY);
void DisplayLobbyMenu(float elapsedTime);
void SetPlayerUsername(float elapsedTime);
void SetServerAddress(float elapsedTime);
void DisplayPauseMenu(float elapsedTime);
void DisplayOptionsMenu();
void DisplayAudioMenu(float centerX, float centerY);
void DisplayGraphicsMenu(float centerX, float centerY);
void DisplayGameplayMenu(float centerX, float centerY);
void DrawSliderBackground(float centerX, float centerY, float minVal, float maxVal, float bottomSideValue, float topSideValue);
void DisplayBarPercentValue(float centerX, float centerY, float posX, float posY, float minVal, float maxVal, float value);
void DrawSlider(float centerX, float centerY, float value, float minVal, float maxVal, float bottomSideValue, float topSideValue);
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
void ProcessNotificationQueue();
char SimulateKeyboard(unsigned char key);
void HandlePlayerInput(float elapsedTime);
Audio m_audio = Audio(AUDIO_PATH "music01.wav", AUDIO_PATH "menumusic01.wav");
irrklang::ISound* m_powpow, * m_scream;
irrklang::ISound* m_whoosh[MAX_BULLETS];
Bullet* m_bullets[MAX_BULLETS];
//Menu
Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
World m_world = World();
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
Renderer m_renderer = Renderer();
Connector m_conn;
Shader m_shader01;
BlockInfo* m_blockinfo[BTYPE_LAST];
BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
GameState m_gamestate = GameState::SPLASH;
Shader m_shader01;
Skybox m_skybox;
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
World m_world = World();
Renderer m_renderer = Renderer();
Booster m_booster = Booster();
TextureAtlas::TextureIndex texBoostHeal;
Texture m_textureCrosshair;
Texture m_textureFont;
Texture m_textureGun;
Texture m_texturePovGun;
Texture m_textureSkybox;
Texture m_textureSoloMultiMenu;
Texture m_textureSoloText;
Texture m_textureMultiText;
Texture m_textureTitle;
TextureAtlas::TextureIndex texBoostHeal;
Texture m_textureLobbyMenu;
Texture m_textureMainMenu;
Texture m_textureOptionsMenu;
Texture m_texturePauseMenu;
Texture m_textureSplashScreen;
Skybox m_skybox;
Audio m_audio = Audio(AUDIO_PATH "start.wav");
Texture m_textureHd;
Texture m_textureFhd;
Texture m_textureQhd;
Texture m_textureUhd;
irrklang::ISound* m_powpow,
* m_scream;
irrklang::ISound *m_whoosh[MAX_BULLETS];
Texture m_textureLobbyServer;
Texture m_textureLobbyIdentify;
Texture m_textureCheck;
Texture m_textureChecked;
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
Bullet* m_bullets[MAX_BULLETS];
Texture m_texturePauseResume;
Texture m_texturePauseMainMenu;
std::unordered_map<uint64_t, Player*> m_players;
netprot::Buffer m_buf, m_bufout;
std::chrono::high_resolution_clock::time_point m_startTime;
Texture m_textureOptAudio;
Texture m_textureOptBack;
Texture m_textureOptGameplay;
Texture m_textureOptGraphics;
Texture m_textureOptMain;
Texture m_textureOptMusic;
Texture m_textureOptOptions;
Texture m_textureOptResolution;
Texture m_textureOptSensitivity;
Texture m_textureOptSfx;
//Menu
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture;
Texture MenuBGTexture;
Texture MenuStartTexture;
Texture MenuQuitTexture;
Texture MenuOptionsTexture;
Texture PauseBGTexture;
Texture SplachScreenTexture;
Texture m_textureMenuBack;
Texture m_textureMenuMulti;
Texture m_textureMenuOptions;
Texture m_textureMenuPlay;
Texture m_textureMenuQuit;
Texture m_textureMenuSingle;
Texture m_textureMenuTitle;
Settings m_options = Settings(m_audio);
Resolution m_resolution = HD;
float m_splashTime = 2.0f;
float m_scale;
float m_time = 0;
float m_time_SplashScreen = 0;
float m_titleX = 0;
float m_titleY = 0;
float m_Width = 0;
float m_Height = 0;
int m_renderCount = 0;
int m_countdown = COUNTDOWN;
int m_nbReductionChunk = 4;
int m_timerReductionChunk = 30;
float m_mainvolume;
float m_musicvolume;
float m_sfxvolume;
float m_sensitivity;
int m_selectedOption = 0;
bool m_selectedOptAudioMainBar = false;
bool m_selectedOptAudioMusicBar = false;
bool m_selectedOptAudioSfxBar = false;
bool m_selectedGameplaySensitivityBar = false;
bool m_damage = false;
bool m_wireframe = false;
@ -143,7 +206,26 @@ private:
bool m_resetcountdown = false;
bool m_soloMultiChoiceMade = false;
bool m_stopcountdown = false;
bool m_selectedPlayOptions = false;
bool m_selectedOptions = false;
bool m_selectedQuit = false;
std::string m_currentInputString;
std::string m_username;
std::string m_serverAddr;
char m_inputChar = 0;
bool m_invalidChar = false;
bool m_charChanged = false;
bool m_settingUsername = false;
bool m_settingServer = false;
bool m_selectedSinglePlayer = false;
bool m_selectedMultiPlayer = false;
bool m_singleReady = false;
bool m_multiReady = false;
bool m_key1 = false;
bool m_key2 = false;
@ -153,20 +235,34 @@ private:
bool m_keyA = false;
bool m_keyS = false;
bool m_keyD = false;
bool m_keyEnter = false;
bool m_keySpace = false;
bool m_keyShift = false;
bool m_keyBackspace = false;
bool m_mouseL = false;
bool m_mouseR = false;
bool m_mouseC = false;
bool m_mouseWU = false;
bool m_mouseWD = false;
//Pour trouver ou est la souris
float m_mousemx = 0;
float m_mousemy = 0;
bool m_networkgame = false;
netprot::PlayerInfo m_pinfo;
RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
Connector m_conn;
std::deque<netprot::ChunkMod*> m_chunkmod_manifest;
std::chrono::high_resolution_clock::time_point m_startTime;
std::unordered_map<uint64_t, Player*> m_players;
std::set<uint64_t> m_deadplayers;
netprot::Buffer m_buf, m_bufout;
netprot::ChunkMod* m_chunkmod = nullptr;
std::unordered_map<uint64_t, Booster*> m_boosters;
std::set<uint64_t> m_boost_manifest;
std::unordered_map<uint64_t, netprot::Sync> m_syncs;
std::string m_messageNotification = "";
};
#endif // ENGINE_H__
#endif // ENGINE_H__

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 596 KiB

View File

Before

Width:  |  Height:  |  Size: 195 KiB

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -16,8 +16,8 @@ bool OpenglContext::Start(const std::string& title, int width, int height, bool
m_fullscreen = fullscreen;
InitWindow(width, height);
Init();
LoadResource();
Init();
sf::Clock clock;

View File

@ -53,9 +53,9 @@ protected:
void ShowCrossCursor() const;
bool m_istarted = false;
void InitWindow(int width, int height);
private:
void InitWindow(int width, int height);
MOUSE_BUTTON ConvertMouseButton(sf::Mouse::Button button) const;
private:

View File

@ -8,15 +8,11 @@
RemotePlayer::RemotePlayer(netprot::PlayerInfo pinfo) : m_pinfo(pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(Vector3f(0, 0, 0)){
LoadTexture(m_texture_front, TEXTURE_PATH "AssetOtherPlayer/FinalPNGStanding/BlueFrontRight.png", false, false);
RemotePlayer::RemotePlayer(netprot::PlayerInfo* pinfo) : m_pinfo(*pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(Vector3f(0, 0, 0)) {
}
RemotePlayer::RemotePlayer(netprot::PlayerInfo pinfo, const Vector3f& pos) : m_pinfo(pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(pos) {
LoadTexture(m_texture_front, TEXTURE_PATH "AssetOtherPlayer/FinalPNGStanding/BlueFrontRight.png", false, false);
RemotePlayer::RemotePlayer(netprot::PlayerInfo* pinfo, const Vector3f& pos) : m_pinfo(*pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(pos) {
}
@ -28,103 +24,286 @@ RemotePlayer::~RemotePlayer()
void RemotePlayer::Init()
{
}
void RemotePlayer::Feed(const netprot::Output out) {
//current.position = out.position;
//current.direction = out.direction;
//current.states = out.states;
//current.id = out.id;
m_position = Vector3f(out.position);
m_direction = Vector3f(out.direction);
current.states = out.states;
//if (current.position != previous.position)
//{
// Vector3f positionDelta = current.position - previous.position;
// m_position = current.position + positionDelta;
// m_direction = current.direction;
//}
//if(current.direction != previous.direction)
//{
// m_direction = current.direction;
// current.direction = current.direction;
//}
//if (current.states.shooting) {
// m_animstate = Anim::SHOOTING;
//}
//else if (current.states.jumping) {
// m_animstate = Anim::JUMPING;
//}
//else if (current.states.dead) {
// m_animstate = Anim::DEAD;
//}
//else if(current.states.powerup){
// m_animstate = Anim::POWERUP;
//}
//else if (current.states.still) {
// m_animstate = Anim::STILL;
//}
//else if (current.states.running) {
// m_animstate = Anim::RUNNING;
//}
//previous.direction = current.direction;
//previous.position = current.position;
//previous.states = current.states;
//previous.id = current.id;
}
void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime)
void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime, Player& camera)
{
float x = GetPosition().x;
float y = GetPosition().y;
float z = GetPosition().z;
float width = 1.f;
float height = 1.7f;
Vector3f DiffCam = GetPosition() - camera.GetPosition();
Vector3f UpCam = Vector3f(0.f, 1.f, 0.f);
Vector3f CrossA = DiffCam.Cross(UpCam);
Vector3f CrossB = DiffCam.Cross(CrossA);
CrossA.Normalize();
CrossB.Normalize();
Vector3f playerPosition = GetPosition() + Vector3f(0.f, -.75f, 0.f);
Vector3f v2 = (playerPosition + CrossA * 0.5 * width + CrossB * 0.5 * height);
Vector3f v1 = (playerPosition - CrossA * 0.5 * width + CrossB * 0.5 * height);
Vector3f v3 = (playerPosition + CrossA * 0.5 * width - CrossB * 0.5 * height);
Vector3f v4 = (playerPosition - CrossA * 0.5 * width - CrossB * 0.5 * height);
Vector3f angleRemote = GetDirection();
Vector3f angleCam = (v1 - v2).Cross(v3 - v2);
angleCam.y = 0;
angleRemote.y = 0;
angleCam.Normalize();
angleRemote.Normalize();
float angle = angleRemote.Dot(angleCam);
int index = 0;
angle = -angle;
Vector3f side = angleRemote.Cross(angleCam);
side = -side;
static float time = 0.f;
static bool Shooting = false;
bool isLeft = side.y > 0;
time += elapsedTime;
if (time >= 0.05)
{
time -= 0.05;
Shooting = !Shooting;
}
//Matrix4 mat4 = tran.GetMatrix();
//mat4 VP = pMatrix * vMatrix;
//Vector3f CameraRight = Vector3f(mat4.Get11(), mat4.Get21(), mat4.Get31());
//Vector3f CameraUp = Vector3f(mat4.Get12(), mat4.Get22(), mat4.Get32());
//std::cout << "shooting : " << current.states.shooting << " jumping : " << current.states.jumping << " jumpshot : " << current.states.jumpshot << " running : " << current.states.running << " still : " << current.states.still << " dead : " << current.states.dead << " hit : " << current.states.hit << std::endl;
if (angle >= 0.75) //Face - side positif
{
if (current.states.shooting) {
if (Shooting)
index = 17;
else
index = 9;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 41;
else
index = 33;
}
else if (current.states.jumping)
index = 25;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 0;
}
else if (angle >= 0.25 && isLeft) //Frontleft
{
if (current.states.shooting) {
if (Shooting)
index = 18;
else
index = 10;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 42;
else
index = 34;
}
else if (current.states.jumping)
index = 26;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 1;
}
else if (angle >= -0.25 && isLeft) //ProfileLeft
{
if (current.states.shooting) {
if (Shooting)
index = 20;
else
index = 12;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 44;
else
index = 36;
}
else if (current.states.jumping)
index = 28;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 3;
}
else if (angle >= -0.75 && isLeft) //BackLeft
{
if (current.states.shooting) {
if (Shooting)
index = 22;
else
index = 14;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 46;
else
index = 38;
}
else if (current.states.jumping)
index = 30;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 5;
}
else if (angle < -0.75) //Dos - side négatif
{
if (current.states.shooting) {
if (Shooting)
index = 24;
else
index = 16;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 48;
else
index = 40;
}
else if (current.states.jumping)
index = 32;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 7;
}
else if (angle >= 0.25 && !isLeft) //FrontRight //REVOIR L'ANIME DE SHOOTING EST PAS DRETTE
{
if (current.states.shooting) {
if (Shooting)
index = 19;
else
index = 11;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 43;
else
index = 35;
}
else if (current.states.jumping)
index = 27;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 2;
}
else if (angle >= -0.25 && !isLeft) //ProfileRight
{
if (current.states.shooting) {
if (Shooting)
index = 21;
else
index = 13;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 45;
else
index = 37;
}
else if (current.states.jumping)
index = 29;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 4;
}
else if (angle >= -0.75 && !isLeft) //BackRight
{
if (current.states.shooting) {
if (Shooting)
index = 23;
else
index = 15;
}
else if (current.states.jumpshot) {
if (Shooting)
index = 47;
else
index = 39;
}
else if (current.states.jumping)
index = 31;
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 6;
}
//Vector3f v1 = (m_position + CameraRight * 0.5 * width + CameraUp * -0.5 * width);
//Vector3f v2 = (m_position + CameraRight * 0.5 * width + CameraUp * 0.5 * width);
//Vector3f v4 = (m_position + CameraRight * -0.5 * width + CameraUp * -0.5 * width);
//Vector3f v3 = (m_position + CameraRight * -0.5 * width + CameraUp * 0.5 * width);
//tran.ApplyTranslation(m_position);
float u, v, w, h;
//glDisable(GL_DEPTH_TEST);
shader.Use();
atlas.Bind();
atlas.TextureIndexToCoord(0, u, v, w, h);
//glLoadIdentity();
atlas.TextureIndexToCoord(index, u, v, w, h);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (current.states.hit)
{
glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
glBlendColor(1.f, 0.f, 0.f, 1.f);
}
else {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
glBlendEquation(GL_FUNC_ADD);
glLoadMatrixf(tran.GetMatrix().GetInternalValues());
glBegin(GL_QUADS);
glTexCoord2f(u, v); glVertex3f(x - width/2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
glTexCoord2f(u + w, v); glVertex3f(x+width/2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
glTexCoord2f(u + w, v + h); glVertex3f(x+width/2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
glTexCoord2f(u, v + h); glVertex3f(x-width/2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
glEnd();
glLoadMatrixf(tran.GetMatrix().GetInternalValues());
glDepthFunc(GL_LEQUAL);
glBegin(GL_QUADS);
glTexCoord2f(u, v); glVertex3f(v1.x, v1.y, v1.z);
glTexCoord2f(u + w, v); glVertex3f(v2.x, v2.y, v2.z);
glTexCoord2f(u + w, v + h); glVertex3f(v3.x, v3.y, v3.z);
glTexCoord2f(u, v + h); glVertex3f(v4.x, v4.y, v4.z);
glEnd();
glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
glBlendEquation(GL_FUNC_SUBTRACT);
glDisable(GL_BLEND);
shader.Disable();
//tran.ApplyTranslation(-m_position);
//glEnable(GL_DEPTH_TEST);
}
bool RemotePlayer::LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps, bool stopOnError)

View File

@ -14,14 +14,14 @@ class RemotePlayer : public Player {
public:
enum Anim: uint8_t { STILL = 1, RUNNING = 2, JUMPING = 4, SHOOTING = 8, POWERUP = 16, DEAD = 32 }; // A REVOIR VOIR DEFINE.H POUR LES ANIMES
RemotePlayer(netprot::PlayerInfo pinfo);
RemotePlayer(netprot::PlayerInfo pinfo, const Vector3f& pos);
RemotePlayer(netprot::PlayerInfo* pinfo);
RemotePlayer(netprot::PlayerInfo* pinfo, const Vector3f& pos);
~RemotePlayer();
void Init();
void Feed(const netprot::Output out);
void Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime);
void Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime, Player& camera);
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps, bool stopOnError);
void SetPosition(Vector3f pos) { m_position = pos; }

View File

@ -120,7 +120,7 @@ void Renderer::RenderWorld(World* origin, int& rendercount, const Vector3f& play
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
unsigned int sx, sy, cx, cy;
origin->GetScope(sx,sy);
origin->GetScope(sx, sy);
for (int index = 0; index < rendercount; ++index) {
int chx = (renderManifest[index].x - sx) * CHUNK_SIZE_X, chy = (renderManifest[index].z - sy) * CHUNK_SIZE_Z;
@ -129,9 +129,9 @@ void Renderer::RenderWorld(World* origin, int& rendercount, const Vector3f& play
glLoadMatrixf(world.GetMatrix().GetInternalValues());
float blcolor = renderManifest[index].y / (VIEW_DISTANCE / 50.f);
glBlendColor(blcolor, blcolor, blcolor, 1.f);
origin->ChunkAt(chx, 1, chy)->GetPosition(cx,cy);
origin->ChunkAt(chx, 1, chy)->GetPosition(cx, cy);
if (m_meshes.Get(cx - sx, cy - sy))
m_meshes.Get(cx - sx, cy -sy)->Render();
m_meshes.Get(cx - sx, cy - sy)->Render();
world.ApplyTranslation(-chx, 0, -chy);
}
shader.Disable();
@ -147,7 +147,7 @@ void Renderer::UpdateMesh(World* origin, const Vector3f& player, BlockInfo* bloc
int threads = 0;
std::future<Mesh*> updateThList[THREADS_UPDATE_CHUNKS];
unsigned int mx = 0 , my = 0, sx, sy;
unsigned int mx = 0, my = 0, sx, sy;
origin->GetScope(sx, sy);
@ -244,31 +244,73 @@ void Renderer::UpdateMesh(World* origin, const Vector3f& player, BlockInfo* bloc
}
}
void Renderer::RenderBillboard(const Vector3f pos, TextureAtlas textureAtlas, TextureAtlas::TextureIndex idx, Shader& shader, Transformation tran)
{
//float x = pos.x;
//float y = pos.y;
//float z = pos.z;
//float width = 1.0f;
//float height = 1.0f;
void Renderer::RenderBooster(TextureAtlas& textureAtlas, Shader& shader, Transformation tran, Player player, Booster* booster) {
float width = 1.f;
float height = 1.f;
//float u, v, w, h;
//shader.Use();
//textureAtlas.Bind();
//textureAtlas.TextureIndexToCoord(idx, u, v, w, h);
Vector3f DiffCam = booster->GetPosition() - player.GetPosition();
Vector3f UpCam = Vector3f(0.f, 1.f, 0.f);
//glLoadMatrixf(tran.GetMatrix().GetInternalValues());
//glBegin(GL_QUADS);
//glTexCoord2f(u, v); glVertex3f(x - width / 2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
//glTexCoord2f(u + w, v); glVertex3f(x + width / 2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
//glTexCoord2f(u + w, v + h); glVertex3f(x + width / 2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
//glTexCoord2f(u, v + h); glVertex3f(x - width / 2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
//glEnd();
//shader.Disable();
Vector3f CrossA = DiffCam.Cross(UpCam);
Vector3f CrossB = DiffCam.Cross(CrossA);
CrossA.Normalize();
CrossB.Normalize();
Vector3f playerPosition = booster->GetPosition() + Vector3f(0.f, -.75f, 0.f);
Vector3f v2 = (playerPosition + CrossA * 0.5 * width + CrossB * 0.5 * height);
Vector3f v1 = (playerPosition - CrossA * 0.5 * width + CrossB * 0.5 * height);
Vector3f v3 = (playerPosition + CrossA * 0.5 * width - CrossB * 0.5 * height);
Vector3f v4 = (playerPosition - CrossA * 0.5 * width - CrossB * 0.5 * height);
int index;
BOOST_TYPE type = booster->GetType();
switch (type)
{
case BTYPE_HEAL:
index = 5;
break;
case BTYPE_DAMAGE:
index = 6;
break;
case BTYPE_SPEED:
index = 7;
break;
case BTYPE_INVINCIBLE:
index = 8;
break;
default:
index = 1;
break;
}
float u, v, w, h;
shader.Use();
textureAtlas.Bind();
textureAtlas.TextureIndexToCoord(index, u, v, w, h);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
glLoadMatrixf(tran.GetMatrix().GetInternalValues());
glBegin(GL_QUADS);
glTexCoord2f(u, v); glVertex3f(v1.x, v1.y, v1.z);
glTexCoord2f(u + w, v); glVertex3f(v2.x, v2.y, v2.z);
glTexCoord2f(u + w, v + h); glVertex3f(v3.x, v3.y, v3.z);
glTexCoord2f(u, v + h); glVertex3f(v4.x, v4.y, v4.z);
glEnd();
glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
glBlendEquation(GL_FUNC_SUBTRACT);
glDisable(GL_BLEND);
shader.Disable();
}
void Renderer::RenderPlayer(Player* player, Transformation tran) const {
}

View File

@ -29,7 +29,7 @@ public:
void UpdateMesh(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
void RenderBillboard(const Vector3f pos, TextureAtlas textureAtlas, TextureAtlas::TextureIndex idx, Shader& shader, Transformation tran);
void RenderBooster(TextureAtlas& textureAtlas, Shader& shader, Transformation tran, Player player, Booster* booster);
void RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation world, Shader& shader, TextureAtlas& atlas) const;
void RenderPlayer(Player* player, Transformation tran) const;

146
SQCSim2021/settings.cpp Normal file
View File

@ -0,0 +1,146 @@
#include "settings.h"
Settings::Settings(Audio& audio)
: m_audio(audio),
m_mainVolume(0.5f),
m_musicVolume(0.5f),
m_sfxVolume(0.5f),
m_resolution(FHD),
m_fullscreen(false),
m_brightness(0.5f),
m_contrast(0.5f),
m_mouseSensitivity(0.0f) {
ApplyResolution(m_resolution);
}
void Settings::SaveFile(const std::string& filename) {
std::ofstream file(filename);
if (!file.is_open()) {
std::cerr << "Failed to open file for saving parameters" << std::endl;
return;
}
file << m_mainVolume << '\n';
file << m_musicVolume << '\n';
file << m_sfxVolume << '\n';
file << static_cast<int>(m_resolution) << '\n';
file << m_fullscreen << '\n';
file << m_brightness << '\n';
file << m_contrast << '\n';
file << m_mouseSensitivity << '\n';
file.close();
}
void Settings::LoadFile(const std::string& filename) {
std::ifstream file(filename);
if (!file.is_open()) {
std::cerr << "Failed to open file for loading parameters" << std::endl;
return;
}
file >> m_mainVolume;
file >> m_musicVolume;
file >> m_sfxVolume;
int resolutionValue;
file >> resolutionValue;
m_resolution = static_cast<Resolution>(resolutionValue);
file >> m_fullscreen;
file >> m_brightness;
file >> m_contrast;
file >> m_mouseSensitivity;
file.close();
}
float Settings::GetMainVolume() const {
return m_mainVolume;
}
void Settings::SetMainVolume(float volume) {
m_mainVolume = volume;
}
void Settings::GetMusicVolume() {
m_musicVolume = m_audio.GetMusicVolume();
}
void Settings::SetMusicVolume(float volume) {
m_musicVolume = volume;
}
float Settings::GetSfxVolume() const {
return m_sfxVolume;
}
void Settings::SetSfxVolume(float volume) {
m_sfxVolume = volume;
}
float Settings::GetBrightness() const {
return m_brightness;
}
void Settings::SetBrightness(float brightness) {
m_brightness = brightness;
}
float Settings::GetContrast() const {
return m_contrast;
}
void Settings::SetContrast(float contrast) {
m_contrast = contrast;
}
bool Settings::GetFullscreen() const {
return m_fullscreen;
}
void Settings::SetFullscreen(bool fullscreen) {
m_fullscreen = fullscreen;
}
const Resolution& Settings::GetResolution() const {
return m_resolution;
}
void Settings::SetResolution(const Resolution& resolution) {
m_resolution = resolution;
}
float Settings::GetMouseSensitivity() const {
return m_mouseSensitivity;
}
void Settings::SetMouseSensitivity(float sensitivity) {
m_mouseSensitivity = sensitivity;
}
void Settings::ApplyResolution(Resolution resolution) {
switch (resolution) {
case HD:
m_rezWidth = 1280;
m_rezHeight = 720;
break;
case FHD:
m_rezWidth = 1920;
m_rezHeight = 1080;
break;
case QHD:
m_rezWidth = 2560;
m_rezHeight = 1440;
break;
case UHD:
m_rezWidth = 3840;
m_rezHeight = 2160;
break;
default:
break;
}
}

70
SQCSim2021/settings.h Normal file
View File

@ -0,0 +1,70 @@
#ifndef SETTINGS_H__
#define SETTINGS_H__
#include <iostream>
#include <fstream>
#include <sstream>
#include <string>
#include <map>
#include "define.h"
#include "audio.h"
class Settings {
public:
Settings(Audio& audio);
void SaveFile(const std::string& filename);
void LoadFile(const std::string& filename);
// Audio
float GetMainVolume() const;
void SetMainVolume(float volume);
void GetMusicVolume();
void SetMusicVolume(float volume);
float GetSfxVolume() const;
void SetSfxVolume(float volume);
// Graphic
float GetBrightness() const;
void SetBrightness(float brightness);
float GetContrast() const;
void SetContrast(float contrast);
bool GetFullscreen() const;
void SetFullscreen(bool fullscreen);
const Resolution& GetResolution() const;
void SetResolution(const Resolution& resolution);
// Gameplay
float GetMouseSensitivity() const;
void SetMouseSensitivity(float sensitivity);
void ApplyResolution(Resolution resolution);
private:
Audio& m_audio;
// Audio
float m_mainVolume;
float m_musicVolume;
float m_sfxVolume;
// Graphic
Resolution m_resolution;
bool m_fullscreen;
int m_rezWidth;
int m_rezHeight;
float m_brightness;
float m_contrast;
// Gameplay
float m_mouseSensitivity;
};
#endif // PARAMETERS_H

BIN
docs/Plan_de_test.pdf Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.