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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

…		…
944		944
945	#############################################################################	945	#############################################################################
946		946
947	package CFPlus::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
948		948
		949	use List::Util qw(min max);
		950
949	our @ISA = CFPlus::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
950		952
951	sub new {	953	sub new {
952	my $class = shift;	954	my $class = shift;
953		955
…		…
984	}	986	}
985		987
986	sub set_offset {	988	sub 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
996	sub coord2local {	1004	sub coord2local {
997	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1070	},
1063	;	1071	;
1064		1072
1065	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1067	can_events => 1,	1076	can_events => 1,
1068	hslider => $hslider,	1077	hslider => $hslider,
1069	vslider => $vslider,	1078	vslider => $vslider,
1070	col_expand => [1, 0],	1079	col_expand => [1, 0],
1071	row_expand => [1, 0],	1080	row_expand => [1, 0],
1072	%arg,	1081	%arg,
1073	);	1082	);
1074		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
1075	$self->SUPER::add (0, 0, $self->{vp});	1098	$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		1099
1079	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1080		1101
1081	$self	1102	$self
1082	}	1103	}
…		…
1087	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1088		1109
1089	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1090	}	1111	}
1091		1112
		1113	sub 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
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
1092	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1094		1146
1095	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1096		1148
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1098		1150
1099	1	1151	1
1100	}	1152	}
1101		1153
1102	sub update_slider {	1154	sub invoke_button_down {
1103	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1104		1156
1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});	1157	if ($ev->{button} == 2) {
1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1158	$self->grab_focus;
1107	#$self->{hslider}->set_visibility ($w1 != $w2);
1108		1159
1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
1111	#$self->{vslider}->set_visibility ($h1 != $h2);	1162
1112	}	1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1113		1165
1114	sub update {	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1115	my ($self) = @_;	1167	$self->update;
		1168	};
1116		1169
1117	$self->SUPER::update;	1170	return 1;
1118	$self->update_slider;	1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub 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
1119	}	1195	}
1120		1196
1121	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1122	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1123		1199
…		…
1279		1355
1280	my @border =	1356	my @border =
1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1282	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);
1283		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
		1363
1284	sub new {	1364	sub new {
1285	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1286		1366
1287	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1288	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
…		…
1456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457		1537
1458	my $border = $self->border;	1538	my $border = $self->border;
1459		1539
1460	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1461	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464	$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);
1465		1559
1466	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1467	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1468		1562
1469	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1500		1594
1501	sub new {	1595	sub new {
1502	my $class = shift;	1596	my $class = shift;
1503		1597
1504	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1505	col_expand => [],	1600	col_expand => [],
1506	row_expand => [],	1601	row_expand => [],
1507	@_,	1602	@_,
1508	)	1603	)
1509	}	1604	}
1510		1605
1511	sub children {	1606	sub children {
1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513	}	1608	}
1514		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1515	sub add {	1611	sub add {
1516	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
		1618	sub add_at {
		1619	my $self = shift;
1517		1620
1518	while (@_) {	1621	while (@_) {
1519	my ($x, $y, $child) = splice @_, 0, 3, ();	1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1520	$child->set_parent ($self);	1624	$child->set_parent ($self);
1521	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
1522	}	1626	}
1523		1627
1524	$self->{force_realloc} = 1;	1628	$self->{force_realloc} = 1;
1525	$self->{force_size_alloc} = 1;	1629	$self->{force_size_alloc} = 1;
1526	$self->realloc;	1630	$self->realloc;
1527	}	1631	}
1528		1632
1529	sub remove {	1633	sub remove {
1530	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1531		1635
1532	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ \|\| [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1533	}	1641	}
1534		1642
1535	# 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?
1536	sub clear {	1644	sub clear {
1537	my ($self) = @_;	1645	my ($self) = @_;
…		…
1650	my ($self) = @_;	1758	my ($self) = @_;
1651		1759
1652	for (grep $_, @{$self->{children}}) {	1760	for (grep $_, @{$self->{children}}) {
1653	$_->draw for grep $_, @$_;	1761	$_->draw for grep $_, @$_;
1654	}	1762	}
		1763	}
		1764
		1765	#############################################################################
		1766
		1767	package CFPlus::UI::Fixed;
		1768
		1769	use List::Util qw(min max);
		1770
		1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub 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
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub 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
		1830	sub 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
1655	}	1845	}
1656		1846
1657	#############################################################################	1847	#############################################################################
1658		1848
1659	package CFPlus::UI::Box;	1849	package CFPlus::UI::Box;
…		…
2217		2407
2218	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
2219		2409
2220	my @tex =	2410	my @tex =
2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
2223		2413
2224	sub new {	2414	sub new {
2225	my $class = shift;	2415	my $class = shift;
2226		2416
2227	$class->SUPER::new (	2417	$class->SUPER::new (
2228	padding_x => 4,	2418	padding_x => 4,
2229	padding_y => 4,	2419	padding_y => 4,
2230	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
2231	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
2232	can_hover => 1,	2422	can_hover => 1,
2233	align => 0,	2423	align => 0,
2234	valign => 0,	2424	valign => 0,
2235	can_events => 1,	2425	can_events => 1,
2236	@_	2426	@_
…		…
2254		2444
2255	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
2258		2448
		2449	my $tex = $tex[$GRAB == $self];
2259	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2260		2451
2261	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2262		2453
2263	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2264	}	2455	}
…		…
3319		3510
3320	sub new {	3511	sub new {
3321	my $class = shift;	3512	my $class = shift;
3322		3513
3323	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
3324	aspect => 1,	3517	aspect => 1,
3325	can_events => 0,	3518	can_events => 0,
3326	@_,	3519	@_,
3327	);	3520	);
3328		3521
3329	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
3330	CFPlus::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
3331		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3332	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334	hard => 1,	3528	parked => 1,
3335	interval => $self->{animspeed},
3336	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
3337	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
3338	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
3339	},	3537	},
3340	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
3341	}	3542	}
3342		3543
3343	$self	3544	$self
3344	}	3545	}
3345		3546
		3547	sub 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
		3564	sub 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
3346	sub size_request {	3577	sub size_request {
3347	(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)
3348	}	3593	}
3349		3594
3350	sub update {	3595	sub update {
3351	my ($self) = @_;	3596	my ($self) = @_;
3352		3597
3353	return unless $self->{visible};	3598	return unless $self->{visible};
3354		3599
3355	$self->SUPER::update;	3600	$self->SUPER::update;
3356	}	3601	}
3357		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
3358	sub _draw {	3611	sub _draw {
3359	my ($self) = @_;	3612	my ($self) = @_;
3360		3613
3361	return unless $::CONN;	3614	return unless $::CONN;
3362		3615
3363	$self->SUPER::_draw;	3616	$self->SUPER::_draw;
3364		3617
3365	my $face;
3366
3367	if ($self->{frame}) {
3368	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
3369		3619	or return;
3370	$face = $anim->[ $self->{frame} % @$anim ]
3371	if $anim && @$anim;
3372	}
3373		3620
3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
3375		3622
3376	if ($tex) {	3623	if ($tex) {
3377	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
3383	}	3630	}
3384		3631
3385	sub destroy {	3632	sub destroy {
3386	my ($self) = @_;	3633	my ($self) = @_;
3387		3634
3388	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3389	if $self->{timer};	3636	if $self->{timer};
3390		3637
3391	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3392	}	3639	}
3393		3640
…		…
4037	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
4038	$_->()	4285	$_->()
4039	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
4040	}	4287	}
4041		4288
4042
4043	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
4046		4292
4047	glMatrixMode GL_PROJECTION;	4293	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs. Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC