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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC vs. Revision 1.133 by root, Sat Jul 19 20:33:47 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.133 by root, Sat Jul 19 20:33:47 2008 UTC