[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.124 by root, Wed Dec 26 18:09:30 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
…		…
77	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
78		73
79	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
80	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81		76
82	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
83	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
84		79
85	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
86	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
87		82
88	my $ua = CFPlus::lwp_useragent;	83	my $ua = CFPlus::lwp_useragent;
…		…
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
		182	if ($::CONN) {
187	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
188	if $::CONN;	184	}
189		185
190	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
191	$self->grab_focus;	187	$self->grab_focus;
192	return unless $::CONN;	188	return unless $::CONN;
193		189
…		…
279		275
280	1	276	1
281	}	277	}
282		278
283	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
284	(	282	(
285	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
286	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
287	)	285	)
288	}	286	}
289		287
290	sub update {	288	sub update {
291	my ($self) = @_;	289	my ($self) = @_;
…		…
293	$self->{need_update} = 1;	291	$self->{need_update} = 1;
294	$self->SUPER::update;	292	$self->SUPER::update;
295	}	293	}
296		294
297	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
298	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
299	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
300	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
301	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
302	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
303	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
304	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
305	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
306		305
307	CFPlus::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
308	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
309	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
310	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
311	);	314	);
312		315
313	sub invoke_key_down {	316	sub invoke_key_down {
314	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
315		318
…		…
317	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
318	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
319		322
320	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
321		324
322	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
323	$::PL_WINDOW->toggle_visibility;
324	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
325	$::HELP_WINDOW->toggle_visibility;
326	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327	::toggle_player_page ($::STATS_PAGE);
328	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
329	::toggle_player_page ($::SKILL_PAGE);
330	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
331	::toggle_player_page ($::SPELL_PAGE);
332	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333	::toggle_player_page ($::INVENTORY_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335	$::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) {
350	return 0; # bindings further down need a valid connection
351
352	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
353	$::CONN->user_send ("stay fire");
354	} elsif ($uni == ord ",") {
355	$::CONN->user_send ("take");
356	} elsif ($uni == ord " ") {
357	$::CONN->user_send ("apply");
358	} elsif ($uni == 13) {
359	$::CONN->user_send ("examine");
360	} elsif ($uni == ord ".") {
361	$::CONN->user_send ($self->{completer}{last_command})
362	if exists $self->{completer}{last_command};
363	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
364	$::CONN->user_send ($_) for @$bind_cmd;
365	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
366	$::CONN->user_send ("rotateshoottype +");
367	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
368	$::CONN->user_send ("rotateshoottype -");
369	} elsif ($uni == ord '"') {
370	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
371	$self->{completer}->show;
372	} elsif ($uni == ord "'") {
373	$self->{completer}->set_prefix ("");
374	$self->{completer}->show;
375	} elsif (exists $DIR{$sym}) {
376	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
377	$self->{shft}++;	327	$self->{shft}++;
378	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
379	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
380	}	330	}
381	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
382	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
383	$self->{ctrl}++;	333	$self->{ctrl}++;
384	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
385	} else {	335	} else {
386	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
387	}	337	}
388	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
389	$self->{completer}->inject_key_down ($ev);
390	$self->{completer}->show;
391	} else {
392	return 0;	339	return 1;
393	}
394
395	1	340	}
		341
		342	0
396	}	343	}
397		344
398	sub invoke_key_up {	345	sub invoke_key_up {
399	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
400		347
…		…
407	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
408	delete $self->{fire_dir};	355	delete $self->{fire_dir};
409	$res = 1;	356	$res = 1;
410	}	357	}
411	} else {	358	} else {
412	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
413	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
414	delete $self->{fire_dir};	361	delete $self->{fire_dir};
415	$res = 1;	362	$res = 1;
416	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	363	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT)
		364	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
417	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
418	delete $self->{fire_dir};	366	delete $self->{fire_dir};
419	$res = 1;	367	$res = 1;
420	}	368	}
421	}	369	}
…		…
426	}	374	}
427		375
428	$res	376	$res
429	}	377	}
430		378
		379	sub invoke_visibility_change {
		380	my ($self) = @_;
		381
		382	$self->refresh_hook;
		383
		384	0
		385	}
		386
