Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
8914150
Move Camera back -5
ElectronicIV Jun 23, 2025
c493af7
Add light to scene
ElectronicIV Jun 23, 2025
26a3d28
Add basic obj files
ElectronicIV Jun 23, 2025
c0ce96b
Move the api from private to public
Valentin22r Jun 24, 2025
d0e7748
Fix Api construction
ElectronicIV Jun 24, 2025
eefeba1
Improve texture creation
ElectronicIV Jun 24, 2025
9600f09
Adjust FOV of camera
ElectronicIV Jun 24, 2025
7c10e6e
Add default entity
ElectronicIV Jun 24, 2025
f8ad66e
Rework of Object3D & texture creation
ElectronicIV Jun 24, 2025
806aa10
Fix network api throw
ElectronicIV Jun 24, 2025
188b2f5
Add default texture handling
ElectronicIV Jun 24, 2025
bdcff50
Add textures and fix api
Valentin22r Jun 24, 2025
47e703e
Use of obj3D instead of obj files to bypass ECS
ElectronicIV Jun 24, 2025
5a3f60b
Setup imgui library build
Sigmanificient Jun 24, 2025
2969faf
Show imgui demo frame
Sigmanificient Jun 24, 2025
0c80045
Move SetupImGUIFrame to Demeter
ElectronicIV Jun 24, 2025
04e92c0
Move destruction of ImGUI to SDL2 class
ElectronicIV Jun 24, 2025
a3a461b
Add Object3d Transformation
ElectronicIV Jun 24, 2025
9828f73
Add Getter for entity pool in demeter
ElectronicIV Jun 24, 2025
d9c4868
Move funcs from hpp to cpp
ElectronicIV Jun 25, 2025
84a651e
Add SDL2 event management
ElectronicIV Jun 25, 2025
f38cb6c
Add camera transformation
ElectronicIV Jun 25, 2025
41c6f10
Add a moving Camera
Valentin22r Jun 25, 2025
8b31022
Fix api to display the map with demeter
Valentin22r Jun 25, 2025
3c97e95
Fix logger info naming form info to inf
Valentin22r Jun 25, 2025
ee08e44
Fix deltatime computation
ElectronicIV Jun 25, 2025
9964434
Add all item on the map
Valentin22r Jun 25, 2025
52428af
Rework camera transformation
ElectronicIV Jun 26, 2025
51100e0
Add sensitivity & velocity
ElectronicIV Jun 26, 2025
269ccc9
Fix unintitialyzed value in demeter
ElectronicIV Jun 26, 2025
d19c19e
Modify cube.obj3D with blender ver
ElectronicIV Jun 26, 2025
8719785
Modify ressources.obj3d with blender
ElectronicIV Jun 26, 2025
ef6c13f
Add Window resizing
ElectronicIV Jun 26, 2025
726b741
Fix Tilemap by initialising co
Valentin22r Jun 26, 2025
ee2c0f8
Remove throws from SDL2
ElectronicIV Jun 26, 2025
a2bd635
Cleanup E_CameraControler unused code
ElectronicIV Jun 26, 2025
b7439ac
Remove throws from Texture
ElectronicIV Jun 26, 2025
4f63587
Remove throw from Mesh & Object3D
ElectronicIV Jun 26, 2025
9cb92d9
Remove throw from Shader & Demeter
ElectronicIV Jun 26, 2025
69c634e
Remove useless files
ElectronicIV Jun 26, 2025
811ab2f
Remove throw from Entities & Zappy
ElectronicIV Jun 26, 2025
f075fec
Complete merge from pr
Valentin22r Jun 26, 2025
b347299
Add Ring event buffer for gui
ElectronicIV Jun 26, 2025
3e84be3
Add the Menu window
Valentin22r Jun 26, 2025
0df9894
Add the whole ImGui window in test
Valentin22r Jun 27, 2025
4474783
Calm down the stdout a bit
ElectronicIV Jun 27, 2025
33d4d96
Modify block texture
ElectronicIV Jun 27, 2025
f2fd6d2
Improve camera movement
ElectronicIV Jun 27, 2025
f3f54cf
Add a better sub window
Valentin22r Jun 27, 2025
50e7d98
Fix API out of range with PIC
ElectronicIV Jun 28, 2025
fdaa562
Better poll check
ElectronicIV Jun 28, 2025
b8f3a55
Move default camera pos
ElectronicIV Jun 28, 2025
aa0e773
Stabilize API tilemap
ElectronicIV Jun 29, 2025
cd609bf
Calm debug down
ElectronicIV Jun 29, 2025
093f4ee
Cleanup grass texture
ElectronicIV Jun 29, 2025
d8dcab3
Add Player rendering
ElectronicIV Jun 29, 2025
caaea00
Set camera rotation to MMB
ElectronicIV Jun 29, 2025
e8a2854
Correct camera forward
ElectronicIV Jun 29, 2025
9cd6d43
Fix texture bit per pixel rate
ElectronicIV Jun 29, 2025
7c7cf0a
Increase the speed of the camera's zoom
ElectronicIV Jun 29, 2025
2c24ac9
Remove useless indent end
ElectronicIV Jun 29, 2025
8e89704
Add colored rocks as ressources
ElectronicIV Jun 29, 2025
a11f617
ImGui tweeking for better UX
ElectronicIV Jun 29, 2025
1596fad
Add colors to all teams into the event panel
Valentin22r Jun 29, 2025
266d2b3
Add colored team everywhere
Valentin22r Jun 29, 2025
b56e09a
Add Egg support
ElectronicIV Jun 29, 2025
1ea731f
Increase The zoom speed again
ElectronicIV Jun 29, 2025
ca0a476
Optimise texture size
ElectronicIV Jun 29, 2025
49837b2
Fix stoi parsing error
ElectronicIV Jun 29, 2025
ef79cf7
Add team color to Trantorians
ElectronicIV Jun 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "gui/imgui"]
path = gui/imgui
url = git@github.com:ocornut/imgui
19 changes: 16 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@ LDFLAGS_gui != pkg-config --libs-only-L sdl2
LDLIBS_gui != pkg-config --libs-only-l sdl2 SDL2_image glew gl glu
CXXFLAGS_gui += $(shell pkg-config --cflags sdl2)

IMGUI_DIR ?= gui/imgui
IMGUI_SRC := $(wildcard $(IMGUI_DIR)/*.cpp)
IMGUI_SRC += $(IMGUI_DIR)/backends/imgui_impl_opengl3.cpp
IMGUI_SRC += $(IMGUI_DIR)/backends/imgui_impl_sdl2.cpp

IMGUI_INC += $(IMGUI_DIR) $(IMGUI_DIR)/backends

# Used to simplify the nix build
GUI_ASSET_DIR ?= assets

CXXFLAGS_gui += -DASSET_DIR='"$(GUI_ASSET_DIR)"'
CXXFLAGS_gui += $(foreach d,$(IMGUI_INC),-iquote $d)

MAKEFLAGS += --no-builtin-rules
MAKEFLAGS += --no-print-directory
Expand All @@ -59,9 +67,14 @@ NAME_gui_debug := debug_gui
NAME_gui_tests := tests_gui

EXTRA_SRC_gui_tests != find tests/gui -name "*.cpp"

EXTRA_SRC_server_tests != find tests/server -type f -name "*.c"

SRC_gui != find gui -type f -name "*.cpp" -not -path "gui/imgui/*"
SRC_gui += $(IMGUI_SRC)

SRC_server != find server -type f -name "*.c"


# call mk-bin, bin-name, profile, lang
# DOES THIS MAKE COFFEE NOW ??
define mk-bin
Expand All @@ -78,8 +91,8 @@ $(BUILD)/$(strip $2)/%.o: %.$(GENERIC_SUFFIX_$(strip $3))
$$(C_PURPLE)$$(notdir $$@) $$(C_RESET)"

out_$(strip $1)_$(strip $2) := $(NAME_$(strip $1)_$(strip $2))
src_$(strip $1)_$(strip $2) != \
find $(strip $1) -type f -name "*.$(GENERIC_SUFFIX_$(strip $3))"

src_$(strip $1)_$(strip $2) := $(SRC_$(strip $1))
src_$(strip $1)_$(strip $2) += $(EXTRA_SRC_$(strip $1)_$(strip $2))

objs_$(strip $1)_$(strip $2) := \
Expand Down
Loading