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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC

…		…
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use CFPlus;
9	use CFPlus::OpenGL;	9	use CFPlus::OpenGL;
10	use CFPlus::UI;	10	use CFPlus::UI;
		11	use CFPlus::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::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 CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
…		…
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
67	::stop_game ();	62	::stop_game ();
68	local $::PROFILE->{host} = $server;	63	local $::PROFILE->{host} = $server;
69	::start_game ();	64	::start_game ();
70	}	65	}
71		66
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 {	67	sub editor_invoke {
82	my $editsup = $::CONN && $::CONN->{editor_support}	68	my $editsup = $::CONN && $::CONN->{editor_support}
83	or return;	69	or return;
84		70
85	my ($pid, $fh);	71	CFPlus::background {
86	unless ($pid = open $fh, "-\|:utf8", "-") {
87	$SIG{__DIE__} = sub {
88	warn "FATAL: @_\n";
89	CFPlus::_exit 99;
90	};
91
92	open STDERR, ">&STDOUT";
93	binmode STDOUT, ":utf8";
94	binmode STDERR, ":utf8";
95	close $fh;
96
97	$\| = 1;
98	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
99	CFPlus::set_proxy;
100		73
101	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
102	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103		76
104	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
105	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
106		79
107	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
108	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
109		82
110	require LWP::UserAgent;	83	my $ua = CFPlus::lwp_useragent;
111
112	my $ua = LWP::UserAgent->new (
113	agent => "cfplus $CFPlus::VERSION",
114	keep_alive => 1,
115	env_proxy => 1,
116	timeout => 30,
117	);
118		84
119	for my $file (qw(archetypes crossfire.0)) {	85	for my $file (qw(archetypes crossfire.0)) {
120	my $url = "$editsup->{lib_root}$file";	86	my $url = "$editsup->{lib_root}$file";
121	print "mirroring $url...\n";	87	print "mirroring $url...\n";
122	check_lwp $ua->mirror ($url, "$libdir/$file");	88	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
123	printf "%s size %d octets\n", $file, -s "$libdir/$file";	89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
124	}	90	}
125		91
126	if (1) { # upload a map	92	if (1) { # upload a map
127	my $mapname = $::CONN->{map_info}[0];	93	my $mapname = $::CONN->{map_info}[0];
128		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
129	print "getting map revision for $mapname...\n";	99	print "getting map revision for $mapname...\n";
130		100
131	# try to get the most recent head revision, what a hack,	101	# try to get the most recent head revision, what a hack,
132	# this should have been returned while downloading sigh	102	# this should have been returned while downloading sigh
133	my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	103	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
134		104
135	if ($log =~ /\?rev=(\d+\.\d+)"/) {	105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
136	my $rev = $1;	106	my $rev = $1;
137		107
138	print "downloading revision $rev...\n";	108	print "downloading revision $rev...\n";
139		109
140	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	110	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
141		111
142	my $meta = {	112	my $meta = {
143	%$editsup,	113	%$editsup,
144	path => $mapname,	114	path => $mapname,
145	revision => $rev,	115	revision => $rev,
146	cf_login => $::PROFILE->{user},	116	cf_login => $::PROFILE->{user},
147	};	117	};
148		118
149	my $mappath = "$mapdir/$mapname";
150
151	require File::Basename;	119	require File::Basename;
152	require File::Path;	120	require File::Path;
153		121
154	File::Path::mkpath (File::Basename::dirname ($mappath));	122	File::Path::mkpath (File::Basename::dirname ($mappath));
155	open my $fh, ">:raw:perlio", "$mappath.meta"	123	open my $fh, ">:raw:perlio", "$mappath.meta"
156	or die "$mappath.meta: $!";	124	or die "$mappath.meta: $!\n";
157	print $fh CFPlus::to_json $meta;	125	print $fh CFPlus::to_json $meta;
158	close $fh;	126	close $fh;
159	open my $fh, ">:raw:perlio:utf8", $mappath	127	open my $fh, ">:raw:perlio:utf8", $mappath
160	or die "$mappath: $!";	128	or die "$mappath: $!\n";
161	print $fh $map;	129	print $fh $map;
162	close $fh;	130	close $fh;
163		131
164	print "saved as $mappath\n";	132	print "saved as $mappath\n";
165		133
…		…
193	# }	161	# }
194	} else {	162	} else {
195	die "viewvc parse error, unable to detect revision\n";	163	die "viewvc parse error, unable to detect revision\n";
196	}	164	}
197	}	165	}
198
199	CFPlus::_exit;
200	}
201
202	my $buffer;
203
204	Event->io (fd => $fh, poll => 'r', cb => sub {
205	unless (sysread $fh, $buffer, 4096, length $buffer) {
206	$_[0]->w->cancel;
207	$buffer .= "done\n";
208	}
209
210	while ($buffer =~ s/^(.*)\n//) {
211	::message ({
212	markup => "editor($pid): " . CFPlus::asxml $1,
213	});
214	}
215	});	166	}
216	}	167	}
217		168
218	sub invoke_button_down {	169	sub invoke_button_down {
219	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
220		171
221	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
222	$self->grab_focus;	173	$self->grab_focus;
223	return unless $::CONN;	174	return unless $::CONN;
224		175
225	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	176	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
226	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	177	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
227		178
228	$x -= int 0.5 * $self->{sw};	179	$x -= CFPlus::floor $::MAP->w * 0.5;
229	$y -= int 0.5 * $self->{sh};	180	$y -= CFPlus::floor $::MAP->h * 0.5;
230		181
		182	if ($::CONN) {
231	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
232	if $::CONN;	184	}
233		185
234	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
235	$self->grab_focus;	187	$self->grab_focus;
236	return unless $::CONN;	188	return unless $::CONN;
237		189
…		…
323		275
324	1	276	1
325	}	277	}
326		278
327	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
328	(	282	(
329	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
330	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
331	)	285	)
332	}	286	}
333		287
334	sub update {	288	sub update {
335	my ($self) = @_;	289	my ($self) = @_;
…		…
337	$self->{need_update} = 1;	291	$self->{need_update} = 1;
338	$self->SUPER::update;	292	$self->SUPER::update;
339	}	293	}
340		294
341	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
342	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
343	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
344	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
345	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
346	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
347	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
348	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
349	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
350		305
351	CFPlus::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
352	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
353	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
354	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
355	);	314	);
356		315
357	sub invoke_key_down {	316	sub invoke_key_down {
358	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
359		318
…		…
361	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
362	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
363		322
364	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
365		324
366	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
367	$::PL_WINDOW->toggle_visibility;
368	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
369	$::HELP_WINDOW->toggle_visibility;
370	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
371	::toggle_player_page ($::STATS_PAGE);
372	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
373	::toggle_player_page ($::SKILL_PAGE);
374	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
375	::toggle_player_page ($::SPELL_PAGE);
376	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377	::toggle_player_page ($::INVENTORY_PAGE);
378	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379	$::SETUP_DIALOG->toggle_visibility;
380	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381	$::BIND_EDITOR->set_binding (undef, undef, [],
382	sub {
383	my ($mod, $sym, $cmds) = @_;
384	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385	});
386	$::BIND_EDITOR->start;
387	$::BIND_EDITOR->show;
388	#TODO: elmex, what was this supposed to do? it currently crashes the client.
389	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390	# $::BIND_EDITOR->stop;
391	# $::BIND_EDITOR->ask_for_bind_and_commit;
392	# $::BIND_EDITOR->hide;
393	} elsif (!$::CONN) {
394	return 0; # bindings further down need a valid connection
395
396	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
397	$::CONN->user_send ("stay fire");
398	} elsif ($uni == ord ",") {
399	$::CONN->user_send ("take");
400	} elsif ($uni == ord " ") {
401	$::CONN->user_send ("apply");
402	} elsif ($uni == 13) {
403	$::CONN->user_send ("examine");
404	} elsif ($uni == ord ".") {
405	$::CONN->user_send ($self->{completer}{last_command})
406	if exists $self->{completer}{last_command};
407	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
408	$::CONN->user_send ($_) for @$bind_cmd;
409	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
410	$::CONN->user_send ("rotateshoottype +");
411	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
412	$::CONN->user_send ("rotateshoottype -");
413	} elsif ($uni == ord '"') {
414	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
415	$self->{completer}->show;
416	} elsif ($uni == ord "'") {
417	$self->{completer}->set_prefix ("");
418	$self->{completer}->show;
419	} elsif (exists $DIR{$sym}) {
420	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
421	$self->{shft}++;	327	$self->{shft}++;
422	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
423	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
424	}	330	}
425	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $DIR{$sym}[0];
426	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
427	$self->{ctrl}++;	333	$self->{ctrl}++;
428	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
429	} else {	335	} else {
430	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
431	}	337	}
432	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
433	$self->{completer}->inject_key_down ($ev);
434	$self->{completer}->show;
435	} else {
436	return 0;	339	return 1;
437	}
438
439	1	340	}
		341
		342	0
440	}	343	}
441		344
442	sub invoke_key_up {	345	sub invoke_key_up {
443	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
444		347
…		…
470	}	373	}
471		374
472	$res	375	$res
473	}	376	}
474		377
		378	sub invoke_visibility_change {
		379	my ($self) = @_;
		380
		381	$self->refresh_hook;
		382
		383	0
		384	}
		385
475	sub set_magicmap {	386	sub set_magicmap {
476	my ($self, $w, $h, $x, $y, $data) = @_;	387	my ($self, $w, $h, $x, $y, $data) = @_;
477		388
478	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	389	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
479	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	390	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
480		391
481	$self->{magicmap} = [$x, $y, $w, $h, $data];	392	$self->{magicmap} = [$x, $y, $w, $h, $data];
482		393
483	$self->update;	394	$self->update;
484	}	395	}
485		396
		397	sub refresh_hook {
		398	my ($self) = @_;
		399
		400	if ($::MAP && $::CONN) {
		401	if (delete $self->{need_update}) {
		402	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		403
		404	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		405	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		406
		407	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		408	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		409
		410	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		411	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		412
		413	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		414	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		415
		416	if ($::CFG->{fow_enable}) {
		417	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		418
		419	$self->{fow_texture} = new CFPlus::Texture
		420	w => $w,
		421	h => $h,
		422	data => $data,
		423	internalformat => GL_ALPHA,
		424	format => GL_ALPHA;
		425	} else {
		426	delete $self->{fow_texture};
		427	}
		428
		429	glNewList ($self->{list} \|\|= glGenList);
		430
		431	glPushMatrix;
		432	glTranslate $sx0, $sy0;
		433	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		434
		435	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		436
		437	glScale $self->{tilesize}, $self->{tilesize};
		438
		439	if (my $tex = $self->{fow_texture}) {
		440	glPushMatrix;
		441	glScale 1/3, 1/3;
		442	glEnable GL_TEXTURE_2D;
		443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		444
		445	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		446	$self->{fow_texture}->draw_quad_alpha (0, 0);
		447
		448	glDisable GL_TEXTURE_2D;
		449	glPopMatrix;
		450	}
		451
		452	if ($self->{magicmap}) {
		453	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		454
		455	$x += $::MAP->ox + $self->{dx};
		456	$y += $::MAP->oy + $self->{dy};
		457
		458	glTranslate - $x - 1, - $y - 1;
		459	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		460	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		461	}
		462
		463	glPopMatrix;
		464	glEndList;
		465	}
		466	} else {
		467	glDeleteList delete $self->{list}
		468	if $self->{list};
		469	}
		470	}
		471