431	sub set_magicmap {	387	sub set_magicmap {
432	my ($self, $w, $h, $x, $y, $data) = @_;	388	my ($self, $w, $h, $x, $y, $data) = @_;
433		389
434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
437	$self->{magicmap} = [$x, $y, $w, $h, $data];	393	$self->{magicmap} = [$x, $y, $w, $h, $data];
438		394
439	$self->update;	395	$self->update;
440	}	396	}
441		397
		398	sub refresh_hook {
		399	my ($self) = @_;
		400
		401	if ($::MAP && $::CONN) {
		402	if (delete $self->{need_update}) {
		403	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		404
		405	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		406	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		407
		408	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		409	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		410
		411	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		412	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		413
		414	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		415	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		416
		417	if ($::CFG->{fow_enable}) {
		418	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		419
		420	$self->{fow_texture} = new CFPlus::Texture
		421	w => $w,
		422	h => $h,
		423	data => $data,
		424	internalformat => GL_ALPHA,
		425	format => GL_ALPHA;
		426	} else {
		427	delete $self->{fow_texture};
		428	}
		429
		430	glNewList ($self->{list} \|\|= glGenList);
		431
		432	glPushMatrix;
		433	glTranslate $sx0, $sy0;
		434	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		435
		436	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		437
		438	glScale $self->{tilesize}, $self->{tilesize};
		439
		440	if (my $tex = $self->{fow_texture}) {
		441	glPushMatrix;
		442	glScale 1/3, 1/3;
		443	glEnable GL_TEXTURE_2D;
		444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		445
		446	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		447	$self->{fow_texture}->draw_quad_alpha (0, 0);
		448
		449	glDisable GL_TEXTURE_2D;
		450	glPopMatrix;
		451	}
		452
		453	if ($self->{magicmap}) {
		454	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		455
		456	$x += $::MAP->ox + $self->{dx};
		457	$y += $::MAP->oy + $self->{dy};
		458
		459	glTranslate - $x - 1, - $y - 1;
		460	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		461	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		462	}
		463
		464	glPopMatrix;
		465	glEndList;
		466	}
		467	} else {
		468	glDeleteList delete $self->{list}
		469	if $self->{list};
		470	}
		471	}
		472
442	sub draw {	473	sub draw {
443	my ($self) = @_;	474	my ($self) = @_;
444		475
445	return unless $::MAP;	476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		477
		478	return unless $self->{list};
446		479
447	my $focused = $CFPlus::UI::FOCUS == $self	480	my $focused = $CFPlus::UI::FOCUS == $self
448	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	481	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
449		482
450	return	483	return
451	unless $focused \|\| !$::FAST;	484	unless $focused \|\| !$::FAST;
452		485
453	if (delete $self->{need_update}) {
454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
455
456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458
459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
460	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
461
462	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
463	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
464
465	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;
467
468	if ($::CFG->{fow_enable}) {
469	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
483	$self->{fow_texture} = new CFPlus::Texture
484	w => $w,
485	h => $h,
486	data => $data,
487	internalformat => GL_ALPHA,
488	format => GL_ALPHA;
489
490	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
491	} else {
492	delete $self->{fow_texture};
493	}
494
495	glNewList $self->{list};
496
497	glPushMatrix;
498	glTranslate $sx0, $sy0;
499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
500
501	$::MAP->draw ($dx, $dy, $sw, $sh);
502
503	glScale 32, 32;
504
505	if (my $tex = $self->{fow_texture}) {
506	glEnable GL_TEXTURE_2D;
507	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
508
509	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
510	$self->{fow_texture}->draw_quad_alpha (0, 0);
511
512	glDisable GL_TEXTURE_2D;
513	}
514
515	if ($self->{magicmap}) {
516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
517
518	$x += $::MAP->ox + $self->{dx};
519	$y += $::MAP->oy + $self->{dy};
520
521	glTranslate - $x - 1, - $y - 1;
522	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
523	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
524	}
525
526	glPopMatrix;
527	glEndList;
528	}
529
530	glCallList $self->{list};	486	glCallList $self->{list};
531		487
532	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
533	unless ($focused) {	489	unless ($focused) {
534	glColor 0.4, 0.2, 0.2, 0.6;	490	glColor_premultiply 0, 0, 1, 0.25;
535	glEnable GL_BLEND;	491	glEnable GL_BLEND;
536	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
537	glBegin GL_QUADS;	493	glBegin GL_QUADS;
538	glVertex 0, 0;	494	glVertex 0, 0;
539	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
540	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
541	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;
…		…
552	$self->SUPER::DESTROY;	508	$self->SUPER::DESTROY;
553	}	509	}
554		510
555	package CFPlus::MapWidget::MapMap;	511	package CFPlus::MapWidget::MapMap;
556		512
		513	use strict;
		514	use utf8;
		515
557	our @ISA = CFPlus::UI::Base::;	516	our @ISA = CFPlus::UI::Base::;
558		517
559	use Time::HiRes qw(time);	518	use Time::HiRes qw(time);
560	use CFPlus::OpenGL;	519	use CFPlus::OpenGL;
561		520
562	sub size_request {	521	sub size_request {
563	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	522	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
564	}	523	}
565		524
566	sub invoke_size_allocate {	525	sub refresh_hook {
567	my ($self, $w, $h) = @_;	526	my ($self) = @_;
568		527
569	$self->update;	528	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)};	529	my ($w, $h) = @$self{qw(w h)};
587		530
588	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	531	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
589	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	532	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
590		533
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);	534	my $ox = 0.5 * ($w - $sw);
595	my $oy = 0.5 * ($h - $sh);	535	my $oy = 0.5 * ($h - $sh);
596		536
597	glEnable GL_BLEND;	537	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	538	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		539
602	if ($self->{texture_atime} < time) {	540	#TODO: map scale is completely borked
		541
		542	my $x0 = int $ox - $sx + 0.5;
		543	my $y0 = int $oy - $sy + 0.5;
		544
		545	$self->{sw} = $sw;
		546	$self->{sh} = $sh;
		547
		548	$self->{x0} = $x0;
		549	$self->{y0} = $y0;
		550
603	$self->{texture_atime} = time + 1/3;	551	$self->{texture_atime} = time + 1/3;
604		552
605	$self->{texture} =	553	$self->{texture} =
606	new CFPlus::Texture	554	new CFPlus::Texture
607	w => $w,	555	w => $w,
608	h => $h,	556	h => $h,
609	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	557	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;	558	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611	}	559	}
		560	}
		561
		562	sub invoke_visibility_change {
		563	my ($self) = @_;
		564
		565	$self->refresh_hook;
		566
		567	0
		568	}
		569
		570	sub invoke_size_allocate {
		571	my ($self, $w, $h) = @_;
		572
		573	$self->update;
		574
		575	1
		576	}
		577
		578	sub update {
		579	my ($self) = @_;
		580
		581	delete $self->{texture_atime};
		582	$self->SUPER::update;
		583	}
		584
		585	sub _draw {
		586	my ($self) = @_;
		587
		588	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		589
		590	$self->{texture} or return;
		591
		592	glEnable GL_BLEND;
		593	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		594	glEnable GL_TEXTURE_2D;
		595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
612		596
613	$self->{texture}->draw_quad (0, 0);	597	$self->{texture}->draw_quad (0, 0);
614		598
615	glDisable GL_TEXTURE_2D;	599	glDisable GL_TEXTURE_2D;
616		600
617	glTranslate 0.375, 0.375;	601	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		602
624	glColor 1, 1, 0, 1;	603	glColor 1, 1, 0, 1;
625	glBegin GL_LINE_LOOP;	604	glBegin GL_LINE_LOOP;
626	glVertex $x0 , $y0 ;	605	glVertex $self->{x0} , $self->{y0} ;
627	glVertex $x0 , $y0 + $sh;	606	glVertex $self->{x0} , $self->{y0} + $self->{sh};
628	glVertex $x0 + $sw, $y0 + $sh;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629	glVertex $x0 + $sw, $y0 ;	608	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630	glEnd;	609	glEnd;
631		610
632	glDisable GL_BLEND;	611	glDisable GL_BLEND;
633	}	612	}
634		613
…		…
670		649
671	if ($ev->{button} == 3) {	650	if ($ev->{button} == 3) {
672	(new CFPlus::UI::Menu	651	(new CFPlus::UI::Menu
673	items => [	652	items => [
674	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	653	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
675	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	654	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
676	],	655	],
677	)->popup ($ev);	656	)->popup ($ev);
678	return 1;	657	return 1;
679	}	658	}
680	0	659	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.124 by root, Wed Dec 26 18:09:30 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.124 by root, Wed Dec 26 18:09:30 2007 UTC