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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs.
Revision 1.112 by root, Fri Jul 20 18:42:45 2007 UTC

…		…
10	use CFPlus::UI;	10	use CFPlus::UI;
11	use CFPlus::Macro;	11	use CFPlus::Macro;
12		12
13	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
14		14
15	sub ::T() { 64 }
16
17	my $magicmap_tex =	15	my $magicmap_tex =
18	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
19	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
20		18
21	sub new {	19	sub new {
…		…
23		21
24	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
25	z => -1,	23	z => -1,
26	can_focus => 1,	24	can_focus => 1,
27	list => glGenList,	25	list => glGenList,
28		26	tilesize => 32,
29	smooth_matrix => [
30	0.05, 0.13, 0.05,
31	0.13, 0.30, 0.13,
32	0.05, 0.13, 0.05,
33	],
34
35	@_	27	@_
36	);	28	);
37		29
38	$self->{completer} = new CFPlus::MapWidget::Command::	30	$self->{completer} = new CFPlus::MapWidget::Command::
39	command => $self->{command},	31	command => $self->{command},
40	tooltip => "#completer_help",	32	tooltip => "#completer_help",
41	;	33	;
42		34
43	$self	35	$self
		36	}
		37
		38	sub set_tilesize {
		39	my ($self, $tilesize) = @_;
		40
		41	$self->{tilesize} = $tilesize;
44	}	42	}
45		43
46	sub add_command {	44	sub add_command {
47	my ($self, $command, $tooltip, $widget, $cb) = @_;	45	my ($self, $command, $tooltip, $widget, $cb) = @_;
48		46
…		…
179		177
180	if ($ev->{button} == 1) {	178	if ($ev->{button} == 1) {
181	$self->grab_focus;	179	$self->grab_focus;
182	return unless $::CONN;	180	return unless $::CONN;
183		181
184	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	182	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
185	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};	183	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
186		184
187	$x -= CFPlus::floor $::MAP->w * 0.5;	185	$x -= CFPlus::floor $::MAP->w * 0.5;
188	$y -= CFPlus::floor $::MAP->h * 0.5;	186	$y -= CFPlus::floor $::MAP->h * 0.5;
189		187
190	if ($::CONN) {	188	if ($::CONN) {
…		…
287		285
288	1	286	1
289	}	287	}
290		288
291	sub size_request {	289	sub size_request {
		290	my ($self) = @_;
		291
292	(	292	(
293	::T * CFPlus::ceil $::WIDTH / ::T,	293	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
294	::T * CFPlus::ceil $::HEIGHT / ::T,	294	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
295	)	295	)
296	}	296	}
297		297
298	sub update {	298	sub update {
299	my ($self) = @_;	299	my ($self) = @_;
…		…
301	$self->{need_update} = 1;	301	$self->{need_update} = 1;
302	$self->SUPER::update;	302	$self->SUPER::update;
303	}	303	}
304		304
305	my %DIR = (	305	my %DIR = (
		306	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
306	CFPlus::SDLK_KP8, [1, "north"],	307	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
307	CFPlus::SDLK_KP9, [2, "northeast"],	308	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
308	CFPlus::SDLK_KP6, [3, "east"],	309	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
309	CFPlus::SDLK_KP3, [4, "southeast"],	310	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
310	CFPlus::SDLK_KP2, [5, "south"],	311	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
311	CFPlus::SDLK_KP1, [6, "southwest"],	312	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
312	CFPlus::SDLK_KP4, [7, "west"],	313	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
313	CFPlus::SDLK_KP7, [8, "northwest"],	314	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
314		315
315	CFPlus::SDLK_UP, [1, "north"],	316	( "," . CFPlus::SDLK_UP ), [1, "north"],
		317	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
316	CFPlus::SDLK_RIGHT, [3, "east"],	318	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		319	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
317	CFPlus::SDLK_DOWN, [5, "south"],	320	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		321	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
318	CFPlus::SDLK_LEFT, [7, "west"],	322	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		323	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
319	);	324	);
320		325
321	sub invoke_key_down {	326	sub invoke_key_down {
322	my ($self, $ev) = @_;	327	my ($self, $ev) = @_;
323		328
…		…
342	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	347	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343	$::SETUP_DIALOG->toggle_visibility;	348	$::SETUP_DIALOG->toggle_visibility;
344	} elsif (!$::CONN) {	349	} elsif (!$::CONN) {
345	return 0; # bindings further down need a valid connection	350	return 0; # bindings further down need a valid connection
346		351
347	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
348	$::CONN->user_send ("stay fire");
349	} elsif ($uni == ord ",") {	352	} elsif ($uni == ord ",") {
350	$::CONN->user_send ("take");	353	$::CONN->user_send ("take");
351	} elsif ($uni == ord " ") {	354	} elsif ($uni == ord " ") {
352	$::CONN->user_send ("apply");	355	$::CONN->user_send ("apply");
353	} elsif ($uni == 13) {	356	} elsif ($uni == 13) {
…		…
368	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	371	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
369	$self->{completer}->show;	372	$self->{completer}->show;
370	} elsif ($uni == ord "'") {	373	} elsif ($uni == ord "'") {
371	$self->{completer}->set_prefix ("");	374	$self->{completer}->set_prefix ("");
372	$self->{completer}->show;	375	$self->{completer}->show;
373	} elsif (exists $DIR{$sym}) {	376	} elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
374	if ($mod & CFPlus::KMOD_SHIFT) {	377	if ($mod & CFPlus::KMOD_SHIFT) {
375	$self->{shft}++;	378	$self->{shft}++;
376	if ($DIR{$sym}[0] != $self->{fire_dir}) {	379	if ($dir->[0] != $self->{fire_dir}) {
377	$::CONN->user_send ("fire $DIR{$sym}[0]");	380	$::CONN->user_send ("fire $dir->[0]");
378	}	381	}
379	$self->{fire_dir} = $DIR{$sym}[0];	382	$self->{fire_dir} = $DIR{$sym}[0];
380	} elsif ($mod & CFPlus::KMOD_CTRL) {	383	} elsif ($mod & CFPlus::KMOD_CTRL) {
381	$self->{ctrl}++;	384	$self->{ctrl}++;
382	$::CONN->user_send ("run $DIR{$sym}[0]");	385	$::CONN->user_send ("run $dir->[0]");
383	} else {	386	} else {
384	$::CONN->user_send ("$DIR{$sym}[1]");	387	$::CONN->user_send ("$dir->[1]");
385	}	388	}
386	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	389	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
387	$self->{completer}->inject_key_down ($ev);	390	$self->{completer}->inject_key_down ($ev);
388	$self->{completer}->show;	391	$self->{completer}->show;
389	} else {	392	} else {
…		…
424	}	427	}
425		428
426	$res	429	$res
427	}	430	}
428		431
		432	sub invoke_visibility_change {
		433	my ($self) = @_;
		434
		435	$self->refresh_hook;
		436
		437	0
		438	}
		439
429	sub set_magicmap {	440	sub set_magicmap {
430	my ($self, $w, $h, $x, $y, $data) = @_;	441	my ($self, $w, $h, $x, $y, $data) = @_;
431		442
432	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	443	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
433	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	444	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
435	$self->{magicmap} = [$x, $y, $w, $h, $data];	446	$self->{magicmap} = [$x, $y, $w, $h, $data];
436		447
437	$self->update;	448	$self->update;
438	}	449	}
439		450
440	sub draw {	451	sub refresh_hook {
441	my ($self) = @_;	452	my ($self) = @_;
442		453
443	return unless $::MAP;	454	return unless $::MAP;
444		455
445	my $focused = $CFPlus::UI::FOCUS == $self
446	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
447
448	return
449	unless $focused \|\| !$::FAST;
450
451	if (delete $self->{need_update}) {	456	if (delete $self->{need_update}) {
452	my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};	457	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
453		458
454	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	459	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	460	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456		461
457	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	462	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
463	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;	468	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
464	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;	469	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
465		470
466	if ($::CFG->{fow_enable}) {	471	if ($::CFG->{fow_enable}) {
467	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	472	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
468
469	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
470	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
471	glConvolutionFilter2D (
472	GL_CONVOLUTION_2D,
473	GL_ALPHA,
474	3, 3,
475	GL_ALPHA, GL_FLOAT,
476	(pack "f*", @{ $self->{smooth_matrix} }),
477	);
478	glEnable GL_CONVOLUTION_2D;
479	}
480		473
481	$self->{fow_texture} = new CFPlus::Texture	474	$self->{fow_texture} = new CFPlus::Texture
482	w => $w,	475	w => $w,
483	h => $h,	476	h => $h,
484	data => $data,	477	data => $data,
485	internalformat => GL_ALPHA,	478	internalformat => GL_ALPHA,
486	format => GL_ALPHA;	479	format => GL_ALPHA;
487
488	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
489	} else {	480	} else {
490	delete $self->{fow_texture};	481	delete $self->{fow_texture};
491	}	482	}
492		483
493	glNewList $self->{list};	484	glNewList $self->{list};
494		485
495	glPushMatrix;	486	glPushMatrix;
496	glTranslate $sx0, $sy0;	487	glTranslate $sx0, $sy0;
497	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	488	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
498		489
499	$::MAP->draw ($dx, $dy, $sw, $sh, ::T);	490	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
500		491
501	glScale ::T, ::T;	492	glScale $self->{tilesize}, $self->{tilesize};
502		493
503	if (my $tex = $self->{fow_texture}) {	494	if (my $tex = $self->{fow_texture}) {
		495	glPushMatrix;
		496	glScale 1/3, 1/3;
504	glEnable GL_TEXTURE_2D;	497	glEnable GL_TEXTURE_2D;
505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	498	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
506		499
507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	500	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
508	$self->{fow_texture}->draw_quad_alpha (0, 0);	501	$self->{fow_texture}->draw_quad_alpha (0, 0);
509		502
510	glDisable GL_TEXTURE_2D;	503	glDisable GL_TEXTURE_2D;
		504	glPopMatrix;
511	}	505	}
512		506
513	if ($self->{magicmap}) {	507	if ($self->{magicmap}) {
514	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	508	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
515		509
…		…
522	}	516	}
523		517
524	glPopMatrix;	518	glPopMatrix;
525	glEndList;	519	glEndList;
526	}	520	}
		521
		522	}
		523
		524	sub draw {
		525	my ($self) = @_;
		526
		527	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		528
		529	return unless $self->{list};
		530
		531	my $focused = $CFPlus::UI::FOCUS == $self
		532	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		533
		534	return
		535	unless $focused \|\| !$::FAST;
527		536
528	glCallList $self->{list};	537	glCallList $self->{list};
529		538
530	# TNT2 emulates logops in software (or worse :)	539	# TNT2 emulates logops in software (or worse :)
531	unless ($focused) {	540	unless ($focused) {
…		…
550	$self->SUPER::DESTROY;	559	$self->SUPER::DESTROY;
551	}	560	}
552		561
553	package CFPlus::MapWidget::MapMap;	562	package CFPlus::MapWidget::MapMap;
554		563
		564	use strict;
		565	use utf8;
		566
555	our @ISA = CFPlus::UI::Base::;	567	our @ISA = CFPlus::UI::Base::;
556		568
557	use Time::HiRes qw(time);	569	use Time::HiRes qw(time);
558	use CFPlus::OpenGL;	570	use CFPlus::OpenGL;
559		571
560	sub size_request {	572	sub size_request {
561	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	573	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
562	}	574	}
563		575
564	sub invoke_size_allocate {	576	sub refresh_hook {
565	my ($self, $w, $h) = @_;	577	my ($self) = @_;
566		578
567	$self->update;	579	if ($::MAP && $self->{texture_atime} < time) {
568
569	1
570	}
571
572	sub update {
573	my ($self) = @_;
574
575	delete $self->{texture_atime};
576	$self->SUPER::update;
577	}
578
579	sub _draw {
580	my ($self) = @_;
581
582	$::MAP or return;
583
584	my ($w, $h) = @$self{qw(w h)};	580	my ($w, $h) = @$self{qw(w h)};
585		581
586	my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;	582	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
587	my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;	583	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
588		584
589	my $sx = int $::CFG->{map_shift_x} / ::T;
590	my $sy = int $::CFG->{map_shift_y} / ::T;
591
592	my $ox = 0.5 * ($w - $sw);	585	my $ox = 0.5 * ($w - $sw);
593	my $oy = 0.5 * ($h - $sh);	586	my $oy = 0.5 * ($h - $sh);
594		587
595	glEnable GL_BLEND;	588	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	589	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
597	glEnable GL_TEXTURE_2D;
598	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
599		590
600	if ($self->{texture_atime} < time) {	591	#TODO: map scale is completely borked
		592
		593	my $x0 = int $ox - $sx + 0.5;
		594	my $y0 = int $oy - $sy + 0.5;
		595
		596	$self->{sw} = $sw;
		597	$self->{sh} = $sh;
		598
		599	$self->{x0} = $x0;
		600	$self->{y0} = $y0;
		601
601	$self->{texture_atime} = time + 1/3;	602	$self->{texture_atime} = time + 1/3;
602		603
603	$self->{texture} =	604	$self->{texture} =
604	new CFPlus::Texture	605	new CFPlus::Texture
605	w => $w,	606	w => $w,
606	h => $h,	607	h => $h,
607	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	608	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
608	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	609	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
609	}	610	}
		611	}
		612
		613	sub invoke_visibility_change {
		614	my ($self) = @_;
		615
		616	$self->refresh_hook;
		617
		618	0
		619	}
		620
		621	sub invoke_size_allocate {
		622	my ($self, $w, $h) = @_;
		623
		624	$self->update;
		625
		626	1
		627	}
		628
		629	sub update {
		630	my ($self) = @_;
		631
		632	delete $self->{texture_atime};
		633	$self->SUPER::update;
		634	}
		635
		636	sub _draw {
		637	my ($self) = @_;
		638
		639	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		640
		641	$self->{texture} or return;
		642
		643	glEnable GL_BLEND;
		644	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		645	glEnable GL_TEXTURE_2D;
		646	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
610		647
611	$self->{texture}->draw_quad (0, 0);	648	$self->{texture}->draw_quad (0, 0);
612		649
613	glDisable GL_TEXTURE_2D;	650	glDisable GL_TEXTURE_2D;
614		651
615	glTranslate 0.375, 0.375;	652	glTranslate 0.375, 0.375;
616
617	#TODO: map scale is completely borked
618
619	my $x0 = int $ox - $sx + 0.5;
620	my $y0 = int $oy - $sy + 0.5;
621		653
622	glColor 1, 1, 0, 1;	654	glColor 1, 1, 0, 1;
623	glBegin GL_LINE_LOOP;	655	glBegin GL_LINE_LOOP;
624	glVertex $x0 , $y0 ;	656	glVertex $self->{x0} , $self->{y0} ;
625	glVertex $x0 , $y0 + $sh;	657	glVertex $self->{x0} , $self->{y0} + $self->{sh};
626	glVertex $x0 + $sw, $y0 + $sh;	658	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
627	glVertex $x0 + $sw, $y0 ;	659	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
628	glEnd;	660	glEnd;
629		661
630	glDisable GL_BLEND;	662	glDisable GL_BLEND;
631	}	663	}
632		664

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs. Revision 1.112 by root, Fri Jul 20 18:42:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs.
Revision 1.112 by root, Fri Jul 20 18:42:45 2007 UTC