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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
265 $self->hide; 268 $self->hide;
266 $self->emit ("destroy"); 269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
268} 271}
269 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
273 return if $self->{parent}; 280 return if $self->{parent};
274 281
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
937 944
938############################################################################# 945#############################################################################
939 946
940package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
941 948
949use List::Util qw(min max);
950
942our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
943 952
944sub new { 953sub new {
945 my $class = shift; 954 my $class = shift;
946 955
… …
977} 986}
978 987
979sub set_offset { 988sub set_offset {
980 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
981 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}) {
982 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
984 997
998 $self->emit (changed => $x, $y);
985 $self->update; 999 $self->update;
1000 }
986} 1001}
987 1002
988# 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
989sub coord2local { 1004sub coord2local {
990 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1026 1041
1027############################################################################# 1042#############################################################################
1028 1043
1029package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1030 1045
1031our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1032 1047
1033sub new { 1048sub new {
1034 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1035 1050
1036 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1037 1052
1038 my $self; 1053 my $self;
1039 1054
1040 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
1041 vertical => 1, 1065 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1067 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1070 },
1046 ; 1071 ;
1047 1072
1048 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1050 can_events => 1, 1076 can_events => 1,
1051 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1052 %arg, 1081 %arg,
1053 ); 1082 );
1054 1083
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
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1056 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1057 1101
1058 $self 1102 $self
1059} 1103}
1060 1104
… …
1064 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1065 1109
1066 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1067} 1111}
1068 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 (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 (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
1069sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1071 1146
1072 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1073 1148
1074 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1075 1150
1076 1 1151 1
1077} 1152}
1078 1153
1079sub update_slider { 1154sub invoke_button_down {
1080 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1081 1156
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1083} 1158 $self->grab_focus;
1084 1159
1085sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1086 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1087 1165
1088 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1089 1169
1090 $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
1091} 1195}
1092 1196
1093sub invoke_size_allocate { 1197sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1095 1199
1096 $self->update_slider; 1200 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1202}
1100 1203
1101############################################################################# 1204#############################################################################
1102 1205
… …
1473 1576
1474sub new { 1577sub new {
1475 my $class = shift; 1578 my $class = shift;
1476 1579
1477 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1478 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1479 @_, 1584 @_,
1480 ) 1585 )
1481} 1586}
1482 1587
1483sub children { 1588sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485} 1590}
1486 1591
1592# TODO: store row/col info in child widget and use standard add/del
1487sub add { 1593sub add {
1488 my ($self) = shift; 1594 my ($self) = shift;
1489 1595
1490 while (@_) { 1596 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self); 1598 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1494 } 1600 }
1495 1601
1496 $self->{force_realloc} = 1; 1602 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1; 1603 $self->{force_size_alloc} = 1;
1498 $self->realloc; 1604 $self->realloc;
1499} 1605}
1500 1606
1501sub remove { 1607sub remove {
1502 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1503 1609
1504 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1505} 1615}
1506 1616
1507# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1508sub clear { 1618sub clear {
1509 my ($self) = @_; 1619 my ($self) = @_;
… …
1558 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1559 1669
1560 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1562 1672
1563 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1564 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1567 1677
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1679
1572 CFPlus::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1573 CFPlus::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1574 1689
1575 my $y; 1690 my $y;
1576 1691
1577 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
… …
1617 my ($self) = @_; 1732 my ($self) = @_;
1618 1733
1619 for (grep $_, @{$self->{children}}) { 1734 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_; 1735 $_->draw for grep $_, @$_;
1621 } 1736 }
1737}
1738
1739#############################################################################
1740
1741package CFPlus::UI::Fixed;
1742
1743use List::Util qw(min max);
1744
1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1622} 1819}
1623 1820
1624############################################################################# 1821#############################################################################
1625 1822
1626package CFPlus::UI::Box; 1823package CFPlus::UI::Box;
… …
1966 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1969 2166
1970 my $text = $self->get_text; 2167 my $text = $self->get_text;
2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2170
1972 if ($uni == 8) { 2171 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
… …
2708sub invoke_mouse_wheel { 2907sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 2908 my ($self, $ev) = @_;
2710 2909
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 2911
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 2915
2715 ! ! $delta 2916 ! ! $delta
2716} 2917}
2717 2918
2718sub update { 2919sub update {
… …
2828 #font => default_font 3029 #font => default_font
2829 @_, 3030 @_,
2830 3031
2831 layout => (new CFPlus::Layout), 3032 layout => (new CFPlus::Layout),
2832 par => [], 3033 par => [],
3034 max_par => 0,
2833 height => 0, 3035 height => 0,
2834 children => [ 3036 children => [
2835 (new CFPlus::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2837 ], 3039 ],
… …
2960 wrapped => 1, 3162 wrapped => 1,
2961 }; 3163 };
2962 3164
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para; 3166 push @{$self->{par}}, $para;
3167 }
3168
3169 if (my $max = $self->{max_par}) {
3170 shift @{$self->{par}} while @{$self->{par}} > $max;
2965 } 3171 }
2966 3172
2967 $self->{need_reflow}++; 3173 $self->{need_reflow}++;
2968 $self->update; 3174 $self->update;
2969} 3175}
… …
3277 3483
3278sub new { 3484sub new {
3279 my $class = shift; 3485 my $class = shift;
3280 3486
3281 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
3282 aspect => 1, 3490 aspect => 1,
3283 can_events => 0, 3491 can_events => 0,
3284 @_, 3492 @_,
3285 ); 3493 );
3286 3494
3287 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
3288 CFPlus::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
3289 3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3290 $self->{timer} = Event->timer ( 3500 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3501 parked => 1,
3293 interval => $self->{animspeed},
3294 cb => sub { 3502 cb => sub {
3503 return unless $::CONN && $widget;
3504
3295 ++$widget->{frame}; 3505 ++$widget->{frame};
3506 $widget->update_face;
3296 $widget->update; 3507 $widget->update;
3508
3509 $widget->update_timer;
3297 }, 3510 },
3298 ); 3511 );
3512
3513 $self->update_face;
3514 $self->update_timer;
3299 } 3515 }
3300 3516
3301 $self 3517 $self
3302} 3518}
3303 3519
3520sub update_timer {
3521 my ($self) = @_;
3522
3523 return unless $self->{timer};
3524
3525 if ($self->{visible}) {
3526 $self->{timer}->at (
3527 $self->{anim_start}
3528 + $self->{animspeed}
3529 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3530 );
3531 $self->{timer}->start;
3532 } else {
3533 $self->{timer}->stop;
3534 }
3535}
3536
3537sub update_face {
3538 my ($self) = @_;
3539
3540 return unless $::CONN;
3541
3542 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3543 if ($anim && @$anim) {
3544 delete $self->{wait_face};
3545 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3546 }
3547 }
3548}
3549
3304sub size_request { 3550sub size_request {
3305 (32, 8) 3551 my ($self) = @_;
3552
3553 if ($::CONN) {
3554 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3555 if (my $tex = $::CONN->{texture}[$faceid]) {
3556 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3557 } else {
3558 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3559 $self->realloc;
3560 });
3561 }
3562 }
3563 }
3564
3565 ($self->{size_w} || 8, $self->{size_h} || 8)
3306} 3566}
3307 3567
3308sub update { 3568sub update {
3309 my ($self) = @_; 3569 my ($self) = @_;
3310 3570
3311 return unless $self->{visible}; 3571 return unless $self->{visible};
3312 3572
3313 $self->SUPER::update; 3573 $self->SUPER::update;
3314} 3574}
3315 3575
3576sub invoke_visibility_change {
3577 my ($self) = @_;
3578
3579 $self->update_timer;
3580
3581 0
3582}
3583
3316sub _draw { 3584sub _draw {
3317 my ($self) = @_; 3585 my ($self) = @_;
3318 3586
3319 return unless $::CONN; 3587 return unless $::CONN;
3320 3588
3321 $self->SUPER::_draw; 3589 $self->SUPER::_draw;
3322 3590
3323 my $face;
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}]; 3591 my $faceid = $::CONN->{faceid}[$self->{face}]
3327 3592 or return;
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331 3593
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3594 my $tex = $::CONN->{texture}[$faceid];
3333 3595
3334 if ($tex) { 3596 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3597 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3598 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3599 glColor 0, 0, 0, 1;
… …
3341} 3603}
3342 3604
3343sub destroy { 3605sub destroy {
3344 my ($self) = @_; 3606 my ($self) = @_;
3345 3607
3346 $self->{timer}->cancel 3608 (delete $self->{timer})->cancel
3347 if $self->{timer}; 3609 if $self->{timer};
3348 3610
3349 $self->SUPER::destroy; 3611 $self->SUPER::destroy;
3350} 3612}
3351 3613

Diff Legend

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