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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.94 by elmex, Mon Dec 4 15:17:14 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.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC