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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs.
Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC

…		…
1227	our @ISA = CFClient::UI::DrawBG::;	1227	our @ISA = CFClient::UI::DrawBG::;
1228		1228
1229	use SDL;	1229	use SDL;
1230	use SDL::OpenGL;	1230	use SDL::OpenGL;
1231		1231
1232	my @tex =
1233	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1234	qw(b1_button_active.png);
1235
1236	sub new {	1232	sub new {
1237	my $class = shift;	1233	my $class = shift;
1238		1234
1239	$class->SUPER::new (	1235	$class->SUPER::new (
1240	padding => 4,	1236	padding => 2,
1241	fg => [1, 1, 1],	1237	fg => [1, 1, 1],
1242	active_fg => [1, 1, 0],	1238	active_fg => [1, 1, 0],
1243	state => 0,	1239	state => 0,
1244	@_	1240	@_
1245	)	1241	)
1246	}	1242	}
1247		1243
		1244	sub size_request {
		1245	my ($self) = @_;
		1246
		1247	($self->{padding} * 2 + 6) x 2
		1248	}
		1249
		1250	sub size_allocate {
		1251	my ($self, $x, $y, $w, $h) = @_;
		1252
		1253	$self->_size_allocate ($x, $y, $w, $h);
		1254	}
		1255
