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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

…		…
21		21
22	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
23	z => -1,	23	z => -1,
24	can_focus => 1,	24	can_focus => 1,
25	list => glGenList,	25	list => glGenList,
		26	tilesize => 32,
26		27
27	smooth_matrix => [	28	smooth_matrix => [
28	0.05, 0.13, 0.05,	29	0.30, 0.50, 0.30,
29	0.13, 0.30, 0.13,
30	0.05, 0.13, 0.05,	30	0.50, 0.50, 0.50,
		31	0.30, 0.50, 0.30,
31	],	32	],
32		33
33	@_	34	@_
34	);	35	);
35		36
…		…
37	command => $self->{command},	38	command => $self->{command},
38	tooltip => "#completer_help",	39	tooltip => "#completer_help",
39	;	40	;
40		41
41	$self	42	$self
		43	}
		44
		45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
42	}	49	}
43		50
44	sub add_command {	51	sub add_command {
45	my ($self, $command, $tooltip, $widget, $cb) = @_;	52	my ($self, $command, $tooltip, $widget, $cb) = @_;
46		53
…		…
177		184
178	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
179	$self->grab_focus;	186	$self->grab_focus;
180	return unless $::CONN;	187	return unless $::CONN;
181		188
182	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	189	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
183	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};	190	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
184		191
185	$x -= CFPlus::floor $::MAP->w * 0.5;	192	$x -= CFPlus::floor $::MAP->w * 0.5;
186	$y -= CFPlus::floor $::MAP->h * 0.5;	193	$y -= CFPlus::floor $::MAP->h * 0.5;
187		194
188	if ($::CONN) {	195	if ($::CONN) {
…		…
285		292
286	1	293	1
287	}	294	}
288		295
289	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
290	(	299	(
291	32 * CFPlus::ceil $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
292	32 * CFPlus::ceil $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
293	)	302	)
294	}	303	}
295		304
296	sub update {	305	sub update {
297	my ($self) = @_;	306	my ($self) = @_;
…		…
299	$self->{need_update} = 1;	308	$self->{need_update} = 1;
300	$self->SUPER::update;	309	$self->SUPER::update;
301	}	310	}
302		311
303	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
304	CFPlus::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
305	CFPlus::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
306	CFPlus::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
307	CFPlus::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
308	CFPlus::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
…		…
323	my $sym = $ev->{sym};	333	my $sym = $ev->{sym};
324	my $uni = $ev->{unicode};	334	my $uni = $ev->{unicode};
325		335
326	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
327		337
328	if ($uni == ord "\t") {	338	if ($sym == 9) {
329	$::PL_WINDOW->toggle_visibility;	339	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	340	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331	$::HELP_WINDOW->toggle_visibility;	341	$::HELP_WINDOW->toggle_visibility;
332	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	342	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333	::toggle_player_page ($::STATS_PAGE);	343	::toggle_player_page ($::STATS_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	344	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
340	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	350	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341	$::SETUP_DIALOG->toggle_visibility;	351	$::SETUP_DIALOG->toggle_visibility;
342	} elsif (!$::CONN) {	352	} elsif (!$::CONN) {
343	return 0; # bindings further down need a valid connection	353	return 0; # bindings further down need a valid connection
344		354
345	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
346	$::CONN->user_send ("stay fire");
347	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
348	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
349	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
350	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
351	} elsif ($uni == 13) {	359	} elsif ($uni == 13) {
352	$::CONN->user_send ("examine");	360	$::CONN->user_send ("examine");
353	} elsif ($uni == ord ".") {	361	} elsif ($uni == ord ".") {
354	$::CONN->user_send ($self->{completer}{last_command})	362	$::CONN->user_send ($self->{completer}{last_command})
355	if exists $self->{completer}{last_command};	363	if exists $self->{completer}{last_command};
356	} elsif (my @macros = CFPlus::Macro::match_event $ev) {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
357	warn "<@macros>\n";#d#
358	$::CONN->macro_send ($_) for @macros;	365	$::CONN->macro_send ($_) for @macros;
359	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
360	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
361	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
362	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
363	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
364	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
365	$self->{completer}->show;	375	$self->{completer}->show;
366	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
367	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
…		…
443		453
444	return	454	return
445	unless $focused \|\| !$::FAST;	455	unless $focused \|\| !$::FAST;
446		456
447	if (delete $self->{need_update}) {	457	if (delete $self->{need_update}) {
448	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	458	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
449		459
450	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	460	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	461	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452		462
453	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	463	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
458		468
459	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;	469	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
460	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;	470	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
461		471
462	if ($::CFG->{fow_enable}) {	472	if ($::CFG->{fow_enable}) {
463	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	473	my ($w, $h, $data) = $::MAP->fow_texture (
464		474	$dx, $dy, $sw, $sh,
465	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	475	$::CFG->{fow_smooth},
466	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
467	glConvolutionFilter2D (
468	GL_CONVOLUTION_2D,
469	GL_ALPHA,
470	3, 3,
471	GL_ALPHA, GL_FLOAT,
472	(pack "f*", @{ $self->{smooth_matrix} }),	476	pack "f*", @{ $self->{smooth_matrix} },
473	);	477	);
474	glEnable GL_CONVOLUTION_2D;
475	}
476		478
477	$self->{fow_texture} = new CFPlus::Texture	479	$self->{fow_texture} = new CFPlus::Texture
478	w => $w,	480	w => $w,
479	h => $h,	481	h => $h,
480	data => $data,	482	data => $data,
481	internalformat => GL_ALPHA,	483	internalformat => GL_ALPHA,
482	format => GL_ALPHA;	484	format => GL_ALPHA;
483
484	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
485	} else {	485	} else {
486	delete $self->{fow_texture};	486	delete $self->{fow_texture};
487	}	487	}
488		488
489	glNewList $self->{list};	489	glNewList $self->{list};
490		490
491	glPushMatrix;	491	glPushMatrix;
492	glTranslate $sx0, $sy0;	492	glTranslate $sx0, $sy0;
493	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	493	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
494		494
495	$::MAP->draw ($dx, $dy, $sw, $sh);	495	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
496		496
497	glScale 32, 32;	497	glScale $self->{tilesize}, $self->{tilesize};
498		498
499	if (my $tex = $self->{fow_texture}) {	499	if (my $tex = $self->{fow_texture}) {
		500	glPushMatrix;
		501	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
500	glEnable GL_TEXTURE_2D;	502	glEnable GL_TEXTURE_2D;
501	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
502		504
503	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	505	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
504	$self->{fow_texture}->draw_quad_alpha (0, 0);	506	$self->{fow_texture}->draw_quad_alpha (0, 0);
505		507
506	glDisable GL_TEXTURE_2D;	508	glDisable GL_TEXTURE_2D;
		509	glPopMatrix;
507	}	510	}
508		511
509	if ($self->{magicmap}) {	512	if ($self->{magicmap}) {
510	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	513	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
511		514
…		…
546	$self->SUPER::DESTROY;	549	$self->SUPER::DESTROY;
547	}	550	}
548		551
549	package CFPlus::MapWidget::MapMap;	552	package CFPlus::MapWidget::MapMap;
550		553
		554	use strict;
		555	use utf8;
		556
551	our @ISA = CFPlus::UI::Base::;	557	our @ISA = CFPlus::UI::Base::;
552		558
553	use Time::HiRes qw(time);	559	use Time::HiRes qw(time);
554	use CFPlus::OpenGL;	560	use CFPlus::OpenGL;
555		561
…		…
577		583
578	$::MAP or return;	584	$::MAP or return;
579		585
580	my ($w, $h) = @$self{qw(w h)};	586	my ($w, $h) = @$self{qw(w h)};
581		587
582	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	588	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	589	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
584		590
585	my $sx = int $::CFG->{map_shift_x} / 32;	591	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
586	my $sy = int $::CFG->{map_shift_y} / 32;	592	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
587		593
588	my $ox = 0.5 * ($w - $sw);	594	my $ox = 0.5 * ($w - $sw);
589	my $oy = 0.5 * ($h - $sh);	595	my $oy = 0.5 * ($h - $sh);
590		596
591	glEnable GL_BLEND;	597	glEnable GL_BLEND;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.97 by root, Sat Dec 9 22:28:11 2006 UTC vs. Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC