[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.122 by root, Wed Dec 5 10:49:17 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",
…		…
19	my $class = shift;	20	my $class = shift;
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	tilesize => 32,
25
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	@_	26	@_
33	);	27	);
34		28
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39
40	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
41	}	36	}
42		37
43	sub add_command {	38	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		40
…		…
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	56	if $::COMPLETER;
62	}	57	}
63		58
64	sub server_login {	59	sub server_login {
65	my ($server) = @_;	60	my ($server) = @_;
66		61
…		…
125	require File::Path;	120	require File::Path;
126		121
127	File::Path::mkpath (File::Basename::dirname ($mappath));	122	File::Path::mkpath (File::Basename::dirname ($mappath));
128	open my $fh, ">:raw:perlio", "$mappath.meta"	123	open my $fh, ">:raw:perlio", "$mappath.meta"
129	or die "$mappath.meta: $!\n";	124	or die "$mappath.meta: $!\n";
130	print $fh CFPlus::to_json $meta;	125	print $fh CFPlus::encode_json $meta;
131	close $fh;	126	close $fh;
132	open my $fh, ">:raw:perlio:utf8", $mappath	127	open my $fh, ">:raw:perlio:utf8", $mappath
133	or die "$mappath: $!\n";	128	or die "$mappath: $!\n";
134	print $fh $map;	129	print $fh $map;
135	close $fh;	130	close $fh;
…		…
176		171
177	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
178	$self->grab_focus;	173	$self->grab_focus;
179	return unless $::CONN;	174	return unless $::CONN;
180		175
181	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	176	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};	177	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183		178
184	$x -= CFPlus::floor $::MAP->w * 0.5;	179	$x -= CFPlus::floor $::MAP->w * 0.5;
185	$y -= CFPlus::floor $::MAP->h * 0.5;	180	$y -= CFPlus::floor $::MAP->h * 0.5;
186		181
187	if ($::CONN) {	182	if ($::CONN) {
188	if ($::IN_BUILD_MODE) {
189	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190	} else {
191	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
192	}
193	}	184	}
194		185
195	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
196	$self->grab_focus;	187	$self->grab_focus;
197	return unless $::CONN;	188	return unless $::CONN;
…		…
284		275
285	1	276	1
286	}	277	}
287		278
288	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
289	(	282	(
290	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
291	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
292	)	285	)
293	}	286	}
294		287
295	sub update {	288	sub update {
296	my ($self) = @_;	289	my ($self) = @_;
…		…
298	$self->{need_update} = 1;	291	$self->{need_update} = 1;
299	$self->SUPER::update;	292	$self->SUPER::update;
300	}	293	}
301		294
302	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
303	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
304	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
305	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
306	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
307	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
308	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
309	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
310	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
311		305
312	CFPlus::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
313	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
314	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
315	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
316	);	314	);
317		315
318	sub invoke_key_down {	316	sub invoke_key_down {
319	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
320		318
…		…
322	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
323	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
324		322
325	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
326		324
327	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
328	$::PL_WINDOW->toggle_visibility;
329	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
330	$::HELP_WINDOW->toggle_visibility;
331	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
332	::toggle_player_page ($::STATS_PAGE);
333	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
334	::toggle_player_page ($::SKILL_PAGE);
335	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
336	::toggle_player_page ($::SPELL_PAGE);
337	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
338	::toggle_player_page ($::INVENTORY_PAGE);
339	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
340	$::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) {
355	return 0; # bindings further down need a valid connection
356
357	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
358	$::CONN->user_send ("stay fire");
359	} elsif ($uni == ord ",") {
360	$::CONN->user_send ("take");
361	} elsif ($uni == ord " ") {
362	$::CONN->user_send ("apply");
363	} elsif ($uni == 13) {
364	$::CONN->user_send ("examine");
365	} elsif ($uni == ord ".") {
366	$::CONN->user_send ($self->{completer}{last_command})
367	if exists $self->{completer}{last_command};
368	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
369	$::CONN->user_send ($_) for @$bind_cmd;
370	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
371	$::CONN->user_send ("rotateshoottype +");
372	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
373	$::CONN->user_send ("rotateshoottype -");
374	} elsif ($uni == ord '"') {
375	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
376	$self->{completer}->show;
377	} elsif ($uni == ord "'") {
378	$self->{completer}->set_prefix ("");
379	$self->{completer}->show;
380	} elsif (exists $DIR{$sym}) {
381	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
382	$self->{shft}++;	327	$self->{shft}++;
383	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
384	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
385	}	330	}
386	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $DIR{$sym}[0];
387	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
388	$self->{ctrl}++;	333	$self->{ctrl}++;
389	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
390	} else {	335	} else {
391	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
392	}	337	}
393	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
394	$self->{completer}->inject_key_down ($ev);
395	$self->{completer}->show;
396	} else {
397	return 0;	339	return 1;
398	}
399
400	1	340	}
		341
		342	0
