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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 2007 UTC

… …
320sub set_visibility { 320sub set_visibility {
321 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
322 322
323 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
324 324
325 $visible ? $self->hide 325 $visible ? $self->show
326 : $self->show; 326 : $self->hide;
327} 327}
328 328
329sub toggle_visibility { 329sub toggle_visibility {
330 my ($self) = @_; 330 my ($self) = @_;
331 331
… …
944 944
945############################################################################# 945#############################################################################
946 946
947package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948 948
949use List::Util qw(min max);
950
949our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
950 952
951sub new { 953sub new {
952 my $class = shift; 954 my $class = shift;
953 955
… …
984} 986}
985 987
986sub set_offset { 988sub set_offset {
987 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
988 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
991 997
998 $self->emit (changed => $x, $y);
992 $self->update; 999 $self->update;
1000 }
993} 1001}
994 1002
995# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1004sub coord2local {
997 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1033 1041
1034############################################################################# 1042#############################################################################
1035 1043
1036package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1037 1045
1038our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1039 1047
1040sub new { 1048sub new {
1041 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1042 1050
1043 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1044 1052
1045 my $self; 1053 my $self;
1046 1054
1047 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1048 vertical => 1, 1065 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1067 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1070 },
1053 ; 1071 ;
1054 1072
1055 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1057 can_events => 1, 1076 can_events => 1,
1058 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1059 %arg, 1081 %arg,
1060 ); 1082 );
1061 1083
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
1063 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1064 1101
1065 $self 1102 $self
1066} 1103}
1067 1104
… …
1071 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1072 1109
1073 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1074} 1111}
1075 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1076sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1078 1146
1079 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1080 1148
1081 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1082 1150
1083 1 1151 1
1084} 1152}
1085 1153
1086sub update_slider { 1154sub invoke_button_down {
1087 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1088 1156
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1090} 1158 $self->grab_focus;
1091 1159
1092sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1093 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1094 1165
1095 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1096 1169
1097 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1098} 1195}
1099 1196
1100sub invoke_size_allocate { 1197sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1102 1199
1103 $self->update_slider; 1200 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1106} 1202}
1107 1203
1108############################################################################# 1204#############################################################################
1109 1205
… …
1259 1355
1260my @border = 1356my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1264sub new { 1364sub new {
1265 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1266 1366
1267 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1268 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437 1537
1438 my $border = $self->border; 1538 my $border = $self->border;
1439 1539
1440 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1441 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1445 1559
1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1448 1562
1449 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1480 1594
1481sub new { 1595sub new {
1482 my $class = shift; 1596 my $class = shift;
1483 1597
1484 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1485 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1486 @_, 1602 @_,
1487 ) 1603 )
1488} 1604}
1489 1605
1490sub children { 1606sub children {
1491 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492} 1608}
1493 1609
1610# TODO: store row/col info in child widget and use standard add/del
1494sub add { 1611sub add {
1495 my ($self) = shift; 1612 my $self = shift;
1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1496 1620
1497 while (@_) { 1621 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1499 $child->set_parent ($self); 1624 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1501 } 1626 }
1502 1627
1503 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1505 $self->realloc; 1630 $self->realloc;
1506} 1631}
1507 1632
1508sub remove { 1633sub remove {
1509 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1510 1635
1511 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1512} 1641}
1513 1642
1514# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1515sub clear { 1644sub clear {
1516 my ($self) = @_; 1645 my ($self) = @_;
… …
1565 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1566 1695
1567 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1569 1698
1570 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1571 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1574 1703
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1705
1579 CFPlus::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1580 CFPlus::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1581 1715
1582 my $y; 1716 my $y;
1583 1717
1584 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
… …
1624 my ($self) = @_; 1758 my ($self) = @_;
1625 1759
1626 for (grep $_, @{$self->{children}}) { 1760 for (grep $_, @{$self->{children}}) {
1627 $_->draw for grep $_, @$_; 1761 $_->draw for grep $_, @$_;
1628 } 1762 }
1763}
1764
1765#############################################################################
1766
1767package CFPlus::UI::Fixed;
1768
1769use List::Util qw(min max);
1770
1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1629} 1845}
1630 1846
1631############################################################################# 1847#############################################################################
1632 1848
1633package CFPlus::UI::Box; 1849package CFPlus::UI::Box;
… …
2191 2407
2192use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2193 2409
2194my @tex = 2410my @tex =
2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2196 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2197 2413
2198sub new { 2414sub new {
2199 my $class = shift; 2415 my $class = shift;
2200 2416
2201 $class->SUPER::new ( 2417 $class->SUPER::new (
2202 padding_x => 4, 2418 padding_x => 4,
2203 padding_y => 4, 2419 padding_y => 4,
2204 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2205 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2206 can_hover => 1, 2422 can_hover => 1,
2207 align => 0, 2423 align => 0,
2208 valign => 0, 2424 valign => 0,
2209 can_events => 1, 2425 can_events => 1,
2210 @_ 2426 @_
… …
2228 2444
2229 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2232 2448
2449 my $tex = $tex[$GRAB == $self];
2233 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2234 2451
2235 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2236 2453
2237 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2238} 2455}
… …
3293 3510
3294sub new { 3511sub new {
3295 my $class = shift; 3512 my $class = shift;
3296 3513
3297 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3298 aspect => 1, 3517 aspect => 1,
3299 can_events => 0, 3518 can_events => 0,
3300 @_, 3519 @_,
3301 ); 3520 );
3302 3521
3303 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3304 CFPlus::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3305 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3306 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308 hard => 1, 3528 parked => 1,
3309 interval => $self->{animspeed},
3310 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3311 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3312 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3313 }, 3537 },
3314 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3315 } 3542 }
3316 3543
3317 $self 3544 $self
3318} 3545}
3319 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3320sub size_request { 3577sub size_request {
3321 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3322} 3593}
3323 3594
3324sub update { 3595sub update {
3325 my ($self) = @_; 3596 my ($self) = @_;
3326 3597
3327 return unless $self->{visible}; 3598 return unless $self->{visible};
3328 3599
3329 $self->SUPER::update; 3600 $self->SUPER::update;
3330} 3601}
3331 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3332sub _draw { 3611sub _draw {
3333 my ($self) = @_; 3612 my ($self) = @_;
3334 3613
3335 return unless $::CONN; 3614 return unless $::CONN;
3336 3615
3337 $self->SUPER::_draw; 3616 $self->SUPER::_draw;
3338 3617
3339 my $face;
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3343 3619 or return;
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347 3620
3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3349 3622
3350 if ($tex) { 3623 if ($tex) {
3351 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3357} 3630}
3358 3631
3359sub destroy { 3632sub destroy {
3360 my ($self) = @_; 3633 my ($self) = @_;
3361 3634
3362 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3363 if $self->{timer}; 3636 if $self->{timer};
3364 3637
3365 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3366} 3639}
3367 3640
… …
4011 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
4012 $_->() 4285 $_->()
4013 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
4014 } 4287 }
4015 4288
4016
4017 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
4020 4292
4021 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;

Diff Legend

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