zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2026-06-07 12:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Clément Le Bihan
2020-02-27 15:32:42 +01:00
parent be83409d59 1c5e1ef0e2
commit 41b9beafd3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -208,6 +208,7 @@ add_executable(My3D
lib/gamacon/include/components/clickable_component.h
lib/gamacon/src/systems/clickable_system.c
lib/gamacon/src/sfml_renderer/sfml_init.c
lib/gamacon/src/sfml_renderer/sfml_events.c
)
add_compile_options(-W -Wall -Wextra -Wshadow)
prefabs/game.gcprefab
+4 -2
View File
@@ -1,7 +1,7 @@
<gc_scene>
<data>
<sprite src="assets/sprites/grass.png" />
<sprite name="button_background" src="assets/sprites/grass.png" />
<sprite name="panel" src="assets/ui/panel.png" />
<sprite name="button_background" src="assets/ui/button_background.png" />
<sprite name="cobblestone" src="assets/sprites/cobblestone.png" />
<sprite name="mossy_cobblestone" src="assets/sprites/cobblestone_mossy.png" />
<sprite name="command_block" src="assets/sprites/command_block.png" />
@@ -19,5 +19,7 @@
<Rect height="auto" width="auto" top="0" left="0" />
</renderer>
</gc_entity>
<panel src="panel" x="100%" y="50%" width="50%" height="120%"/>
<text text="TEAMS" x="88%" y="40"/>
</gc_entities>
</gc_scene>