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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs. Revision 1.143 by root, Wed Sep 3 06:07:39 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.143 by root, Wed Sep 3 06:07:39 2008 UTC