… | |
… | |
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 |
… | |
… | |
176 | |
176 | |
177 | return if $FOCUS == $self; |
177 | return if $FOCUS == $self; |
178 | return unless $self->{can_focus}; |
178 | return unless $self->{can_focus}; |
179 | |
179 | |
180 | my $focus = $FOCUS; $FOCUS = $self; |
180 | my $focus = $FOCUS; $FOCUS = $self; |
|
|
181 | |
|
|
182 | $self->emit (focus_in => $focus); |
|
|
183 | |
181 | $focus->update if $focus; |
184 | $focus->update if $focus; |
182 | $FOCUS->update; |
185 | $FOCUS->update; |
183 | } |
186 | } |
184 | |
187 | |
185 | sub focus_out { |
188 | sub focus_out { |
186 | my ($self) = @_; |
189 | my ($self) = @_; |
187 | |
190 | |
188 | return unless $FOCUS == $self; |
191 | return unless $FOCUS == $self; |
189 | |
192 | |
190 | my $focus = $FOCUS; undef $FOCUS; |
193 | my $focus = $FOCUS; undef $FOCUS; |
|
|
194 | |
|
|
195 | $self->emit (focus_out => $focus); |
|
|
196 | |
191 | $focus->update if $focus; #? |
197 | $focus->update if $focus; #? |
192 | } |
198 | } |
193 | |
199 | |
194 | sub mouse_motion { } |
200 | sub mouse_motion { } |
195 | sub button_up { } |
201 | sub button_up { } |
… | |
… | |
565 | # TODO: user_x, user_y, overwrite moveto? |
571 | # TODO: user_x, user_y, overwrite moveto? |
566 | |
572 | |
567 | $class->SUPER::new ( |
573 | $class->SUPER::new ( |
568 | bg => [1, 1, 1, 1], |
574 | bg => [1, 1, 1, 1], |
569 | border_bg => [1, 1, 1, 1], |
575 | border_bg => [1, 1, 1, 1], |
570 | border => $::FONTSIZE * 0.8, |
576 | border => int $::FONTSIZE * 0.8, |
571 | @_ |
577 | @_ |
572 | ) |
578 | ) |
573 | } |
579 | } |
574 | |
580 | |
575 | sub size_request { |
581 | sub size_request { |
… | |
… | |
1276 | |
1282 | |
1277 | sub _draw { |
1283 | sub _draw { |
1278 | my ($self) = @_; |
1284 | my ($self) = @_; |
1279 | |
1285 | |
1280 | local $self->{fg} = $self->{fg}; |
1286 | local $self->{fg} = $self->{fg}; |
1281 | my $tex = $tex[0]; |
|
|
1282 | |
|
|
1283 | glEnable GL_BLEND; |
|
|
1284 | glEnable GL_TEXTURE_2D; |
|
|
1285 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
1286 | |
1287 | |
1287 | if ($GRAB == $self) { |
1288 | if ($GRAB == $self) { |
1288 | $self->{fg} = $self->{active_fg}; |
1289 | $self->{fg} = $self->{active_fg}; |
1289 | } |
1290 | } |
1290 | |
1291 | |
1291 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
1292 | glEnable GL_BLEND; |
|
|
1293 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
1294 | glEnable GL_TEXTURE_2D; |
1292 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1295 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
1296 | glColor 0, 0, 0, 1; |
1293 | |
1297 | |
1294 | $tex->draw_quad (0, 0, $self->{w}, $self->{h}); |
1298 | $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); |
1295 | |
1299 | |
1296 | glDisable GL_TEXTURE_2D; |
1300 | glDisable GL_TEXTURE_2D; |
1297 | glDisable GL_BLEND; |
1301 | glDisable GL_BLEND; |
1298 | |
1302 | |
1299 | $self->SUPER::_draw; |
1303 | $self->SUPER::_draw; |
… | |
… | |
1781 | 0.1, 0.1, 0.1, |
1785 | 0.1, 0.1, 0.1, |
1782 | ; |
1786 | ; |
1783 | glEnable GL_CONVOLUTION_2D; |
1787 | glEnable GL_CONVOLUTION_2D; |
1784 | } |
1788 | } |
1785 | |
1789 | |
1786 | my $tex = new CFClient::Texture |
1790 | $self->{fow_texture} = new CFClient::Texture |
1787 | w => $w, |
1791 | w => $w, |
1788 | h => $h, |
1792 | h => $h, |
1789 | data => $data, |
1793 | data => $data, |
1790 | internalformat => GL_ALPHA, |
1794 | internalformat => GL_ALPHA, |
1791 | format => GL_ALPHA; |
1795 | format => GL_ALPHA; |
… | |
… | |
1796 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1800 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1797 | glEnable GL_TEXTURE_2D; |
1801 | glEnable GL_TEXTURE_2D; |
1798 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1802 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1799 | |
1803 | |
1800 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
1804 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
1801 | $tex->draw_quad (0, 0, $w * 32, $h * 32); |
1805 | $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); |
1802 | |
1806 | |
1803 | glDisable GL_TEXTURE_2D; |
1807 | glDisable GL_TEXTURE_2D; |
1804 | glDisable GL_BLEND; |
1808 | glDisable GL_BLEND; |
1805 | } |
1809 | } |
1806 | |
1810 | |
… | |
… | |
1812 | glEnable GL_BLEND; |
1816 | glEnable GL_BLEND; |
1813 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1817 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1814 | glEnable GL_TEXTURE_2D; |
1818 | glEnable GL_TEXTURE_2D; |
1815 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1819 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1816 | |
1820 | |
|
|
1821 | $self->{mapmap_texture} = |
1817 | CFClient::Texture->new ( |
1822 | new CFClient::Texture |
1818 | w => $w, |
1823 | w => $w, |
1819 | h => $h, |
1824 | h => $h, |
1820 | data => $::MAP->mapmap ($w, $h), |
1825 | data => $::MAP->mapmap ($w, $h), |
1821 | type => GL_UNSIGNED_INT_8_8_8_8_REV |
1826 | type => GL_UNSIGNED_INT_8_8_8_8_REV; |
1822 | )->draw_quad (100, 100); |
1827 | |
|
|
1828 | $self->{mapmap_texture}->draw_quad (100, 100); |
1823 | |
1829 | |
1824 | glDisable GL_TEXTURE_2D; |
1830 | glDisable GL_TEXTURE_2D; |
1825 | glDisable GL_BLEND; |
1831 | glDisable GL_BLEND; |
1826 | } |
1832 | } |
1827 | # HACK END |
1833 | # HACK END |
… | |
… | |
2023 | sub add { |
2029 | sub add { |
2024 | my ($self, $widget) = @_; |
2030 | my ($self, $widget) = @_; |
2025 | |
2031 | |
2026 | $self->SUPER::add ($widget); |
2032 | $self->SUPER::add ($widget); |
2027 | |
2033 | |
2028 | $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); |
2034 | $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request); |
2029 | } |
2035 | } |
2030 | |
2036 | |
2031 | sub on_refresh { |
2037 | sub on_refresh { |
2032 | my ($self, $id, $cb) = @_; |
2038 | my ($self, $id, $cb) = @_; |
2033 | |
2039 | |