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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC

…		…
1	package CFClient::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use List::Util qw(min max);	6	use List::Util qw(min max);
6		7
		8	use DC;
7	use CFClient::OpenGL;	9	use DC::OpenGL;
		10	use DC::UI;
		11	use DC::Macro;
8		12
9	our @ISA = CFClient::UI::Base::;	13	our @ISA = DC::UI::Base::;
		14
		15	my $magicmap_tex =
		16	new_from_resource DC::Texture "magicmap.png",
		17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
10		18
11	sub new {	19	sub new {
12	my $class = shift;	20	my $class = shift;
13		21
14	$class->SUPER::new (	22	my $self = $class->SUPER::new (
15	z => -1,	23	z => -1,
16	can_focus => 1,	24	can_focus => 1,
17	list => glGenList,	25	tilesize => 32,
18	@_	26	@_
19	)	27	);
20	}
21		28
22	sub DESTROY {	29	$self
		30	}
		31
		32	sub add_command {
		33	my ($self, $command, $tooltip, $widget, $cb) = @_;
		34
		35	(my $data = $command) =~ s/\\//g;
		36
		37	$tooltip =~ s/^\s+//;
		38	$tooltip = "<big>$data</big>\n\n$tooltip";
		39	$tooltip =~ s/\s+$//;
		40
		41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		42	}
		43
		44	sub clr_commands {
23	my $self = shift;	45	my ($self) = @_;
24		46
25	glDeleteList $self->{list};	47	%{$::COMPLETER->{command}} = ();
26		48
27	$self->SUPER::DESTROY;	49	$::COMPLETER->hide
		50	if $::COMPLETER;
28	}	51	}
29		52
30	sub key_down {	53	sub server_login {
31	print "MAPKEYDOWN\n";	54	my ($server) = @_;
32	}
33		55
34	sub key_up {	56	::stop_game ();
		57	local $::PROFILE->{host} = $server;
		58	::start_game ();
35	}	59	}
36		60
		61	sub editor_invoke {
		62	my $editsup = $::CONN && $::CONN->{editor_support}
		63	or return;
		64
		65	DC::background {
		66	print "preparing editor startup...\n";
		67
		68	my $server = $editsup->{gameserver} \|\| "default";
		69	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		70
		71	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		72	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		73
		74	print "map directory is $mapdir\n";
		75	print "lib directory is $libdir\n";
		76
		77	my $ua = DC::lwp_useragent;
		78
		79	for my $file (qw(archetypes crossfire.0)) {
		80	my $url = "$editsup->{lib_root}$file";
		81	print "mirroring $url...\n";
		82	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		83	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		84	}
		85
		86	if (1) { # upload a map
		87	my $mapname = $::CONN->{map_info}[0];
		88
		89	my $mappath = "$mapdir/$mapname";
		90
		91	-e $mappath and die "$mappath already exists\n";
		92
		93	print "getting map revision for $mapname...\n";
		94
		95	# try to get the most recent head revision, what a hack,
		96	# this should have been returned while downloading sigh
		97	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		98
		99	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		100	my $rev = $1;
		101
		102	print "downloading revision $rev...\n";
		103
		104	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		105
		106	my $meta = {
		107	%$editsup,
		108	path => $mapname,
		109	revision => $rev,
		110	cf_login => $::PROFILE->{user},
		111	};
		112
		113	require File::Basename;
		114	require File::Path;
		115
		116	File::Path::mkpath (File::Basename::dirname ($mappath));
		117	open my $fh, ">:raw:perlio", "$mappath.meta"
		118	or die "$mappath.meta: $!\n";
		119	print $fh DC::encode_json $meta;
		120	close $fh;
		121	open my $fh, ">:raw:perlio:utf8", $mappath
		122	or die "$mappath: $!\n";
		123	print $fh $map;
		124	close $fh;
		125
		126	print "saved as $mappath\n";
		127
		128	print "invoking editor...\n";
		129	exec "/root/s2/gce $mappath";#d#
		130
		131	# now upload it
		132	# require HTTP::Request::Common;
		133	#
		134	# my $res = $ua->post (
		135	# $ENV{CFPLUS_UPLOAD},
		136	# Content_Type => 'multipart/form-data',
		137	# Content => [
		138	# path => $mapname,
		139	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		140	# map => $map,
		141	# revision => $rev,
		142	# cf_login => $ENV{CFPLUS_LOGIN},
		143	# cf_password => $ENV{CFPLUS_PASSWORD},
		144	# comment => "",
		145	# ]
		146	# );
		147	#
		148	# if ($res->is_error) {
		149	# # fatal condition
		150	# warn $res->status_line;
		151	# } else {
		152	# # script replies are marked as {{..}}
		153	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		154	# warn map "$_\n", @msgs;
		155	# }
		156	} else {
		157	die "viewvc parse error, unable to detect revision\n";
		158	}
		159	}
		160	}
		161	}
		162
37	sub button_down {	163	sub invoke_button_down {
38	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
39		165
40	$self->focus_in;
41
42	if ($ev->{button} == 2) {	166	if ($ev->{button} == 1) {
		167	$self->grab_focus;
		168	return unless $::CONN && $self->{ctilesize};
		169
		170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
		171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
		172
		173	$x -= DC::floor $::MAP->w * 0.5;
		174	$y -= DC::floor $::MAP->h * 0.5;
		175
		176	if ($::CONN) {
		177	$::CONN->lookat ($x, $y)
		178	}
		179
		180	} elsif ($ev->{button} == 2) {
		181	$self->grab_focus;
		182	return unless $::CONN;
		183
43	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
44	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
45		186
46	$self->{motion} = sub {	187	$self->{motion} = sub {
47	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
51	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
52	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
53		194
54	$self->update;	195	$self->update;
55	};	196	};
		197	} elsif ($ev->{button} == 3) {
		198	my @items = (
		199	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		206	);
		207
		208	if ($::CONN && $::CONN->{editor_support}) {
		209	# push @items, [
		210	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		211	# \&editor_invoke,
		212	# ];
		213
		214	for my $type (qw(test name)) {
		215	$::CONN->{editor_support}{type} ne $type
		216	or next;
		217	my $server = $::CONN->{editor_support}{"${type}server"}
		218	or next;
		219
		220	push @items, [
		221	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		222	sub { server_login $server },
		223	];
		224	}
		225	}
		226
		227	push @items,
		228	["Quit",
		229	sub {
		230	if ($::CONN) {
		231	&::open_quit_dialog;
		232	} else {
		233	exit;
		234	}
		235	}
		236	],
		237	;
		238
		239	(new DC::UI::Menu
		240	items => \@items,
		241	)->popup ($ev);
		242	}
		243
56	}	244	1
57	}	245	}
58		246
59	sub button_up {	247	sub invoke_button_up {
60	my ($self, $ev, $x, $y) = @_;	248	my ($self, $ev, $x, $y) = @_;
61		249
62	delete $self->{motion};	250	delete $self->{motion};
63	}
64		251
		252	1
		253	}
		254
65	sub mouse_motion {	255	sub invoke_mouse_motion {
66	my ($self, $ev, $x, $y) = @_;	256	my ($self, $ev, $x, $y) = @_;
67		257
		258	if ($self->{motion}) {
68	$self->{motion}->($ev, $x, $y) if $self->{motion};	259	$self->{motion}->($ev, $x, $y);
		260	} else {
		261	return 0;
		262	}
		263
		264	1
69	}	265	}
70		266
71	sub size_request {	267	sub size_request {
		268	my ($self) = @_;
		269
72	(	270	(
73	1 + 32 * int $::WIDTH / 32,	271	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
74	1 + 32 * int $::HEIGHT / 32,	272	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
75	)	273	)
76	}	274	}
77		275
78	sub update {	276	sub update {
79	my ($self) = @_;	277	my ($self) = @_;
80		278
81	$self->{need_update} = 1;	279	$self->{need_update} = 1;
82	$self->SUPER::update;	280	$self->SUPER::update;
83	}	281	}
84		282
85	sub draw {	283	my %DIR = (
		284	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		285	( "," . DC::SDLK_KP8 ), [1, "north"],
		286	( "," . DC::SDLK_KP9 ), [2, "northeast"],
		287	( "," . DC::SDLK_KP6 ), [3, "east"],
		288	( "," . DC::SDLK_KP3 ), [4, "southeast"],
		289	( "," . DC::SDLK_KP2 ), [5, "south"],
		290	( "," . DC::SDLK_KP1 ), [6, "southwest"],
		291	( "," . DC::SDLK_KP4 ), [7, "west"],
		292	( "," . DC::SDLK_KP7 ), [8, "northwest"],
		293
		294	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		295	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		296	( "," . DC::SDLK_END ), [6, "southwest"],
		297	( "," . DC::SDLK_HOME ), [8, "northwest"],
		298
		299	( "," . DC::SDLK_UP ), [1, "north"],
		300	("1," . DC::SDLK_UP ), [2, "northeast"],
		301	( "," . DC::SDLK_RIGHT ), [3, "east"],
		302	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
		303	( "," . DC::SDLK_DOWN ), [5, "south"],
		304	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		305	( "," . DC::SDLK_LEFT ), [7, "west"],
		306	("1," . DC::SDLK_LEFT ), [8, "northwest"],
		307	);
		308
		309	sub invoke_key_down {
86	my ($self) = @_;	310	my ($self, $ev) = @_;
87		311
		312	my $mod = $ev->{mod};
		313	my $sym = $ev->{sym};
		314	my $uni = $ev->{unicode};
		315
		316	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
		317
		318	# ignore repeated keypresses
		319	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
		320	$self->{last_mod} = $mod;
		321	$self->{last_sym} = $sym;
		322
		323	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		324
		325	if ($::CONN && $dir) {
		326	if ($mod & DC::KMOD_SHIFT) {
		327	$self->{shft}++;
		328	if ($dir->[0] != $self->{fire_dir}) {
		329	$::CONN->user_send ("fire $dir->[0]");
		330	}
		331	$self->{fire_dir} = $dir->[0];
		332	} elsif ($mod & DC::KMOD_CTRL) {
		333	$self->{ctrl}++;
		334	$::CONN->user_send ("run $dir->[0]");
		335	} else {
		336	$::CONN->user_send ("$dir->[1]");
		337	}
		338
		339	return 1;
		340	}
		341
		342	0
		343	}
		344
		345	sub invoke_key_up {
		346	my ($self, $ev) = @_;
		347
		348	my $res = 0;
		349	my $mod = $ev->{mod};
		350	my $sym = $ev->{sym};
		351
		352	delete $self->{last_mod};
		353	delete $self->{last_sym};
		354
		355	if ($::CFG->{shift_fire_stop}) {
		356	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
		357	$::CONN->user_send ("fire_stop");
		358	delete $self->{fire_dir};
		359	$res = 1;
		360	}
		361	} else {
		362	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		363
		364	if ($dir && delete $self->{shft}) {
		365	$::CONN->user_send ("fire_stop");
		366	delete $self->{fire_dir};
		367	$res = 1;
		368	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		369	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		370	$::CONN->user_send ("fire_stop");
		371	delete $self->{fire_dir};
		372	$res = 1;
		373	}
		374	}
		375
		376	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
		377	$::CONN->user_send ("run_stop");
		378	$res = 1;
		379	}
		380
		381	$res
		382	}
		383
		384	sub invoke_visibility_change {
		385	my ($self) = @_;
		386
		387	$self->refresh_hook;
		388
		389	0
		390	}
		391
		392	sub set_tilesize {
		393	my ($self, $tilesize) = @_;
		394
		395	$self->{tilesize} = $tilesize;
		396	}
		397
		398	sub scroll {
		399	my ($self, $dx, $dy) = @_;
		400
		401	$::MAP->scroll ($dx, $dy);
		402
		403	$self->{last_fow_texture} = $self->{fow_texture};
		404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411	}
		412
		413	sub set_magicmap {
		414	my ($self, $w, $h, $x, $y, $data) = @_;
		415
		416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		418
		419	$self->{magicmap} = [$x, $y, $w, $h, $data];
		420
		421	$self->update;
		422	}
		423
		424	sub movement_update {
		425	my ($self) = @_;
		426
		427	if ($::CFG->{smooth_movement}) {
		428	if ($self->{sdx} \|\| $self->{sdy}) {
		429	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		431
		432	# the minimum time for a single tile movement
		433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $mintime * 2.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452	}
		453
		454	$self->update;
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = EV::time;
		461	}
		462
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
88	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
89	glNewList $self->{list};	468	$self->movement_update;
90		469
91	if ($::MAP) {	470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
92	my $sw = int $::WIDTH / 32;
93	my $sh = int $::HEIGHT / 32;
94		471
95	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
96	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
97		474
98	glTranslate $sx0 - 32, $sy0 - 32, 0;	475	# width/height of map, in tiles
		476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
99		478
100	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		482
		483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
101		489
102	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
103	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	491	my ($sdx_t, $sdy_t);#d# do not anchor at player
104	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	492
105	glConvolutionFilter2D (	493	my ($w, $h, $data) = $::MAP->fow_texture (
106	GL_CONVOLUTION_2D,	494	$dx + (min 0, $sdx_t),
107	GL_ALPHA,	495	$dy + (min 0, $sdy_t),
108	3, 3,	496	$sw + abs $sdx_t,
109	GL_ALPHA, GL_FLOAT,	497	$sh + abs $sdy_t
110	pack "f*",
111	0.1, 0.1, 0.1,
112	0.1, 0.2, 0.1,
113	0.1, 0.1, 0.1,
114	);	498	);
115	glEnable GL_CONVOLUTION_2D;
116	}
117		499
118	$self->{fow_texture} = new CFClient::Texture	500	$self->{fow_texture} = new DC::Texture
119	w => $w,	501	w => $w,
120	h => $h,	502	h => $h,
121	data => $data,	503	data => $data,
122	internalformat => GL_ALPHA,	504	internalformat => GL_ALPHA,
123	format => GL_ALPHA;	505	format => GL_ALPHA;
		506	} else {
		507	delete $self->{fow_texture};
		508	}
124		509
125	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	510	glNewList ($self->{list} \|\|= glGenList);
126		511
127	glEnable GL_BLEND;	512	glPushMatrix;
128	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glTranslate $sx0, $sy0;
		514	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		515	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		516
		517	$::MAP->draw ($dx, $dy, $sw, $sh,
		518	$self->{tilesize},
		519	$::CONN->{player}{tag},
		520	-$self->{sdx}, -$self->{sdy});
		521
		522	#d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
		523	glScale $self->{tilesize}, $self->{tilesize};
		524
		525	if (my $tex = $self->{fow_texture}) {
129	glEnable GL_TEXTURE_2D;	526	glEnable GL_TEXTURE_2D;
130	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131		528
		529	my $a1 = 0.9;
		530
		531	if (0 && $self->{last_fow_texture}) {
		532	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		533	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		534
		535	if ($d1 * $d2) {
		536	my $a2 = $d1 / $d2;
		537
		538	$a1 = 1 - $a2;
		539
		540	$a1 *= 0.9;
		541	#$a2 *= 0.9;
		542
		543	printf "%4g %4g %4g\n", $d1, $d2, $a1+$a2;#d#
		544
		545	#$a1 = 1 - (1-$a1) * 0.707;
		546	#$a2 = 1 - (1-$a2) * 0.707;
		547
		548	glColor 1,0,0,1;
		549	glBegin GL_QUADS;
		550	glVertex 10 + $sdx_t, 10;
		551	glVertex 11 + $sdx_t, 10;
		552	glVertex 11 + $sdx_t, 11;
		553	glVertex 10 + $sdx_t, 11;
		554	glEnd;
		555
		556	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		557	glPushMatrix;
		558	glTranslate $sdx_t, $sdy_t; # anchor at player
		559	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		560	glScale 1/3, 1/3;
		561	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		562	glPopMatrix;
		563	} else {
		564	delete $self->{last_fow_texture};
		565	}
		566	}
		567
132	glColor +($::CFG->{fow_intensity}) x 3, 1;	568	glColor +($::CFG->{fow_intensity}) x 3, $a1;
		569	glPushMatrix;
		570	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
		571	glScale 1/3, 1/3;
133	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	572	$self->{fow_texture}->draw_quad_alpha (0, 0);
		573	glPopMatrix;
134		574
135	glDisable GL_TEXTURE_2D;	575	glDisable GL_TEXTURE_2D;
136	glDisable GL_BLEND;
137	}	576	}
138		577
139	# HACK BEGIN	578	if ($self->{magicmap}) {
140	{	579	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
141	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142		580
143	glTranslate 0, 30;	581	$x += $::MAP->ox + $self->{dx};
144	my ($w, $h) = (250, 250);	582	$y += $::MAP->oy + $self->{dy};
145		583
146	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	584	glTranslate - $x - 1, - $y - 1;
147		585	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
148	glEnable GL_BLEND;	586	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
149	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150	glEnable GL_TEXTURE_2D;
151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
152
153	$self->{mapmap_texture} =
154	new CFClient::Texture
155	w => $w,
156	h => $h,
157	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
158	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
159
160	$self->{mapmap_texture}->draw_quad (0, 0);
161
162	glDisable GL_TEXTURE_2D;
163
164	glTranslate 0.375, 0.375;
165
166	glColor 1, 1, 0, 1;
167	glBegin GL_LINE_LOOP;
168	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172	glEnd;
173
174	glDisable GL_BLEND;
175	}	587	}
176	# HACK END
177	}
178		588
		589	glPopMatrix;
