ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC vs.
Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC

… …
74sub harmonize { 74sub 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
115sub move { 115sub 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
122sub needs_redraw { 122sub 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
575sub size_request { 575sub size_request {
… …
950 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
951 fg => [1, 1, 1], 951 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
953 text => "", 953 text => "",
954 align => -1, 954 align => -1,
955 valign => -1,
955 padding => 2, 956 padding => 2,
956 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
957 %arg 958 %arg
958 ); 959 );
959 960
… …
1036 my $x = 1037 my $x =
1037 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1039 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
1040 1041
1041 $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);
1042 1048
1043 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
1044 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
1045} 1051}
1046 1052
… …
1061 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1062 active_bg => [1, 1, 1, 0.5], 1068 active_bg => [1, 1, 1, 0.5],
1063 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1064 can_hover => 1, 1070 can_hover => 1,
1065 can_focus => 1, 1071 can_focus => 1,
1072 valign => 0,
1066 @_ 1073 @_
1067 ) 1074 )
1068} 1075}
1069 1076
1070sub _set_text { 1077sub _set_text {
… …
1774 0.1, 0.1, 0.1, 1781 0.1, 0.1, 0.1,
1775 ; 1782 ;
1776 glEnable GL_CONVOLUTION_2D; 1783 glEnable GL_CONVOLUTION_2D;
1777 } 1784 }
1778 1785
1779 my $tex = new CFClient::Texture 1786 $self->{fow_texture} = new CFClient::Texture
1780 w => $w, 1787 w => $w,
1781 h => $h, 1788 h => $h,
1782 data => $data, 1789 data => $data,
1783 internalformat => GL_ALPHA, 1790 internalformat => GL_ALPHA,
1784 format => GL_ALPHA; 1791 format => GL_ALPHA;
… …
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1790 glEnable GL_TEXTURE_2D; 1797 glEnable GL_TEXTURE_2D;
1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1792 1799
1793 glColor +($::CFG->{fow_intensity}) x 3, 1; 1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1794 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1801 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1795 1802
1796 glDisable GL_TEXTURE_2D; 1803 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND; 1804 glDisable GL_BLEND;
1798 } 1805 }
1799 1806
… …
1805 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1816
1817 $self->{mapmap_texture} =
1810 CFClient::Texture->new ( 1818 new CFClient::Texture
1811 w => $w, 1819 w => $w,
1812 h => $h, 1820 h => $h,
1813 data => $::MAP->mapmap ($w, $h), 1821 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV 1822 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1815 )->draw_quad (100, 100); 1823
1824 $self->{mapmap_texture}->draw_quad (100, 100);
1816 1825
1817 glDisable GL_TEXTURE_2D; 1826 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND; 1827 glDisable GL_BLEND;
1819 } 1828 }
1820 # HACK END 1829 # HACK END
… …
2016sub add { 2025sub add {
2017 my ($self, $widget) = @_; 2026 my ($self, $widget) = @_;
2018 2027
2019 $self->SUPER::add ($widget); 2028 $self->SUPER::add ($widget);
2020 2029
2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2030 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2022} 2031}
2023 2032
2024sub on_refresh { 2033sub on_refresh {
2025 my ($self, $id, $cb) = @_; 2034 my ($self, $id, $cb) = @_;
2026 2035

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines