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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.88 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 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_resource DC::Texture "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 = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
199	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
200		172
201	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
202	$y -= int 0.5 * $self->{sh};	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 = (
315	CFPlus::SDLK_KP8, [1, "north"],	290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		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_PAGEUP ), [2, "northeast"],
		301	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		302	( "," . DC::SDLK_END ), [6, "southwest"],
		303	( "," . DC::SDLK_HOME ), [8, "northwest"],
		304
		305	( "," . DC::SDLK_UP ), [1, "north"],
		306	("1," . DC::SDLK_UP ), [2, "northeast"],
325	CFPlus::SDLK_RIGHT, [3, "east"],	307	( "," . DC::SDLK_RIGHT ), [3, "east"],
326	CFPlus::SDLK_DOWN, [5, "south"],	308	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
327	CFPlus::SDLK_LEFT, [7, "west"],	309	( "," . DC::SDLK_DOWN ), [5, "south"],
		310	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		311	( "," . DC::SDLK_LEFT ), [7, "west"],
		312	("1," . DC::SDLK_LEFT ), [8, "northwest"],
328	);	313	);
329		314
330	sub invoke_key_down {	315	sub invoke_key_down {
331	my ($self, $ev) = @_;	316	my ($self, $ev) = @_;
332		317
333	my $mod = $ev->{mod};	318	my $mod = $ev->{mod};
334	my $sym = $ev->{sym};	319	my $sym = $ev->{sym};
335	my $uni = $ev->{unicode};	320	my $uni = $ev->{unicode};
336		321
337	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	322	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
338		323
339	if ($uni == ord "\t") {	324	# ignore repeated keypresses
340	$::PL_WINDOW->toggle_visibility;	325	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
341	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	326	$self->{last_mod} = $mod;
342	$::HELP_WINDOW->toggle_visibility;	327	$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		328
369	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	329	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
370	$::CONN->user_send ("stay fire");	330
371	} elsif ($uni == ord ",") {	331	if ($::CONN && $dir) {
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) {	332	if ($mod & DC::KMOD_SHIFT) {
394	$self->{shft}++;	333	$self->{shft}++;
395	if ($DIR{$sym}[0] != $self->{fire_dir}) {	334	if ($dir->[0] != $self->{fire_dir}) {
396	$::CONN->user_send ("fire $DIR{$sym}[0]");	335	$::CONN->user_send ("fire $dir->[0]");
397	}	336	}
398	$self->{fire_dir} = $DIR{$sym}[0];	337	$self->{fire_dir} = $dir->[0];
399	} elsif ($mod & CFPlus::KMOD_CTRL) {	338	} elsif ($mod & DC::KMOD_CTRL) {
400	$self->{ctrl}++;	339	$self->{ctrl}++;
401	$::CONN->user_send ("run $DIR{$sym}[0]");	340	$::CONN->user_send ("run $dir->[0]");
402	} else {	341	} else {
403	$::CONN->user_send ("$DIR{$sym}[1]");	342	$::CONN->user_send ("$dir->[1]");
404	}	343	}
405	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	344
406	$self->{completer}->inject_key_down ($ev);
407	$self->{completer}->show;
408	} else {
409	return 0;	345	return 1;
410	}
411
412	1	346	}
		347
		348	0
413	}	349	}
414		350
415	sub invoke_key_up {	351	sub invoke_key_up {
416	my ($self, $ev) = @_;	352	my ($self, $ev) = @_;
417		353
418	my $res = 0;	354	my $res = 0;
419	my $mod = $ev->{mod};	355	my $mod = $ev->{mod};
420	my $sym = $ev->{sym};	356	my $sym = $ev->{sym};
421		357
		358	delete $self->{last_mod};
		359	delete $self->{last_sym};
		360
422	if ($::CFG->{shift_fire_stop}) {	361	if ($::CFG->{shift_fire_stop}) {
423	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	362	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
424	$::CONN->user_send ("fire_stop");	363	$::CONN->user_send ("fire_stop");
425	delete $self->{fire_dir};	364	delete $self->{fire_dir};
426	$res = 1;	365	$res = 1;
427	}	366	}
428	} else {	367	} else {
		368	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		369
429	if (exists $DIR{$sym} && delete $self->{shft}) {	370	if ($dir && delete $self->{shft}) {
430	$::CONN->user_send ("fire_stop");	371	$::CONN->user_send ("fire_stop");
431	delete $self->{fire_dir};	372	delete $self->{fire_dir};
432	$res = 1;	373	$res = 1;
433	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	374	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		375	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
434	$::CONN->user_send ("fire_stop");	376	$::CONN->user_send ("fire_stop");
435	delete $self->{fire_dir};	377	delete $self->{fire_dir};
436	$res = 1;	378	$res = 1;
437	}	379	}
438	}	380	}
439		381
440	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	382	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
441	$::CONN->user_send ("run_stop");	383	$::CONN->user_send ("run_stop");
442	$res = 1;	384	$res = 1;
443	}	385	}
444		386
445	$res	387	$res
446	}	388	}
447		389
		390	sub invoke_visibility_change {
		391	my ($self) = @_;
		392
		393	$self->refresh_hook;
		394
		395	0
		396	}
		397
		398	sub set_tilesize {
		399	my ($self, $tilesize) = @_;
		400
		401	$self->{tilesize} = $tilesize;
		402	}
		403
		404	sub scroll {
		405	my ($self, $dx, $dy) = @_;
		406
		407	$::MAP->scroll ($dx, $dy);
		408
		409	$self->movement_update;
		410
		411	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		412	$self->{sdy} += $dy * $self->{tilesize};
		413	}
		414
448	sub set_magicmap {	415	sub set_magicmap {
449	my ($self, $w, $h, $x, $y, $data) = @_;	416	my ($self, $w, $h, $x, $y, $data) = @_;
450		417
451	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	418	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	419	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453		420
454	$self->{magicmap} = [$x, $y, $w, $h, $data];	421	$self->{magicmap} = [$x, $y, $w, $h, $data];
455		422
456	$self->update;	423	$self->update;
457	}	424	}
458		425
		426	sub movement_update {
		427	my ($self) = @_;
		428
		429	if ($::CFG->{smooth_movement}) {
		430	if ($self->{sdx} \|\| $self->{sdy}) {
		431	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		432	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		433
		434	# the minimum time for a single tile movement
		435	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $self->{tilesize} * $mintime * 1.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $self->{tilesize} $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	$self->update;
		454	}
		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) {
		467	if (delete $self->{need_update}) {
		468	$self->movement_update;
		469
		470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		471
		472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		474
		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;
		478
		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;
		489
		490	if ($::CFG->{fow_enable}) {
		491	$sdx_t = $sdy_t = 0;#d#
		492	my ($w, $h, $data) = $::MAP->fow_texture (
		493	$dx + (min 0, $sdx_t),
		494	$dy + (min 0, $sdy_t),
		495	$sw + abs $sdx_t,
		496	$sh + abs $sdy_t
		497	);
		498
		499	$self->{fow_texture} = new DC::Texture
		500	w => $w,
		501	h => $h,
		502	data => $data,
		503	internalformat => GL_ALPHA,
		504	format => GL_ALPHA;
		505	} else {
		506	delete $self->{fow_texture};
		507	}
		508
		509	glNewList ($self->{list} \|\|= glGenList);
		510
		511	glPushMatrix;
		512	glTranslate $sx0, $sy0;
		513	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		514	glTranslate $self->{sdx}, $self->{sdy};
		515
		516	$::MAP->draw ($dx, $dy, $sw, $sh,
		517	$self->{tilesize},
		518	$::CONN->{player}{tag},
		519	-$self->{sdx}, -$self->{sdy});
		520
		521	#glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
		522	glScale $self->{tilesize}, $self->{tilesize};
		523
		524	if (my $tex = $self->{fow_texture}) {
		525	glPushMatrix;
		526	glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
		527	glScale 1/3, 1/3;
		528	glEnable GL_TEXTURE_2D;
		529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		530
		531	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		532	$self->{fow_texture}->draw_quad_alpha (0, 0);
		533
		534	glDisable GL_TEXTURE_2D;
		535	glPopMatrix;
		536	}
		537
		538	if ($self->{magicmap}) {
		539	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		540
		541	$x += $::MAP->ox + $self->{dx};
		542	$y += $::MAP->oy + $self->{dy};
		543
		544	glTranslate - $x - 1, - $y - 1;
		545	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		546	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		547	}
		548
		549	glPopMatrix;
		550	glEndList;
		551	}
		552	} else {
		553	glDeleteList delete $self->{list}
		554	if $self->{list};
		555	}
		556	}
		557
459	sub draw {	558	sub draw {
460	my ($self) = @_;	559	my ($self) = @_;
461		560
462	return unless $::MAP;	561	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
463		562
		563	return unless $self->{list};
		564
464	my $focused = $CFPlus::UI::FOCUS == $self	565	my $focused = $DC::UI::FOCUS == $self
465	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	566	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
466		567
467	return	568	return
468	unless $focused \|\| !$::FAST;	569	unless $focused \|\| !$::FAST;
469		570
470	if (delete $self->{need_update}) {
471	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
472
473	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475
476	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478
479	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
480	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
481
482	if ($::CFG->{fow_enable}) {
483	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
484
485	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
486	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
487	glConvolutionFilter2D (
488	GL_CONVOLUTION_2D,
489	GL_ALPHA,
490	3, 3,
491	GL_ALPHA, GL_FLOAT,
492	(pack "f*", @{ $self->{smooth_matrix} }),
493	);
494	glEnable GL_CONVOLUTION_2D;
495	}
496
497	$self->{fow_texture} = new CFPlus::Texture
498	w => $w,
499	h => $h,
500	data => $data,
501	internalformat => GL_ALPHA,
502	format => GL_ALPHA;
503
504	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
505	} else {
506	delete $self->{fow_texture};
507	}
508
509	glNewList $self->{list};
510
511	glPushMatrix;
512	glTranslate $sx0, $sy0;
513	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514
515	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
516
517	glScale 32, 32;
518
519	if (my $tex = $self->{fow_texture}) {
520	glEnable GL_TEXTURE_2D;
521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522
523	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
524	$self->{fow_texture}->draw_quad_alpha (0, 0);
525
526	glDisable GL_TEXTURE_2D;
527	}
528
529	if ($self->{magicmap}) {
530	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531
532	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
533	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
534
535	glTranslate - $x - 1, - $y - 1;
536	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538	}
539
540	glPopMatrix;
541	glEndList;
542	}
543
544	glCallList $self->{list};	571	glCallList $self->{list};
545		572
546	# TNT2 emulates logops in software (or worse :)	573	# TNT2 emulates logops in software (or worse :)
547	unless ($focused) {	574	unless ($focused) {
548	glColor 0.4, 0.2, 0.2, 0.6;	575	glColor_premultiply 0, 0, 1, 0.25;
549	glEnable GL_BLEND;	576	glEnable GL_BLEND;
550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	577	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
551	glBegin GL_QUADS;	578	glBegin GL_QUADS;
552	glVertex 0, 0;	579	glVertex 0, 0;
553	glVertex 0, $::HEIGHT;	580	glVertex 0, $::HEIGHT;
554	glVertex $::WIDTH, $::HEIGHT;	581	glVertex $::WIDTH, $::HEIGHT;
555	glVertex $::WIDTH, 0;	582	glVertex $::WIDTH, 0;
…		…
564	glDeleteList $self->{list};	591	glDeleteList $self->{list};
565		592
566	$self->SUPER::DESTROY;	593	$self->SUPER::DESTROY;
567	}	594	}
568		595
569	package CFPlus::MapWidget::MapMap;	596	package DC::MapWidget::MapMap;
570		597
		598	use strict;
		599	use utf8;
		600
571	our @ISA = CFPlus::UI::Base::;	601	our @ISA = DC::UI::Base::;
572		602
573	use Time::HiRes qw(time);	603	use Time::HiRes qw(time);
574	use CFPlus::OpenGL;	604	use DC::OpenGL;
575		605
576	sub size_request {	606	sub size_request {
577	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	607	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		608	}
		609
		610	sub refresh_hook {
		611	my ($self) = @_;
		612
		613	if ($::MAP && $self->{texture_atime} < time) {
		614	my ($w, $h) = @$self{qw(w h)};
		615
		616	return unless $w && $h;
		617
		618	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		619	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		620
		621	my $ox = 0.5 * ($w - $sw);
		622	my $oy = 0.5 * ($h - $sh);
		623
		624	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		625	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		626
		627	#TODO: map scale is completely borked
		628
		629	my $x0 = int $ox - $sx + 0.5;
		630	my $y0 = int $oy - $sy + 0.5;
		631
		632	$self->{sw} = $sw;
		633	$self->{sh} = $sh;
		634
		635	$self->{x0} = $x0;
		636	$self->{y0} = $y0;
		637
		638	$self->{texture_atime} = time + 1/3;
		639
		640	$self->{texture} =
		641	new DC::Texture
		642	w => $w,
		643	h => $h,
		644	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		645	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		646	}
		647	}
		648
		649	sub invoke_visibility_change {
		650	my ($self) = @_;
		651
		652	$self->refresh_hook;
		653
		654	0
578	}	655	}
579		656
580	sub invoke_size_allocate {	657	sub invoke_size_allocate {
581	my ($self, $w, $h) = @_;	658	my ($self, $w, $h) = @_;
582		659
…		…
593	}	670	}
594		671
595	sub _draw {	672	sub _draw {
596	my ($self) = @_;	673	my ($self) = @_;
597		674
598	$::MAP or return;	675	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
599		676
600	my ($w, $h) = @$self{qw(w h)};	677	$self->{texture} or return;
601
602	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
603	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
604
605	my $sx = int $::CFG->{map_shift_x} / 32;
606	my $sy = int $::CFG->{map_shift_y} / 32;
607
608	my $ox = 0.5 * ($w - $sw);
609	my $oy = 0.5 * ($h - $sh);
610		678
611	glEnable GL_BLEND;	679	glEnable GL_BLEND;
612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	680	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
613	glEnable GL_TEXTURE_2D;	681	glEnable GL_TEXTURE_2D;
614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	682	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
615		683
616	if ($self->{texture_atime} < time) {
617	$self->{texture_atime} = time + 1/3;
618
619	$self->{texture} =
620	new CFPlus::Texture
621	w => $w,
622	h => $h,
623	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
624	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625	}
626
627	$self->{texture}->draw_quad (0, 0);	684	$self->{texture}->draw_quad (0, 0);
628		685
629	glDisable GL_TEXTURE_2D;	686	glDisable GL_TEXTURE_2D;
630		687
631	glTranslate 0.375, 0.375;	688	glTranslate 0.375, 0.375;
632
633	#TODO: map scale is completely borked
634
635	my $x0 = int $ox - $sx + 0.5;
636	my $y0 = int $oy - $sy + 0.5;
637		689
638	glColor 1, 1, 0, 1;	690	glColor 1, 1, 0, 1;
639	glBegin GL_LINE_LOOP;	691	glBegin GL_LINE_LOOP;
640	glVertex $x0 , $y0 ;	692	glVertex $self->{x0} , $self->{y0} ;
641	glVertex $x0 , $y0 + $sh;	693	glVertex $self->{x0} , $self->{y0} + $self->{sh};
642	glVertex $x0 + $sw, $y0 + $sh;	694	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
643	glVertex $x0 + $sw, $y0 ;	695	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
644	glEnd;	696	glEnd;
645		697
646	glDisable GL_BLEND;	698	glDisable GL_BLEND;
647	}	699	}
648		700
649	package CFPlus::MapWidget::Command;	701	package DC::MapWidget::Command;
650		702
651	use strict;	703	use strict;
652		704
653	use CFPlus::OpenGL;	705	use DC::OpenGL;
654		706
655	our @ISA = CFPlus::UI::Frame::;	707	our @ISA = DC::UI::Frame::;
656		708
657	sub new {	709	sub new {
658	my $class = shift;	710	my $class = shift;
659		711
660	my $self = $class->SUPER::new (	712	my $self = $class->SUPER::new (
661	bg => [0, 0, 0, 0.8],	713	bg => [0, 0, 0, 0.8],
662	@_,	714	@_,
663	);	715	);
664		716
665	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	717	$self->add ($self->{vbox} = new DC::UI::VBox);
666		718
667	$self->{label} = [	719	$self->{label} = [
668	map	720	map
669	CFPlus::UI::Label->new (	721	DC::UI::Label->new (
		722	align => 0,
670	can_hover => 1,	723	can_hover => 1,
671	can_events => 1,	724	can_events => 1,
672	tooltip_width => 0.33,	725	tooltip_width => 0.33,
673	fontsize => $_,	726	fontsize => $_,
674	), (0.8) x 16	727	), (0.8) x 16
675	];	728	];
676		729
677	$self->{entry} = new CFPlus::UI::Entry	730	$self->{entry} = new DC::UI::Entry
678	on_changed => sub {	731	on_changed => sub {
679	$self->update_labels;	732	$self->update_labels;
680	0	733	0
681	},	734	},
682	on_button_down => sub {	735	on_button_down => sub {
683	my ($entry, $ev, $x, $y) = @_;	736	my ($entry, $ev, $x, $y) = @_;
684		737
685	if ($ev->{button} == 3) {	738	if ($ev->{button} == 3) {
686	(new CFPlus::UI::Menu	739	(new DC::UI::Menu
687	items => [	740	items => [
688	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	741	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
689	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	742	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690	],	743	],
691	)->popup ($ev);	744	)->popup ($ev);
692	return 1;	745	return 1;
693	}	746	}
694	0	747	0
…		…
709	$self->hide;	762	$self->hide;
710	}	763	}
711	} elsif ($ev->{sym} == 27) {	764	} elsif ($ev->{sym} == 27) {
712	$self->{hist_ptr} = 0;	765	$self->{hist_ptr} = 0;
713	$self->hide;	766	$self->hide;
714	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	767	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
715	if ($self->{hist_ptr} > 1) {	768	if ($self->{hist_ptr} > 1) {
716	$self->{hist_ptr}--;	769	$self->{hist_ptr}--;
717	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	770	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
718	} elsif ($self->{hist_ptr} > 0) {	771	} elsif ($self->{hist_ptr} > 0) {
719	$self->{hist_ptr}--;	772	$self->{hist_ptr}--;
…		…
721	} else {	774	} else {
722	++$self->{select_offset}	775	++$self->{select_offset}
723	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	776	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
724	}	777	}
725	$self->update_labels;	778	$self->update_labels;
726	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	779	} elsif ($ev->{sym} == DC::SDLK_UP) {
727	if ($self->{select_offset}) {	780	if ($self->{select_offset}) {
728	--$self->{select_offset}	781	--$self->{select_offset}
729	} else {	782	} else {
730	unless ($self->{hist_ptr}) {	783	unless ($self->{hist_ptr}) {
731	$self->{hist_saveback} = $self->{entry}->get_text;	784	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
889		942
890	sub _draw {	943	sub _draw {
891	my ($self) = @_;	944	my ($self) = @_;
892		945
893	# hack	946	# hack
894	local $CFPlus::UI::FOCUS = $self->{entry};	947	local $DC::UI::FOCUS = $self->{entry};
895		948
896	$self->SUPER::_draw;	949	$self->SUPER::_draw;
897	}	950	}
898		951
899	1	952	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.88 by root, Mon Oct 9 01:06:36 2006 UTC vs. Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.88 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC