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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

…		…
59		59
60	$self->{completer}->hide	60	$self->{completer}->hide
61	if $self->{completer};	61	if $self->{completer};
62	}	62	}
63		63
		64	sub server_login {
		65	my ($server) = @_;
		66
		67	::stop_game ();
		68	local $::PROFILE->{host} = $server;
		69	::start_game ();
		70	}
		71
		72	sub editor_invoke {
		73	my $editsup = $::CONN && $::CONN->{editor_support}
		74	or return;
		75
		76	CFPlus::background {
		77	print "preparing editor startup...\n";
		78
		79	my $server = $editsup->{gameserver} \|\| "default";
		80	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		81
		82	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		83	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
		84
		85	print "map directory is $mapdir\n";
		86	print "lib directory is $libdir\n";
		87
		88	my $ua = CFPlus::lwp_useragent;
		89
		90	for my $file (qw(archetypes crossfire.0)) {
		91	my $url = "$editsup->{lib_root}$file";
		92	print "mirroring $url...\n";
		93	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
		94	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		95	}
		96
		97	if (1) { # upload a map
		98	my $mapname = $::CONN->{map_info}[0];
		99
		100	my $mappath = "$mapdir/$mapname";
		101
		102	-e $mappath and die "$mappath already exists\n";
		103
		104	print "getting map revision for $mapname...\n";
		105
		106	# try to get the most recent head revision, what a hack,
		107	# this should have been returned while downloading sigh
		108	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		109
		110	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		111	my $rev = $1;
		112
		113	print "downloading revision $rev...\n";
		114
		115	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		116
		117	my $meta = {
		118	%$editsup,
		119	path => $mapname,
		120	revision => $rev,
		121	cf_login => $::PROFILE->{user},
		122	};
		123
		124	require File::Basename;
		125	require File::Path;
		126
		127	File::Path::mkpath (File::Basename::dirname ($mappath));
		128	open my $fh, ">:raw:perlio", "$mappath.meta"
		129	or die "$mappath.meta: $!\n";
		130	print $fh CFPlus::to_json $meta;
		131	close $fh;
		132	open my $fh, ">:raw:perlio:utf8", $mappath
		133	or die "$mappath: $!\n";
		134	print $fh $map;
		135	close $fh;
		136
		137	print "saved as $mappath\n";
		138
		139	print "invoking editor...\n";
		140	exec "/root/s2/gce $mappath";#d#
		141
		142	# now upload it
		143	# require HTTP::Request::Common;
		144	#
		145	# my $res = $ua->post (
		146	# $ENV{CFPLUS_UPLOAD},
		147	# Content_Type => 'multipart/form-data',
		148	# Content => [
		149	# path => $mapname,
		150	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		151	# map => $map,
		152	# revision => $rev,
		153	# cf_login => $ENV{CFPLUS_LOGIN},
		154	# cf_password => $ENV{CFPLUS_PASSWORD},
		155	# comment => "",
		156	# ]
		157	# );
		158	#
		159	# if ($res->is_error) {
		160	# # fatal condition
		161	# warn $res->status_line;
		162	# } else {
		163	# # script replies are marked as {{..}}
		164	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		165	# warn map "$_\n", @msgs;
		166	# }
		167	} else {
		168	die "viewvc parse error, unable to detect revision\n";
		169	}
		170	}
		171	}
		172	}
		173
64	sub invoke_button_down {	174	sub invoke_button_down {
65	my ($self, $ev, $x, $y) = @_;	175	my ($self, $ev, $x, $y) = @_;
66		176
67	if ($ev->{button} == 1) {	177	if ($ev->{button} == 1) {
68	$self->grab_focus;	178	$self->grab_focus;
69	return unless $::CONN;	179	return unless $::CONN;
70		180
71	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	181	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
72	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	182	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
73		183
74	$x -= int 0.5 * $self->{sw};	184	$x -= CFPlus::floor $::MAP->w * 0.5;
75	$y -= int 0.5 * $self->{sh};	185	$y -= CFPlus::floor $::MAP->h * 0.5;
76		186
77	$::CONN->lookat ($x, $y)	187	$::CONN->lookat ($x, $y)
78	if $::CONN;	188	if $::CONN;
79		189
80	} elsif ($ev->{button} == 2) {	190	} elsif ($ev->{button} == 2) {
…		…
93	$::CFG->{map_shift_y} = $bh + $y - $oy;	203	$::CFG->{map_shift_y} = $bh + $y - $oy;
94		204
95	$self->update;	205	$self->update;
96	};	206	};
97	} elsif ($ev->{button} == 3) {	207	} elsif ($ev->{button} == 3) {
98	(new CFPlus::UI::Menu	208	my @items = (
99	items => [
100	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	209	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	210	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	211	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	212	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	213	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
108	$::PICKUP_ENABLE->{state}	217	$::PICKUP_ENABLE->{state}
109	? "Disable automatic pickup"	218	? "Disable automatic pickup"
110	: "Enable automatic pickup",	219	: "Enable automatic pickup",
111	sub { $::PICKUP_ENABLE->toggle }	220	sub { $::PICKUP_ENABLE->toggle }
112	],	221	],
		222	);
		223
		224	if ($::CONN && $::CONN->{editor_support}) {
		225	push @items, [
		226	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
		227	\&editor_invoke,
		228	];
		229
		230	for my $type (qw(test name)) {
		231	$::CONN->{editor_support}{type} ne $type
		232	or next;
		233	my $server = $::CONN->{editor_support}{"${type}server"}
		234	or next;
		235
		236	push @items, [
		237	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		238	sub { server_login $server },
		239	];
		240	}
		241	}
		242
		243	push @items,
113	["Quit",	244	["Quit",
114	sub {	245	sub {
115	if ($::CONN) {	246	if ($::CONN) {
116	&::open_quit_dialog;	247	&::open_quit_dialog;
117	} else {	248	} else {
118	exit;	249	exit;
119	}
120	}	250	}
121	],	251	}
122	],	252	],
		253	;
		254
		255	(new CFPlus::UI::Menu
		256	items => \@items,
123	)->popup ($ev);	257	)->popup ($ev);
124	}	258	}
125		259
126	1	260	1
127	}	261	}
…		…
224	} elsif ($uni == 13) {	358	} elsif ($uni == 13) {
225	$::CONN->user_send ("examine");	359	$::CONN->user_send ("examine");
226	} elsif ($uni == ord ".") {	360	} elsif ($uni == ord ".") {
227	$::CONN->user_send ($self->{completer}{last_command})	361	$::CONN->user_send ($self->{completer}{last_command})
228	if exists $self->{completer}{last_command};	362	if exists $self->{completer}{last_command};
229	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {	363	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
230	$::CONN->user_send ($_) for @$bind_cmd;	364	$::CONN->user_send ($_) for @$bind_cmd;
231	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	365	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
232	$::CONN->user_send ("rotateshoottype +");	366	$::CONN->user_send ("rotateshoottype +");
233	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	367	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
234	$::CONN->user_send ("rotateshoottype -");	368	$::CONN->user_send ("rotateshoottype -");
…		…
295	}	429	}
296		430
297	sub set_magicmap {	431	sub set_magicmap {
298	my ($self, $w, $h, $x, $y, $data) = @_;	432	my ($self, $w, $h, $x, $y, $data) = @_;
299		433
300	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
301	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
302		436
303	$self->{magicmap} = [$x, $y, $w, $h, $data];	437	$self->{magicmap} = [$x, $y, $w, $h, $data];
304		438
305	$self->update;	439	$self->update;
306	}	440	}
…		…
317	unless $focused \|\| !$::FAST;	451	unless $focused \|\| !$::FAST;
318		452
319	if (delete $self->{need_update}) {	453	if (delete $self->{need_update}) {
320	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
321		455
		456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		458
322	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
323	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	460	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
324		461
325	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	462	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
326	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	463	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
327		464
328	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	465	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
329	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	466	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
330		467
331	if ($::CFG->{fow_enable}) {	468	if ($::CFG->{fow_enable}) {
332	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	469	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
333		470
334	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	471	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
335	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	472	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
336	glConvolutionFilter2D (	473	glConvolutionFilter2D (
337	GL_CONVOLUTION_2D,	474	GL_CONVOLUTION_2D,
…		…
359		496
360	glPushMatrix;	497	glPushMatrix;
361	glTranslate $sx0, $sy0;	498	glTranslate $sx0, $sy0;
362	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
363		500
364	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	501	$::MAP->draw ($dx, $dy, $sw, $sh);
365		502
366	glScale 32, 32;	503	glScale 32, 32;
367		504
368	if (my $tex = $self->{fow_texture}) {	505	if (my $tex = $self->{fow_texture}) {
369	glEnable GL_TEXTURE_2D;	506	glEnable GL_TEXTURE_2D;
…		…
376	}	513	}
377		514
378	if ($self->{magicmap}) {	515	if ($self->{magicmap}) {
379	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
380		517
381	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	518	$x += $::MAP->ox + $self->{dx};
382	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	519	$y += $::MAP->oy + $self->{dy};
383		520
384	glTranslate - $x - 1, - $y - 1;	521	glTranslate - $x - 1, - $y - 1;
385	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	522	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
386	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	523	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
387	}	524	}
…		…
744		881
745	$self->SUPER::_draw;	882	$self->SUPER::_draw;
746	}	883	}
747		884
748	1	885	1
		886

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs. Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC