removed main_window::active()
glColor4b() -> glColor4f()
sandbox/trunk/tools/gtk_action_game/main_window_impl.cpp (diff) sandbox/trunk/tools/gtk_action_game/sprite.hpp (diff) sandbox/trunk/tools/gtk_action_game/main_window_impl.hpp (diff) sandbox/trunk/tools/gtk_action_game/draw.hpp (diff)| @@ -566,7 +566,7 @@ | ||
| 566 | 566 | explicit impl(GtkWidget* widget, const game_project& proj) |
| 567 | 567 | : widget_(widget), project_(proj) |
| 568 | 568 | , input_(widget_), system_(widget_), rc_(widget_), textures_(rc_) |
| 569 | - , active_(false), last_time_(get_tick_count()), frames_(0) | |
| 569 | + , last_time_(get_tick_count()), frames_(0) | |
| 570 | 570 | #if defined(HAMIGAKI_DISPLAY_FPS) |
| 571 | 571 | , last_fps_time_(0), fps_count_(0) |
| 572 | 572 | #endif |
| @@ -573,14 +573,11 @@ | ||
| 573 | 573 | { |
| 574 | 574 | ::gtk_window_set_title(GTK_WINDOW(widget_), "ActionGame"); |
| 575 | 575 | |
| 576 | - ::glViewport(0, 0, proj.screen_width, proj.screen_height); | |
| 576 | + rc_.select(); | |
| 577 | 577 | |
| 578 | - ::glMatrixMode(GL_PROJECTION); | |
| 579 | - ::glPushMatrix(); | |
| 580 | - ::glLoadIdentity(); | |
| 581 | 578 | ::glOrtho( |
| 582 | - 0.0, static_cast<double>(proj.screen_width), | |
| 583 | - static_cast<double>(proj.screen_height), 0.0, | |
| 579 | + 0.0, static_cast<double>(project_.screen_width), | |
| 580 | + static_cast<double>(project_.screen_height), 0.0, | |
| 584 | 581 | 0.0, 1.0 |
| 585 | 582 | ); |
| 586 | 583 |
| @@ -608,7 +605,7 @@ | ||
| 608 | 605 | |
| 609 | 606 | bool process_input() |
| 610 | 607 | { |
| 611 | - if (active_) | |
| 608 | + if (::gtk_window_is_active(GTK_WINDOW(widget_))) | |
| 612 | 609 | system_.command = input_(); |
| 613 | 610 | else |
| 614 | 611 | system_.command = input_command(); |
| @@ -650,8 +647,11 @@ | ||
| 650 | 647 | { |
| 651 | 648 | system_.characters.sort(character_ptr_z_greator()); |
| 652 | 649 | |
| 650 | + rc_.select(); | |
| 651 | + | |
| 653 | 652 | set_clear_color(project_.bg_color); |
| 654 | - ::glClear(GL_COLOR_BUFFER_BIT); | |
| 653 | + ::glClearDepth(1.0f); | |
| 654 | + ::glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); | |
| 655 | 655 | |
| 656 | 656 | ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
| 657 | 657 | ::glEnable(GL_BLEND); |
| @@ -1090,8 +1090,3 @@ | ||
| 1090 | 1090 | { |
| 1091 | 1091 | pimpl_->render(); |
| 1092 | 1092 | } |
| 1093 | - | |
| 1094 | -void main_window::active(bool val) | |
| 1095 | -{ | |
| 1096 | - pimpl_->active(val); | |
| 1097 | -} |
| @@ -30,11 +30,11 @@ | ||
| 30 | 30 | x -= 0.5f; |
| 31 | 31 | y -= 0.5f; |
| 32 | 32 | |
| 33 | - ::glColor4b( | |
| 34 | - static_cast<unsigned char>((color >> 16) & 0xFF), | |
| 35 | - static_cast<unsigned char>((color >> 8) & 0xFF), | |
| 36 | - static_cast<unsigned char>((color ) & 0xFF), | |
| 37 | - static_cast<unsigned char>((color >> 24) & 0xFF) | |
| 33 | + ::glColor4f( | |
| 34 | + static_cast<float>((color >> 16) & 0xFF) / 255.0f, | |
| 35 | + static_cast<float>((color >> 8) & 0xFF) / 255.0f, | |
| 36 | + static_cast<float>((color ) & 0xFF) / 255.0f, | |
| 37 | + static_cast<float>((color >> 24) & 0xFF) / 255.0f | |
| 38 | 38 | ); |
| 39 | 39 | |
| 40 | 40 | texture.bind(); |
| @@ -71,11 +71,11 @@ | ||
| 71 | 71 | x -= 0.5f; |
| 72 | 72 | y -= 0.5f; |
| 73 | 73 | |
| 74 | - ::glColor4b( | |
| 75 | - static_cast<unsigned char>((color >> 16) & 0xFF), | |
| 76 | - static_cast<unsigned char>((color >> 8) & 0xFF), | |
| 77 | - static_cast<unsigned char>((color ) & 0xFF), | |
| 78 | - static_cast<unsigned char>((color >> 24) & 0xFF) | |
| 74 | + ::glColor4f( | |
| 75 | + static_cast<float>((color >> 16) & 0xFF) / 255.0f, | |
| 76 | + static_cast<float>((color >> 8) & 0xFF) / 255.0f, | |
| 77 | + static_cast<float>((color ) & 0xFF) / 255.0f, | |
| 78 | + static_cast<float>((color >> 24) & 0xFF) / 255.0f | |
| 79 | 79 | ); |
| 80 | 80 | |
| 81 | 81 | texture.bind(); |
| @@ -21,7 +21,6 @@ | ||
| 21 | 21 | explicit main_window(GtkWidget* widget, const game_project& proj); |
| 22 | 22 | bool process_input(); |
| 23 | 23 | void render(); |
| 24 | - void active(bool val); | |
| 25 | 24 | |
| 26 | 25 | private: |
| 27 | 26 | class impl; |
| @@ -22,11 +22,11 @@ | ||
| 22 | 22 | float x, float y, float z, |
| 23 | 23 | float width, float height, unsigned long color) |
| 24 | 24 | { |
| 25 | - ::glColor4b( | |
| 26 | - static_cast<unsigned char>((color >> 16) & 0xFF), | |
| 27 | - static_cast<unsigned char>((color >> 8) & 0xFF), | |
| 28 | - static_cast<unsigned char>((color ) & 0xFF), | |
| 29 | - static_cast<unsigned char>((color >> 24) & 0xFF) | |
| 25 | + ::glColor4f( | |
| 26 | + static_cast<float>((color >> 16) & 0xFF) / 255.0f, | |
| 27 | + static_cast<float>((color >> 8) & 0xFF) / 255.0f, | |
| 28 | + static_cast<float>((color ) & 0xFF) / 255.0f, | |
| 29 | + static_cast<float>((color >> 24) & 0xFF) / 255.0f | |
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | ::glBegin(GL_TRIANGLE_STRIP); |
