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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC

…		…
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use CFPlus;
9	use CFPlus::OpenGL;	9	use CFPlus::OpenGL;
10	use CFPlus::UI;	10	use CFPlus::UI;
		11	use CFPlus::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
…		…
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	list => glGenList,
25		26	tilesize => 32,
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	27	@_
33	);	28	);
34		29
35	$self->{completer} = new CFPlus::MapWidget::Command::	30	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},	31	command => $self->{command},
37	tooltip => "#completer_help",	32	tooltip => "#completer_help",
38	;	33	;
39		34
40	$self	35	$self
		36	}
		37
		38	sub set_tilesize {
		39	my ($self, $tilesize) = @_;
		40
		41	$self->{tilesize} = $tilesize;
41	}	42	}
42		43
43	sub add_command {	44	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	45	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		46
…		…
176		177
177	if ($ev->{button} == 1) {	178	if ($ev->{button} == 1) {
178	$self->grab_focus;	179	$self->grab_focus;
179	return unless $::CONN;	180	return unless $::CONN;
180		181
181	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};
182	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};
183		184
184	$x -= CFPlus::floor $::MAP->w * 0.5;	185	$x -= CFPlus::floor $::MAP->w * 0.5;
185	$y -= CFPlus::floor $::MAP->h * 0.5;	186	$y -= CFPlus::floor $::MAP->h * 0.5;
186		187
		188	if ($::CONN) {
		189	if ($::IN_BUILD_MODE) {
		190	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		191	} else {
187	$::CONN->lookat ($x, $y)	192	$::CONN->lookat ($x, $y)
188	if $::CONN;	193	}
		194	}
189		195
190	} elsif ($ev->{button} == 2) {	196	} elsif ($ev->{button} == 2) {
191	$self->grab_focus;	197	$self->grab_focus;
192	return unless $::CONN;	198	return unless $::CONN;
193		199
…		…
279		285
280	1	286	1
281	}	287	}
282		288
283	sub size_request {	289	sub size_request {
		290	my ($self) = @_;
		291
284	(	292	(
285	32 * CFPlus::ceil $::WIDTH / 32,	293	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
286	32 * CFPlus::ceil $::HEIGHT / 32,	294	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
287	)	295	)
288	}	296	}
289		297
290	sub update {	298	sub update {
291	my ($self) = @_;	299	my ($self) = @_;
…		…
293	$self->{need_update} = 1;	301	$self->{need_update} = 1;
294	$self->SUPER::update;	302	$self->SUPER::update;
295	}	303	}
296		304
297	my %DIR = (	305	my %DIR = (
		306	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
298	CFPlus::SDLK_KP8, [1, "north"],	307	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
299	CFPlus::SDLK_KP9, [2, "northeast"],	308	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
300	CFPlus::SDLK_KP6, [3, "east"],	309	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
301	CFPlus::SDLK_KP3, [4, "southeast"],	310	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
302	CFPlus::SDLK_KP2, [5, "south"],	311	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
303	CFPlus::SDLK_KP1, [6, "southwest"],	312	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
304	CFPlus::SDLK_KP4, [7, "west"],	313	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
305	CFPlus::SDLK_KP7, [8, "northwest"],	314	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
306		315
307	CFPlus::SDLK_UP, [1, "north"],	316	( "," . CFPlus::SDLK_UP ), [1, "north"],
		317	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
308	CFPlus::SDLK_RIGHT, [3, "east"],	318	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		319	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
309	CFPlus::SDLK_DOWN, [5, "south"],	320	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		321	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
310	CFPlus::SDLK_LEFT, [7, "west"],	322	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		323	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
311	);	324	);
312		325
313	sub invoke_key_down {	326	sub invoke_key_down {
314	my ($self, $ev) = @_;	327	my ($self, $ev) = @_;
315		328
…		…
317	my $sym = $ev->{sym};	330	my $sym = $ev->{sym};
318	my $uni = $ev->{unicode};	331	my $uni = $ev->{unicode};
319		332
320	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	333	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
321		334
322	if ($uni == ord "\t") {	335	if ($sym == 9) {
323	$::PL_WINDOW->toggle_visibility;	336	($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
324	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	337	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
325	$::HELP_WINDOW->toggle_visibility;	338	$::HELP_WINDOW->toggle_visibility;
326	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	339	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327	::toggle_player_page ($::STATS_PAGE);	340	::toggle_player_page ($::STATS_PAGE);
328	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	341	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
331	::toggle_player_page ($::SPELL_PAGE);	344	::toggle_player_page ($::SPELL_PAGE);
332	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {	345	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333	::toggle_player_page ($::INVENTORY_PAGE);	346	::toggle_player_page ($::INVENTORY_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	347	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335	$::SETUP_DIALOG->toggle_visibility;	348	$::SETUP_DIALOG->toggle_visibility;
336	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
337	$::BIND_EDITOR->set_binding (undef, undef, [],
338	sub {
339	my ($mod, $sym, $cmds) = @_;
340	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
341	});
342	$::BIND_EDITOR->start;
343	$::BIND_EDITOR->show;
344	#TODO: elmex, what was this supposed to do? it currently crashes the client.
345	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
346	# $::BIND_EDITOR->stop;
347	# $::BIND_EDITOR->ask_for_bind_and_commit;
348	# $::BIND_EDITOR->hide;
349	} elsif (!$::CONN) {	349	} elsif (!$::CONN) {
350	return 0; # bindings further down need a valid connection	350	return 0; # bindings further down need a valid connection
351		351
352	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
353	$::CONN->user_send ("stay fire");
354	} elsif ($uni == ord ",") {	352	} elsif ($uni == ord ",") {
355	$::CONN->user_send ("take");	353	$::CONN->user_send ("take");
356	} elsif ($uni == ord " ") {	354	} elsif ($uni == ord " ") {
357	$::CONN->user_send ("apply");	355	$::CONN->user_send ("apply");
358	} elsif ($uni == 13) {	356	} elsif ($uni == 13) {
359	$::CONN->user_send ("examine");	357	$::CONN->user_send ("examine");
360	} elsif ($uni == ord ".") {	358	} elsif ($uni == ord ".") {
361	$::CONN->user_send ($self->{completer}{last_command})	359	$::CONN->user_send ($self->{completer}{last_command})
362	if exists $self->{completer}{last_command};	360	if exists $self->{completer}{last_command};
363	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {	361	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
364	$::CONN->user_send ($_) for @$bind_cmd;	362	$::CONN->macro_send ($_) for @macros;
365	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	363	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
366	$::CONN->user_send ("rotateshoottype +");	364	$::CONN->user_send ("rotateshoottype +");
367	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	365	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
368	$::CONN->user_send ("rotateshoottype -");	366	$::CONN->user_send ("rotateshoottype -");
		367	} elsif ($uni == ord '!') {
		368	$self->{completer}->set_prefix ("shout ");
		369	$self->{completer}->show;
369	} elsif ($uni == ord '"') {	370	} elsif ($uni == ord '"') {
370	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	371	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
371	$self->{completer}->show;	372	$self->{completer}->show;
372	} elsif ($uni == ord "'") {	373	} elsif ($uni == ord "'") {
373	$self->{completer}->set_prefix ("");	374	$self->{completer}->set_prefix ("");
374	$self->{completer}->show;	375	$self->{completer}->show;
375	} elsif (exists $DIR{$sym}) {	376	} elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
376	if ($mod & CFPlus::KMOD_SHIFT) {	377	if ($mod & CFPlus::KMOD_SHIFT) {
377	$self->{shft}++;	378	$self->{shft}++;
378	if ($DIR{$sym}[0] != $self->{fire_dir}) {	379	if ($dir->[0] != $self->{fire_dir}) {
379	$::CONN->user_send ("fire $DIR{$sym}[0]");	380	$::CONN->user_send ("fire $dir->[0]");
380	}	381	}
381	$self->{fire_dir} = $DIR{$sym}[0];	382	$self->{fire_dir} = $DIR{$sym}[0];
382	} elsif ($mod & CFPlus::KMOD_CTRL) {	383	} elsif ($mod & CFPlus::KMOD_CTRL) {
383	$self->{ctrl}++;	384	$self->{ctrl}++;
384	$::CONN->user_send ("run $DIR{$sym}[0]");	385	$::CONN->user_send ("run $dir->[0]");
385	} else {	386	} else {
386	$::CONN->user_send ("$DIR{$sym}[1]");	387	$::CONN->user_send ("$dir->[1]");
387	}	388	}
388	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	389	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
389	$self->{completer}->inject_key_down ($ev);	390	$self->{completer}->inject_key_down ($ev);
390	$self->{completer}->show;	391	$self->{completer}->show;
391	} else {	392	} else {
…		…
426	}	427	}
427		428
428	$res	429	$res
429	}	430	}
430		431
		432	sub invoke_visibility_change {
		433	my ($self) = @_;
		434
		435	$self->refresh_hook;
		436
		437	0
		438	}
		439
431	sub set_magicmap {	440	sub set_magicmap {
432	my ($self, $w, $h, $x, $y, $data) = @_;	441	my ($self, $w, $h, $x, $y, $data) = @_;
433		442
434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	443	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	444	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
437	$self->{magicmap} = [$x, $y, $w, $h, $data];	446	$self->{magicmap} = [$x, $y, $w, $h, $data];
438		447
439	$self->update;	448	$self->update;
440	}	449	}
441		450
442	sub draw {	451	sub refresh_hook {
443	my ($self) = @_;	452	my ($self) = @_;
444		453
445	return unless $::MAP;	454	return unless $::MAP;
446		455
447	my $focused = $CFPlus::UI::FOCUS == $self
448	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
449
450	return
451	unless $focused \|\| !$::FAST;
452
453	if (delete $self->{need_update}) {	456	if (delete $self->{need_update}) {
454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	457	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
455		458
456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	459	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	460	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458		461
459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	462	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
…		…
465	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;
466	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;
467		470
468	if ($::CFG->{fow_enable}) {	471	if ($::CFG->{fow_enable}) {
469	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	472	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
470
471	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
472	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
473	glConvolutionFilter2D (
474	GL_CONVOLUTION_2D,
475	GL_ALPHA,
476	3, 3,
477	GL_ALPHA, GL_FLOAT,
478	(pack "f*", @{ $self->{smooth_matrix} }),
479	);
480	glEnable GL_CONVOLUTION_2D;
481	}
482		473
483	$self->{fow_texture} = new CFPlus::Texture	474	$self->{fow_texture} = new CFPlus::Texture
484	w => $w,	475	w => $w,
485	h => $h,	476	h => $h,
486	data => $data,	477	data => $data,
487	internalformat => GL_ALPHA,	478	internalformat => GL_ALPHA,
488	format => GL_ALPHA;	479	format => GL_ALPHA;
489
490	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
491	} else {	480	} else {
492	delete $self->{fow_texture};	481	delete $self->{fow_texture};
493	}	482	}
494		483
495	glNewList $self->{list};	484	glNewList $self->{list};
496		485
497	glPushMatrix;	486	glPushMatrix;
498	glTranslate $sx0, $sy0;	487	glTranslate $sx0, $sy0;
499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	488	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
500		489
501	$::MAP->draw ($dx, $dy, $sw, $sh);	490	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
502		491
503	glScale 32, 32;	492	glScale $self->{tilesize}, $self->{tilesize};
504		493
505	if (my $tex = $self->{fow_texture}) {	494	if (my $tex = $self->{fow_texture}) {
		495	glPushMatrix;
		496	glScale 1/3, 1/3;
506	glEnable GL_TEXTURE_2D;	497	glEnable GL_TEXTURE_2D;
507	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	498	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
508		499
509	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	500	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
510	$self->{fow_texture}->draw_quad_alpha (0, 0);	501	$self->{fow_texture}->draw_quad_alpha (0, 0);
511		502
512	glDisable GL_TEXTURE_2D;	503	glDisable GL_TEXTURE_2D;
		504	glPopMatrix;
513	}	505	}
514		506
515	if ($self->{magicmap}) {	507	if ($self->{magicmap}) {
516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	508	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
517		509
…		…
524	}	516	}
525		517
526	glPopMatrix;	518	glPopMatrix;
527	glEndList;	519	glEndList;
528	}	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;
529		536
530	glCallList $self->{list};	537	glCallList $self->{list};
531		538
532	# TNT2 emulates logops in software (or worse :)	539	# TNT2 emulates logops in software (or worse :)
533	unless ($focused) {	540	unless ($focused) {
…		…
552	$self->SUPER::DESTROY;	559	$self->SUPER::DESTROY;
553	}	560	}
554		561
555	package CFPlus::MapWidget::MapMap;	562	package CFPlus::MapWidget::MapMap;
556		563
		564	use strict;
		565	use utf8;
		566
557	our @ISA = CFPlus::UI::Base::;	567	our @ISA = CFPlus::UI::Base::;
558		568
559	use Time::HiRes qw(time);	569	use Time::HiRes qw(time);
560	use CFPlus::OpenGL;	570	use CFPlus::OpenGL;
561		571
562	sub size_request {	572	sub size_request {
563	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	573	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
564	}	574	}
565		575
566	sub invoke_size_allocate {	576	sub refresh_hook {
567	my ($self, $w, $h) = @_;	577	my ($self) = @_;
568		578
569	$self->update;	579	if ($::MAP && $self->{texture_atime} < time) {
570
571	1
572	}
573
574	sub update {
575	my ($self) = @_;
576
577	delete $self->{texture_atime};
578	$self->SUPER::update;
579	}
580
581	sub _draw {
582	my ($self) = @_;
583
584	$::MAP or return;
585
586	my ($w, $h) = @$self{qw(w h)};	580	my ($w, $h) = @$self{qw(w h)};
587		581
588	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	582	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
589	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	583	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
590		584
591	my $sx = int $::CFG->{map_shift_x} / 32;
592	my $sy = int $::CFG->{map_shift_y} / 32;
593
594	my $ox = 0.5 * ($w - $sw);	585	my $ox = 0.5 * ($w - $sw);
595	my $oy = 0.5 * ($h - $sh);	586	my $oy = 0.5 * ($h - $sh);
596		587
597	glEnable GL_BLEND;	588	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	589	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
599	glEnable GL_TEXTURE_2D;
600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
601		590
602	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
603	$self->{texture_atime} = time + 1/3;	602	$self->{texture_atime} = time + 1/3;
604		603
605	$self->{texture} =	604	$self->{texture} =
606	new CFPlus::Texture	605	new CFPlus::Texture
607	w => $w,	606	w => $w,
608	h => $h,	607	h => $h,
609	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	608	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
610	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;
611	}	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;
612		647
613	$self->{texture}->draw_quad (0, 0);	648	$self->{texture}->draw_quad (0, 0);
614		649
615	glDisable GL_TEXTURE_2D;	650	glDisable GL_TEXTURE_2D;
616		651
617	glTranslate 0.375, 0.375;	652	glTranslate 0.375, 0.375;
618
619	#TODO: map scale is completely borked
620
621	my $x0 = int $ox - $sx + 0.5;
622	my $y0 = int $oy - $sy + 0.5;
623		653
624	glColor 1, 1, 0, 1;	654	glColor 1, 1, 0, 1;
625	glBegin GL_LINE_LOOP;	655	glBegin GL_LINE_LOOP;
626	glVertex $x0 , $y0 ;	656	glVertex $self->{x0} , $self->{y0} ;
627	glVertex $x0 , $y0 + $sh;	657	glVertex $self->{x0} , $self->{y0} + $self->{sh};
628	glVertex $x0 + $sw, $y0 + $sh;	658	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629	glVertex $x0 + $sw, $y0 ;	659	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630	glEnd;	660	glEnd;
631		661
632	glDisable GL_BLEND;	662	glDisable GL_BLEND;
633	}	663	}
634		664
…		…
670		700
671	if ($ev->{button} == 3) {	701	if ($ev->{button} == 3) {
672	(new CFPlus::UI::Menu	702	(new CFPlus::UI::Menu
673	items => [	703	items => [
674	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	704	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
675	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	705	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
676	],	706	],
677	)->popup ($ev);	707	)->popup ($ev);
678	return 1;	708	return 1;
679	}	709	}
680	0	710	0

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.93 by root, Thu Nov 16 19:42:45 2006 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.93 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC