diff --git a/bin/back b/bin/back index 17f6936..381d3fa 100755 Binary files a/bin/back and b/bin/back differ diff --git a/levels/level_00/room_0 b/levels/level_00/room_0 new file mode 100644 index 0000000..be5ec62 --- /dev/null +++ b/levels/level_00/room_0 @@ -0,0 +1,53 @@ +Blocks : +[-16.0, -1.0, -16.0, 32.0, 1.0, 32.0, 0.0, 0.0, 128, 192, 128] +[-15.0, 0.0, -15.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[-15.0, 0.0, 13.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[13.0, 0.0, -15.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[13.0, 0.0, 13.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] + +Entities: +[-0.5, 5.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 0, 10, 0, 0] +[-11.0, 0.0, -1.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 255, 1, 0, 6, welcome here, 222, 222, 222] +[9.0, 0.0, -1.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 0, 1, 0, 6, collect coins to advance, 222, 222, 111] +[-1.0, 0.0, -11.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 0, 0, 1, 0, 6, if HP goes to 0 its game over, 222, 222, 111] +[-1.0, 0.0, 9.0, 2.0, 2.0, 2.0, 0.0, 0.0, 0, 0, 255, 1, 0, 6, enjoy, 222, 222, 111] + +Weight : +0 + +$ +blocks: + [x, y, z, w, h, d, rhz, rvt, r, g, b] + +teleporters: + [x, y, z, w, h, d, rhz, rvt, r, g, b, dest_chx, dest_chy] + +entities: + [x, y, z, w, h, d, rhz, rvt, r, g, b, hp, damage, entityType ..] + // Entity types are : + // 0 (coin) -> damage equals the coin's value + // 1 (still explosive) + // 2 (seeking explosive) + // 3 (shooting still explosive) + // if entityType = 4 (moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with + amplitude_{x,y,z} = double[>= 0.0] + {mult,divd} = int + {phase} = int[0, 360] + + // else if entityType = 5 (linear moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with + amplitude_{x,y,z} = double[>= 0.0] + speed_{x,y,z} = double + + // else if entityType = 6 (text box) + [.. text, tred, tgreen, tblue] with + text = {char*} + + // else if entityType = 7 (warp text box) + [.. dest_folder, room_count, text, tred, tgreen, tblue] with + {dest_folder,text} = {char*} (length <= 50) + {r,g,b} = int[0-256] + + else + [..] \ No newline at end of file diff --git a/levels/level_00/room_1 b/levels/level_00/room_1 new file mode 100644 index 0000000..da8d582 --- /dev/null +++ b/levels/level_00/room_1 @@ -0,0 +1,45 @@ +Blocks : +[-16.0, -1.0, -16.0, 32.0, 1.0, 32.0, 0.0, 0.0, 128, 128, 128] +[-1.0, 0.0, -15.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[-1.0, 0.0, 13.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[-15.0, 0.0, -1.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[13.0, 0.0, -1.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] + +Entities: +[-2.0, 5.0, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 255, 255, 255, 1, 0, 4, 0.0, 3.0, 0.0, 4, 1, 0] +[-0.5, 13.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 0, 10, 0, 0] + +Weight : +50 + +$ +blocks: + [x, y, z, w, h, d, rhz, rvt, r, g, b] + +teleporters: + [x, y, z, w, h, d, rhz, rvt, r, g, b, dest_chx, dest_chy] + +entities: + [x, y, z, w, h, d, rhz, rvt, r, g, b, hp, damage, entityType ..] + if entityType = 4 (moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with + amplitude_{x,y,z} = double[>= 0.0] + {mult,divd} = int + {phase} = int[0, 360] + + else if entityType = 5 (linear moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with + amplitude_{x,y,z} = double[>= 0.0] + speed_{x,y,z} = double + + else if entityType = 6 (text box) + [.. text] with + text = {char*} + + else if entityType = 7 (warp text box) + [.. dest_folder, room_count, text, r, g, b] with + {dest_folder,text} = {char*} (length <= 50) + {r,g,b} = int[0-256] + + else + [..] \ No newline at end of file diff --git a/levels/level_00/room_2 b/levels/level_00/room_2 new file mode 100644 index 0000000..d29e6e8 --- /dev/null +++ b/levels/level_00/room_2 @@ -0,0 +1,53 @@ +Blocks : +[-16.0, -1.0, -16.0, 32.0, 1.0, 32.0, 0.0, 0.0, 128, 128, 128] +[-15.0, 0.0, -15.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[-15.0, 0.0, 13.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[13.0, 0.0, -15.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] +[13.0, 0.0, 13.0, 2.0, 10.0, 2.0, 0.0, 0.0, 128, 128, 128] + +Entities: +[-2.0, 5.0, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 255, 255, 255, 1, 0, 5, 0.0, 3.0, 0.0, 0.0, 3.0, 0.0] +[-14.0, 15.0, -14.0, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 0, 3, 0, 0] +[-14.0, 15.0, 12.0, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 0, 3, 0, 0] +[12.0, 15.0, -14.0, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 0, 3, 0, 0] +[12.0, 15.0, 12.0, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 0, 3, 0, 0] + +Weight : +50 + +$ +blocks: + [x, y, z, w, h, d, rhz, rvt, r, g, b] + +teleporters: + [x, y, z, w, h, d, rhz, rvt, r, g, b, dest_chx, dest_chy] + +entities: + [x, y, z, w, h, d, rhz, rvt, r, g, b, hp, damage, entityType ..] + // Entity types are : + // 0 (coin) -> damage equals the coin's value + // 1 (still explosive) + // 2 (seeking explosive) + // 3 (shooting still explosive) + // if entityType = 4 (moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with + amplitude_{x,y,z} = double[>= 0.0] + {mult,divd} = int + {phase} = int[0, 360] + + // else if entityType = 5 (linear moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with + amplitude_{x,y,z} = double[>= 0.0] + speed_{x,y,z} = double + + // else if entityType = 6 (text box) + [.. text, tred, tgreen, tblue] with + text = {char*} + + // else if entityType = 7 (warp text box) + [.. dest_folder, room_count, text, tred, tgreen, tblue] with + {dest_folder,text} = {char*} (length <= 50) + {r,g,b} = int[0-256] + + else + [..] \ No newline at end of file diff --git a/levels/level_00/room_3 b/levels/level_00/room_3 new file mode 100644 index 0000000..936e73a --- /dev/null +++ b/levels/level_00/room_3 @@ -0,0 +1,37 @@ +Blocks : +[-16.0, -1.0, -16.0, 32.0, 1.0, 32.0, 0.0, 0.0, 128, 128, 128] + +Weight : +50 + +$ +blocks: + [x, y, z, w, h, d, rhz, rvt, r, g, b] + +teleporters: + [x, y, z, w, h, d, rhz, rvt, r, g, b, dest_chx, dest_chy] + +entities: + [x, y, z, w, h, d, rhz, rvt, r, g, b, hp, damage, entityType ..] + if entityType = 4 (moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with + amplitude_{x,y,z} = double[>= 0.0] + {mult,divd} = int + {phase} = int[0, 360] + + else if entityType = 5 (linear moving platform) + [.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with + amplitude_{x,y,z} = double[>= 0.0] + speed_{x,y,z} = double + + else if entityType = 6 (text box) + [.. text] with + text = {char*} + + else if entityType = 7 (warp text box) + [.. dest_folder, room_count, text, r, g, b] with + {dest_folder,text} = {char*} (length <= 50) + {r,g,b} = int[0-256] + + else + [..] \ No newline at end of file diff --git a/obj/display.o b/obj/display.o index 59366c3..5d3236f 100644 Binary files a/obj/display.o and b/obj/display.o differ diff --git a/obj/generation.o b/obj/generation.o index 980c554..9000ea8 100644 Binary files a/obj/generation.o and b/obj/generation.o differ diff --git a/obj/main.o b/obj/main.o index 7784732..e74351c 100644 Binary files a/obj/main.o and b/obj/main.o differ diff --git a/obj/menus.o b/obj/menus.o index 5968bec..47f14f5 100644 Binary files a/obj/menus.o and b/obj/menus.o differ diff --git a/res/digits/big-sign-sum.bmp b/res/digits/big-sign-sum.bmp deleted file mode 100755 index 3941036..0000000 Binary files a/res/digits/big-sign-sum.bmp and /dev/null differ diff --git a/res/digits/digit-0.bmp b/res/digits/digit-0.bmp deleted file mode 100755 index 2d29cce..0000000 Binary files a/res/digits/digit-0.bmp and /dev/null differ diff --git a/res/digits/digit-1.bmp b/res/digits/digit-1.bmp deleted file mode 100755 index 50cbccb..0000000 Binary files a/res/digits/digit-1.bmp and /dev/null differ diff --git a/res/digits/digit-2.bmp b/res/digits/digit-2.bmp deleted file mode 100755 index 8afa656..0000000 Binary files a/res/digits/digit-2.bmp and /dev/null differ diff --git a/res/digits/digit-3.bmp b/res/digits/digit-3.bmp deleted file mode 100755 index 0b75609..0000000 Binary files a/res/digits/digit-3.bmp and /dev/null differ diff --git a/res/digits/digit-4.bmp b/res/digits/digit-4.bmp deleted file mode 100755 index 88cb6e8..0000000 Binary files a/res/digits/digit-4.bmp and /dev/null differ diff --git a/res/digits/digit-5.bmp b/res/digits/digit-5.bmp deleted file mode 100755 index d6d03f4..0000000 Binary files a/res/digits/digit-5.bmp and /dev/null differ diff --git a/res/digits/digit-6.bmp b/res/digits/digit-6.bmp deleted file mode 100755 index 9bca97a..0000000 Binary files a/res/digits/digit-6.bmp and /dev/null differ diff --git a/res/digits/digit-7.bmp b/res/digits/digit-7.bmp deleted file mode 100755 index 538fafb..0000000 Binary files a/res/digits/digit-7.bmp and /dev/null differ diff --git a/res/digits/digit-8.bmp b/res/digits/digit-8.bmp deleted file mode 100755 index 541457a..0000000 Binary files a/res/digits/digit-8.bmp and /dev/null differ diff --git a/res/digits/digit-9.bmp b/res/digits/digit-9.bmp deleted file mode 100755 index 976c2af..0000000 Binary files a/res/digits/digit-9.bmp and /dev/null differ diff --git a/res/digits/sign-minus.bmp b/res/digits/sign-minus.bmp deleted file mode 100755 index 9709c17..0000000 Binary files a/res/digits/sign-minus.bmp and /dev/null differ diff --git a/res/digits/sign-plus.bmp b/res/digits/sign-plus.bmp deleted file mode 100755 index 5c79139..0000000 Binary files a/res/digits/sign-plus.bmp and /dev/null differ diff --git a/res/digits/sign-prod.bmp b/res/digits/sign-prod.bmp deleted file mode 100755 index cdb645f..0000000 Binary files a/res/digits/sign-prod.bmp and /dev/null differ diff --git a/res/digits/sum-k.bmp b/res/digits/sum-k.bmp deleted file mode 100755 index e078d79..0000000 Binary files a/res/digits/sum-k.bmp and /dev/null differ diff --git a/res/letters/letter-a.bmp b/res/letters/letter-a.bmp deleted file mode 100755 index 14f2b35..0000000 Binary files a/res/letters/letter-a.bmp and /dev/null differ diff --git a/res/letters/letter-b.bmp b/res/letters/letter-b.bmp deleted file mode 100755 index 262a69f..0000000 Binary files a/res/letters/letter-b.bmp and /dev/null differ diff --git a/res/letters/letter-c.bmp b/res/letters/letter-c.bmp deleted file mode 100755 index 2679118..0000000 Binary files a/res/letters/letter-c.bmp and /dev/null differ diff --git a/res/letters/letter-d.bmp b/res/letters/letter-d.bmp deleted file mode 100755 index 5b8b9ba..0000000 Binary files a/res/letters/letter-d.bmp and /dev/null differ diff --git a/res/letters/letter-e.bmp b/res/letters/letter-e.bmp deleted file mode 100755 index de2b701..0000000 Binary files a/res/letters/letter-e.bmp and /dev/null differ diff --git a/res/letters/letter-f.bmp b/res/letters/letter-f.bmp deleted file mode 100755 index 2372800..0000000 Binary files a/res/letters/letter-f.bmp and /dev/null differ diff --git a/res/letters/letter-g.bmp b/res/letters/letter-g.bmp deleted file mode 100755 index 237148a..0000000 Binary files a/res/letters/letter-g.bmp and /dev/null differ diff --git a/res/letters/letter-h.bmp b/res/letters/letter-h.bmp deleted file mode 100755 index 360b232..0000000 Binary files a/res/letters/letter-h.bmp and /dev/null differ diff --git a/res/letters/letter-i.bmp b/res/letters/letter-i.bmp deleted file mode 100755 index be20a23..0000000 Binary files a/res/letters/letter-i.bmp and /dev/null differ diff --git a/res/letters/letter-j.bmp b/res/letters/letter-j.bmp deleted file mode 100755 index e24a36f..0000000 Binary files a/res/letters/letter-j.bmp and /dev/null differ diff --git a/res/letters/letter-k.bmp b/res/letters/letter-k.bmp deleted file mode 100755 index feb33bf..0000000 Binary files a/res/letters/letter-k.bmp and /dev/null differ diff --git a/res/letters/letter-l.bmp b/res/letters/letter-l.bmp deleted file mode 100755 index c4c746f..0000000 Binary files a/res/letters/letter-l.bmp and /dev/null differ diff --git a/res/letters/letter-m.bmp b/res/letters/letter-m.bmp deleted file mode 100755 index 227af44..0000000 Binary files a/res/letters/letter-m.bmp and /dev/null differ diff --git a/res/letters/letter-n.bmp b/res/letters/letter-n.bmp deleted file mode 100755 index 0493414..0000000 Binary files a/res/letters/letter-n.bmp and /dev/null differ diff --git a/res/letters/letter-o.bmp b/res/letters/letter-o.bmp deleted file mode 100755 index 5e66c2d..0000000 Binary files a/res/letters/letter-o.bmp and /dev/null differ diff --git a/res/letters/letter-p.bmp b/res/letters/letter-p.bmp deleted file mode 100755 index 680a103..0000000 Binary files a/res/letters/letter-p.bmp and /dev/null differ diff --git a/res/letters/letter-q.bmp b/res/letters/letter-q.bmp deleted file mode 100755 index ec1425b..0000000 Binary files a/res/letters/letter-q.bmp and /dev/null differ diff --git a/res/letters/letter-r.bmp b/res/letters/letter-r.bmp deleted file mode 100755 index cf35973..0000000 Binary files a/res/letters/letter-r.bmp and /dev/null differ diff --git a/res/letters/letter-s.bmp b/res/letters/letter-s.bmp deleted file mode 100755 index 778ab9d..0000000 Binary files a/res/letters/letter-s.bmp and /dev/null differ diff --git a/res/letters/letter-t.bmp b/res/letters/letter-t.bmp deleted file mode 100755 index 789c76c..0000000 Binary files a/res/letters/letter-t.bmp and /dev/null differ diff --git a/res/letters/letter-u.bmp b/res/letters/letter-u.bmp deleted file mode 100755 index 741d11f..0000000 Binary files a/res/letters/letter-u.bmp and /dev/null differ diff --git a/res/letters/letter-v.bmp b/res/letters/letter-v.bmp deleted file mode 100755 index 69071e9..0000000 Binary files a/res/letters/letter-v.bmp and /dev/null differ diff --git a/res/letters/letter-w.bmp b/res/letters/letter-w.bmp deleted file mode 100755 index 46d063d..0000000 Binary files a/res/letters/letter-w.bmp and /dev/null differ diff --git a/res/letters/letter-x.bmp b/res/letters/letter-x.bmp deleted file mode 100755 index a8d4395..0000000 Binary files a/res/letters/letter-x.bmp and /dev/null differ diff --git a/res/letters/letter-y.bmp b/res/letters/letter-y.bmp deleted file mode 100755 index 5d6a432..0000000 Binary files a/res/letters/letter-y.bmp and /dev/null differ diff --git a/res/letters/letter-z.bmp b/res/letters/letter-z.bmp deleted file mode 100755 index 0c5ec0e..0000000 Binary files a/res/letters/letter-z.bmp and /dev/null differ diff --git a/res/letters/ranking-A.png b/res/letters/ranking-A.png deleted file mode 100755 index 62bdba4..0000000 Binary files a/res/letters/ranking-A.png and /dev/null differ diff --git a/res/letters/ranking-B.png b/res/letters/ranking-B.png deleted file mode 100755 index e6101be..0000000 Binary files a/res/letters/ranking-B.png and /dev/null differ diff --git a/res/letters/ranking-C.png b/res/letters/ranking-C.png deleted file mode 100755 index 16fa5c5..0000000 Binary files a/res/letters/ranking-C.png and /dev/null differ diff --git a/res/letters/ranking-D.png b/res/letters/ranking-D.png deleted file mode 100755 index 030ce33..0000000 Binary files a/res/letters/ranking-D.png and /dev/null differ diff --git a/res/letters/ranking-S.png b/res/letters/ranking-S.png deleted file mode 100755 index 02486e2..0000000 Binary files a/res/letters/ranking-S.png and /dev/null differ diff --git a/res/letters/ranking-X.png b/res/letters/ranking-X.png deleted file mode 100755 index dc9cec7..0000000 Binary files a/res/letters/ranking-X.png and /dev/null differ diff --git a/res/letters/symbol-percent.bmp b/res/letters/symbol-percent.bmp deleted file mode 100755 index 034c65c..0000000 Binary files a/res/letters/symbol-percent.bmp and /dev/null differ diff --git a/res/money.png b/res/money.png new file mode 100644 index 0000000..f8e80ba Binary files /dev/null and b/res/money.png differ diff --git a/res/steel.jpeg b/res/steel.jpeg new file mode 100644 index 0000000..197e348 Binary files /dev/null and b/res/steel.jpeg differ diff --git a/src/display.c b/src/display.c index 98bac14..7e38f9c 100644 --- a/src/display.c +++ b/src/display.c @@ -164,7 +164,7 @@ bool is_visible(cube_0* cb, double offx, double offy, double offz) { void gl_renderAll(unsigned int shaderProgram, unsigned int fragmentShader, unsigned int VAO, unsigned int VBO, room* rtd, double offx, double offy, double offz) { if(rtd != NULL) { glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, textures[0]); + glBindTexture(GL_TEXTURE_2D, textures[5]); for(int k = 0; k < rtd->map_size; k++) { if(is_visible(rtd->map[k], offx, offy, offz)) { gl_renderCube(shaderProgram, fragmentShader, VAO, VBO, rtd->map[k], offx, offy, offz); diff --git a/src/generation.c b/src/generation.c index 7ed7f2a..4a78cbf 100644 --- a/src/generation.c +++ b/src/generation.c @@ -41,7 +41,7 @@ void init_ent_generator(int n) { } hashtbl_entities[0].id = 0; - hashtbl_entities[0].tex = 0; + hashtbl_entities[0].tex = 3; hashtbl_entities[0].name = "Coin"; // 0 = default hashtbl_entities[0].updatePos = &speen; hashtbl_entities[0].onHit = &money; @@ -69,14 +69,14 @@ void init_ent_generator(int n) { hashtbl_entities[3].onDeath = NULL; hashtbl_entities[4].id = 4; - hashtbl_entities[4].tex = 0; + hashtbl_entities[4].tex = 4; hashtbl_entities[4].name = "SinePlatform"; hashtbl_entities[4].updatePos = &moving_xyz; hashtbl_entities[4].onHit = &translatePlayer; hashtbl_entities[4].onDeath = NULL; hashtbl_entities[5].id = 5; - hashtbl_entities[5].tex = 0; + hashtbl_entities[5].tex = 4; hashtbl_entities[5].name = "LinePlatform"; hashtbl_entities[5].updatePos = &moving_xyz_line; hashtbl_entities[5].onHit = &translatePlayerLine; @@ -228,9 +228,10 @@ void init_hashtbl() { printf("+1\n"); fflush(stdout); visited = hashtbl_generate(1789); printf("+1\n"); fflush(stdout); - build_starting_chunk(player_chx, player_chy); + //generate_nearby_chunks(0); + //build_starting_chunk(player_chx, player_chy); printf("+1\n"); fflush(stdout); - current_room = hashtbl_find_opt(visited, player_chx, player_chy); + //current_room = hashtbl_find_opt(visited, player_chx, player_chy); printf("+1\n"); fflush(stdout); total_weight = 0; printf("+1\n"); fflush(stdout); @@ -523,6 +524,8 @@ void parse_one_room(int id, char* filename) { printf("3/3...\n"); fflush(stdout); + align_to(ptr, 'W'); + pool[id].weight = read_int(ptr, true); total_weight += pool[id].weight; @@ -587,6 +590,9 @@ void parse_rooms(int n_rooms, char* folder) { printf("\nDone.\n"); free(name); printf("Total sum : %d\n", total_weight); + + generate_nearby_chunks(0); + current_room = hashtbl_find_opt(visited, player_chx, player_chy); } // has to be a multiple of both room_width and room_depth @@ -624,15 +630,18 @@ void generate_nearby_chunks(int render_dist) { for(int w = -render_dist; w <= render_dist; w++) { for(int h = -render_dist; h <= render_dist; h++) { if(!hashtbl_mem(visited, player_chx + w, player_chy + h)) { - printf("generating (%d, %d)... ", player_chx + w, player_chy + h); + printf("generating (%d, %d)... ", player_chx + w, player_chy + h); fflush(stdout); //build_starting_chunk(player_chx + w, player_chy + h); int pick = rand()%total_weight; - printf("R = %d ", pick); + if(w == 0 && h == 0) { // 1st room will always be room_0 + pick = -1; + } + printf("R = %d ", pick); fflush(stdout); int sum = 0; for(int k = 0; k < pool_size; k++) { sum += pool[k].weight; if(pick < sum) { - printf("chose %d\n", k); + printf("chose %d\n", k); fflush(stdout); room* new = malloc(sizeof(room)); copy_room(pool[k].area, new, player_chx + w, player_chy + h); //generate_terrain(new); diff --git a/src/main.c b/src/main.c index 0af9732..b49cabf 100644 --- a/src/main.c +++ b/src/main.c @@ -54,9 +54,9 @@ void reset_everything(GLFWwindow *window, int count, char* folder) { parse_rooms(count, folder); interface_set(-1);*/ - camx = /*2*room_width*player_chx+*/2.0; + camx = /*2*room_width*player_chx+*/0.0; camy = 5.0; - camz = /*2*room_depth*player_chy+*/2.0; + camz = /*2*room_depth*player_chy+*/0.0; player_chx = 0; player_chy = 0; @@ -246,7 +246,7 @@ void processInput(GLFWwindow *window, float dtime) { if(glfwGetKey(window, GLFW_KEY_R) == GLFW_PRESS) { if(!isMenuOpen() && !rPress) { rPress = true; - reset_everything(window, 7, "templates/"); + reset_everything(window, 4, "levels/level_00/"); } } else { rPress = false; @@ -437,6 +437,9 @@ int main_alt() { generate_texture(0, "res/white.png", PNG); generate_texture(1, "res/question_block.png", PNG); generate_texture(2, "res/exclamation_block.png", PNG); + generate_texture(3, "res/money.png", PNG); + generate_texture(4, "res/container.jpg", JPG); + generate_texture(5, "res/steel.jpeg", JPEG); printf("-----------------------------------------------------------------------------------------------\n"); fflush(stdout); diff --git a/src/menus.c b/src/menus.c index 0db7edf..e8da4e4 100644 --- a/src/menus.c +++ b/src/menus.c @@ -305,6 +305,8 @@ void gl_drawChar(unsigned int fragShader, char ch, float x, float y, float size, gl_drawRect(fragShader, x-size/2-width, y-width, size+2*width, 2*width, r, g, b); gl_drawRect(fragShader, x-size/2-width, y-size-width, 2*width, size+2*width, r, g, b); gl_drawRect(fragShader, x-size/2-width, y-size-width, size+2*width, 2*width, r, g, b); + } else if((int)ch >= 48 && (int)ch <= 57) { + gl_drawDigit(fragShader, (int)ch -48, x, y, size, r, g, b, width); } }