Commit Graph

51 Commits

Author SHA1 Message Date
Bluub
16ea3e3d80 fix compilation, model is a 3D drawable 2021-05-27 16:27:48 +02:00
arthur.jamet
5469b6f169 model is now a 3D drawable 2021-05-27 15:46:18 +02:00
arthur.jamet
70d69b0621 player 2021-05-27 15:04:47 +02:00
Clément Le Bihan
d69a4f8ee2 delete Vector3.cpp and rm trailing space 2021-05-27 12:01:43 +02:00
arthur.jamet
26eebc26bc unique file for player model + animation 2021-05-27 10:52:10 +02:00
arthur.jamet
7f1e8ab398 animation 2021-05-27 10:37:44 +02:00
Clément Le Bihan
b2659c3272 change window draw function to IDrawable 2021-05-26 16:38:27 +02:00
Clément Le Bihan
c12ecf6d8b renderers seems to work 2021-05-26 16:24:43 +02:00
Clément Le Bihan
214b9a4674 systems whould work but i don't know how to put my entity in a scene 2021-05-26 15:43:42 +02:00
Clément Le Bihan
16f18c406d still some issues with drawable3D component 2021-05-26 15:36:08 +02:00
Clément Le Bihan
2841ba5d6b compiling but renderer doesn't render 2021-05-26 15:22:51 +02:00
Clément Le Bihan
8a9a5bb32c adding a screen renderer system 2021-05-26 15:18:44 +02:00
Clément Le Bihan
408e955b52 big merge and fixing unit test compil 2021-05-26 11:38:21 +02:00
Clément Le Bihan
a5a336e1f5 Merge branch 'develop' into renderer
# Conflicts:
#	CMakeLists.txt
#	lib/wal/CMakeLists.txt
#	sources/Component/Movable/MovableComponent.cpp
#	sources/Component/Position/PositionComponent.cpp
#	sources/Component/Position/PositionComponent.hpp
#	sources/System/Movable/MovableSystem.cpp
#	sources/System/Movable/MovableSystem.hpp
#	sources/main.cpp
2021-05-26 11:31:28 +02:00
Clément Le Bihan
682b4388bb fixing issues qith 3D/2D Renderer systems 2021-05-26 10:46:12 +02:00
arthur.jamet
756daf0c17 import all assets 2021-05-25 20:11:23 +02:00
arthur.jamet
0b23b9c5cb fix namespaces + assets 2021-05-25 14:21:31 +02:00
arthur.jamet
5c78a4bd07 assets for player 2021-05-25 14:06:57 +02:00
Clément Le Bihan
95b1b2ebb7 trying inheriting from class T 2021-05-25 12:39:25 +02:00
Clément Le Bihan
e8aec2b7ef fixing some issues in Drawables components and Render systems 2021-05-25 12:14:24 +02:00
Zoe Roux
6deade8ddc Fixing namespace 2021-05-24 17:15:24 +02:00
Zoe Roux
c104a3ad99 Moving components and systems out of the ecs 2021-05-24 15:23:20 +02:00
Zoe Roux
54fe800549 Adding a state and scene utils 2021-05-24 14:59:28 +02:00
Clément Le Bihan
8a5dcdc0ad Merge remote-tracking branch 'origin/renderer' into renderer 2021-05-24 11:46:59 +02:00
Clément Le Bihan
3d5ea204b6 adding a RectangleDrawable2DComponent and moving files 2021-05-24 11:33:19 +02:00
arthur.jamet
60cfc7f9be encapsulation of trace log 2021-05-24 10:59:29 +02:00
arthur.jamet
77534276ef fix double definition of cast operator 2021-05-23 19:22:49 +02:00
Clément Le Bihan
7bab6e8b55 Merge branch 'renderer' into animations 2021-05-23 18:27:34 +02:00
Arthi-chaud
89397c95d0 Merge branch 'develop' into renderer 2021-05-22 15:56:06 +02:00
arthur.jamet
d9c3772b9e Iressource holds again a unload method 2021-05-22 14:13:31 +02:00
arthur.jamet
66c33b403c creation of animation containers 2021-05-22 11:55:44 +02:00
arthur.jamet
c46c0bccd9 better management of drawing/display states for window 2021-05-22 01:47:45 +02:00
arthur.jamet
f0c10aade6 vector are now proper struct, including conversion functions 2021-05-22 00:43:31 +02:00
arthur.jamet
d1d994fd29 fix indentation, now using tabs 2021-05-21 23:52:08 +02:00
Clément Le Bihan
bcab70bb56 fix ci 2021-05-21 17:11:47 +02:00
Clément Le Bihan
09b4c8cb56 rm logs debug 2021-05-21 17:09:19 +02:00
Clément Le Bihan
ace448763e using ctor of Vector3 instead of C cast (CI fix) 2021-05-21 16:53:22 +02:00
Clément Le Bihan
69effd46dc Merge branch 'master' of github.com:AnonymusRaccoon/Bomberman into develop 2021-05-21 16:38:30 +02:00
Clément Le Bihan
8323639e4f resetting getter not const (due to poor lib design) 2021-05-21 16:30:53 +02:00
Clément Le Bihan
688b5d992d fixing image getter not const and adding the window flags and icon support 2021-05-21 16:09:18 +02:00
arthur.jamet
5d5b63ae33 try explicit conversion 2021-05-21 15:20:21 +02:00
arthur.jamet
536de9a488 add cube + color contructable from hsv 2021-05-21 13:32:35 +02:00
arthur.jamet
94312bd6ad fix text display pb 2021-05-21 12:48:50 +02:00
arthur.jamet
22bad1036a fix merge 2021-05-21 12:41:22 +02:00
arthur.jamet
e4bd77197a singleton for window 2021-05-21 12:38:10 +02:00
Clément Le Bihan
5e0f5d5690 fuirst commit develop 2021-05-21 12:15:11 +02:00
arthur.jamet
35e6fe67c8 update workflow 2021-05-21 10:56:57 +02:00
Clément Le Bihan
e86ffbe456 compiling first test of encapsulation 2021-05-21 10:23:07 +02:00
Zoe Roux
68d17cd0a2 Adding tests 2021-05-17 17:22:09 +02:00
Zoe Roux
43bbf487a3 Adding a scene manger and wal functions 2021-05-14 16:26:07 +02:00