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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC

…		…
1	package CFPlus::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use DC;
9	use CFPlus::OpenGL;	9	use DC::OpenGL;
10	use CFPlus::UI;	10	use DC::UI;
		11	use DC::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = DC::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my $class = shift;
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	tilesize => 32,
25
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	26	@_
33	);	27	);
34		28
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39
40	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
41	}	36	}
42		37
43	sub add_command {	38	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		40
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	56	if $::COMPLETER;
62	}	57	}
63		58
64	sub server_login {	59	sub server_login {
65	my ($server) = @_;	60	my ($server) = @_;
66		61
…		…
71		66
72	sub editor_invoke {	67	sub editor_invoke {
73	my $editsup = $::CONN && $::CONN->{editor_support}	68	my $editsup = $::CONN && $::CONN->{editor_support}
74	or return;	69	or return;
75		70
76	CFPlus::background {	71	DC::background {
77	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
78		73
79	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
80	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81		76
82	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
83	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
84		79
85	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
86	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
87		82
88	my $ua = CFPlus::lwp_useragent;	83	my $ua = DC::lwp_useragent;
89		84
90	for my $file (qw(archetypes crossfire.0)) {	85	for my $file (qw(archetypes crossfire.0)) {
91	my $url = "$editsup->{lib_root}$file";	86	my $url = "$editsup->{lib_root}$file";
92	print "mirroring $url...\n";	87	print "mirroring $url...\n";
93	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");	88	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
94	printf "%s size %d octets\n", $file, -s "$libdir/$file";	89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
95	}	90	}
96		91
97	if (1) { # upload a map	92	if (1) { # upload a map
98	my $mapname = $::CONN->{map_info}[0];	93	my $mapname = $::CONN->{map_info}[0];
…		…
103		98
104	print "getting map revision for $mapname...\n";	99	print "getting map revision for $mapname...\n";
105		100
106	# try to get the most recent head revision, what a hack,	101	# try to get the most recent head revision, what a hack,
107	# this should have been returned while downloading sigh	102	# this should have been returned while downloading sigh
108	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	103	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
109		104
110	if ($log =~ /\?rev=(\d+\.\d+)"/) {	105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
111	my $rev = $1;	106	my $rev = $1;
112		107
113	print "downloading revision $rev...\n";	108	print "downloading revision $rev...\n";
114		109
115	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	110	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
116		111
117	my $meta = {	112	my $meta = {
118	%$editsup,	113	%$editsup,
119	path => $mapname,	114	path => $mapname,
120	revision => $rev,	115	revision => $rev,
…		…
125	require File::Path;	120	require File::Path;
126		121
127	File::Path::mkpath (File::Basename::dirname ($mappath));	122	File::Path::mkpath (File::Basename::dirname ($mappath));
128	open my $fh, ">:raw:perlio", "$mappath.meta"	123	open my $fh, ">:raw:perlio", "$mappath.meta"
129	or die "$mappath.meta: $!\n";	124	or die "$mappath.meta: $!\n";
130	print $fh CFPlus::to_json $meta;	125	print $fh DC::encode_json $meta;
131	close $fh;	126	close $fh;
132	open my $fh, ">:raw:perlio:utf8", $mappath	127	open my $fh, ">:raw:perlio:utf8", $mappath
133	or die "$mappath: $!\n";	128	or die "$mappath: $!\n";
134	print $fh $map;	129	print $fh $map;
135	close $fh;	130	close $fh;
…		…
176		171
177	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
178	$self->grab_focus;	173	$self->grab_focus;
179	return unless $::CONN;	174	return unless $::CONN;
180		175
181	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};	177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183		178
184	$x -= CFPlus::floor $::MAP->w * 0.5;	179	$x -= DC::floor $::MAP->w * 0.5;
185	$y -= CFPlus::floor $::MAP->h * 0.5;	180	$y -= DC::floor $::MAP->h * 0.5;
186		181
		182	if ($::CONN) {
187	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
188	if $::CONN;	184	}
189		185
190	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
191	$self->grab_focus;	187	$self->grab_focus;
192	return unless $::CONN;	188	return unless $::CONN;
193		189
…		…
210	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
211	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
212	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
213	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
214	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
215	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
216	[	212	[
217	$::PICKUP_ENABLE->{state}	213	$::PICKUP_ENABLE->{state}
218	? "Disable automatic pickup"	214	? "Disable automatic pickup"
219	: "Enable automatic pickup",	215	: "Enable automatic pickup",
220	sub { $::PICKUP_ENABLE->toggle }	216	sub { $::PICKUP_ENABLE->toggle }
221	],	217	],
222	);	218	);
223		219
224	if ($::CONN && $::CONN->{editor_support}) {	220	if ($::CONN && $::CONN->{editor_support}) {
225	push @items, [	221	# push @items, [
226	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	222	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
227	\&editor_invoke,	223	# \&editor_invoke,
228	];	224	# ];
229		225
230	for my $type (qw(test name)) {	226	for my $type (qw(test name)) {
231	$::CONN->{editor_support}{type} ne $type	227	$::CONN->{editor_support}{type} ne $type
232	or next;	228	or next;
233	my $server = $::CONN->{editor_support}{"${type}server"}	229	my $server = $::CONN->{editor_support}{"${type}server"}
234	or next;	230	or next;
235		231
236	push @items, [	232	push @items, [
237	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",	233	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
238	sub { server_login $server },	234	sub { server_login $server },
239	];	235	];
240	}	236	}
241	}	237	}
242		238
…		…
250	}	246	}
251	}	247	}
252	],	248	],
253	;	249	;
254		250
255	(new CFPlus::UI::Menu	251	(new DC::UI::Menu
256	items => \@items,	252	items => \@items,
257	)->popup ($ev);	253	)->popup ($ev);
258	}	254	}
259		255
260	1	256	1
…		…
279		275
280	1	276	1
281	}	277	}
282		278
283	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
284	(	282	(
285	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
286	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
287	)	285	)
288	}	286	}
289		287
290	sub update {	288	sub update {
291	my ($self) = @_;	289	my ($self) = @_;
…		…
293	$self->{need_update} = 1;	291	$self->{need_update} = 1;
294	$self->SUPER::update;	292	$self->SUPER::update;
295	}	293	}
296		294
297	my %DIR = (	295	my %DIR = (
		296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
298	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . DC::SDLK_KP8 ), [1, "north"],
299	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . DC::SDLK_KP9 ), [2, "northeast"],
300	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . DC::SDLK_KP6 ), [3, "east"],
301	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . DC::SDLK_KP3 ), [4, "southeast"],
302	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . DC::SDLK_KP2 ), [5, "south"],
303	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . DC::SDLK_KP1 ), [6, "southwest"],
304	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . DC::SDLK_KP4 ), [7, "west"],
305	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . DC::SDLK_KP7 ), [8, "northwest"],
306		305
307	CFPlus::SDLK_UP, [1, "north"],	306	( "," . DC::SDLK_UP ), [1, "north"],
		307	("1," . DC::SDLK_UP ), [2, "northeast"],
