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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs. Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC