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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.110 by root, Sat Apr 15 01:16:17 2006 UTC

…		…
1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429		1429
1430	my ($value, $lo, $hi, $page) = @{$self->{range}};	1430	my ($value, $lo, $hi, $page) = @{$self->{range}};
1431		1431
		1432	$hi = $value + 1 if $lo == $hi;
		1433
1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1434	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1435	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434		1436
1435	$page = int $page * $inner_w / ($hi - $lo);	1437	$page = int $page * $inner_w / ($hi - $lo);
1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1438	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1482	(new CFClient::UI::Empty expand => 1),	1484	(new CFClient::UI::Empty expand => 1),
1483	(new CFClient::UI::Slider vertical => 1),	1485	(new CFClient::UI::Slider vertical => 1),
1484	],	1486	],
1485	);	1487	);
1486		1488
		1489	$self->{children}[1]->connect (changed => sub {
		1490	$self->update;
		1491	});
		1492
1487	$self	1493	$self
		1494	}
		1495
		1496	sub set_fontsize {
		1497	my ($self, $fontsize) = @_;
		1498
		1499	$self->{fontsize} = $fontsize;
		1500	$self->reflow;
1488	}	1501	}
1489		1502
1490	sub text_height {	1503	sub text_height {
1491	my ($self, $text) = @_;	1504	my ($self, $text) = @_;
1492		1505
…		…
1500	}	1513	}
1501		1514
1502	sub reflow {	1515	sub reflow {
1503	my ($self) = @_;	1516	my ($self) = @_;
1504		1517
1505	my $height = 0;	1518	$self->{need_reflow}++;
1506		1519	$self->update;
1507	for (@{$self->{par}}) {
1508	$height += $_->[0] = $self->text_height ($_->[2]);
1509	}
1510
1511	$self->{height} = $height;
1512
1513	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514	}	1520	}
1515		1521
1516	sub size_request {	1522	sub size_request {
1517	my ($self) = @_;	1523	my ($self) = @_;
1518		1524
…		…
1526		1532
1527	$self->{layout}->set_height ($self->{fontsize});	1533	$self->{layout}->set_height ($self->{fontsize});
1528	$self->{layout}->set_width ($self->{w});	1534	$self->{layout}->set_width ($self->{w});
1529		1535
1530	$self->reflow;	1536	$self->reflow;
1531	$self->update;
1532	}	1537	}
1533		1538
1534	sub add_paragraph {	1539	sub add_paragraph {
1535	my ($self, $color, $text) = @_;	1540	my ($self, $color, $text) = @_;
1536		1541
…		…
1551		1556
1552	$self->SUPER::update;	1557	$self->SUPER::update;
1553		1558
1554	return unless $self->{h} > 0;	1559	return unless $self->{h} > 0;
1555		1560
		1561	delete $self->{texture};
		1562
		1563	$TOPLEVEL->on_refresh ($self, sub {
		1564	if (delete $self->{need_reflow}) {
		1565	my $height = 0;
		1566
		1567	$height += $_->[0] = $self->text_height ($_->[2])
		1568	for @{$self->{par}};
		1569
		1570	$self->{height} = $height;
		1571
		1572	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1573
		1574	delete $self->{texture};
		1575	}
		1576
1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1577	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557	glClearColor 0, 0, 0, 1;	1578	glClearColor 0, 0, 0, 1;
1558	glClear GL_COLOR_BUFFER_BIT;	1579	glClear GL_COLOR_BUFFER_BIT;
1559		1580
1560	my $y0 = $self->{height} - $self->{h};
1561	my $y1 = $self->{height};
1562
1563	glEnable GL_BLEND;	1581	glEnable GL_BLEND;
1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1582	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565	glEnable GL_TEXTURE_2D;	1583	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1584	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1585
		1586	my $top = int $self->{children}[1]{range}[0];
		1587
		1588	my $y0 = $top;
		1589	my $y1 = $top + $self->{h};
		1590
1568	my $y = 0;	1591	my $y = 0;
1569		1592
1570	my $layout = $self->{layout};	1593	my $layout = $self->{layout};
1571		1594
1572	for my $par (@{$self->{par}}) {	1595	for my $par (@{$self->{par}}) {
1573	my $h = $par->[0];	1596	my $h = $par->[0];
1574		1597
1575	if ($y0 < $y + $h && $y < $y1) {	1598	if ($y0 < $y + $h && $y < $y1) {
1576	$layout->set_text ($par->[2]);	1599	$layout->set_text ($par->[2]);
1577		1600
1578	glColor @{ $par->[1] };	1601	glColor @{ $par->[1] };
1579	my ($W, $H) = $layout->size;	1602	my ($W, $H) = $layout->size;
1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1603	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1604	}
		1605
		1606	$y += $h;
1581	}	1607	}
1582		1608
1583	$y += $h;
1584	}
1585
1586	glDisable GL_TEXTURE_2D;	1609	glDisable GL_TEXTURE_2D;
1587	glDisable GL_BLEND;	1610	glDisable GL_BLEND;
		1611	};
1588	};	1612	});
1589	}	1613	}
1590		1614
1591	sub _draw {	1615	sub _draw {
1592	my ($self) = @_;	1616	my ($self) = @_;
1593		1617
…		…
1631	}	1655	}
1632		1656
1633	sub key_up {	1657	sub key_up {
1634	}	1658	}
1635		1659
		1660	sub button_down {
		1661	my ($self, $ev, $x, $y) = @_;
		1662
		1663	$self->focus_in;
		1664
		1665	if ($ev->button == 2) {
		1666	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1667	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1668
		1669	$self->{motion} = sub {
		1670	my ($ev, $x, $y) = @_;
		1671
		1672	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1673
		1674	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1675	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1676
		1677	$self->update;
		1678	};
		1679	}
		1680	}
		1681
		1682	sub button_up {
		1683	my ($self, $ev, $x, $y) = @_;
		1684
		1685	delete $self->{motion};
		1686	}
		1687
		1688	sub mouse_motion {
		1689	my ($self, $ev, $x, $y) = @_;
		1690
		1691	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1692	}
		1693
1636	sub size_request {	1694	sub size_request {
1637	(	1695	(
1638	1 + 32 * int $::WIDTH / 32,	1696	1 + 32 * int $::WIDTH / 32,
1639	1 + 32 * int $::HEIGHT / 32,	1697	1 + 32 * int $::HEIGHT / 32,
1640	)	1698	)
…		…
1648	}	1706	}
1649		1707
1650	sub draw {	1708	sub draw {
1651	my ($self) = @_;	1709	my ($self) = @_;
1652		1710
1653	$self->{need_update}++;#d#
1654	if (delete $self->{need_update}) {	1711	if (delete $self->{need_update}) {
1655	glNewList $self->{list}, GL_COMPILE;	1712	glNewList $self->{list}, GL_COMPILE;
1656		1713
1657	my $sw = int $::WIDTH / 32;
1658	my $sh = int $::HEIGHT / 32;
1659
1660	if ($::MAP) {	1714	if ($::MAP) {
		1715	my $sw = int $::WIDTH / 32;
		1716	my $sh = int $::HEIGHT / 32;
		1717
		1718	my $sx = $::CFG->{map_shift_x};
		1719	my $sy = $::CFG->{map_shift_y};
		1720
		1721	glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
		1722
1661	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1723	my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1662		1724
1663	if ($::CFG->{fow_enable}) {	1725	if ($::CFG->{fow_enable}) {
1664	if ($::CFG->{fow_smooth}) { # smooth fog of war	1726	if ($::CFG->{fow_smooth}) { # smooth fog of war
1665	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1727	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1666	glConvolutionFilter2D	1728	glConvolutionFilter2D
…		…
1684	format => GL_ALPHA;	1746	format => GL_ALPHA;
1685		1747
1686	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1748	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687		1749
1688	glEnable GL_BLEND;	1750	glEnable GL_BLEND;
		1751	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689	glEnable GL_TEXTURE_2D;	1752	glEnable GL_TEXTURE_2D;
1690	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1753	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691		1754
1692	glColor +($::CFG->{fow_intensity}) x 3, 1;	1755	glColor +($::CFG->{fow_intensity}) x 3, 1;
1693	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1756	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1694		1757
1695	glDisable GL_TEXTURE_2D;	1758	glDisable GL_TEXTURE_2D;
1696	glDisable GL_BLEND;	1759	glDisable GL_BLEND;
1697	}	1760	}
		1761
		1762	# HACK BEGIN
		1763	{
		1764	glTranslate -(($sx & 31) - 32), -(($sy & 31) - 32), 0;#remove
		1765	my ($w, $h) = (250, 250);
		1766
		1767	glEnable GL_BLEND;
		1768	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1769	glEnable GL_TEXTURE_2D;
		1770	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1771
		1772	CFClient::Texture->new (
		1773	w => $w,
		1774	h => $h,
		1775	data => $::MAP->mapmap ($w, $h),
		1776	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1777	)->draw_quad (100, 100);
		1778
		1779	glDisable GL_TEXTURE_2D;
		1780	glDisable GL_BLEND;
		1781	}
		1782	# HACK END
1698	}	1783	}
1699		1784
1700	glEndList;	1785	glEndList;
1701	}	1786	}
1702		1787
		1788	glPushMatrix;
1703	glCallList $self->{list};	1789	glCallList $self->{list};
		1790	glPopMatrix;
1704		1791
1705	if ($FOCUS != $self) {	1792	if ($FOCUS != $self) {
1706	glColor 64/255, 64/255, 64/255;	1793	glColor 64/255, 64/255, 64/255;
1707	glLogicOp GL_AND;	1794	glLogicOp GL_AND;
1708	glEnable GL_COLOR_LOGIC_OP;	1795	glEnable GL_COLOR_LOGIC_OP;
…		…
1857		1944
1858	package CFClient::UI::Toplevel;	1945	package CFClient::UI::Toplevel;
1859		1946
1860	our @ISA = CFClient::UI::Container::;	1947	our @ISA = CFClient::UI::Container::;
1861		1948
		1949	use SDL::OpenGL;
		1950
1862	sub size_request {	1951	sub size_request {
1863	($::WIDTH, $::HEIGHT)	1952	($::WIDTH, $::HEIGHT)
1864	}	1953	}
1865		1954
1866	sub size_allocate {	1955	sub size_allocate {
…		…
1891	$self->SUPER::add ($widget);	1980	$self->SUPER::add ($widget);
1892		1981
1893	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	1982	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1894	}	1983	}
1895		1984
		1985	sub on_refresh {
		1986	my ($self, $id, $cb) = @_;
		1987
		1988	$self->{refresh_hook}{$id} = $cb;
		1989	}
		1990
1896	sub draw {	1991	sub draw {
1897	my ($self) = @_;	1992	my ($self) = @_;
1898		1993
		1994	while (my $rcb = delete $self->{refresh_hook}) {
		1995	$_->() for values %$rcb;
		1996	}
		1997
		1998	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		1999	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2000	glClear GL_COLOR_BUFFER_BIT;
		2001
		2002	glMatrixMode GL_PROJECTION;
		2003	glLoadIdentity;
		2004	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2005	glMatrixMode GL_MODELVIEW;
		2006	glLoadIdentity;
		2007
1899	$self->_draw;	2008	$self->_draw;
1900	}	2009	}
1901		2010
1902	#############################################################################	2011	#############################################################################
1903		2012

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs. Revision 1.110 by root, Sat Apr 15 01:16:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.110 by root, Sat Apr 15 01:16:17 2006 UTC