401	}	343	}
402		344
403	sub invoke_key_up {	345	sub invoke_key_up {
404	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
405		347
…		…
431	}	373	}
432		374
433	$res	375	$res
434	}	376	}
435		377
		378	sub invoke_visibility_change {
		379	my ($self) = @_;
		380
		381	$self->refresh_hook;
		382
		383	0
		384	}
		385
436	sub set_magicmap {	386	sub set_magicmap {
437	my ($self, $w, $h, $x, $y, $data) = @_;	387	my ($self, $w, $h, $x, $y, $data) = @_;
438		388
439	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	389	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	390	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
442	$self->{magicmap} = [$x, $y, $w, $h, $data];	392	$self->{magicmap} = [$x, $y, $w, $h, $data];
443		393
444	$self->update;	394	$self->update;
445	}	395	}
446		396
		397	sub refresh_hook {
		398	my ($self) = @_;
		399
		400	if ($::MAP && $::CONN) {
		401	if (delete $self->{need_update}) {
		402	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		403
		404	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		405	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		406
		407	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		408	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		409
		410	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		411	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		412
		413	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		414	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		415
		416	if ($::CFG->{fow_enable}) {
		417	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		418
		419	$self->{fow_texture} = new CFPlus::Texture
		420	w => $w,
		421	h => $h,
		422	data => $data,
		423	internalformat => GL_ALPHA,
		424	format => GL_ALPHA;
		425	} else {
		426	delete $self->{fow_texture};
		427	}
		428
		429	glNewList ($self->{list} \|\|= glGenList);
		430
		431	glPushMatrix;
		432	glTranslate $sx0, $sy0;
		433	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		434
		435	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		436
		437	glScale $self->{tilesize}, $self->{tilesize};
		438
		439	if (my $tex = $self->{fow_texture}) {
		440	glPushMatrix;
		441	glScale 1/3, 1/3;
		442	glEnable GL_TEXTURE_2D;
		443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		444
		445	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		446	$self->{fow_texture}->draw_quad_alpha (0, 0);
		447
		448	glDisable GL_TEXTURE_2D;
		449	glPopMatrix;
		450	}
		451
		452	if ($self->{magicmap}) {
		453	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		454
		455	$x += $::MAP->ox + $self->{dx};
		456	$y += $::MAP->oy + $self->{dy};
		457
		458	glTranslate - $x - 1, - $y - 1;
		459	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		460	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		461	}
		462
		463	glPopMatrix;
		464	glEndList;
		465	}
		466	} else {
		467	glDeleteList delete $self->{list}
		468	if $self->{list};
		469	}
		470	}
		471
447	sub draw {	472	sub draw {
448	my ($self) = @_;	473	my ($self) = @_;
449		474
450	return unless $::MAP;	475	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		476
		477	return unless $self->{list};
451		478
452	my $focused = $CFPlus::UI::FOCUS == $self	479	my $focused = $CFPlus::UI::FOCUS == $self
453	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	480	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
454		481
455	return	482	return
456	unless $focused \|\| !$::FAST;	483	unless $focused \|\| !$::FAST;
457		484
458	if (delete $self->{need_update}) {
459	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
460
461	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
464	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
465	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
466
467	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
468	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
469
470	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
473	if ($::CFG->{fow_enable}) {
474	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
488	$self->{fow_texture} = new CFPlus::Texture
489	w => $w,
490	h => $h,
491	data => $data,
492	internalformat => GL_ALPHA,
493	format => GL_ALPHA;
494
495	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496	} else {
497	delete $self->{fow_texture};
498	}
499
500	glNewList $self->{list};
501
502	glPushMatrix;
503	glTranslate $sx0, $sy0;
504	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505
506	$::MAP->draw ($dx, $dy, $sw, $sh);
507
508	glScale 32, 32;
509
510	if (my $tex = $self->{fow_texture}) {
511	glEnable GL_TEXTURE_2D;
512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513
514	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515	$self->{fow_texture}->draw_quad_alpha (0, 0);
516
517	glDisable GL_TEXTURE_2D;
518	}
519
520	if ($self->{magicmap}) {
521	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522
523	$x += $::MAP->ox + $self->{dx};
524	$y += $::MAP->oy + $self->{dy};
525
526	glTranslate - $x - 1, - $y - 1;
527	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
528	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
529	}
530
531	glPopMatrix;
532	glEndList;
533	}
534
535	glCallList $self->{list};	485	glCallList $self->{list};
536		486
537	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
538	unless ($focused) {	488	unless ($focused) {
539	glColor 0.4, 0.2, 0.2, 0.6;	489	glColor_premultiply 0, 0, 1, 0.25;
540	glEnable GL_BLEND;	490	glEnable GL_BLEND;
541	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542	glBegin GL_QUADS;	492	glBegin GL_QUADS;
543	glVertex 0, 0;	493	glVertex 0, 0;
544	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
545	glVertex $::WIDTH, $::HEIGHT;	495	glVertex $::WIDTH, $::HEIGHT;
546	glVertex $::WIDTH, 0;	496	glVertex $::WIDTH, 0;
…		…
557	$self->SUPER::DESTROY;	507	$self->SUPER::DESTROY;
558	}	508	}
559		509
560	package CFPlus::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
561		511
		512	use strict;
		513	use utf8;
		514
562	our @ISA = CFPlus::UI::Base::;	515	our @ISA = CFPlus::UI::Base::;
563		516
564	use Time::HiRes qw(time);	517	use Time::HiRes qw(time);
565	use CFPlus::OpenGL;	518	use CFPlus::OpenGL;
566		519
567	sub size_request {	520	sub size_request {
568	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	521	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
569	}	522	}
570		523
571	sub invoke_size_allocate {	524	sub refresh_hook {
572	my ($self, $w, $h) = @_;	525	my ($self) = @_;
573		526
574	$self->update;	527	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)};	528	my ($w, $h) = @$self{qw(w h)};
592		529
593	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	530	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
594	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	531	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
595		532
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);	533	my $ox = 0.5 * ($w - $sw);
600	my $oy = 0.5 * ($h - $sh);	534	my $oy = 0.5 * ($h - $sh);
601		535
602	glEnable GL_BLEND;	536	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
603	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	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		538
607	if ($self->{texture_atime} < time) {	539	#TODO: map scale is completely borked
		540
		541	my $x0 = int $ox - $sx + 0.5;
		542	my $y0 = int $oy - $sy + 0.5;
		543
		544	$self->{sw} = $sw;
		545	$self->{sh} = $sh;
		546
		547	$self->{x0} = $x0;
		548	$self->{y0} = $y0;
		549
608	$self->{texture_atime} = time + 1/3;	550	$self->{texture_atime} = time + 1/3;
609		551
610	$self->{texture} =	552	$self->{texture} =
611	new CFPlus::Texture	553	new CFPlus::Texture
612	w => $w,	554	w => $w,
613	h => $h,	555	h => $h,
614	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	556	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;	557	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
616	}	558	}
		559	}
		560
		561	sub invoke_visibility_change {
		562	my ($self) = @_;
		563
		564	$self->refresh_hook;
		565
		566	0
		567	}
		568
		569	sub invoke_size_allocate {
		570	my ($self, $w, $h) = @_;
		571
		572	$self->update;
		573
		574	1
		575	}
		576
		577	sub update {
		578	my ($self) = @_;
		579
		580	delete $self->{texture_atime};
		581	$self->SUPER::update;
		582	}
		583
		584	sub _draw {
		585	my ($self) = @_;
		586
		587	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		588
		589	$self->{texture} or return;
		590
		591	glEnable GL_BLEND;
		592	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		593	glEnable GL_TEXTURE_2D;
		594	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
617		595
618	$self->{texture}->draw_quad (0, 0);	596	$self->{texture}->draw_quad (0, 0);
619		597
620	glDisable GL_TEXTURE_2D;	598	glDisable GL_TEXTURE_2D;
621		599
622	glTranslate 0.375, 0.375;	600	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		601
629	glColor 1, 1, 0, 1;	602	glColor 1, 1, 0, 1;
630	glBegin GL_LINE_LOOP;	603	glBegin GL_LINE_LOOP;
631	glVertex $x0 , $y0 ;	604	glVertex $self->{x0} , $self->{y0} ;
632	glVertex $x0 , $y0 + $sh;	605	glVertex $self->{x0} , $self->{y0} + $self->{sh};
633	glVertex $x0 + $sw, $y0 + $sh;	606	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
634	glVertex $x0 + $sw, $y0 ;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
635	glEnd;	608	glEnd;
636		609
637	glDisable GL_BLEND;	610	glDisable GL_BLEND;
638	}	611	}
639		612
…		…
675		648
676	if ($ev->{button} == 3) {	649	if ($ev->{button} == 3) {
677	(new CFPlus::UI::Menu	650	(new CFPlus::UI::Menu
678	items => [	651	items => [
679	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	652	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
680	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	653	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681	],	654	],
682	)->popup ($ev);	655	)->popup ($ev);
683	return 1;	656	return 1;
684	}	657	}
685	0	658	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.122 by root, Wed Dec 5 10:49:17 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.122 by root, Wed Dec 5 10:49:17 2007 UTC