[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.111 by root, Thu Jul 19 14:54:50 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",
…		…
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	list => glGenList,
25		26	tilesize => 32,
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	@_	27	@_
33	);	28	);
34		29
35	$self->{completer} = new CFPlus::MapWidget::Command::	30	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},	31	command => $self->{command},
…		…
38	;	33	;
39		34
40	$self	35	$self
41	}	36	}
42		37
		38	sub set_tilesize {
		39	my ($self, $tilesize) = @_;
		40
		41	$self->{tilesize} = $tilesize;
		42	}
		43
43	sub add_command {	44	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	45	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		46
46	(my $data = $command) =~ s/\\//g;	47	(my $data = $command) =~ s/\\//g;
47		48
…		…
67	::stop_game ();	68	::stop_game ();
68	local $::PROFILE->{host} = $server;	69	local $::PROFILE->{host} = $server;
69	::start_game ();	70	::start_game ();
70	}	71	}
71		72
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 {	73	sub editor_invoke {
82	my $editsup = $::CONN && $::CONN->{editor_support}	74	my $editsup = $::CONN && $::CONN->{editor_support}
83	or return;	75	or return;
84		76
85	CFPlus::background {	77	CFPlus::background {
86	print "preparing editor startup...\n";	78	print "preparing editor startup...\n";
87	CFPlus::set_proxy;
88		79
89	my $server = $editsup->{gameserver} \|\| "default";	80	my $server = $editsup->{gameserver} \|\| "default";
90	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	81	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91		82
92	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	83	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;	84	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94		85
95	print "map directory is $mapdir\n";	86	print "map directory is $mapdir\n";
96	print "lib directory is $libdir\n";	87	print "lib directory is $libdir\n";
97		88
98	require LWP::UserAgent;	89	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		90
107	for my $file (qw(archetypes crossfire.0)) {	91	for my $file (qw(archetypes crossfire.0)) {
108	my $url = "$editsup->{lib_root}$file";	92	my $url = "$editsup->{lib_root}$file";
109	print "mirroring $url...\n";	93	print "mirroring $url...\n";
110	check_lwp $ua->mirror ($url, "$libdir/$file");	94	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111	printf "%s size %d octets\n", $file, -s "$libdir/$file";	95	printf "%s size %d octets\n", $file, -s "$libdir/$file";
112	}	96	}
113		97
114	if (1) { # upload a map	98	if (1) { # upload a map
115	my $mapname = $::CONN->{map_info}[0];	99	my $mapname = $::CONN->{map_info}[0];
…		…
120		104
121	print "getting map revision for $mapname...\n";	105	print "getting map revision for $mapname...\n";
122		106
123	# try to get the most recent head revision, what a hack,	107	# try to get the most recent head revision, what a hack,
124	# this should have been returned while downloading sigh	108	# 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;	109	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126		110
127	if ($log =~ /\?rev=(\d+\.\d+)"/) {	111	if ($log =~ /\?rev=(\d+\.\d+)"/) {
128	my $rev = $1;	112	my $rev = $1;
129		113
130	print "downloading revision $rev...\n";	114	print "downloading revision $rev...\n";
131		115
132	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	116	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133		117
134	my $meta = {	118	my $meta = {
135	%$editsup,	119	%$editsup,
136	path => $mapname,	120	path => $mapname,
137	revision => $rev,	121	revision => $rev,
…		…
193		177
194	if ($ev->{button} == 1) {	178	if ($ev->{button} == 1) {
195	$self->grab_focus;	179	$self->grab_focus;
196	return unless $::CONN;	180	return unless $::CONN;
197		181
198	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	182	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};	183	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
200		184
201	$x -= int 0.5 * $self->{sw};	185	$x -= CFPlus::floor $::MAP->w * 0.5;
202	$y -= int 0.5 * $self->{sh};	186	$y -= CFPlus::floor $::MAP->h * 0.5;
203		187
		188	if ($::CONN) {
		189	if ($::IN_BUILD_MODE) {
		190	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		191	} else {
204	$::CONN->lookat ($x, $y)	192	$::CONN->lookat ($x, $y)
205	if $::CONN;	193	}
		194	}
206		195
207	} elsif ($ev->{button} == 2) {	196	} elsif ($ev->{button} == 2) {
208	$self->grab_focus;	197	$self->grab_focus;
209	return unless $::CONN;	198	return unless $::CONN;
210		199
…		…
296		285
297	1	286	1
298	}	287	}
299		288
300	sub size_request {	289	sub size_request {
		290	my ($self) = @_;
		291
301	(	292	(
302	32 * CFPlus::ceil $::WIDTH / 32,	293	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
303	32 * CFPlus::ceil $::HEIGHT / 32,	294	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
304	)	295	)
305	}	296	}
306		297
307	sub update {	298	sub update {
308	my ($self) = @_;	299	my ($self) = @_;
…		…
310	$self->{need_update} = 1;	301	$self->{need_update} = 1;
311	$self->SUPER::update;	302	$self->SUPER::update;
312	}	303	}
313		304
314	my %DIR = (	305	my %DIR = (
		306	CFPlus::SDLK_KP5, [0, "stay fire"],
315	CFPlus::SDLK_KP8, [1, "north"],	307	CFPlus::SDLK_KP8, [1, "north"],
316	CFPlus::SDLK_KP9, [2, "northeast"],	308	CFPlus::SDLK_KP9, [2, "northeast"],
317	CFPlus::SDLK_KP6, [3, "east"],	309	CFPlus::SDLK_KP6, [3, "east"],
318	CFPlus::SDLK_KP3, [4, "southeast"],	310	CFPlus::SDLK_KP3, [4, "southeast"],
319	CFPlus::SDLK_KP2, [5, "south"],	311	CFPlus::SDLK_KP2, [5, "south"],
…		…
334	my $sym = $ev->{sym};	326	my $sym = $ev->{sym};
335	my $uni = $ev->{unicode};	327	my $uni = $ev->{unicode};
336		328
337	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	329	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
338		330
339	if ($uni == ord "\t") {	331	if ($sym == 9) {
340	$::PL_WINDOW->toggle_visibility;	332	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
341	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	333	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342	$::HELP_WINDOW->toggle_visibility;	334	$::HELP_WINDOW->toggle_visibility;
343	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	335	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344	::toggle_player_page ($::STATS_PAGE);	336	::toggle_player_page ($::STATS_PAGE);
345	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	337	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
348	::toggle_player_page ($::SPELL_PAGE);	340	::toggle_player_page ($::SPELL_PAGE);
349	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {	341	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350	::toggle_player_page ($::INVENTORY_PAGE);	342	::toggle_player_page ($::INVENTORY_PAGE);
351	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	343	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352	$::SETUP_DIALOG->toggle_visibility;	344	$::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) {	345	} elsif (!$::CONN) {
367	return 0; # bindings further down need a valid connection	346	return 0; # bindings further down need a valid connection
368		347
369	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370	$::CONN->user_send ("stay fire");
371	} elsif ($uni == ord ",") {	348	} elsif ($uni == ord ",") {
372	$::CONN->user_send ("take");	349	$::CONN->user_send ("take");
373	} elsif ($uni == ord " ") {	350	} elsif ($uni == ord " ") {
374	$::CONN->user_send ("apply");	351	$::CONN->user_send ("apply");
375	} elsif ($uni == 13) {	352	} elsif ($uni == 13) {
376	$::CONN->user_send ("examine");	353	$::CONN->user_send ("examine");
377	} elsif ($uni == ord ".") {	354	} elsif ($uni == ord ".") {
378	$::CONN->user_send ($self->{completer}{last_command})	355	$::CONN->user_send ($self->{completer}{last_command})
379	if exists $self->{completer}{last_command};	356	if exists $self->{completer}{last_command};
380	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {	357	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
381	$::CONN->user_send ($_) for @$bind_cmd;	358	$::CONN->macro_send ($_) for @macros;
382	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	359	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
383	$::CONN->user_send ("rotateshoottype +");	360	$::CONN->user_send ("rotateshoottype +");
384	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	361	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
385	$::CONN->user_send ("rotateshoottype -");	362	$::CONN->user_send ("rotateshoottype -");
		363	} elsif ($uni == ord '!') {
		364	$self->{completer}->set_prefix ("shout ");
		365	$self->{completer}->show;
386	} elsif ($uni == ord '"') {	366	} elsif ($uni == ord '"') {
387	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	367	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
388	$self->{completer}->show;	368	$self->{completer}->show;
389	} elsif ($uni == ord "'") {	369	} elsif ($uni == ord "'") {
390	$self->{completer}->set_prefix ("");	370	$self->{completer}->set_prefix ("");
…		…
443	}	423	}
444		424
445	$res	425	$res
446	}	426	}
447		427
		428	sub invoke_visibility_change {
		429	my ($self) = @_;
		430
		431	$self->refresh_hook;
		432
		433	0
		434	}
		435
448	sub set_magicmap {	436	sub set_magicmap {
449	my ($self, $w, $h, $x, $y, $data) = @_;	437	my ($self, $w, $h, $x, $y, $data) = @_;
450		438
451	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	439	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	440	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453		441
454	$self->{magicmap} = [$x, $y, $w, $h, $data];	442	$self->{magicmap} = [$x, $y, $w, $h, $data];
455		443
456	$self->update;	444	$self->update;
457	}	445	}
458		446
459	sub draw {	447	sub refresh_hook {
460	my ($self) = @_;	448	my ($self) = @_;
461		449
462	return unless $::MAP;	450	return unless $::MAP;
463		451
464	my $focused = $CFPlus::UI::FOCUS == $self
465	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
466
467	return
468	unless $focused \|\| !$::FAST;
469
470	if (delete $self->{need_update}) {	452	if (delete $self->{need_update}) {
471	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	453	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
472		454
		455	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		456	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		457
473	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	458	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	459	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475		460
476	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	461	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	462	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478		463
479	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	464	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
480	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	465	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
481		466
482	if ($::CFG->{fow_enable}) {	467	if ($::CFG->{fow_enable}) {
483	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	468	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $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		469
497	$self->{fow_texture} = new CFPlus::Texture	470	$self->{fow_texture} = new CFPlus::Texture
498	w => $w,	471	w => $w,
499	h => $h,	472	h => $h,
500	data => $data,	473	data => $data,
501	internalformat => GL_ALPHA,	474	internalformat => GL_ALPHA,
502	format => GL_ALPHA;	475	format => GL_ALPHA;
503
504	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
505	} else {	476	} else {
506	delete $self->{fow_texture};	477	delete $self->{fow_texture};
507	}	478	}
508		479
509	glNewList $self->{list};	480	glNewList $self->{list};
510		481
511	glPushMatrix;	482	glPushMatrix;
512	glTranslate $sx0, $sy0;	483	glTranslate $sx0, $sy0;
513	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	484	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514		485
515	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	486	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
516		487
517	glScale 32, 32;	488	glScale $self->{tilesize}, $self->{tilesize};
518		489
519	if (my $tex = $self->{fow_texture}) {	490	if (my $tex = $self->{fow_texture}) {
		491	glPushMatrix;
		492	glScale 1/3, 1/3;
520	glEnable GL_TEXTURE_2D;	493	glEnable GL_TEXTURE_2D;
521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	494	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522		495
523	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	496	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
524	$self->{fow_texture}->draw_quad_alpha (0, 0);	497	$self->{fow_texture}->draw_quad_alpha (0, 0);
525		498
526	glDisable GL_TEXTURE_2D;	499	glDisable GL_TEXTURE_2D;
		500	glPopMatrix;
527	}	501	}
528		502
529	if ($self->{magicmap}) {	503	if ($self->{magicmap}) {
530	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	504	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531		505
532	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	506	$x += $::MAP->ox + $self->{dx};
533	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	507	$y += $::MAP->oy + $self->{dy};
534		508
535	glTranslate - $x - 1, - $y - 1;	509	glTranslate - $x - 1, - $y - 1;
536	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	510	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	511	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538	}	512	}
539		513
540	glPopMatrix;	514	glPopMatrix;
541	glEndList;	515	glEndList;
542	}	516	}
		517
		518	}
		519
		520	sub draw {
		521	my ($self) = @_;
		522
		523	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		524
		525	return unless $self->{list};
		526
		527	my $focused = $CFPlus::UI::FOCUS == $self
		528	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		529
		530	return
		531	unless $focused \|\| !$::FAST;
543		532
544	glCallList $self->{list};	533	glCallList $self->{list};
545		534
546	# TNT2 emulates logops in software (or worse :)	535	# TNT2 emulates logops in software (or worse :)
547	unless ($focused) {	536	unless ($focused) {
…		…
566	$self->SUPER::DESTROY;	555	$self->SUPER::DESTROY;
567	}	556	}
568		557
569	package CFPlus::MapWidget::MapMap;	558	package CFPlus::MapWidget::MapMap;
570		559
		560	use strict;
		561	use utf8;
		562
571	our @ISA = CFPlus::UI::Base::;	563	our @ISA = CFPlus::UI::Base::;
572		564
573	use Time::HiRes qw(time);	565	use Time::HiRes qw(time);
574	use CFPlus::OpenGL;	566	use CFPlus::OpenGL;
575		567
576	sub size_request {	568	sub size_request {
577	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	569	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
578	}	570	}
579		571
580	sub invoke_size_allocate {	572	sub refresh_hook {
581	my ($self, $w, $h) = @_;	573	my ($self) = @_;
582		574
583	$self->update;	575	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)};	576	my ($w, $h) = @$self{qw(w h)};
601		577
602	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	578	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
603	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	579	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
604		580
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);	581	my $ox = 0.5 * ($w - $sw);
609	my $oy = 0.5 * ($h - $sh);	582	my $oy = 0.5 * ($h - $sh);
610		583
611	glEnable GL_BLEND;	584	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	585	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		586
616	if ($self->{texture_atime} < time) {	587	#TODO: map scale is completely borked
		588
		589	my $x0 = int $ox - $sx + 0.5;
		590	my $y0 = int $oy - $sy + 0.5;
		591
		592	$self->{sw} = $sw;
		593	$self->{sh} = $sh;
		594
		595	$self->{x0} = $x0;
		596	$self->{y0} = $y0;
		597
617	$self->{texture_atime} = time + 1/3;	598	$self->{texture_atime} = time + 1/3;
618		599
619	$self->{texture} =	600	$self->{texture} =
620	new CFPlus::Texture	601	new CFPlus::Texture
621	w => $w,	602	w => $w,
622	h => $h,	603	h => $h,
623	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	604	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;	605	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625	}	606	}
		607	}
		608
		609	sub invoke_visibility_change {
		610	my ($self) = @_;
		611
		612	$self->refresh_hook;
		613
		614	0
		615	}
		616
		617	sub invoke_size_allocate {
		618	my ($self, $w, $h) = @_;
		619
		620	$self->update;
		621
		622	1
		623	}
		624
		625	sub update {
		626	my ($self) = @_;
		627
		628	delete $self->{texture_atime};
		629	$self->SUPER::update;
		630	}
		631
		632	sub _draw {
		633	my ($self) = @_;
		634
		635	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		636
		637	$self->{texture} or return;
		638
		639	glEnable GL_BLEND;
		640	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		641	glEnable GL_TEXTURE_2D;
		642	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
626		643
627	$self->{texture}->draw_quad (0, 0);	644	$self->{texture}->draw_quad (0, 0);
628		645
629	glDisable GL_TEXTURE_2D;	646	glDisable GL_TEXTURE_2D;
630		647
631	glTranslate 0.375, 0.375;	648	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		649
638	glColor 1, 1, 0, 1;	650	glColor 1, 1, 0, 1;
639	glBegin GL_LINE_LOOP;	651	glBegin GL_LINE_LOOP;
640	glVertex $x0 , $y0 ;	652	glVertex $self->{x0} , $self->{y0} ;
641	glVertex $x0 , $y0 + $sh;	653	glVertex $self->{x0} , $self->{y0} + $self->{sh};
642	glVertex $x0 + $sw, $y0 + $sh;	654	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
643	glVertex $x0 + $sw, $y0 ;	655	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
644	glEnd;	656	glEnd;
645		657
646	glDisable GL_BLEND;	658	glDisable GL_BLEND;
647	}	659	}
648		660
…		…
684		696
685	if ($ev->{button} == 3) {	697	if ($ev->{button} == 3) {
686	(new CFPlus::UI::Menu	698	(new CFPlus::UI::Menu
687	items => [	699	items => [
688	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	700	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	701	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690	],	702	],
691	)->popup ($ev);	703	)->popup ($ev);
692	return 1;	704	return 1;
693	}	705	}
694	0	706	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.111 by root, Thu Jul 19 14:54:50 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.111 by root, Thu Jul 19 14:54:50 2007 UTC