308	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . DC::SDLK_RIGHT), [3, "east"],
		309	("1," . DC::SDLK_RIGHT), [4, "southeast"],
309	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . DC::SDLK_DOWN ), [5, "south"],
		311	("1," . DC::SDLK_DOWN ), [6, "southwest"],
310	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . DC::SDLK_LEFT ), [7, "west"],
		313	("1," . DC::SDLK_LEFT ), [8, "northwest"],
311	);	314	);
312		315
313	sub invoke_key_down {	316	sub invoke_key_down {
314	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
315		318
316	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
317	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
318	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
319		322
320	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
321		324
322	if ($uni == ord "\t") {	325	# ignore repeated keypresses
323	$::PL_WINDOW->toggle_visibility;	326	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
324	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	327	$self->{last_mod} = $mod;
325	$::HELP_WINDOW->toggle_visibility;	328	$self->{last_sym} = $sym;
326	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327	::toggle_player_page ($::STATS_PAGE);
328	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
329	::toggle_player_page ($::SKILL_PAGE);
330	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
331	::toggle_player_page ($::SPELL_PAGE);
332	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333	::toggle_player_page ($::INVENTORY_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335	$::SETUP_DIALOG->toggle_visibility;
336	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
337	$::BIND_EDITOR->set_binding (undef, undef, [],
338	sub {
339	my ($mod, $sym, $cmds) = @_;
340	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
341	});
342	$::BIND_EDITOR->start;
343	$::BIND_EDITOR->show;
344	#TODO: elmex, what was this supposed to do? it currently crashes the client.
345	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
346	# $::BIND_EDITOR->stop;
347	# $::BIND_EDITOR->ask_for_bind_and_commit;
348	# $::BIND_EDITOR->hide;
349	} elsif (!$::CONN) {
350	return 0; # bindings further down need a valid connection
351		329
352	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	330	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
353	$::CONN->user_send ("stay fire");
354	} elsif ($uni == ord ",") {
355	$::CONN->user_send ("take");
356	} elsif ($uni == ord " ") {
357	$::CONN->user_send ("apply");
358	} elsif ($uni == 13) {
359	$::CONN->user_send ("examine");
360	} elsif ($uni == ord ".") {
361	$::CONN->user_send ($self->{completer}{last_command})
362	if exists $self->{completer}{last_command};
363	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
364	$::CONN->user_send ($_) for @$bind_cmd;
365	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
366	$::CONN->user_send ("rotateshoottype +");
367	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
368	$::CONN->user_send ("rotateshoottype -");
369	} elsif ($uni == ord '"') {
370	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
371	$self->{completer}->show;
372	} elsif ($uni == ord "'") {
373	$self->{completer}->set_prefix ("");
374	$self->{completer}->show;
375	} elsif (exists $DIR{$sym}) {
376	if ($mod & CFPlus::KMOD_SHIFT) {	331	if ($mod & DC::KMOD_SHIFT) {
377	$self->{shft}++;	332	$self->{shft}++;
378	if ($DIR{$sym}[0] != $self->{fire_dir}) {	333	if ($dir->[0] != $self->{fire_dir}) {
379	$::CONN->user_send ("fire $DIR{$sym}[0]");	334	$::CONN->user_send ("fire $dir->[0]");
380	}	335	}
381	$self->{fire_dir} = $DIR{$sym}[0];	336	$self->{fire_dir} = $dir->[0];
382	} elsif ($mod & CFPlus::KMOD_CTRL) {	337	} elsif ($mod & DC::KMOD_CTRL) {
383	$self->{ctrl}++;	338	$self->{ctrl}++;
384	$::CONN->user_send ("run $DIR{$sym}[0]");	339	$::CONN->user_send ("run $dir->[0]");
385	} else {	340	} else {
386	$::CONN->user_send ("$DIR{$sym}[1]");	341	$::CONN->user_send ("$dir->[1]");
387	}	342	}
388	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	343
389	$self->{completer}->inject_key_down ($ev);
390	$self->{completer}->show;
391	} else {
392	return 0;	344	return 1;
393	}
394
395	1	345	}
		346
		347	0
396	}	348	}
397		349
398	sub invoke_key_up {	350	sub invoke_key_up {
399	my ($self, $ev) = @_;	351	my ($self, $ev) = @_;
400		352
401	my $res = 0;	353	my $res = 0;
402	my $mod = $ev->{mod};	354	my $mod = $ev->{mod};
403	my $sym = $ev->{sym};	355	my $sym = $ev->{sym};
404		356
		357	delete $self->{last_mod};
		358	delete $self->{last_sym};
		359
405	if ($::CFG->{shift_fire_stop}) {	360	if ($::CFG->{shift_fire_stop}) {
406	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	361	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
407	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
408	delete $self->{fire_dir};	363	delete $self->{fire_dir};
409	$res = 1;	364	$res = 1;
410	}	365	}
411	} else {	366	} else {
412	if (exists $DIR{$sym} && delete $self->{shft}) {	367	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
413	$::CONN->user_send ("fire_stop");	368	$::CONN->user_send ("fire_stop");
414	delete $self->{fire_dir};	369	delete $self->{fire_dir};
415	$res = 1;	370	$res = 1;
416	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	371	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		372	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
417	$::CONN->user_send ("fire_stop");	373	$::CONN->user_send ("fire_stop");
418	delete $self->{fire_dir};	374	delete $self->{fire_dir};
419	$res = 1;	375	$res = 1;
420	}	376	}
421	}	377	}
422		378
423	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	379	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
424	$::CONN->user_send ("run_stop");	380	$::CONN->user_send ("run_stop");
425	$res = 1;	381	$res = 1;
426	}	382	}
427		383
428	$res	384	$res
429	}	385	}
430		386
		387	sub invoke_visibility_change {
		388	my ($self) = @_;
		389
		390	$self->refresh_hook;
		391
		392	0
		393	}
		394
431	sub set_magicmap {	395	sub set_magicmap {
432	my ($self, $w, $h, $x, $y, $data) = @_;	396	my ($self, $w, $h, $x, $y, $data) = @_;
433		397
434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	398	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	399	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
437	$self->{magicmap} = [$x, $y, $w, $h, $data];	401	$self->{magicmap} = [$x, $y, $w, $h, $data];
438		402
439	$self->update;	403	$self->update;
440	}	404	}
441		405
		406	sub refresh_hook {
		407	my ($self) = @_;
		408
		409	if ($::MAP && $::CONN) {
		410	if (delete $self->{need_update}) {
		411	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		412
		413	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		414	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
		415
		416	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
		417	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
		418
		419	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		420	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		421
		422	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		423	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		424
		425	if ($::CFG->{fow_enable}) {
		426	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		427
		428	$self->{fow_texture} = new DC::Texture
		429	w => $w,
		430	h => $h,
		431	data => $data,
		432	internalformat => GL_ALPHA,
		433	format => GL_ALPHA;
		434	} else {
		435	delete $self->{fow_texture};
		436	}
		437
		438	glNewList ($self->{list} \|\|= glGenList);
		439
		440	glPushMatrix;
		441	glTranslate $sx0, $sy0;
		442	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		443
		444	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		445
		446	glScale $self->{tilesize}, $self->{tilesize};
		447
		448	if (my $tex = $self->{fow_texture}) {
		449	glPushMatrix;
		450	glScale 1/3, 1/3;
		451	glEnable GL_TEXTURE_2D;
		452	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		453
		454	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		455	$self->{fow_texture}->draw_quad_alpha (0, 0);
		456
		457	glDisable GL_TEXTURE_2D;
		458	glPopMatrix;
		459	}
		460
		461	if ($self->{magicmap}) {
		462	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		463
		464	$x += $::MAP->ox + $self->{dx};
		465	$y += $::MAP->oy + $self->{dy};
		466
		467	glTranslate - $x - 1, - $y - 1;
		468	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		469	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		470	}
		471
		472	glPopMatrix;
		473	glEndList;
		474	}
		475	} else {
		476	glDeleteList delete $self->{list}
		477	if $self->{list};
		478	}
		479	}
		480
442	sub draw {	481	sub draw {
443	my ($self) = @_;	482	my ($self) = @_;
444		483
445	return unless $::MAP;	484	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
446		485
		486	return unless $self->{list};
		487
447	my $focused = $CFPlus::UI::FOCUS == $self	488	my $focused = $DC::UI::FOCUS == $self
448	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	489	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
449		490
450	return	491	return
451	unless $focused \|\| !$::FAST;	492	unless $focused \|\| !$::FAST;
452		493
453	if (delete $self->{need_update}) {
454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
455
456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458
459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
460	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
461
462	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
463	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
464
465	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
466	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
467
468	if ($::CFG->{fow_enable}) {
469	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
470
471	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
472	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
473	glConvolutionFilter2D (
474	GL_CONVOLUTION_2D,
475	GL_ALPHA,
476	3, 3,
477	GL_ALPHA, GL_FLOAT,
478	(pack "f*", @{ $self->{smooth_matrix} }),
479	);
480	glEnable GL_CONVOLUTION_2D;
481	}
482
483	$self->{fow_texture} = new CFPlus::Texture
484	w => $w,
485	h => $h,
486	data => $data,
487	internalformat => GL_ALPHA,
488	format => GL_ALPHA;
489
490	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
491	} else {
492	delete $self->{fow_texture};
493	}
494
495	glNewList $self->{list};
496
497	glPushMatrix;
498	glTranslate $sx0, $sy0;
499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
500
501	$::MAP->draw ($dx, $dy, $sw, $sh);
502
503	glScale 32, 32;
504
505	if (my $tex = $self->{fow_texture}) {
506	glEnable GL_TEXTURE_2D;
507	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
508
509	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
510	$self->{fow_texture}->draw_quad_alpha (0, 0);
511
512	glDisable GL_TEXTURE_2D;
513	}
514
515	if ($self->{magicmap}) {
516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
517
518	$x += $::MAP->ox + $self->{dx};
519	$y += $::MAP->oy + $self->{dy};
520
521	glTranslate - $x - 1, - $y - 1;
522	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
523	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
524	}
525
526	glPopMatrix;
527	glEndList;
528	}
529
530	glCallList $self->{list};	494	glCallList $self->{list};
531		495
532	# TNT2 emulates logops in software (or worse :)	496	# TNT2 emulates logops in software (or worse :)
533	unless ($focused) {	497	unless ($focused) {
534	glColor 0.4, 0.2, 0.2, 0.6;	498	glColor_premultiply 0, 0, 1, 0.25;
535	glEnable GL_BLEND;	499	glEnable GL_BLEND;
536	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	500	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
537	glBegin GL_QUADS;	501	glBegin GL_QUADS;
538	glVertex 0, 0;	502	glVertex 0, 0;
539	glVertex 0, $::HEIGHT;	503	glVertex 0, $::HEIGHT;
540	glVertex $::WIDTH, $::HEIGHT;	504	glVertex $::WIDTH, $::HEIGHT;
541	glVertex $::WIDTH, 0;	505	glVertex $::WIDTH, 0;
…		…
550	glDeleteList $self->{list};	514	glDeleteList $self->{list};
551		515
552	$self->SUPER::DESTROY;	516	$self->SUPER::DESTROY;
553	}	517	}
554		518
555	package CFPlus::MapWidget::MapMap;	519	package DC::MapWidget::MapMap;
556		520
		521	use strict;
		522	use utf8;
		523
557	our @ISA = CFPlus::UI::Base::;	524	our @ISA = DC::UI::Base::;
558		525
559	use Time::HiRes qw(time);	526	use Time::HiRes qw(time);
560	use CFPlus::OpenGL;	527	use DC::OpenGL;
561		528
562	sub size_request {	529	sub size_request {
563	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	530	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		531	}
		532
		533	sub refresh_hook {
		534	my ($self) = @_;
		535
		536	if ($::MAP && $self->{texture_atime} < time) {
		537	my ($w, $h) = @$self{qw(w h)};
		538
		539	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		540	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		541
		542	my $ox = 0.5 * ($w - $sw);
		543	my $oy = 0.5 * ($h - $sh);
		544
		545	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		546	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		547
		548	#TODO: map scale is completely borked
		549
		550	my $x0 = int $ox - $sx + 0.5;
		551	my $y0 = int $oy - $sy + 0.5;
		552
		553	$self->{sw} = $sw;
		554	$self->{sh} = $sh;
		555
		556	$self->{x0} = $x0;
		557	$self->{y0} = $y0;
		558
		559	$self->{texture_atime} = time + 1/3;
		560
		561	$self->{texture} =
		562	new DC::Texture
		563	w => $w,
		564	h => $h,
		565	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		566	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		567	}
		568	}
		569
		570	sub invoke_visibility_change {
		571	my ($self) = @_;
		572
		573	$self->refresh_hook;
		574
		575	0
564	}	576	}
565		577
566	sub invoke_size_allocate {	578	sub invoke_size_allocate {
567	my ($self, $w, $h) = @_;	579	my ($self, $w, $h) = @_;
568		580
…		…
579	}	591	}
580		592
581	sub _draw {	593	sub _draw {
582	my ($self) = @_;	594	my ($self) = @_;
583		595
584	$::MAP or return;	596	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
585		597
586	my ($w, $h) = @$self{qw(w h)};	598	$self->{texture} or return;
587
588	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
589	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
590
591	my $sx = int $::CFG->{map_shift_x} / 32;
592	my $sy = int $::CFG->{map_shift_y} / 32;
593
594	my $ox = 0.5 * ($w - $sw);
595	my $oy = 0.5 * ($h - $sh);
596		599
597	glEnable GL_BLEND;	600	glEnable GL_BLEND;
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	601	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
599	glEnable GL_TEXTURE_2D;	602	glEnable GL_TEXTURE_2D;
600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	603	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
601		604
602	if ($self->{texture_atime} < time) {
603	$self->{texture_atime} = time + 1/3;
604
605	$self->{texture} =
606	new CFPlus::Texture
607	w => $w,
608	h => $h,
609	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
610	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611	}
612
613	$self->{texture}->draw_quad (0, 0);	605	$self->{texture}->draw_quad (0, 0);
614		606
615	glDisable GL_TEXTURE_2D;	607	glDisable GL_TEXTURE_2D;
616		608
617	glTranslate 0.375, 0.375;	609	glTranslate 0.375, 0.375;
618
619	#TODO: map scale is completely borked
620
621	my $x0 = int $ox - $sx + 0.5;
622	my $y0 = int $oy - $sy + 0.5;
623		610
624	glColor 1, 1, 0, 1;	611	glColor 1, 1, 0, 1;
625	glBegin GL_LINE_LOOP;	612	glBegin GL_LINE_LOOP;
626	glVertex $x0 , $y0 ;	613	glVertex $self->{x0} , $self->{y0} ;
627	glVertex $x0 , $y0 + $sh;	614	glVertex $self->{x0} , $self->{y0} + $self->{sh};
628	glVertex $x0 + $sw, $y0 + $sh;	615	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629	glVertex $x0 + $sw, $y0 ;	616	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630	glEnd;	617	glEnd;
631		618
632	glDisable GL_BLEND;	619	glDisable GL_BLEND;
633	}	620	}
634		621
635	package CFPlus::MapWidget::Command;	622	package DC::MapWidget::Command;
636		623
637	use strict;	624	use strict;
638		625
639	use CFPlus::OpenGL;	626	use DC::OpenGL;
640		627
641	our @ISA = CFPlus::UI::Frame::;	628	our @ISA = DC::UI::Frame::;
642		629
643	sub new {	630	sub new {
644	my $class = shift;	631	my $class = shift;
645		632
646	my $self = $class->SUPER::new (	633	my $self = $class->SUPER::new (
647	bg => [0, 0, 0, 0.8],	634	bg => [0, 0, 0, 0.8],
648	@_,	635	@_,
649	);	636	);
650		637
651	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	638	$self->add ($self->{vbox} = new DC::UI::VBox);
652		639
653	$self->{label} = [	640	$self->{label} = [
654	map	641	map
655	CFPlus::UI::Label->new (	642	DC::UI::Label->new (
		643	align => 0,
656	can_hover => 1,	644	can_hover => 1,
657	can_events => 1,	645	can_events => 1,
658	tooltip_width => 0.33,	646	tooltip_width => 0.33,
659	fontsize => $_,	647	fontsize => $_,
660	), (0.8) x 16	648	), (0.8) x 16
661	];	649	];
662		650
663	$self->{entry} = new CFPlus::UI::Entry	651	$self->{entry} = new DC::UI::Entry
664	on_changed => sub {	652	on_changed => sub {
665	$self->update_labels;	653	$self->update_labels;
666	0	654	0
667	},	655	},
668	on_button_down => sub {	656	on_button_down => sub {
669	my ($entry, $ev, $x, $y) = @_;	657	my ($entry, $ev, $x, $y) = @_;
670		658
671	if ($ev->{button} == 3) {	659	if ($ev->{button} == 3) {
672	(new CFPlus::UI::Menu	660	(new DC::UI::Menu
673	items => [	661	items => [
674	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	662	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
675	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	663	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
676	],	664	],
677	)->popup ($ev);	665	)->popup ($ev);
678	return 1;	666	return 1;
679	}	667	}
680	0	668	0
…		…
695	$self->hide;	683	$self->hide;
696	}	684	}
697	} elsif ($ev->{sym} == 27) {	685	} elsif ($ev->{sym} == 27) {
698	$self->{hist_ptr} = 0;	686	$self->{hist_ptr} = 0;
699	$self->hide;	687	$self->hide;
700	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	688	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
701	if ($self->{hist_ptr} > 1) {	689	if ($self->{hist_ptr} > 1) {
702	$self->{hist_ptr}--;	690	$self->{hist_ptr}--;
703	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	691	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
704	} elsif ($self->{hist_ptr} > 0) {	692	} elsif ($self->{hist_ptr} > 0) {
705	$self->{hist_ptr}--;	693	$self->{hist_ptr}--;
…		…
707	} else {	695	} else {
708	++$self->{select_offset}	696	++$self->{select_offset}
709	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	697	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
710	}	698	}
711	$self->update_labels;	699	$self->update_labels;
712	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	700	} elsif ($ev->{sym} == DC::SDLK_UP) {
713	if ($self->{select_offset}) {	701	if ($self->{select_offset}) {
714	--$self->{select_offset}	702	--$self->{select_offset}
715	} else {	703	} else {
716	unless ($self->{hist_ptr}) {	704	unless ($self->{hist_ptr}) {
717	$self->{hist_saveback} = $self->{entry}->get_text;	705	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
875		863
876	sub _draw {	864	sub _draw {
877	my ($self) = @_;	865	my ($self) = @_;
878		866
879	# hack	867	# hack
880	local $CFPlus::UI::FOCUS = $self->{entry};	868	local $DC::UI::FOCUS = $self->{entry};
881		869
882	$self->SUPER::_draw;	870	$self->SUPER::_draw;
883	}	871	}
884		872
885	1	873	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs. Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC