[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.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	CFPlus::background {	71	CFPlus::background {
86	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
87	CFPlus::set_proxy;
88		73
89	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
90	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91		76
92	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;
93	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;
94		79
95	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
96	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
97		82
98	require LWP::UserAgent;	83	my $ua = CFPlus::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		84
107	for my $file (qw(archetypes crossfire.0)) {	85	for my $file (qw(archetypes crossfire.0)) {
108	my $url = "$editsup->{lib_root}$file";	86	my $url = "$editsup->{lib_root}$file";
109	print "mirroring $url...\n";	87	print "mirroring $url...\n";
110	check_lwp $ua->mirror ($url, "$libdir/$file");	88	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111	printf "%s size %d octets\n", $file, -s "$libdir/$file";	89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
112	}	90	}
113		91
114	if (1) { # upload a map	92	if (1) { # upload a map
115	my $mapname = $::CONN->{map_info}[0];	93	my $mapname = $::CONN->{map_info}[0];
…		…
120		98
121	print "getting map revision for $mapname...\n";	99	print "getting map revision for $mapname...\n";
122		100
123	# try to get the most recent head revision, what a hack,	101	# try to get the most recent head revision, what a hack,
124	# this should have been returned while downloading sigh	102	# 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;	103	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126		104
127	if ($log =~ /\?rev=(\d+\.\d+)"/) {	105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
128	my $rev = $1;	106	my $rev = $1;
129		107
130	print "downloading revision $rev...\n";	108	print "downloading revision $rev...\n";
131		109
132	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;
133		111
134	my $meta = {	112	my $meta = {
135	%$editsup,	113	%$editsup,
136	path => $mapname,	114	path => $mapname,
137	revision => $rev,	115	revision => $rev,
…		…
193		171
194	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
195	$self->grab_focus;	173	$self->grab_focus;
196	return unless $::CONN;	174	return unless $::CONN;
197		175
198	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};
199	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};
200		178
201	$x -= int 0.5 * $self->{sw};	179	$x -= CFPlus::floor $::MAP->w * 0.5;
202	$y -= int 0.5 * $self->{sh};	180	$y -= CFPlus::floor $::MAP->h * 0.5;
203		181
		182	if ($::CONN) {
204	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
205	if $::CONN;	184	}
206		185
207	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
208	$self->grab_focus;	187	$self->grab_focus;
209	return unless $::CONN;	188	return unless $::CONN;
210		189
…		…
296		275
297	1	276	1
298	}	277	}
299		278
300	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
301	(	282	(
302	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
303	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
304	)	285	)
305	}	286	}
306		287
307	sub update {	288	sub update {
308	my ($self) = @_;	289	my ($self) = @_;
…		…
310	$self->{need_update} = 1;	291	$self->{need_update} = 1;
311	$self->SUPER::update;	292	$self->SUPER::update;
312	}	293	}
313		294
314	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
315	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
316	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
317	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
318	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
319	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
320	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
321	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
322	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
323		305
324	CFPlus::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
325	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
326	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
327	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
328	);	314	);
329		315
330	sub invoke_key_down {	316	sub invoke_key_down {
331	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
332		318
…		…
334	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
335	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
336		322
337	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
338		324
339	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
340	$::PL_WINDOW->toggle_visibility;
341	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342	$::HELP_WINDOW->toggle_visibility;
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
369	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370	$::CONN->user_send ("stay fire");
371	} elsif ($uni == ord ",") {
372	$::CONN->user_send ("take");
373	} elsif ($uni == ord " ") {
374	$::CONN->user_send ("apply");
375	} elsif ($uni == 13) {
376	$::CONN->user_send ("examine");
377	} elsif ($uni == ord ".") {
378	$::CONN->user_send ($self->{completer}{last_command})
379	if exists $self->{completer}{last_command};
380	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
381	$::CONN->user_send ($_) for @$bind_cmd;
382	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
383	$::CONN->user_send ("rotateshoottype +");
384	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
385	$::CONN->user_send ("rotateshoottype -");
386	} elsif ($uni == ord '"') {
387	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
388	$self->{completer}->show;
389	} elsif ($uni == ord "'") {
390	$self->{completer}->set_prefix ("");
391	$self->{completer}->show;
392	} elsif (exists $DIR{$sym}) {
393	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
394	$self->{shft}++;	327	$self->{shft}++;
395	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
396	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
397	}	330	}
398	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $DIR{$sym}[0];
399	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
400	$self->{ctrl}++;	333	$self->{ctrl}++;
401	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
402	} else {	335	} else {
403	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
404	}	337	}
405	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
406	$self->{completer}->inject_key_down ($ev);
407	$self->{completer}->show;
408	} else {
409	return 0;	339	return 1;
410	}
411
412	1	340	}
		341
		342	0
413	}	343	}
414		344
415	sub invoke_key_up {	345	sub invoke_key_up {
416	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
417		347
…		…
443	}	373	}
444		374
445	$res	375	$res
446	}	376	}
447		377
		378	sub invoke_visibility_change {
		379	my ($self) = @_;
		380
		381	$self->refresh_hook;
		382
		383	0
		384	}
		385
448	sub set_magicmap {	386	sub set_magicmap {
449	my ($self, $w, $h, $x, $y, $data) = @_;	387	my ($self, $w, $h, $x, $y, $data) = @_;
450		388
451	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	389	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	390	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453		391
454	$self->{magicmap} = [$x, $y, $w, $h, $data];	392	$self->{magicmap} = [$x, $y, $w, $h, $data];
455		393
456	$self->update;	394	$self->update;
457	}	395	}
458		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
459	sub draw {	472	sub draw {
460	my ($self) = @_;	473	my ($self) = @_;
461		474
462	return unless $::MAP;	475	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		476
		477	return unless $self->{list};
463		478
464	my $focused = $CFPlus::UI::FOCUS == $self	479	my $focused = $CFPlus::UI::FOCUS == $self
465	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	480	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
466		481
467	return	482	return
468	unless $focused \|\| !$::FAST;	483	unless $focused \|\| !$::FAST;
469		484
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};	485	glCallList $self->{list};
545		486
546	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
547	unless ($focused) {	488	unless ($focused) {
548	glColor 0.4, 0.2, 0.2, 0.6;	489	glColor_premultiply 0, 0, 1, 0.25;
549	glEnable GL_BLEND;	490	glEnable GL_BLEND;
550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
551	glBegin GL_QUADS;	492	glBegin GL_QUADS;
552	glVertex 0, 0;	493	glVertex 0, 0;
553	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
554	glVertex $::WIDTH, $::HEIGHT;	495	glVertex $::WIDTH, $::HEIGHT;
555	glVertex $::WIDTH, 0;	496	glVertex $::WIDTH, 0;
…		…
566	$self->SUPER::DESTROY;	507	$self->SUPER::DESTROY;
567	}	508	}
568		509
569	package CFPlus::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
570		511
		512	use strict;
		513	use utf8;
		514
571	our @ISA = CFPlus::UI::Base::;	515	our @ISA = CFPlus::UI::Base::;
572		516
573	use Time::HiRes qw(time);	517	use Time::HiRes qw(time);
574	use CFPlus::OpenGL;	518	use CFPlus::OpenGL;
575		519
576	sub size_request {	520	sub size_request {
577	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	521	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
578	}	522	}
579		523
580	sub invoke_size_allocate {	524	sub refresh_hook {
581	my ($self, $w, $h) = @_;	525	my ($self) = @_;
582		526
583	$self->update;	527	if ($::MAP && $self->{texture_atime} < time) {
584
585	1
586	}
587
588	sub update {
589	my ($self) = @_;
590
591	delete $self->{texture_atime};
592	$self->SUPER::update;
593	}
594
595	sub _draw {
596	my ($self) = @_;
597
598	$::MAP or return;
599
600	my ($w, $h) = @$self{qw(w h)};	528	my ($w, $h) = @$self{qw(w h)};
601		529
602	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	530	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
603	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	531	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
604		532
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);	533	my $ox = 0.5 * ($w - $sw);
609	my $oy = 0.5 * ($h - $sh);	534	my $oy = 0.5 * ($h - $sh);
610		535
611	glEnable GL_BLEND;	536	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
613	glEnable GL_TEXTURE_2D;
614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
615		538
616	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
617	$self->{texture_atime} = time + 1/3;	550	$self->{texture_atime} = time + 1/3;
618		551
619	$self->{texture} =	552	$self->{texture} =
620	new CFPlus::Texture	553	new CFPlus::Texture
621	w => $w,	554	w => $w,
622	h => $h,	555	h => $h,
623	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	556	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;	557	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625	}	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;
626		595
627	$self->{texture}->draw_quad (0, 0);	596	$self->{texture}->draw_quad (0, 0);
628		597
629	glDisable GL_TEXTURE_2D;	598	glDisable GL_TEXTURE_2D;
630		599
631	glTranslate 0.375, 0.375;	600	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		601
638	glColor 1, 1, 0, 1;	602	glColor 1, 1, 0, 1;
639	glBegin GL_LINE_LOOP;	603	glBegin GL_LINE_LOOP;
640	glVertex $x0 , $y0 ;	604	glVertex $self->{x0} , $self->{y0} ;
641	glVertex $x0 , $y0 + $sh;	605	glVertex $self->{x0} , $self->{y0} + $self->{sh};
642	glVertex $x0 + $sw, $y0 + $sh;	606	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
643	glVertex $x0 + $sw, $y0 ;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
644	glEnd;	608	glEnd;
645		609
646	glDisable GL_BLEND;	610	glDisable GL_BLEND;
647	}	611	}
648		612
…		…
684		648
685	if ($ev->{button} == 3) {	649	if ($ev->{button} == 3) {
686	(new CFPlus::UI::Menu	650	(new CFPlus::UI::Menu
687	items => [	651	items => [
688	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	652	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	653	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690	],	654	],
691	)->popup ($ev);	655	)->popup ($ev);
692	return 1;	656	return 1;
693	}	657	}
694	0	658	0

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.121 by root, Tue Aug 28 16:26:13 2007 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.121 by root, Tue Aug 28 16:26:13 2007 UTC