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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.105 by root, Wed Apr 4 02:54:02 2007 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

…		…
24	can_focus => 1,	24	can_focus => 1,
25	list => glGenList,	25	list => glGenList,
26	tilesize => 32,	26	tilesize => 32,
27		27
28	smooth_matrix => [	28	smooth_matrix => [
29	0.05, 0.13, 0.05,	29	0.30, 0.50, 0.30,
30	0.13, 0.30, 0.13,
31	0.05, 0.13, 0.05,	30	0.50, 0.50, 0.50,
		31	0.30, 0.50, 0.30,
32	],	32	],
33		33
34	@_	34	@_
35	);	35	);
36		36
…		…
184		184
185	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
186	$self->grab_focus;	186	$self->grab_focus;
187	return unless $::CONN;	187	return unless $::CONN;
188		188
189	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};
190	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};
191		191
192	$x -= CFPlus::floor $::MAP->w * 0.5;	192	$x -= CFPlus::floor $::MAP->w * 0.5;
193	$y -= CFPlus::floor $::MAP->h * 0.5;	193	$y -= CFPlus::floor $::MAP->h * 0.5;
194		194
195	if ($::CONN) {	195	if ($::CONN) {
…		…
308	$self->{need_update} = 1;	308	$self->{need_update} = 1;
309	$self->SUPER::update;	309	$self->SUPER::update;
310	}	310	}
311		311
312	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
313	CFPlus::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
314	CFPlus::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
315	CFPlus::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
316	CFPlus::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
317	CFPlus::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
…		…
349	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	350	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
350	$::SETUP_DIALOG->toggle_visibility;	351	$::SETUP_DIALOG->toggle_visibility;
351	} elsif (!$::CONN) {	352	} elsif (!$::CONN) {
352	return 0; # bindings further down need a valid connection	353	return 0; # bindings further down need a valid connection
353		354
354	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
355	$::CONN->user_send ("stay fire");
356	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
357	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
358	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
359	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
360	} elsif ($uni == 13) {	359	} elsif ($uni == 13) {
…		…
431	}	430	}
432		431
433	$res	432	$res
434	}	433	}
435		434
		435	sub invoke_visibility_change {
		436	my ($self) = @_;
		437
		438	$self->refresh_hook;
		439
		440	0
		441	}
		442
436	sub set_magicmap {	443	sub set_magicmap {
437	my ($self, $w, $h, $x, $y, $data) = @_;	444	my ($self, $w, $h, $x, $y, $data) = @_;
438		445
439	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	446	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	447	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
442	$self->{magicmap} = [$x, $y, $w, $h, $data];	449	$self->{magicmap} = [$x, $y, $w, $h, $data];
443		450
444	$self->update;	451	$self->update;
445	}	452	}
446		453
447	sub draw {	454	sub refresh_hook {
448	my ($self) = @_;	455	my ($self) = @_;
449		456
450	return unless $::MAP;	457	return unless $::MAP;
451		458
452	my $focused = $CFPlus::UI::FOCUS == $self
453	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
454
455	return
456	unless $focused \|\| !$::FAST;
457
458	if (delete $self->{need_update}) {	459	if (delete $self->{need_update}) {
459	my $tilesize = $self->{tilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;	460	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
460		461
461	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	462	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	463	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463		464
464	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	465	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
469		470
470	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;
471	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;
472		473
473	if ($::CFG->{fow_enable}) {	474	if ($::CFG->{fow_enable}) {
474	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	475	my ($w, $h, $data) = $::MAP->fow_texture (
475		476	$dx, $dy, $sw, $sh,
476	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	477	$::CFG->{fow_smooth},
477	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
478	glConvolutionFilter2D (
479	GL_CONVOLUTION_2D,
480	GL_ALPHA,
481	3, 3,
482	GL_ALPHA, GL_FLOAT,
483	(pack "f*", @{ $self->{smooth_matrix} }),	478	pack "f*", @{ $self->{smooth_matrix} },
484	);	479	);
485	glEnable GL_CONVOLUTION_2D;
486	}
487		480
488	$self->{fow_texture} = new CFPlus::Texture	481	$self->{fow_texture} = new CFPlus::Texture
489	w => $w,	482	w => $w,
490	h => $h,	483	h => $h,
491	data => $data,	484	data => $data,
492	internalformat => GL_ALPHA,	485	internalformat => GL_ALPHA,
493	format => GL_ALPHA;	486	format => GL_ALPHA;
494
495	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496	} else {	487	} else {
497	delete $self->{fow_texture};	488	delete $self->{fow_texture};
498	}	489	}
499		490
500	glNewList $self->{list};	491	glNewList $self->{list};
…		…
506	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});	497	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
507		498
508	glScale $self->{tilesize}, $self->{tilesize};	499	glScale $self->{tilesize}, $self->{tilesize};
509		500
510	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};
511	glEnable GL_TEXTURE_2D;	504	glEnable GL_TEXTURE_2D;
512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513		506
514	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515	$self->{fow_texture}->draw_quad_alpha (0, 0);	508	$self->{fow_texture}->draw_quad_alpha (0, 0);
516		509
517	glDisable GL_TEXTURE_2D;	510	glDisable GL_TEXTURE_2D;
		511	glPopMatrix;
518	}	512	}
519		513
520	if ($self->{magicmap}) {	514	if ($self->{magicmap}) {
521	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	515	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522		516
…		…
529	}	523	}
530		524
531	glPopMatrix;	525	glPopMatrix;
532	glEndList;	526	glEndList;
533	}	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;
534		543
535	glCallList $self->{list};	544	glCallList $self->{list};
536		545
537	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
538	unless ($focused) {	547	unless ($focused) {
…		…
569		578
570	sub size_request {	579	sub size_request {
571	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
572	}	581	}
573		582
574	sub invoke_size_allocate {	583	sub refresh_hook {
575	my ($self, $w, $h) = @_;	584	my ($self) = @_;
576		585
577	$self->update;	586	if ($::MAP && $self->{texture_atime} < time) {
578
579	1
580	}
581
582	sub update {
583	my ($self) = @_;
584
585	delete $self->{texture_atime};
586	$self->SUPER::update;
587	}
588
589	sub _draw {
590	my ($self) = @_;
591
592	$::MAP or return;
593
594	my ($w, $h) = @$self{qw(w h)};	587	my ($w, $h) = @$self{qw(w h)};
595		588
596	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	589	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
597	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	590	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
598		591
		592	my $ox = 0.5 * ($w - $sw);
		593	my $oy = 0.5 * ($h - $sh);
		594
599	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};	595	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
600	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};	596	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
601		597
602	my $ox = 0.5 * ($w - $sw);	598	#TODO: map scale is completely borked
603	my $oy = 0.5 * ($h - $sh);
604		599
605	glEnable GL_BLEND;	600	my $x0 = int $ox - $sx + 0.5;
606	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	601	my $y0 = int $oy - $sy + 0.5;
607	glEnable GL_TEXTURE_2D;
608	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
609		602
610	if ($self->{texture_atime} < time) {	603	$self->{sw} = $sw;
		604	$self->{sh} = $sh;
		605
		606	$self->{x0} = $x0;
		607	$self->{y0} = $y0;
		608
611	$self->{texture_atime} = time + 1/3;	609	$self->{texture_atime} = time + 1/3;
612		610
613	$self->{texture} =	611	$self->{texture} =
614	new CFPlus::Texture	612	new CFPlus::Texture
615	w => $w,	613	w => $w,
616	h => $h,	614	h => $h,
617	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	615	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
618	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;
619	}	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;
620		654
621	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
622		656
623	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
624		658
625	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
626
627	#TODO: map scale is completely borked
628
629	my $x0 = int $ox - $sx + 0.5;
630	my $y0 = int $oy - $sy + 0.5;
631		660
632	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
633	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
634	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
635	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
636	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
637	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
638	glEnd;	667	glEnd;
639		668
640	glDisable GL_BLEND;	669	glDisable GL_BLEND;
641	}	670	}
642		671

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.105 by root, Wed Apr 4 02:54:02 2007 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.105 by root, Wed Apr 4 02:54:02 2007 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC