[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

…		…
113	}	113	}
114		114
115	if ($GRAB) {	115	if ($GRAB) {
116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
117	# mousewheel	117	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
120	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
121	} else {	125	} else {
122	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
123	}	127	}
124	}	128	}
…		…
547		551
548	# parent	552	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	554	}
551		555
552	sub find_widget {	556	#sub find_widget {
553	my ($self, $x, $y) = @_;	557	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		558
564	sub set_parent {	559	sub set_parent {
565	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
566		561
567	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
944		939
945	#############################################################################	940	#############################################################################
946		941
947	package CFPlus::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
948		943
		944	use List::Util qw(min max);
		945
949	our @ISA = CFPlus::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
950		947
951	sub new {	948	sub new {
952	my $class = shift;	949	my $class = shift;
953		950
…		…
984	}	981	}
985		982
986	sub set_offset {	983	sub set_offset {
987	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
988		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
991		992
		993	$self->emit (changed => $x, $y);
992	$self->update;	994	$self->update;
		995	}
993	}	996	}
994		997
995	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	999	sub coord2local {
997	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
1013		1016
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1019	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	1021	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1023	}
1021	}	1024	}
1022		1025
…		…
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1065	},
1063	;	1066	;
1064		1067
1065	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1067	can_events => 1,	1071	can_events => 1,
1068	hslider => $hslider,	1072	hslider => $hslider,
1069	vslider => $vslider,	1073	vslider => $vslider,
1070	col_expand => [1, 0],	1074	col_expand => [1, 0],
1071	row_expand => [1, 0],	1075	row_expand => [1, 0],
1072	%arg,	1076	%arg,
1073	);	1077	);
1074		1078
		1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
1075	$self->SUPER::add (0, 0, $self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1094
1079	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1080		1096
1081	$self	1097	$self
1082	}	1098	}
…		…
1087	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1088		1104
1089	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1090	}	1106	}
1091		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1092	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1094		1141
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1098		1147
1099	1	1148	1
1100	}	1149	}
1101		1150
1102	sub update_slider {	1151	sub invoke_button_down {
1103	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1104		1153
1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});	1154	if ($ev->{button} == 2) {
1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1155	$self->grab_focus;
1107	#$self->{hslider}->set_visibility ($w1 != $w2);
1108		1156
1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1111	#$self->{vslider}->set_visibility ($h1 != $h2);	1159
1112	}	1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1113		1162
1114	sub update {	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1115	my ($self) = @_;	1164	$self->update;
		1165	};
1116		1166
1117	$self->SUPER::update;	1167	return 1;
		1168	}
1118		1169
1119	$self->update_slider;	1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1120	}	1192	}
1121		1193
1122	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1123	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1124		1196
1125	$self->update_slider;	1197	$self->update_slider;
1126
1127	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1128	}	1199	}
1129		1200
1130	#############################################################################	1201	#############################################################################
1131		1202
…		…
1281		1352
1282	my @border =	1353	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
1286	sub new {	1361	sub new {
1287	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1288		1363
1289	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1534
1460	my $border = $self->border;	1535	my $border = $self->border;
1461		1536
1462	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467		1556
1468	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1470		1559
1471	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1502		1591
1503	sub new {	1592	sub new {
1504	my $class = shift;	1593	my $class = shift;
1505		1594
1506	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1507	col_expand => [],	1597	col_expand => [],
1508	row_expand => [],	1598	row_expand => [],
1509	@_,	1599	@_,
1510	)	1600	)
1511	}	1601	}
1512		1602
1513	sub children {	1603	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}	1605	}
1516		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1517	sub add {	1608	sub add {
1518	my ($self) = shift;	1609	my $self = shift;
		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
1519		1617
1520	while (@_) {	1618	while (@_) {
1521	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1522	$child->set_parent ($self);	1621	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
1524	}	1623	}
1525		1624
1526	$self->{force_realloc} = 1;	1625	$self->{force_realloc} = 1;
1527	$self->{force_size_alloc} = 1;	1626	$self->{force_size_alloc} = 1;
1528	$self->realloc;	1627	$self->realloc;
1529	}	1628	}
1530		1629
1531	sub remove {	1630	sub remove {
1532	my ($self, $child) = @_;	1631	my ($self, $child) = @_;
1533		1632
1534	# TODO: not yet implemented	1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ \|\| [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1535	}	1638	}
1536		1639
1537	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1538	sub clear {	1641	sub clear {
1539	my ($self) = @_;	1642	my ($self) = @_;
…		…
1652	my ($self) = @_;	1755	my ($self) = @_;
1653		1756
1654	for (grep $_, @{$self->{children}}) {	1757	for (grep $_, @{$self->{children}}) {
1655	$_->draw for grep $_, @$_;	1758	$_->draw for grep $_, @$_;
1656	}	1759	}
		1760	}
		1761
		1762	#############################################################################
		1763
		1764	package CFPlus::UI::Fixed;
		1765
		1766	use List::Util qw(min max);
		1767
		1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
1657	}	1842	}
1658		1843
1659	#############################################################################	1844	#############################################################################
1660		1845
1661	package CFPlus::UI::Box;	1846	package CFPlus::UI::Box;
…		…
2219		2404
2220	use CFPlus::OpenGL;	2405	use CFPlus::OpenGL;
2221		2406
2222	my @tex =	2407	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
2225		2410
2226	sub new {	2411	sub new {
2227	my $class = shift;	2412	my $class = shift;
2228		2413
2229	$class->SUPER::new (	2414	$class->SUPER::new (
2230	padding_x => 4,	2415	padding_x => 4,
2231	padding_y => 4,	2416	padding_y => 4,
2232	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
2233	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
2234	can_hover => 1,	2419	can_hover => 1,
2235	align => 0,	2420	align => 0,
2236	valign => 0,	2421	valign => 0,
2237	can_events => 1,	2422	can_events => 1,
2238	@_	2423	@_
…		…
2256		2441
2257	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
2260		2445
		2446	my $tex = $tex[$GRAB == $self];
2261	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262		2448
2263	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
2264		2450
2265	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
2266	}	2452	}
…		…
3321		3507
3322	sub new {	3508	sub new {
3323	my $class = shift;	3509	my $class = shift;
3324		3510
3325	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
3326	aspect => 1,	3514	aspect => 1,
3327	can_events => 0,	3515	can_events => 0,
3328	@_,	3516	@_,
3329	);	3517	);
3330		3518
3331	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
3333		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336	hard => 1,	3525	parked => 1,
3337	interval => $self->{animspeed},
3338	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
3339	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
3340	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
3341	},	3534	},
3342	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
3343	}	3539	}
3344		3540
3345	$self	3541	$self
3346	}	3542	}
3347		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
3348	sub size_request {	3574	sub size_request {
3349	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3581	} else {
		3582	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3350	}	3590	}
3351		3591
3352	sub update {	3592	sub update {
3353	my ($self) = @_;	3593	my ($self) = @_;
3354		3594
3355	return unless $self->{visible};	3595	return unless $self->{visible};
3356		3596
3357	$self->SUPER::update;	3597	$self->SUPER::update;
3358	}	3598	}
3359		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
3360	sub _draw {	3608	sub _draw {
3361	my ($self) = @_;	3609	my ($self) = @_;
3362		3610
3363	return unless $::CONN;	3611	return unless $::CONN;
3364		3612
3365	$self->SUPER::_draw;	3613	$self->SUPER::_draw;
3366		3614
3367	my $face;
3368
3369	if ($self->{frame}) {
3370	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
3371		3616	or return;
3372	$face = $anim->[ $self->{frame} % @$anim ]
3373	if $anim && @$anim;
3374	}
3375		3617
3376	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
3377		3619
3378	if ($tex) {	3620	if ($tex) {
3379	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
3380	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3381	glColor 0, 0, 0, 1;	3623	glColor 0, 0, 0, 1;
…		…
3385	}	3627	}
3386		3628
3387	sub destroy {	3629	sub destroy {
3388	my ($self) = @_;	3630	my ($self) = @_;
3389		3631
3390	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
3391	if $self->{timer};	3633	if $self->{timer};
3392		3634
3393	$self->SUPER::destroy;	3635	$self->SUPER::destroy;
3394	}	3636	}
3395		3637
…		…
4039	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
4040	$_->()	4282	$_->()
4041	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
4042	}	4284	}
4043		4285
4044
4045	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4046	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4047	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
4048		4289
4049	glMatrixMode GL_PROJECTION;	4290	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC vs. Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC