[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.132 by root, Sun Jul 13 12:17:00 2008 UTC

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