| … | |
… | |
| 74 | sub harmonize { |
74 | sub harmonize { |
| 75 | my ($vals) = @_; |
75 | my ($vals) = @_; |
| 76 | |
76 | |
| 77 | my $rem = 0; |
77 | my $rem = 0; |
| 78 | |
78 | |
| 79 | for ($vals) { |
79 | for (@$vals) { |
| 80 | my $i = int $_ + $rem; |
80 | my $i = int $_ + $rem; |
| 81 | $rem += $_ - $i; |
81 | $rem += $_ - $i; |
| 82 | $_ = $i; |
82 | $_ = $i; |
| 83 | } |
83 | } |
| 84 | } |
84 | } |
| … | |
… | |
| 112 | $self |
112 | $self |
| 113 | } |
113 | } |
| 114 | |
114 | |
| 115 | sub move { |
115 | sub move { |
| 116 | my ($self, $x, $y, $z) = @_; |
116 | my ($self, $x, $y, $z) = @_; |
| 117 | $self->{x} = $x; |
117 | $self->{x} = int $x; |
| 118 | $self->{y} = $y; |
118 | $self->{y} = int $y; |
| 119 | $self->{z} = $z if defined $z; |
119 | $self->{z} = $z if defined $z; |
| 120 | } |
120 | } |
| 121 | |
121 | |
| 122 | sub needs_redraw { |
122 | sub needs_redraw { |
| 123 | 0 |
123 | 0 |
| … | |
… | |
| 565 | # TODO: user_x, user_y, overwrite moveto? |
565 | # TODO: user_x, user_y, overwrite moveto? |
| 566 | |
566 | |
| 567 | $class->SUPER::new ( |
567 | $class->SUPER::new ( |
| 568 | bg => [1, 1, 1, 1], |
568 | bg => [1, 1, 1, 1], |
| 569 | border_bg => [1, 1, 1, 1], |
569 | border_bg => [1, 1, 1, 1], |
| 570 | border => $::FONTSIZE * 0.8, |
570 | border => int $::FONTSIZE * 0.8, |
| 571 | @_ |
571 | @_ |
| 572 | ) |
572 | ) |
| 573 | } |
573 | } |
| 574 | |
574 | |
| 575 | sub size_request { |
575 | sub size_request { |
| … | |
… | |
| 704 | |
704 | |
| 705 | $child->set_parent ($self); |
705 | $child->set_parent ($self); |
| 706 | $self->{children}[$y][$x] = $child; |
706 | $self->{children}[$y][$x] = $child; |
| 707 | |
707 | |
| 708 | $self->{w} = $self->{h} = -1; |
708 | $self->{w} = $self->{h} = -1; |
|
|
709 | $self->update; |
|
|
710 | } |
|
|
711 | |
|
|
712 | # TODO: move to container class maybe? send childs a signal on removal? |
|
|
713 | sub clear { |
|
|
714 | my ($self) = @_; |
|
|
715 | |
|
|
716 | delete $self->{children}; |
| 709 | $self->update; |
717 | $self->update; |
| 710 | } |
718 | } |
| 711 | |
719 | |
| 712 | sub get_wh { |
720 | sub get_wh { |
| 713 | my ($self) = @_; |
721 | my ($self) = @_; |
| … | |
… | |
| 942 | my $self = $class->SUPER::new ( |
950 | my $self = $class->SUPER::new ( |
| 943 | fg => [1, 1, 1], |
951 | fg => [1, 1, 1], |
| 944 | fontsize => $::FONTSIZE, |
952 | fontsize => $::FONTSIZE, |
| 945 | text => "", |
953 | text => "", |
| 946 | align => -1, |
954 | align => -1, |
|
|
955 | valign => -1, |
| 947 | padding => 2, |
956 | padding => 2, |
| 948 | layout => new CFClient::Layout, |
957 | layout => new CFClient::Layout, |
| 949 | %arg |
958 | %arg |
| 950 | ); |
959 | ); |
| 951 | |
960 | |
| … | |
… | |
| 1028 | my $x = |
1037 | my $x = |
| 1029 | $self->{align} < 0 ? $self->{padding} |
1038 | $self->{align} < 0 ? $self->{padding} |
| 1030 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1039 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
| 1031 | : ($self->{w} - $tex->{w}) * 0.5; |
1040 | : ($self->{w} - $tex->{w}) * 0.5; |
| 1032 | |
1041 | |
| 1033 | $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); |
1042 | my $y = |
|
|
1043 | $self->{valign} < 0 ? $self->{padding} |
|
|
1044 | : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} |
|
|
1045 | : ($self->{h} - $tex->{h}) * 0.5; |
|
|
1046 | |
|
|
1047 | $tex->draw_quad (int $x, int $y); |
| 1034 | |
1048 | |
| 1035 | glDisable GL_TEXTURE_2D; |
1049 | glDisable GL_TEXTURE_2D; |
| 1036 | glDisable GL_BLEND; |
1050 | glDisable GL_BLEND; |
| 1037 | } |
1051 | } |
| 1038 | |
1052 | |
| … | |
… | |
| 1053 | bg => [0, 0, 0, 0.2], |
1067 | bg => [0, 0, 0, 0.2], |
| 1054 | active_bg => [1, 1, 1, 0.5], |
1068 | active_bg => [1, 1, 1, 0.5], |
| 1055 | active_fg => [0, 0, 0], |
1069 | active_fg => [0, 0, 0], |
| 1056 | can_hover => 1, |
1070 | can_hover => 1, |
| 1057 | can_focus => 1, |
1071 | can_focus => 1, |
|
|
1072 | valign => 0, |
| 1058 | @_ |
1073 | @_ |
| 1059 | ) |
1074 | ) |
| 1060 | } |
1075 | } |
| 1061 | |
1076 | |
| 1062 | sub _set_text { |
1077 | sub _set_text { |
| … | |
… | |
| 1261 | |
1276 | |
| 1262 | sub _draw { |
1277 | sub _draw { |
| 1263 | my ($self) = @_; |
1278 | my ($self) = @_; |
| 1264 | |
1279 | |
| 1265 | local $self->{fg} = $self->{fg}; |
1280 | local $self->{fg} = $self->{fg}; |
| 1266 | my $tex = $tex[0]; |
|
|
| 1267 | |
|
|
| 1268 | glEnable GL_BLEND; |
|
|
| 1269 | glEnable GL_TEXTURE_2D; |
|
|
| 1270 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
| 1271 | |
1281 | |
| 1272 | if ($GRAB == $self) { |
1282 | if ($GRAB == $self) { |
| 1273 | $self->{fg} = $self->{active_fg}; |
1283 | $self->{fg} = $self->{active_fg}; |
| 1274 | } |
1284 | } |
| 1275 | |
1285 | |
| 1276 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
1286 | glEnable GL_BLEND; |
|
|
1287 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
1288 | glEnable GL_TEXTURE_2D; |
| 1277 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1289 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
1290 | glColor 0, 0, 0, 1; |
| 1278 | |
1291 | |
| 1279 | $tex->draw_quad (0, 0, $self->{w}, $self->{h}); |
1292 | $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); |
| 1280 | |
1293 | |
| 1281 | glDisable GL_TEXTURE_2D; |
1294 | glDisable GL_TEXTURE_2D; |
| 1282 | glDisable GL_BLEND; |
1295 | glDisable GL_BLEND; |
| 1283 | |
1296 | |
| 1284 | $self->SUPER::_draw; |
1297 | $self->SUPER::_draw; |
| … | |
… | |
| 1766 | 0.1, 0.1, 0.1, |
1779 | 0.1, 0.1, 0.1, |
| 1767 | ; |
1780 | ; |
| 1768 | glEnable GL_CONVOLUTION_2D; |
1781 | glEnable GL_CONVOLUTION_2D; |
| 1769 | } |
1782 | } |
| 1770 | |
1783 | |
| 1771 | my $tex = new CFClient::Texture |
1784 | $self->{fow_texture} = new CFClient::Texture |
| 1772 | w => $w, |
1785 | w => $w, |
| 1773 | h => $h, |
1786 | h => $h, |
| 1774 | data => $data, |
1787 | data => $data, |
| 1775 | internalformat => GL_ALPHA, |
1788 | internalformat => GL_ALPHA, |
| 1776 | format => GL_ALPHA; |
1789 | format => GL_ALPHA; |
| … | |
… | |
| 1781 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1794 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
| 1782 | glEnable GL_TEXTURE_2D; |
1795 | glEnable GL_TEXTURE_2D; |
| 1783 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1796 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
| 1784 | |
1797 | |
| 1785 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
1798 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
| 1786 | $tex->draw_quad (0, 0, $w * 32, $h * 32); |
1799 | $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); |
| 1787 | |
1800 | |
| 1788 | glDisable GL_TEXTURE_2D; |
1801 | glDisable GL_TEXTURE_2D; |
| 1789 | glDisable GL_BLEND; |
1802 | glDisable GL_BLEND; |
| 1790 | } |
1803 | } |
| 1791 | |
1804 | |
| … | |
… | |
| 1797 | glEnable GL_BLEND; |
1810 | glEnable GL_BLEND; |
| 1798 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1811 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
| 1799 | glEnable GL_TEXTURE_2D; |
1812 | glEnable GL_TEXTURE_2D; |
| 1800 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1813 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
| 1801 | |
1814 | |
|
|
1815 | $self->{mapmap_texture} = |
| 1802 | CFClient::Texture->new ( |
1816 | new CFClient::Texture |
| 1803 | w => $w, |
1817 | w => $w, |
| 1804 | h => $h, |
1818 | h => $h, |
| 1805 | data => $::MAP->mapmap ($w, $h), |
1819 | data => $::MAP->mapmap ($w, $h), |
| 1806 | type => GL_UNSIGNED_INT_8_8_8_8_REV |
1820 | type => GL_UNSIGNED_INT_8_8_8_8_REV; |
| 1807 | )->draw_quad (100, 100); |
1821 | |
|
|
1822 | $self->{mapmap_texture}->draw_quad (100, 100); |
| 1808 | |
1823 | |
| 1809 | glDisable GL_TEXTURE_2D; |
1824 | glDisable GL_TEXTURE_2D; |
| 1810 | glDisable GL_BLEND; |
1825 | glDisable GL_BLEND; |
| 1811 | } |
1826 | } |
| 1812 | # HACK END |
1827 | # HACK END |
| … | |
… | |
| 1960 | |
1975 | |
| 1961 | # TODO: use animation |
1976 | # TODO: use animation |
| 1962 | if ($self->{state} = !$self->{state}) { |
1977 | if ($self->{state} = !$self->{state}) { |
| 1963 | $CFClient::UI::ROOT->add ($self->{other}); |
1978 | $CFClient::UI::ROOT->add ($self->{other}); |
| 1964 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
1979 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
1980 | $self->emit ("open"); |
| 1965 | } else { |
1981 | } else { |
| 1966 | $CFClient::UI::ROOT->remove ($self->{other}); |
1982 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
1983 | $self->emit ("close"); |
| 1967 | } |
1984 | } |
|
|
1985 | |
|
|
1986 | $self->emit (changed => $self->{state}); |
| 1968 | } |
1987 | } |
| 1969 | |
1988 | |
| 1970 | ############################################################################# |
1989 | ############################################################################# |
| 1971 | |
1990 | |
| 1972 | package CFClient::UI::Root; |
1991 | package CFClient::UI::Root; |
| … | |
… | |
| 2004 | sub add { |
2023 | sub add { |
| 2005 | my ($self, $widget) = @_; |
2024 | my ($self, $widget) = @_; |
| 2006 | |
2025 | |
| 2007 | $self->SUPER::add ($widget); |
2026 | $self->SUPER::add ($widget); |
| 2008 | |
2027 | |
| 2009 | $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); |
2028 | $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request); |
| 2010 | } |
2029 | } |
| 2011 | |
2030 | |
| 2012 | sub on_refresh { |
2031 | sub on_refresh { |
| 2013 | my ($self, $id, $cb) = @_; |
2032 | my ($self, $id, $cb) = @_; |
| 2014 | |
2033 | |
