506 Commits

Author SHA1 Message Date
Antoine
e3623072ff dynamic scaling vertexArray with textureWrap (no more stretching) 2021-05-20 23:28:45 +02:00
Antoine
bdc2144145 test with Zangief 2021-05-20 20:55:51 +02:00
Antoine
29685f8e40 swapTexWrap from pixels coordinates of the source image 2021-05-20 20:04:16 +02:00
Antoine
4fc87e7b08 swapTexWrap added 2021-05-20 19:02:28 +02:00
Antoine
859344b131 setTexture added 2021-05-20 18:02:24 +02:00
Léo
282a8b0283 added isKeyDown Class for keyboard input 2021-05-20 16:26:13 +02:00
Léo
69cfdadf85 Merge branch 'engineWIP' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into engineWIP 2021-05-20 16:13:32 +02:00
Léo
59d822015a Keyboard input added In Engine.java 2021-05-20 15:54:54 +02:00
Antoine
8506065de0 drawing sprite back to front 2021-05-20 15:52:20 +02:00
Antoine
7a79c19c98 added framerate control 2021-05-19 19:08:09 +02:00
Antoine
cf4f121069 Correct projection width 2021-05-19 18:41:28 +02:00
Antoine
e9935403b6 Orthographic camera, viewpoint, correct aspect ratio 2021-05-19 17:59:05 +02:00
Antoine
57b6be084d ObjectGlTex & ObjectGlTexColor now working :o) 2021-05-19 15:00:12 +02:00
Antoine
7f491ad597 added ObjectGlTexColor, tweaked shaders 2021-05-19 05:37:45 +02:00
Antoine
58e94314cc cleanup Engine.java 2021-05-19 03:35:23 +02:00
Antoine
e78b680389 new engine 2021-05-19 02:52:15 +02:00
Antoine
c6181c96fe ObjectGl, ObjectGlColor, ObjectGlTex added 2021-05-18 21:18:26 +02:00
Antoine
b7de1556cc Merge remote-tracking branch 'origin/engineWIP' into engineWIP 2021-05-18 19:01:27 +02:00
Antoine
4abc87597d Added scaling operation in Matrix4f 2021-05-18 19:01:18 +02:00
Noliere Leo
da6e5e3be8 Upload Architecture moteur 2021-05-18 16:38:18 +00:00
Antoine
2aa23512be z-buffer 2021-05-17 19:05:45 +02:00
Antoine
5f4b2aa56e Problem where the angle given in the rotation function was not converted to a radian 2021-05-17 18:29:58 +02:00
Antoine
2570553b93 transform added 2021-05-17 14:53:16 +02:00
Antoine
e241c7c9b1 Added rotation on the z axis 2021-05-17 05:56:37 +02:00
Antoine
4c7e32f44b Added rotation on the x and y axis 2021-05-17 05:52:22 +02:00
Antoine
565bc5edfe Presentation Matrix4f 2021-05-17 05:45:55 +02:00
Antoine
202c141e4d Organisation 2021-05-17 05:39:23 +02:00
Azra Victor
61fee3fbf5 Uploaded drawio file of gameplay loop 2021-05-16 14:28:15 +00:00
Azra Victor
e8827bfe97 Replace gameplay_loop.png 2021-05-16 14:26:23 +00:00
Rativel Remi
c36d1db148 Update class-diagram 2021-05-16 14:03:00 +00:00
Rativel Remi
e811223bf9 Delete class-diagram.png 2021-05-16 14:02:14 +00:00
Azra Victor
c2ffd8c5fb gameplay loop png 2021-05-14 19:44:38 +00:00
Azra Victor
fff3f3e4f6 delete to be properly replaced 2021-05-14 19:44:09 +00:00
Azra Victor
7251e5ecf5 replace gameplay loop pdf by png for me readability 2021-05-14 19:43:12 +00:00
Azra Victor
8b8d21c7f8 First flowchart of the gameplay loop. Still needs at least to add how to handle hits being taken. 2021-05-14 19:40:50 +00:00
Rativel Remi
647fe988fb Upload Class Diagram made by Antoine Dupuis, Rémi Rativel and Victor Azra 2021-05-14 19:40:03 +00:00
Rativel Remi
f7cbfe827b Delete class-diagram.png 2021-05-14 19:39:40 +00:00
Rativel Remi
ae511a2fc1 Upload Class Diagram made by Antoine Dupuis, Rémi Rativel and Victor Azra 2021-05-14 19:28:49 +00:00
Antoine
5d93325b3d Ajout d'un canal texture dans le vertexArray 2021-05-14 20:46:17 +02:00
Antoine
e1cbbb85eb Ajout d'un canal couleur dans le vertexArray 2021-05-14 18:47:05 +02:00
Antoine
049e735e1a setUniform4f in Shader 2021-05-14 15:34:08 +02:00
Antoine
e4c1c80e4a Ajout du rectangle dans les primitives ajout de la gestion de l'EBO dans scene et VertexArray.
Mode Wireframe avec le touche space.
Gestion des inputs dans la classe Input
2021-05-13 21:51:40 +02:00
Antoine
b5d18197ff Ajout de classe primitive 2021-05-13 21:05:11 +02:00
Antoine
e2b43446c8 Gestion taille de rendu si modification de la taille de la fenêtre + unbind() à la fin du cycle de rendu du vertexArray 2021-05-13 20:55:04 +02:00
Antoine
b02119dca7 Ajout de la classe:
Scene, VertexArray, Shader, ShaderUtils, BufferUtils, FileUtils, Matrix4f, Vector3f
Ajout des shaders de test:
vert.vert et frag.frag dans le dossier shaders
2021-05-13 20:40:21 +02:00
Antoine
4e88d1d1a4 Stock 2021-05-13 16:34:19 +02:00
Antoine
0d522685b7 Test 2021-05-13 16:34:13 +02:00
François Autin
bf781060e2 Merge branch 'fautin-master-patch-37381' into 'master'
Update README.md

See merge request fautin/jeu-de-combat!2
2021-05-11 14:09:08 +00:00
François Autin
681ce93078 Update README.md 2021-05-11 14:08:58 +00:00
François Autin
85d4a490b9 Merge branch 'fautin-master-patch-37248' into 'master'
Ajout d'un dossier pour l'upload des documents de travail

See merge request fautin/jeu-de-combat!1
2021-05-11 12:34:51 +00:00