zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2026-05-29 17:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding texture loading from xml

Browse Source
This commit is contained in:
Clément Le Bihan
2020-03-12 10:37:20 +01:00
parent 4f8a1474e9
commit b4d37eabf1
4 changed files with 179 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/map_interactions.h
+9
View File
@@ -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);
lib/gamacon
+1 -1
Submodule lib/gamacon updated: 9becdaece5...689dc791c2
prefabs/tilemap.gcmap
+165 -158
View File
@@ -1,165 +1,172 @@
<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" />
<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" />
<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>
</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>
<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">
</tiles_data>
</gc_map>
src/components/isometry/map_interactions.c
+4 -8
View File
@@ -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;
}
}