179	glEndList;	590	glEndList;
		591	}
		592	} else {
		593	glDeleteList delete $self->{list}
		594	if $self->{list};
180	}	595	}
		596	}
181		597
182	glPushMatrix;	598	sub draw {
		599	my ($self) = @_;
		600
		601	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		602
		603	return unless $self->{list};
		604
		605	my $focused = $DC::UI::FOCUS == $self
		606	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		607
		608	return
		609	unless $focused \|\| !$::FAST;
		610
183	glCallList $self->{list};	611	glCallList $self->{list};
184	glPopMatrix;
185		612
186	if ($CFClient::UI::FOCUS != $self) {	613	# TNT2 emulates logops in software (or worse :)
187	glColor 64/255, 64/255, 64/255;	614	unless ($focused) {
188	glLogicOp GL_AND;	615	glColor_premultiply 0, 0, 1, 0.25;
189	glEnable GL_COLOR_LOGIC_OP;	616	glEnable GL_BLEND;
		617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
190	glBegin GL_QUADS;	618	glBegin GL_QUADS;
191	glVertex 0, 0;	619	glVertex 0, 0;
192	glVertex 0, $::HEIGHT;	620	glVertex 0, $::HEIGHT;
193	glVertex $::WIDTH, $::HEIGHT;	621	glVertex $::WIDTH, $::HEIGHT;
194	glVertex $::WIDTH, 0;	622	glVertex $::WIDTH, 0;
195	glEnd;	623	glEnd;
196	glDisable GL_COLOR_LOGIC_OP;	624	glDisable GL_BLEND;
		625	}
		626	}
		627
		628	sub DESTROY {
		629	my $self = shift;
		630
		631	glDeleteList $self->{list};
		632
		633	$self->SUPER::DESTROY;
		634	}
		635
		636	package DC::MapWidget::MapMap;
		637
		638	use strict;
		639	use utf8;
		640
		641	our @ISA = DC::UI::Base::;
		642
		643	use Time::HiRes qw(time);
		644	use DC::OpenGL;
		645
		646	sub size_request {
		647	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		648	}
		649
		650	sub refresh_hook {
		651	my ($self) = @_;
		652
		653	if ($::MAP && $self->{texture_atime} < time) {
		654	my ($w, $h) = @$self{qw(w h)};
		655
		656	return unless $w && $h;
		657
		658	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		659	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		660
		661	my $ox = 0.5 * ($w - $sw);
		662	my $oy = 0.5 * ($h - $sh);
		663
		664	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		665	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		666
		667	#TODO: map scale is completely borked
		668
		669	my $x0 = int $ox - $sx + 0.5;
		670	my $y0 = int $oy - $sy + 0.5;
		671
		672	$self->{sw} = $sw;
		673	$self->{sh} = $sh;
		674
		675	$self->{x0} = $x0;
		676	$self->{y0} = $y0;
		677
		678	$self->{texture_atime} = time + 1/3;
		679
		680	$self->{texture} =
		681	new DC::Texture
		682	w => $w,
		683	h => $h,
		684	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		685	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		686	}
		687	}
		688
		689	sub invoke_visibility_change {
		690	my ($self) = @_;
		691
		692	$self->refresh_hook;
		693
		694	0
		695	}
		696
		697	sub invoke_size_allocate {
		698	my ($self, $w, $h) = @_;
		699
		700	$self->update;
		701
		702	1
		703	}
		704
		705	sub update {
		706	my ($self) = @_;
		707
		708	delete $self->{texture_atime};
		709	$self->SUPER::update;
		710	}
		711
		712	sub _draw {
		713	my ($self) = @_;
		714
		715	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		716
		717	$self->{texture} or return;
		718
		719	glEnable GL_BLEND;
		720	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		721	glEnable GL_TEXTURE_2D;
		722	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		723
		724	$self->{texture}->draw_quad (0, 0);
		725
		726	glDisable GL_TEXTURE_2D;
		727
		728	glTranslate 0.375, 0.375;
		729
		730	glColor 1, 1, 0, 1;
		731	glBegin GL_LINE_LOOP;
		732	glVertex $self->{x0} , $self->{y0} ;
		733	glVertex $self->{x0} , $self->{y0} + $self->{sh};
		734	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
		735	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
		736	glEnd;
197	}	737
		738	glDisable GL_BLEND;
198	}	739	}
199		740
200	my %DIR = (	741	package DC::MapWidget::Command;
201	CFClient::SDLK_KP8, [1, "north"],
202	CFClient::SDLK_KP9, [2, "northeast"],
203	CFClient::SDLK_KP6, [3, "east"],
204	CFClient::SDLK_KP3, [4, "southeast"],
205	CFClient::SDLK_KP2, [5, "south"],
206	CFClient::SDLK_KP1, [6, "southwest"],
207	CFClient::SDLK_KP4, [7, "west"],
208	CFClient::SDLK_KP7, [8, "northwest"],
209		742
210	CFClient::SDLK_UP, [1, "north"],	743	use strict;
211	CFClient::SDLK_RIGHT, [3, "east"],
212	CFClient::SDLK_DOWN, [5, "south"],
213	CFClient::SDLK_LEFT, [7, "west"],
214	);
215		744
		745	use DC::OpenGL;
		746
		747	our @ISA = DC::UI::Frame::;
		748
		749	sub new {
		750	my $class = shift;
		751
		752	my $self = $class->SUPER::new (
		753	bg => [0, 0, 0, 0.8],
		754	@_,
		755	);
		756
		757	$self->add ($self->{vbox} = new DC::UI::VBox);
		758
		759	$self->{label} = [
		760	map
		761	DC::UI::Label->new (
		762	align => 0,
		763	can_hover => 1,
		764	can_events => 1,
		765	tooltip_width => 0.33,
		766	fontsize => $_,
		767	), (0.8) x 16
		768	];
		769
		770	$self->{entry} = new DC::UI::Entry
		771	on_changed => sub {
		772	$self->update_labels;
		773	0
		774	},
		775	on_button_down => sub {
		776	my ($entry, $ev, $x, $y) = @_;
		777
		778	if ($ev->{button} == 3) {
		779	(new DC::UI::Menu
		780	items => [
		781	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		782	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		783	],
		784	)->popup ($ev);
		785	return 1;
		786	}
		787	0
		788	},
		789	on_key_down => sub {
		790	my ($entry, $ev) = @_;
		791
		792	my $self = $entry->{parent}{parent};
		793
		794	if ($ev->{sym} == 13) {
		795	if (exists $self->{select}) {
		796	$self->{last_command} = $self->{select};
		797	$::CONN->user_send ($self->{select});
		798
		799	unshift @{$self->{history}}, $self->{entry}->get_text;
		800	$self->{hist_ptr} = 0;
		801
		802	$self->hide;
		803	}
		804	} elsif ($ev->{sym} == 27) {
		805	$self->{hist_ptr} = 0;
		806	$self->hide;
		807	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		808	if ($self->{hist_ptr} > 1) {
		809	$self->{hist_ptr}--;
		810	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		811	} elsif ($self->{hist_ptr} > 0) {
		812	$self->{hist_ptr}--;
		813	$self->{entry}->set_text ($self->{hist_saveback});
		814	} else {
		815	++$self->{select_offset}
		816	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		817	}
		818	$self->update_labels;
		819	} elsif ($ev->{sym} == DC::SDLK_UP) {
		820	if ($self->{select_offset}) {
		821	--$self->{select_offset}
		822	} else {
		823	unless ($self->{hist_ptr}) {
		824	$self->{hist_saveback} = $self->{entry}->get_text;
		825	}
		826	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		827	$self->{hist_ptr}++;
		828	}
		829	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		830	if exists $self->{history}->[$self->{hist_ptr} - 1];
		831	}
		832	$self->update_labels;
		833	} else {
		834	return 0;
		835	}
		836
		837	1
		838	}
		839	;
		840
		841	$self->{vbox}->add (
		842	$self->{entry},
		843	@{$self->{label}},
		844	);
		845
		846	$self
		847	}
		848
		849	sub set_prefix {
		850	my ($self, $prefix) = @_;
		851
		852	$self->{entry}->set_text ($prefix);
		853	$self->show;
		854	}
		855
		856	sub invoke_size_allocate {
		857	my ($self, $w, $h) = @_;
		858
		859	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		860
		861	$self->SUPER::invoke_size_allocate ($w, $h)
		862	}
		863
		864	sub show {
		865	my ($self) = @_;
		866
		867	$self->SUPER::show;
		868	$self->{entry}->grab_focus;
		869	}
		870
		871	sub hide {
		872	my ($self) = @_;
		873
		874	$self->{hist_ptr} = 0;
		875
		876	$self->SUPER::hide;
		877	$self->{entry}->set_text ("");
		878	}
		879
216	sub key_down {	880	sub inject_key_down {
217	my ($self, $ev) = @_;	881	my ($self, $ev) = @_;
218		882
219	my $mod = $ev->{mod};	883	$self->{entry}->grab_focus;
220	my $sym = $ev->{sym};	884	$self->{entry}->emit (key_down => $ev);
		885	}
221		886
222	if ($sym == CFClient::SDLK_KP5) {	887	sub update_labels {
223	$::CONN->user_send ("stay fire");	888	my ($self) = @_;
224	} elsif ($sym == ord "a") {	889
225	$::CONN->user_send ("apply");	890	my $text = $self->{entry}->get_text;
226	} elsif ($sym == ord "'") {	891
227	$self->emit ('activate_console');	892	length $text
228	} elsif ($sym == ord "/") {	893	or return $self->hide;
229	$self->emit ('activate_console' => '/');	894
230	} elsif (exists $DIR{$sym}) {	895	if ($text ne $self->{last_search}) {
231	if ($mod & CFClient::KMOD_SHIFT) {	896	my @match;
232	$self->{shft}++;	897
233	$::CONN->user_send ("fire $DIR{$sym}[0]");	898	if ($text =~ /^(.*?)\s+$/) {
234	} elsif ($mod & CFClient::KMOD_CTRL) {	899	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
235	$self->{ctrl}++;	900	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
236	$::CONN->user_send ("run $DIR{$sym}[0]");
237	} else {	901	} else {
238	$::CONN->user_send ("$DIR{$sym}[1]");	902	# @match is [command, penalty, command with arguments] until sort
		903
		904	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		905
		906	my $regexp_abbrev = do {
		907	my ($beg, @chr) = split //, lc $cmd;
		908
		909	# the following regex is used to match our "completion entry"
		910	# to an actual command - the parentheses match kind of "overhead"
		911	# - the more characters the parentheses match, the less attractive
		912	# is the match.
		913	my $regexp = "^\Q$beg\E"
		914	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		915	qr<$regexp>
		916	};
		917
		918	my $regexp_partial = do {
		919	my $regexp = "^\Q$text\E(.*)";
		920	qr<$regexp>
		921	};
		922
		923	for (keys %{$self->{command}}) {
		924	my @scores;
		925
		926	# 1. Complete command [with args]
		927	# command is a prefix of the text
		928	# score is length of complete command matched
		929	# e.g. "invoke summon pet monster bat"
		930	# "invoke" "summon pet monster bat" = 6
		931	# "invoke summon pet monster" "bat" = 25
		932	if ($text =~ /^\Q$_\E(.*)/) {
		933	push @scores, [$_, length $_, $text];
		934	}
		935
		936	# 2. Partial command
		937	# text is a prefix of the full command
		938	# score is the length of the input text
		939	# e.g. "invoke s"
		940	# "invoke small fireball" = 8
		941	# "invoke summon pet monster" = 8
		942
		943	if ($_ =~ $regexp_partial) {
		944	push @scores, [$_, length $text, $_];
		945	}
		946
		947	# 3. Abbreviation match
		948	# attempts to use first word of text as an abbreviated command
		949	# score is length of word + 1 - 3 per non-word-initial character
		950
		951	if (my @penalty = $_ =~ $regexp_abbrev) {
		952	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		953	}
		954
		955	# Pick the best option for this command
		956	push @match, (sort {
		957	$b->[1] <=> $a->[1]
		958	} @scores)[0];
239	}	959	}
240	}
241	}
242		960
243	sub key_up {	961	# @match is now [command object, command with arguments]
		962	@match = map [$self->{command}{$_->[0]}, $_->[2]],
		963	sort {
		964	$b->[1] <=> $a->[1]
		965	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		966	or (length $b->[0]) <=> (length $a->[0])
		967	} @match;
		968	}
		969
		970	$self->{last_search} = $text;
		971	$self->{last_match} = \@match;
		972
		973	$self->{select_offset} = 0;
		974	}
		975
		976	my @labels = @{ $self->{label} };
		977	my @matches = @{ $self->{last_match} \|\| [] };
		978
		979	if ($self->{select_offset}) {
		980	splice @matches, 0, $self->{select_offset}, ();
		981
		982	my $label = shift @labels;
		983	$label->set_text ("...");
		984	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		985	}
		986
		987	for my $label (@labels) {
		988	$label->{fg} = [1, 1, 1, 1];
		989	$label->{bg} = [0, 0, 0, 0];
		990	}
		991
		992	if (@matches) {
		993	$self->{select} = "$matches[0][1]";
		994
		995	$labels[0]->{fg} = [0, 0, 0, 1];
		996	$labels[0]->{bg} = [1, 1, 1, 0.8];
		997	} else {
		998	$self->{select} = "$text";
		999	}
		1000
		1001	for my $match (@matches) {
		1002	my $label = shift @labels;
		1003
		1004	if (@labels) {
		1005	$label->set_text ("$match->[1]");
		1006	$label->set_tooltip ("$match->[0][1]");
		1007	} else {
		1008	$label->set_text ("...");
		1009	$label->set_tooltip ("Use Cursor-Down to view more matches");
		1010	last;
		1011	}
		1012	}
		1013
		1014	for my $label (@labels) {
		1015	$label->set_text ("");
		1016	$label->set_tooltip ("");
		1017	}
		1018
		1019	$self->update;
		1020	}
		1021
		1022	sub _draw {
244	my ($self, $ev) = @_;	1023	my ($self) = @_;
245		1024
246	my $mod = $ev->{mod};	1025	# hack
247	my $sym = $ev->{sym};	1026	local $DC::UI::FOCUS = $self->{entry};
248		1027
249	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	1028	$self->SUPER::_draw;
250	$::CONN->user_send ("fire_stop");
251	}
252	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
253	$::CONN->user_send ("run_stop");
254	}
255	}
256
257	sub add_command {
258	my ($self, $command, $widget, $cb) = @_;
259
260	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261	warn "$command\|$abbrev\|$widget\n";#d#
262	}	1029	}
263		1030
264	1	1031	1
		1032

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC