diff --git a/bin/back b/bin/back index 2dacfd5..17f6936 100755 Binary files a/bin/back and b/bin/back differ diff --git a/obj/base.o b/obj/base.o index 0629df3..b4cd687 100644 Binary files a/obj/base.o and b/obj/base.o differ diff --git a/obj/generation.o b/obj/generation.o index ef6f895..980c554 100644 Binary files a/obj/generation.o and b/obj/generation.o differ diff --git a/obj/main.o b/obj/main.o index c8d1ce8..7784732 100644 Binary files a/obj/main.o and b/obj/main.o differ diff --git a/res/exclamation_block.png b/res/exclamation_block.png new file mode 100644 index 0000000..a422303 Binary files /dev/null and b/res/exclamation_block.png differ diff --git a/src/base.c b/src/base.c index e6ba0ac..8840982 100644 --- a/src/base.c +++ b/src/base.c @@ -373,9 +373,9 @@ void project_to_cube(double x0, double y0, double z0, double* rx, double* ry, do double z = z0 - (c->z + c->d/2.0); // rotate (y) - double xry = x*cos(c->hz_angle) + z*sin(c->hz_angle); + double xry = x*cos(c->hz_angle) - z*sin(c->hz_angle); double yry = y; - double zry = z*cos(c->hz_angle) - x*sin(c->hz_angle); + double zry = z*cos(c->hz_angle) + x*sin(c->hz_angle); // rotate (x) if(rx != NULL) {*rx = c->x + c->w/2.0 + xry;} diff --git a/src/generation.c b/src/generation.c index 857c6bc..7ed7f2a 100644 --- a/src/generation.c +++ b/src/generation.c @@ -90,7 +90,7 @@ void init_ent_generator(int n) { hashtbl_entities[6].onDeath = NULL; hashtbl_entities[7].id = 7; - hashtbl_entities[7].tex = 0; + hashtbl_entities[7].tex = 2; hashtbl_entities[7].name = "WarpBox"; hashtbl_entities[7].updatePos = NULL; hashtbl_entities[7].onHit = &pop_and_tp; diff --git a/src/main.c b/src/main.c index bbe2219..0af9732 100644 --- a/src/main.c +++ b/src/main.c @@ -431,10 +431,12 @@ int main_alt() { glEnableVertexAttribArray(1); printf("-----------------------------------------------------------------------------------------------\n"); fflush(stdout); - + // 16 max // + //generate_texture(0, "res/container.jpg", "jpg"); generate_texture(0, "res/white.png", PNG); generate_texture(1, "res/question_block.png", PNG); + generate_texture(2, "res/exclamation_block.png", PNG); printf("-----------------------------------------------------------------------------------------------\n"); fflush(stdout); diff --git a/templates/room_1 b/templates/room_1 index e1f7882..bd3e153 100644 --- a/templates/room_1 +++ b/templates/room_1 @@ -20,7 +20,7 @@ Entities : [0.0, 8.0, 1.0, 0.5, 0.5, 0.5, 0.0, 0.0, 193, 192, 0, 1, 0, 0] [0.0, 9.0, 0.0, 0.5, 0.5, 0.5, 0.0, 0.0, 193, 192, 0, 1, 0, 0] [0.0, 10.0, 0.0, 0.5, 0.5, 0.5, 0.0, 0.0, 193, 192, 0, 1, 0, 0] -[-1.0, -5.0, -1.0, 2.0, 2.0, 2.0, 1.0, 0.0, 16, 16, 16, 1, 0, 7, templates/, 7, level passed, 192, 192, 192] +[-1.0, -5.0, -1.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 255, 1, 0, 7, templates/, 7, level passed, 192, 192, 192] Weight : 50