mirror of
https://github.com/zoriya/My3D.git
synced 2026-06-02 02:26:35 +00:00
Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D
This commit is contained in:
AnonymusRaccoon
+6
-1
@@ -252,7 +252,12 @@ add_executable(My3D
|
||||
src/components/isometry/map_manager_component.c
|
||||
include/components/isometry/map_manager_component.h
|
||||
lib/gamacon/src/components/isometry/vertex_data_loader.c
|
||||
lib/gamacon/include/vertex_data_loader.h src/toolbar.c lib/gamacon/include/callbacks.h src/selectors.c src/framerate.c)
|
||||
lib/gamacon/include/vertex_data_loader.h src/toolbar.c
|
||||
lib/gamacon/include/callbacks.h src/selectors.c
|
||||
src/framerate.c
|
||||
lib/gamacon/src/components/isometry/create_map_functions.c
|
||||
lib/gamacon/include/create_map_functions.h
|
||||
)
|
||||
|
||||
add_compile_options(-W -Wall -Wextra -Wshadow)
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 165 B |
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
@@ -13,6 +13,15 @@
|
||||
#include "vertex_component.h"
|
||||
#include "keybindings.h"
|
||||
|
||||
enum modes_on_tile {
|
||||
VERTEX_0 = 2,
|
||||
VERTEX_1 = 4,
|
||||
VERTEX_2 = 8,
|
||||
VERTEX_3 = 16,
|
||||
ALL_VERTICES = 30,
|
||||
INVERT_ADD_VALUE = 1
|
||||
};
|
||||
|
||||
bool tile_interact(gc_engine *engine, gc_entity *entity, gc_vector2 pos, \
|
||||
enum gc_mousekeys key);
|
||||
|
||||
|
||||
@@ -19,12 +19,14 @@
|
||||
<sprite name="command_block" src="assets/sprites/command_block.png" />
|
||||
<sprite name="black_background" src="assets/ui/black_background.png" />
|
||||
<sprite name="crafting_table" src="assets/sprites/crafting_table_top.png" />
|
||||
<sprite name="grass_top" src="assets/sprites/grass_top.png" />
|
||||
<sprite name="grass_side" src="assets/sprites/grass_side.png" />
|
||||
<music src="assets/musics/music.ogg"/>
|
||||
<font src="assets/fonts/roboto.ttf" />
|
||||
|
||||
<tiles>
|
||||
<tile name="grass_top" />
|
||||
<tile name="cobblestone" />
|
||||
<tile name="command_block" />
|
||||
<tile name="comparator_on" />
|
||||
<tile name="crafting_table" />
|
||||
<tile name="mossy_cobblestone" />
|
||||
|
||||
+164
-163
@@ -1,165 +1,166 @@
|
||||
<gc_map >
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<vertex_data>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
<line>
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
<row height="0" />
|
||||
</line>
|
||||
</vertex_data>
|
||||
<tiles_data>
|
||||
<texture x="0" y="0" name="cobblestone" />
|
||||
<texture x="4" y="4" name="cobblestone" />
|
||||
<texture x="4" y="5" name="comparator_on" />
|
||||
<texture x="1" y="1" name="grass_top" />
|
||||
<texture x="0" y="1" name="grass_side" />
|
||||
</tiles_data>
|
||||
</gc_map>
|
||||
@@ -62,12 +62,8 @@ void move_tile(gc_engine *engine, struct tile *ret, char mode, bool r)
|
||||
{
|
||||
int val = (mode & INVERT_ADD_VALUE) ? ADD_VALUE : -ADD_VALUE;
|
||||
|
||||
if (mode & VERTEX_0)
|
||||
ret->corners[0]->z += (r) ? -ret->corners[0]->z : val;
|
||||
if (mode & VERTEX_1)
|
||||
ret->corners[1]->z += (r) ? -ret->corners[1]->z : val;
|
||||
if (mode & VERTEX_2)
|
||||
ret->corners[2]->z += (r) ? -ret->corners[2]->z : val;
|
||||
if (mode & VERTEX_3)
|
||||
ret->corners[3]->z += (r) ? -ret->corners[3]->z : val;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (mode & (int)pow(2, i + 1))
|
||||
ret->corners[i]->z += (r) ? -ret->corners[i]->z : val;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user