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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 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 $macro = CFPlus::Macro::match_event $ev) {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
357	$::CONN->macro_send ($macro);	365	$::CONN->macro_send ($_) for @macros;
358	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
359	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
360	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
361	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
362	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
363	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
364	$self->{completer}->show;	375	$self->{completer}->show;
365	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
366	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
…		…
419	}	430	}
420		431
421	$res	432	$res
422	}	433	}
423		434
		435	sub invoke_visibility_change {
		436	my ($self) = @_;
		437
		438	$self->refresh_hook;
		439
		440	0
		441	}
		442
424	sub set_magicmap {	443	sub set_magicmap {
425	my ($self, $w, $h, $x, $y, $data) = @_;	444	my ($self, $w, $h, $x, $y, $data) = @_;
426		445
427	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	446	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
428	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	447	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
430	$self->{magicmap} = [$x, $y, $w, $h, $data];	449	$self->{magicmap} = [$x, $y, $w, $h, $data];
431		450
432	$self->update;	451	$self->update;
433	}	452	}
434		453
435	sub draw {	454	sub refresh_hook {
436	my ($self) = @_;	455	my ($self) = @_;
437		456
438	return unless $::MAP;	457	return unless $::MAP;
439		458
440	my $focused = $CFPlus::UI::FOCUS == $self
441	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
442
443	return
444	unless $focused \|\| !$::FAST;
445
446	if (delete $self->{need_update}) {	459	if (delete $self->{need_update}) {
447	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	460	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
448		461
449	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	462	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
450	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	463	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
451		464
452	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	465	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
457		470
458	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;	471	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
459	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;	472	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
460		473
461	if ($::CFG->{fow_enable}) {	474	if ($::CFG->{fow_enable}) {
462	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	475	my ($w, $h, $data) = $::MAP->fow_texture (
463		476	$dx, $dy, $sw, $sh,
464	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	477	$::CFG->{fow_smooth},
465	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
466	glConvolutionFilter2D (
467	GL_CONVOLUTION_2D,
468	GL_ALPHA,
469	3, 3,
470	GL_ALPHA, GL_FLOAT,
471	(pack "f*", @{ $self->{smooth_matrix} }),	478	pack "f*", @{ $self->{smooth_matrix} },
472	);	479	);
473	glEnable GL_CONVOLUTION_2D;
474	}
475		480
476	$self->{fow_texture} = new CFPlus::Texture	481	$self->{fow_texture} = new CFPlus::Texture
477	w => $w,	482	w => $w,
478	h => $h,	483	h => $h,
479	data => $data,	484	data => $data,
480	internalformat => GL_ALPHA,	485	internalformat => GL_ALPHA,
481	format => GL_ALPHA;	486	format => GL_ALPHA;
482
483	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
484	} else {	487	} else {
485	delete $self->{fow_texture};	488	delete $self->{fow_texture};
486	}	489	}
487		490
488	glNewList $self->{list};	491	glNewList $self->{list};
489		492
490	glPushMatrix;	493	glPushMatrix;
491	glTranslate $sx0, $sy0;	494	glTranslate $sx0, $sy0;
492	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	495	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
493		496
494	$::MAP->draw ($dx, $dy, $sw, $sh);	497	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
495		498
496	glScale 32, 32;	499	glScale $self->{tilesize}, $self->{tilesize};
497		500
498	if (my $tex = $self->{fow_texture}) {	501	if (my $tex = $self->{fow_texture}) {
		502	glPushMatrix;
		503	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
499	glEnable GL_TEXTURE_2D;	504	glEnable GL_TEXTURE_2D;
500	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
501		506
502	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
503	$self->{fow_texture}->draw_quad_alpha (0, 0);	508	$self->{fow_texture}->draw_quad_alpha (0, 0);
504		509
505	glDisable GL_TEXTURE_2D;	510	glDisable GL_TEXTURE_2D;
		511	glPopMatrix;
506	}	512	}
507		513
508	if ($self->{magicmap}) {	514	if ($self->{magicmap}) {
509	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	515	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
510		516
…		…
517	}	523	}
518		524
519	glPopMatrix;	525	glPopMatrix;
520	glEndList;	526	glEndList;
521	}	527	}
		528
		529	}
		530
		531	sub draw {
		532	my ($self) = @_;
		533
		534	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		535
		536	return unless $self->{list};
		537
		538	my $focused = $CFPlus::UI::FOCUS == $self
		539	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		540
		541	return
		542	unless $focused \|\| !$::FAST;
522		543
523	glCallList $self->{list};	544	glCallList $self->{list};
524		545
525	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
526	unless ($focused) {	547	unless ($focused) {
…		…
545	$self->SUPER::DESTROY;	566	$self->SUPER::DESTROY;
546	}	567	}
547		568
548	package CFPlus::MapWidget::MapMap;	569	package CFPlus::MapWidget::MapMap;
549		570
		571	use strict;
		572	use utf8;
		573
550	our @ISA = CFPlus::UI::Base::;	574	our @ISA = CFPlus::UI::Base::;
551		575
552	use Time::HiRes qw(time);	576	use Time::HiRes qw(time);
553	use CFPlus::OpenGL;	577	use CFPlus::OpenGL;
554		578
555	sub size_request {	579	sub size_request {
556	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
557	}	581	}
558		582
559	sub invoke_size_allocate {	583	sub refresh_hook {
560	my ($self, $w, $h) = @_;	584	my ($self) = @_;
561		585
562	$self->update;	586	if ($::MAP && $self->{texture_atime} < time) {
563
564	1
565	}
566
567	sub update {
568	my ($self) = @_;
569
570	delete $self->{texture_atime};
571	$self->SUPER::update;
572	}
573
574	sub _draw {
575	my ($self) = @_;
576
577	$::MAP or return;
578
579	my ($w, $h) = @$self{qw(w h)};	587	my ($w, $h) = @$self{qw(w h)};
580		588
581	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	589	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
582	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	590	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583		591
584	my $sx = int $::CFG->{map_shift_x} / 32;
585	my $sy = int $::CFG->{map_shift_y} / 32;
586
587	my $ox = 0.5 * ($w - $sw);	592	my $ox = 0.5 * ($w - $sw);
588	my $oy = 0.5 * ($h - $sh);	593	my $oy = 0.5 * ($h - $sh);
589		594
590	glEnable GL_BLEND;	595	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
591	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
592	glEnable GL_TEXTURE_2D;
593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
594		597
595	if ($self->{texture_atime} < time) {	598	#TODO: map scale is completely borked
		599
		600	my $x0 = int $ox - $sx + 0.5;
		601	my $y0 = int $oy - $sy + 0.5;
		602
		603	$self->{sw} = $sw;
		604	$self->{sh} = $sh;
		605
		606	$self->{x0} = $x0;
		607	$self->{y0} = $y0;
		608
596	$self->{texture_atime} = time + 1/3;	609	$self->{texture_atime} = time + 1/3;
597		610
598	$self->{texture} =	611	$self->{texture} =
599	new CFPlus::Texture	612	new CFPlus::Texture
600	w => $w,	613	w => $w,
601	h => $h,	614	h => $h,
602	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	615	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
603	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	616	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
604	}	617	}
		618	}
		619
		620	sub invoke_visibility_change {
		621	my ($self) = @_;
		622
		623	$self->refresh_hook;
		624
		625	0
		626	}
		627
		628	sub invoke_size_allocate {
		629	my ($self, $w, $h) = @_;
		630
		631	$self->update;
		632
		633	1
		634	}
		635
		636	sub update {
		637	my ($self) = @_;
		638
		639	delete $self->{texture_atime};
		640	$self->SUPER::update;
		641	}
		642
		643	sub _draw {
		644	my ($self) = @_;
		645
		646	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		647
		648	$self->{texture} or return;
		649
		650	glEnable GL_BLEND;
		651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		652	glEnable GL_TEXTURE_2D;
		653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
605		654
606	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
607		656
608	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
609		658
610	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
611
612	#TODO: map scale is completely borked
613
614	my $x0 = int $ox - $sx + 0.5;
615	my $y0 = int $oy - $sy + 0.5;
616		660
617	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
618	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
619	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
620	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
621	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
622	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
623	glEnd;	667	glEnd;
624		668
625	glDisable GL_BLEND;	669	glDisable GL_BLEND;
626	}	670	}
627		671

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.96 by root, Sat Dec 9 21:44:43 2006 UTC vs. Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC