174 Commits

Author SHA1 Message Date
Antoine
bd587a5587 SoundManager, SoundBuffer Fixed, BufferUtils.java rename to BufferUtilsEngine.java to avoid conflict with org.lwjgl.BufferUtils
Le son fonctionne yay
2021-05-31 18:45:38 +02:00
Léo
00a19177c7 gamepadInput updated 2021-05-31 16:54:02 +02:00
Léo
888e5825ba added gamepadInputClass 2021-05-31 15:36:40 +02:00
Indy
f2b2fa9e9b parser json to java 2021-05-31 15:01:39 +02:00
Indy
fbd690f427 update pom + reso json 2021-05-31 12:25:39 +02:00
Léo
09562c4216 added input package
test for control binding
2021-05-30 19:06:15 +02:00
Antoine
4f8a32d5a4 SoundManager update 2021-05-29 02:49:33 +02:00
Antoine
efbef95aa0 SoundManager import 2021-05-29 00:46:50 +02:00
Antoine
17ca8eedb7 SoundBuffer, SoundListener, SoundManager, SoundSource, Correction d'un shader qui portait pas très bien son nom. 2021-05-29 00:36:33 +02:00
Antoine
9fb1de708a Merge remote-tracking branch 'origin/master' 2021-05-28 18:35:40 +02:00
Antoine
0185a14b0b Input """cleanup""" 2021-05-28 18:34:49 +02:00
Indy
a4573fd3c0 replace json file 2021-05-28 16:05:30 +02:00
Antoine
68580ce40b Correct camera:
l'espace de jeu est compris entre les coordonnées -1000:1000 et -1000*aspectRatio:1000*aspectRatio
Peut-être fixé l'aspect ratio du jeu pour ne pas avoir certains problèmes
2021-05-28 13:37:03 +02:00
Antoine
9612db9b49 Modification du constructeur d'Engine ajout de la largeur et la hauteur de la fenêtre ainsi que l'aspect ratio 2021-05-28 13:02:48 +02:00
François Autin
a88cbebd18
Removed window decorations from launcher
Prevents resizing the window thus renders theme development easier
2021-05-28 01:20:26 +02:00
François Autin
0da311c65a
Main class now correctly launches the Launcher
Commented out game object from being created
2021-05-28 01:16:51 +02:00
François Autin
cd7627d36d
Launcher now finds and correctly sets main Scene 2021-05-28 01:15:50 +02:00
François Autin
4e99b1e115
Added stage attr along with getters and setters to launcher.Settings. 2021-05-28 00:55:12 +02:00
François Autin
b52bbb506a
Added setting file manipulator class to launcher package.
Contains getters, setters, setDefaultSettings method in case of failure
of parseSettings method (currently not implemented).
2021-05-28 00:50:57 +02:00
Antoine
809c9e5be7 1d simple perlin noise 2021-05-27 19:02:46 +02:00
François Autin
8d039a1828
Updated gameplay.match package to fit naming conventions 2021-05-27 17:46:30 +02:00
François Autin
de721b59ab
Corrected classpath, new (and clearer) package arrangement. 2021-05-27 17:45:02 +02:00
Indy
5c6c55826f conf/pers 2021-05-27 13:51:28 +02: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
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
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