Indy
5c6c55826f
conf/pers
2021-05-27 13:51:28 +02:00
François Autin
04c28b9e0f
Merge branch 'engineWIP' into 'master'
...
EngineWIP -> master (2)
See merge request fautin/jeu-de-combat!5
2021-05-27 11:27:41 +00:00
François Autin
252c9d3697
Merge branch 'master' into 'engineWIP'
...
# Conflicts:
# src/Main.java
2021-05-27 11:27:27 +00:00
François Autin
bf2960f58e
Lancement de la fenêtre du launceur
...
Problématique avec le fxml. Mauvaise version il semblerait ? Fichier à
refaire.
2021-05-27 03:14:20 +02:00
François Autin
9ced943c0a
Ajout du fxml du launcher (initial)
2021-05-27 03:04:08 +02:00
François Autin
75865640aa
Progrès ajout Launcher
...
Ajout de JavaFX.fxml aux dépendances, aménagement de l'architecture du
launcher pour (launcher étend maintenant Application, Main lance
correctement le Launcher)
2021-05-27 03:02:36 +02:00
François Autin
33a02891fc
Ajout des dépendances à JavaFX
2021-05-27 02:19:42 +02:00
Antoine
dc2b696f7e
Shaders modif
2021-05-27 00:14:28 +02:00
Antoine
db4e2d0e86
Shaders modif
2021-05-26 17:23:13 +02:00
Antoine
72c0098f9a
Pos zangief
2021-05-24 19:26:36 +02:00
Léo
6262dd42d7
we don't call inputGamepad if there is no gamepad
2021-05-24 19:24:57 +02:00
Antoine
5c48a88be4
système pour contrôler le rendu de sprite de taille differente
...
# Pour l'instant toutes les sprites d'un même état doivent être de la même taille
2021-05-23 00:57:29 +02:00
Antoine
ee8473e344
Doc d'ObjectGl dans un Anglais approximatif
2021-05-21 21:01:42 +02:00
Antoine
574e31e02d
Correct frag shader when using texture + color
2021-05-21 19:51:29 +02:00
Antoine
770d134722
J'ai viré les classes useless
2021-05-21 19:15:48 +02:00
Antoine
ecbe08fdc3
Zangief idle wrap correction
2021-05-21 18:20:49 +02:00
Léo
3e12e98010
left joystick control ( textures update)
2021-05-21 17:26:35 +02:00
Léo
7bcbad5792
added Rightjoystick controls for zangief
2021-05-21 16:43:45 +02:00
Léo
3cf4372912
test gamepad Inputs
2021-05-21 15:08:02 +02:00
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
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