486	sub draw {	472	sub draw {
487	my ($self) = @_;	473	my ($self) = @_;
488		474
489	return unless $::MAP;	475	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		476
		477	return unless $self->{list};
490		478
491	my $focused = $CFPlus::UI::FOCUS == $self	479	my $focused = $CFPlus::UI::FOCUS == $self
492	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	480	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
493		481
494	return	482	return
495	unless $focused \|\| !$::FAST;	483	unless $focused \|\| !$::FAST;
496		484
497	if (delete $self->{need_update}) {
498	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
499
500	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
501	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
502
503	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
504	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
505
506	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
507	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
508
509	if ($::CFG->{fow_enable}) {
510	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
511
512	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
513	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
514	glConvolutionFilter2D (
515	GL_CONVOLUTION_2D,
516	GL_ALPHA,
517	3, 3,
518	GL_ALPHA, GL_FLOAT,
519	(pack "f*", @{ $self->{smooth_matrix} }),
520	);
521	glEnable GL_CONVOLUTION_2D;
522	}
523
524	$self->{fow_texture} = new CFPlus::Texture
525	w => $w,
526	h => $h,
527	data => $data,
528	internalformat => GL_ALPHA,
529	format => GL_ALPHA;
530
531	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
532	} else {
533	delete $self->{fow_texture};
534	}
535
536	glNewList $self->{list};
537
538	glPushMatrix;
539	glTranslate $sx0, $sy0;
540	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
541
542	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
543
544	glScale 32, 32;
545
546	if (my $tex = $self->{fow_texture}) {
547	glEnable GL_TEXTURE_2D;
548	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
549
550	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
551	$self->{fow_texture}->draw_quad_alpha (0, 0);
552
553	glDisable GL_TEXTURE_2D;
554	}
555
556	if ($self->{magicmap}) {
557	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
558
559	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
560	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
561
562	glTranslate - $x - 1, - $y - 1;
563	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
564	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
565	}
566
567	glPopMatrix;
568	glEndList;
569	}
570
571	glCallList $self->{list};	485	glCallList $self->{list};
572		486
573	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
574	unless ($focused) {	488	unless ($focused) {
575	glColor 0.4, 0.2, 0.2, 0.6;	489	glColor_premultiply 0, 0, 1, 0.25;
576	glEnable GL_BLEND;	490	glEnable GL_BLEND;
577	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
578	glBegin GL_QUADS;	492	glBegin GL_QUADS;
579	glVertex 0, 0;	493	glVertex 0, 0;
580	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
581	glVertex $::WIDTH, $::HEIGHT;	495	glVertex $::WIDTH, $::HEIGHT;
582	glVertex $::WIDTH, 0;	496	glVertex $::WIDTH, 0;
…		…
593	$self->SUPER::DESTROY;	507	$self->SUPER::DESTROY;
594	}	508	}
595		509
596	package CFPlus::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
597		511
		512	use strict;
		513	use utf8;
		514
598	our @ISA = CFPlus::UI::Base::;	515	our @ISA = CFPlus::UI::Base::;
599		516
600	use Time::HiRes qw(time);	517	use Time::HiRes qw(time);
601	use CFPlus::OpenGL;	518	use CFPlus::OpenGL;
602		519
603	sub size_request {	520	sub size_request {
604	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	521	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
605	}	522	}
606		523
607	sub invoke_size_allocate {	524	sub refresh_hook {
608	my ($self, $w, $h) = @_;	525	my ($self) = @_;
609		526
610	$self->update;	527	if ($::MAP && $self->{texture_atime} < time) {
611
612	1
613	}
614
615	sub update {
616	my ($self) = @_;
617
618	delete $self->{texture_atime};
619	$self->SUPER::update;
620	}
621
622	sub _draw {
623	my ($self) = @_;
624
625	$::MAP or return;
626
627	my ($w, $h) = @$self{qw(w h)};	528	my ($w, $h) = @$self{qw(w h)};
628		529
629	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	530	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
630	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	531	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
631		532
632	my $sx = int $::CFG->{map_shift_x} / 32;
633	my $sy = int $::CFG->{map_shift_y} / 32;
634
635	my $ox = 0.5 * ($w - $sw);	533	my $ox = 0.5 * ($w - $sw);
636	my $oy = 0.5 * ($h - $sh);	534	my $oy = 0.5 * ($h - $sh);
637		535
638	glEnable GL_BLEND;	536	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
639	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
640	glEnable GL_TEXTURE_2D;
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642		538
643	if ($self->{texture_atime} < time) {	539	#TODO: map scale is completely borked
		540
		541	my $x0 = int $ox - $sx + 0.5;
		542	my $y0 = int $oy - $sy + 0.5;
		543
		544	$self->{sw} = $sw;
		545	$self->{sh} = $sh;
		546
		547	$self->{x0} = $x0;
		548	$self->{y0} = $y0;
		549
644	$self->{texture_atime} = time + 1/3;	550	$self->{texture_atime} = time + 1/3;
645		551
646	$self->{texture} =	552	$self->{texture} =
647	new CFPlus::Texture	553	new CFPlus::Texture
648	w => $w,	554	w => $w,
649	h => $h,	555	h => $h,
650	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	556	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
651	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	557	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
652	}	558	}
		559	}
		560
		561	sub invoke_visibility_change {
		562	my ($self) = @_;
		563
		564	$self->refresh_hook;
		565
		566	0
		567	}
		568
		569	sub invoke_size_allocate {
		570	my ($self, $w, $h) = @_;
		571
		572	$self->update;
		573
		574	1
		575	}
		576
		577	sub update {
		578	my ($self) = @_;
		579
		580	delete $self->{texture_atime};
		581	$self->SUPER::update;
		582	}
		583
		584	sub _draw {
		585	my ($self) = @_;
		586
		587	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		588
		589	$self->{texture} or return;
		590
		591	glEnable GL_BLEND;
		592	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		593	glEnable GL_TEXTURE_2D;
		594	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
653		595
654	$self->{texture}->draw_quad (0, 0);	596	$self->{texture}->draw_quad (0, 0);
655		597
656	glDisable GL_TEXTURE_2D;	598	glDisable GL_TEXTURE_2D;
657		599
658	glTranslate 0.375, 0.375;	600	glTranslate 0.375, 0.375;
659
660	#TODO: map scale is completely borked
661
662	my $x0 = int $ox - $sx + 0.5;
663	my $y0 = int $oy - $sy + 0.5;
664		601
665	glColor 1, 1, 0, 1;	602	glColor 1, 1, 0, 1;
666	glBegin GL_LINE_LOOP;	603	glBegin GL_LINE_LOOP;
667	glVertex $x0 , $y0 ;	604	glVertex $self->{x0} , $self->{y0} ;
668	glVertex $x0 , $y0 + $sh;	605	glVertex $self->{x0} , $self->{y0} + $self->{sh};
669	glVertex $x0 + $sw, $y0 + $sh;	606	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
670	glVertex $x0 + $sw, $y0 ;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
671	glEnd;	608	glEnd;
672		609
673	glDisable GL_BLEND;	610	glDisable GL_BLEND;
674	}	611	}
675		612
…		…
711		648
712	if ($ev->{button} == 3) {	649	if ($ev->{button} == 3) {
713	(new CFPlus::UI::Menu	650	(new CFPlus::UI::Menu
714	items => [	651	items => [
715	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	652	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
716	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	653	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
717	],	654	],
718	)->popup ($ev);	655	)->popup ($ev);
719	return 1;	656	return 1;
720	}	657	}
721	0	658	0

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs. Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC