diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92c0b86 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +build/game_tower +build/CMakeFiles/game_tower.dir/main.c.o +build/.ninja_log +build/.ninja_deps diff --git a/build/.ninja_deps b/build/.ninja_deps index fe42afc..a50df82 100644 Binary files a/build/.ninja_deps and b/build/.ninja_deps differ diff --git a/build/.ninja_log b/build/.ninja_log index 08e01bc..b6ef6a9 100644 --- a/build/.ninja_log +++ b/build/.ninja_log @@ -2,3 +2,49 @@ 353 388 1728610037321000745 game_tower 441a688158d57ab3 1 353 1728610036968995150 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f 0 15 1742080161894083352 build.ninja 9414d867134ab9c8 +1 332 1742080602419756739 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +332 369 1742080602747760900 game_tower a3ba29710d75d5f0 +2 327 1742081102558043487 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +327 362 1742081102882047531 game_tower a3ba29710d75d5f0 +0 328 1742081161354777151 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +328 362 1742081161682781243 game_tower a3ba29710d75d5f0 +1 339 1742081192795169155 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +340 373 1742081193135173391 game_tower a3ba29710d75d5f0 +1 329 1742081225603578003 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +329 364 1742081225931582090 game_tower a3ba29710d75d5f0 +1 338 1742081313240669154 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +338 372 1742081313576673335 game_tower a3ba29710d75d5f0 +1 328 1742081323828800898 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +328 362 1742081324152804929 game_tower a3ba29710d75d5f0 +1 340 1742081338464982981 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +341 375 1742081338804987211 game_tower a3ba29710d75d5f0 +1 327 1742081403141787227 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +327 361 1742081403465791255 game_tower a3ba29710d75d5f0 +1 332 1742081423698042722 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +332 367 1742081424030046847 game_tower a3ba29710d75d5f0 +1 326 1742081462634526516 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +326 360 1742081462958530542 game_tower a3ba29710d75d5f0 +1 330 1742081483158781463 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +330 365 1742081483486785536 game_tower a3ba29710d75d5f0 +1 329 1742081510355119212 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +329 363 1742081510683123285 game_tower a3ba29710d75d5f0 +1 326 1742081561823758181 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +327 361 1742081562151762253 game_tower a3ba29710d75d5f0 +1 328 1742081574411914422 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +329 363 1742081574739918491 game_tower a3ba29710d75d5f0 +1 325 1742081590004107923 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +325 360 1742081590328111944 game_tower a3ba29710d75d5f0 +1 330 1742081600208234548 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +330 365 1742081600540238667 game_tower a3ba29710d75d5f0 +1 330 1742081620816490247 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +330 367 1742081621144494317 game_tower a3ba29710d75d5f0 +0 328 1742081629284595308 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +328 363 1742081629612599376 game_tower a3ba29710d75d5f0 +1 326 1742081777406432059 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +326 360 1742081777730436076 game_tower a3ba29710d75d5f0 +1 333 1742081851955355928 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +333 369 1742081852287360042 game_tower a3ba29710d75d5f0 +1 325 1742081880635711273 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +325 359 1742081880959715288 game_tower a3ba29710d75d5f0 +0 330 1742081931248338253 CMakeFiles/game_tower.dir/main.c.o 2f596dfe27ad444f +330 363 1742081931580342364 game_tower a3ba29710d75d5f0 diff --git a/build/CMakeFiles/game_tower.dir/main.c.o b/build/CMakeFiles/game_tower.dir/main.c.o index 7ab8252..d56cb32 100644 Binary files a/build/CMakeFiles/game_tower.dir/main.c.o and b/build/CMakeFiles/game_tower.dir/main.c.o differ diff --git a/build/game_tower b/build/game_tower index cb6b89f..5ac970b 100755 Binary files a/build/game_tower and b/build/game_tower differ diff --git a/main.c b/main.c index 1aedc32..0c8a814 100644 --- a/main.c +++ b/main.c @@ -431,6 +431,7 @@ void render_ui_locator(){ //glPopMatrix(); glTranslatef(-10,-1,0); texst_number_render(inventory.locator); + glBindTexture(GL_TEXTURE_2D, 0); } void render_ui_oil(){ render_ui_lo(); @@ -443,6 +444,7 @@ void render_ui_oil(){ glTranslatef(-10,-1,0); texst_number_render(inventory.oil); glColor3f(0,0,0); + glBindTexture(GL_TEXTURE_2D, 0); } void render_ui_sphere(){ render_ui_lo(); @@ -454,6 +456,7 @@ void render_ui_sphere(){ texst_render("Сферы "); glTranslatef(-10,-1,0); texst_number_render(inventory.sphere); + glBindTexture(GL_TEXTURE_2D, 0); } void render_ui_battery(){ render_ui_lo(); @@ -465,6 +468,7 @@ void render_ui_battery(){ texst_render("Батарея "); glTranslatef(-10,-1,0); texst_number_render(bat); + glBindTexture(GL_TEXTURE_2D, 0); } int x = 3, y = 10; @@ -602,7 +606,7 @@ void render_GUI(){ glScalef(0.12,0.12,1); glTranslatef(1,4,0); render_ui_oil(); -/* + ren(); glOrtho(0,4, 0,8, -1,1); glTranslatef(2,0,0); @@ -618,7 +622,7 @@ void render_GUI(){ glScalef(0.12,0.12,1); glTranslatef(1,4,0); render_ui_battery(); - */ + glColor3f(0,0,0); }