1248	sub button_down {	1256	sub button_down {
1249	my ($self, $ev, $x, $y) = @_;	1257	my ($self, $ev, $x, $y) = @_;
1250		1258
1251	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1259	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1252	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1260	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1253	$self->{state} = !$self->{state};	1261	$self->{state} = !$self->{state};
1254	$self->emit ("changed");	1262	$self->emit (changed => $self->{state});
1255	}	1263	}
1256	}	1264	}
1257		1265
1258	sub _draw {	1266	sub _draw {
1259	my ($self) = @_;	1267	my ($self) = @_;
1260		1268
1261	local $self->{fg} = $self->{fg};
1262	my $tex = $tex[0];
1263
1264	glEnable GL_BLEND;
1265	glEnable GL_TEXTURE_2D;
1266	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1267
1268	if ($GRAB == $self) {
1269	$self->{fg} = $self->{active_fg};
1270	}
1271
1272	glBindTexture GL_TEXTURE_2D, $tex->{name};
1273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1274
1275	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
1276
1277	glDisable GL_TEXTURE_2D;
1278	glDisable GL_BLEND;
1279
1280	$self->SUPER::_draw;	1269	$self->SUPER::_draw;
		1270
		1271	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1272
		1273	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1274
		1275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1276
		1277	glBegin GL_LINE_LOOP;
		1278	glVertex 0 , 0;
		1279	glVertex 0 , $s;
		1280	glVertex $s, $s;
		1281	glVertex $s, 0;
		1282	glEnd;
		1283
		1284	if ($self->{state}) {
		1285	glBegin GL_LINES;
		1286	glVertex 0 , 0;
		1287	glVertex $s, $s;
		1288	glVertex $s, 0;
		1289	glVertex 0 , $s;
		1290	glEnd;
		1291	}
1281	}	1292	}
1282		1293
1283	#############################################################################	1294	#############################################################################
1284		1295
1285	package CFClient::UI::Slider;	1296	package CFClient::UI::Slider;
…		…
1443	}	1454	}
1444		1455
1445	sub draw {	1456	sub draw {
1446	my ($self) = @_;	1457	my ($self) = @_;
1447		1458
		1459	$self->{need_update}++;#d#
1448	if (delete $self->{need_update}) {	1460	if (delete $self->{need_update}) {
1449	glNewList $self->{list}, GL_COMPILE;	1461	glNewList $self->{list}, GL_COMPILE;
1450		1462
1451	my $mx = $::CONN->{mapx};
1452	my $my = $::CONN->{mapy};
1453
1454	my $map = $::CONN->{map};
1455
1456	my ($xofs, $yofs);
1457
1458	my $sw = 1 + int $::WIDTH / 32;	1463	my $sw = int $::WIDTH / 32;
1459	my $sh = 1 + int $::HEIGHT / 32;	1464	my $sh = int $::HEIGHT / 32;
1460		1465
1461	if ($::CONN->{mapw} > $sw) {	1466	if ($::MAP) {
1462	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1467	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1463	} else {
1464	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1465	}
1466		1468
1467	if ($::CONN->{maph} > $sh) {	1469	if ($::CFG->{fow_enable}) {
1468	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1470	if ($::CFG->{fow_smooth}) { # smooth fog of war
1469	} else {	1471	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1470	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1472	glConvolutionFilter2D
1471	}	1473	GL_CONVOLUTION_2D,
1472		1474	GL_ALPHA,
1473	glEnable GL_TEXTURE_2D;	1475	3, 3,
1474	glEnable GL_BLEND;	1476	GL_ALPHA, GL_FLOAT,
1475	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1477	pack "f*",
1476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1478	0.1, 0.1, 0.1,
1477		1479	0.1, 0.2, 0.1,
1478	my $sw4 = ($sw + 3) & ~3;	1480	0.1, 0.1, 0.1,
1479	my $darkness = "\x00" x ($sw4 * $sh);
1480
1481	for my $x (0 .. $sw - 1) {
1482	my $row = $map->[$x + $xofs];
1483	for my $y (0 .. $sh - 1) {
1484
1485	my $cell = $row->[$y + $yofs]
1486	or next;	1481	;
1487		1482	glEnable GL_CONVOLUTION_2D;
1488	my $dark = $cell->[0];
1489	if ($dark < 0) {
1490	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1491	} else {
1492	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1493	}	1483	}
1494		1484
1495	for my $num (grep $_, @$cell[1,2,3]) {	1485	my $tex = new CFClient::Texture
1496	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1486	w => $w,
1497		1487	h => $h,
1498	my ($w, $h) = @$tex{qw(w h)};	1488	data => $data,
		1489	internalformat => GL_ALPHA,
		1490	format => GL_ALPHA;
1499		1491
1500	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1492	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1501	}	1493
		1494	glEnable GL_BLEND;
		1495	glEnable GL_TEXTURE_2D;
		1496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1497
		1498	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1499	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1500
		1501	glDisable GL_TEXTURE_2D;
		1502	glDisable GL_BLEND;
1502	}	1503	}
1503	}	1504	}
1504		1505
1505	# if (1) { # higher quality darkness	1506	glEndList;
1506	# $lighting =~ s/(.)/$1$1$1/gs;
1507	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1508	#
1509	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1510	#
1511	# $lighting = $pb->get_pixels;
1512	# $lighting =~ s/(.)../$1/gs;
1513	# }	1507	}
1514		1508
1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1509	glCallList $self->{list};
1516		1510
1517	$darkness = new CFClient::Texture	1511	if ($FOCUS != $self) {
1518	w => $sw4,	1512	glEnable GL_BLEND;
1519	h => $sh,	1513	glColor 0, 0, 1, 0.4;
1520	data => $darkness,	1514	glBegin GL_QUADS;
1521	internalformat => GL_ALPHA,	1515	glVertex 0, 0;
1522	format => GL_ALPHA;	1516	glVertex 0, $::HEIGHT;
1523		1517	glVertex $::WIDTH, $::HEIGHT;
1524	glColor 0.45, 0.45, 0.45, 1;	1518	glVertex $::WIDTH, 0;
1525	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);	1519	glEnd;
1526
1527	glDisable GL_TEXTURE_2D;
1528	glDisable GL_BLEND;	1520	glDisable GL_BLEND;
1529
1530	glEndList;
1531	}	1521	}
1532
1533	glCallList $self->{list};
1534	}	1522	}
1535		1523
1536	my %DIR = (	1524	my %DIR = (
1537	SDLK_KP8, [1, "north"],	1525	SDLK_KP8, [1, "north"],
1538	SDLK_KP9, [2, "northeast"],	1526	SDLK_KP9, [2, "northeast"],
…		…
1554		1542
1555	my $mod = $ev->key_mod;	1543	my $mod = $ev->key_mod;
1556	my $sym = $ev->key_sym;	1544	my $sym = $ev->key_sym;
1557		1545
1558	if ($sym == SDLK_KP5) {	1546	if ($sym == SDLK_KP5) {
1559	$::CONN->send ("command stay fire");	1547	$::CONN->user_send ("command stay fire");
1560	} elsif ($sym == SDLK_a) {	1548	} elsif ($sym == SDLK_a) {
1561	$::CONN->send ("command apply");	1549	$::CONN->user_send ("command apply");
1562	} elsif (exists $DIR{$sym}) {	1550	} elsif (exists $DIR{$sym}) {
1563	if ($mod & KMOD_SHIFT) {	1551	if ($mod & KMOD_SHIFT) {
1564	$self->{shft}++;	1552	$self->{shft}++;
1565	$::CONN->send ("command fire $DIR{$sym}[0]");	1553	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1566	} elsif ($mod & KMOD_CTRL) {	1554	} elsif ($mod & KMOD_CTRL) {
1567	$self->{ctrl}++;	1555	$self->{ctrl}++;
1568	$::CONN->send ("command run $DIR{$sym}[0]");	1556	$::CONN->user_send ("command run $DIR{$sym}[0]");
1569	} else {	1557	} else {
1570	$::CONN->send ("command $DIR{$sym}[1]");	1558	$::CONN->user_send ("command $DIR{$sym}[1]");
1571	}	1559	}
1572	}	1560	}
1573	}	1561	}
1574		1562
1575	sub key_up {	1563	sub key_up {
…		…
1577		1565
1578	my $mod = $ev->key_mod;	1566	my $mod = $ev->key_mod;
1579	my $sym = $ev->key_sym;	1567	my $sym = $ev->key_sym;
1580		1568
1581	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1569	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1582	$::CONN->send ("command fire_stop");	1570	$::CONN->user_send ("command fire_stop");
1583	}	1571	}
1584	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1572	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1585	$::CONN->send ("command run_stop");	1573	$::CONN->user_send ("command run_stop");
1586	}	1574	}
1587	}	1575	}
1588		1576
1589	#############################################################################	1577	#############################################################################
1590		1578
…		…
1628	glPopMatrix;	1616	glPopMatrix;
1629	}	1617	}
1630		1618
1631	#############################################################################	1619	#############################################################################
1632		1620
		1621	package CFClient::UI::Flopper;
		1622
		1623	our @ISA = CFClient::UI::Button::;
		1624
		1625	sub new {
		1626	my $class = shift;
		1627
		1628	my $self = $class->SUPER::new (
		1629	state => 0,
		1630	connect_activate => \&toggle_flopper,
		1631	@_
		1632	);
		1633
		1634	if ($self->{state}) {
		1635	$self->{state} = 0;
		1636	$self->toggle_flopper;
		1637	}
		1638
		1639	$self
		1640	}
		1641
		1642	sub toggle_flopper {
		1643	my ($self) = @_;
		1644
		1645	if ($self->{state} = !$self->{state}) {
		1646	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1647	$self->{other}->move (
		1648	($::WIDTH - $self->{other}{w}) * 0.5,
		1649	($::HEIGHT - $self->{other}{h}) * 0.5,
		1650	);
		1651	} else {
		1652	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1653	}
		1654	}
		1655
		1656	#############################################################################
		1657
1633	package CFClient::UI::Toplevel;	1658	package CFClient::UI::Toplevel;
1634		1659
1635	our @ISA = CFClient::UI::Container::;	1660	our @ISA = CFClient::UI::Container::;
1636		1661
1637	sub size_request {	1662	sub size_request {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs. Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs.
Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC