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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.84 by root, Sun Oct 1 18:17:38 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 test_server_login {	64	sub server_login {
65	return unless	65	my ($server) = @_;
66	$::CONN && length $::CONN->{test_server};
67		66
68	my $server = $::CONN->{test_server};
69	::stop_game ();	67	::stop_game ();
70	local $::PROFILE->{host} = $server;	68	local $::PROFILE->{host} = $server;
71	::start_game ();	69	::start_game ();
72	}	70	}
73		71
74	sub editor_invoke {	72	sub editor_invoke {
75	return unless $::CONN;	73	my $editsup = $::CONN && $::CONN->{editor_support}
		74	or return;
76		75
77	# putting the password into the env is somewhat tasteless	76	CFPlus::background {
78	local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};	77	print "preparing editor startup...\n";
79	local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80	local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81	local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82		78
83	CFPlus::set_proxy;	79	my $server = $editsup->{gameserver} \|\| "default";
		80	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84		81
85	my $map = "map:$::CONN->{map_info}[0]";	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;
86		84
87	if (fork == 0) {	85	print "map directory is $mapdir\n";
88	$SIG{__DIE__} = sub {	86	print "lib directory is $libdir\n";
89	warn "@_";	87
90	CFPlus::_exit 99;	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";
91	};	95	}
92		96
93	# TODO: move into editor	97	if (1) { # upload a map
94	require LWP::UserAgent;	98	my $mapname = $::CONN->{map_info}[0];
95		99
96	my $ua = LWP::UserAgent->new (	100	my $mappath = "$mapdir/$mapname";
97	agent => "cfplus $CFPlus::VERSION",
98	keep_alive => 1,
99	env_proxy => 1,
100	);
101		101
102	if ($map =~ /^map:(.*)/) {	102	-e $mappath and die "$mappath already exists\n";
103	my $mapname = $1;	103
		104	print "getting map revision for $mapname...\n";
		105
104	# try to get the most recent head revision, what a hack	106	# try to get the most recent head revision, what a hack,
		107	# this should have been returned while downloading sigh
105	my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content;	108	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
106		109
107	if ($log =~ /\?rev=(\d+\.\d+)"/) {	110	if ($log =~ /\?rev=(\d+\.\d+)"/) {
108	my $rev = $1;	111	my $rev = $1;
109	my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content;	112
110	warn "revision is $rev " .(length $map)."\n";#d#	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#
111		141
112	# now upload it	142	# now upload it
113	my $comment = "some comment";
114
115	require HTTP::Request::Common;	143	# require HTTP::Request::Common;
116		144	#
117	my $res = $ua->post (	145	# my $res = $ua->post (
118	$ENV{CFPLUS_UPLOAD},	146	# $ENV{CFPLUS_UPLOAD},
119	Content_Type => 'multipart/form-data',	147	# Content_Type => 'multipart/form-data',
120	Content => [	148	# Content => [
121	path => $mapname,	149	# path => $mapname,
122	mapdir => $ENV{CROSSFIRE_MAPDIR},	150	# mapdir => $ENV{CROSSFIRE_MAPDIR},
123	map => $map,	151	# map => $map,
124	revision => $rev,	152	# revision => $rev,
125	cf_login => $ENV{CFPLUS_LOGIN},	153	# cf_login => $ENV{CFPLUS_LOGIN},
126	cf_password => $ENV{CFPLUS_PASSWORD},	154	# cf_password => $ENV{CFPLUS_PASSWORD},
127	comment => "",	155	# comment => "",
128	]	156	# ]
129	);	157	# );
130		158	#
131	if ($res->is_error) {	159	# if ($res->is_error) {
132	# fatal condition	160	# # fatal condition
133	warn $res->status_line;	161	# warn $res->status_line;
134	} else {	162	# } else {
135	# script replies are marked as {{..}}	163	# # script replies are marked as {{..}}
136	my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;	164	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137	warn map "$_\n", @msgs;	165	# warn map "$_\n", @msgs;
138	}	166	# }
139	} else {	167	} else {
140	# error, could not detect revision	168	die "viewvc parse error, unable to detect revision\n";
141	}	169	}
142	}	170	}
143
144	CFPlus::_exit;
145	}	171	}
146	}	172	}
147		173
148	sub invoke_button_down {	174	sub invoke_button_down {
149	my ($self, $ev, $x, $y) = @_;	175	my ($self, $ev, $x, $y) = @_;
150		176
151	if ($ev->{button} == 1) {	177	if ($ev->{button} == 1) {
152	$self->grab_focus;	178	$self->grab_focus;
153	return unless $::CONN;	179	return unless $::CONN;
154		180
155	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};
156	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};
157		183
158	$x -= int 0.5 * $self->{sw};	184	$x -= CFPlus::floor $::MAP->w * 0.5;
159	$y -= int 0.5 * $self->{sh};	185	$y -= CFPlus::floor $::MAP->h * 0.5;
160		186
161	$::CONN->lookat ($x, $y)	187	$::CONN->lookat ($x, $y)
162	if $::CONN;	188	if $::CONN;
163		189
164	} elsif ($ev->{button} == 2) {	190	} elsif ($ev->{button} == 2) {
…		…
177	$::CFG->{map_shift_y} = $bh + $y - $oy;	203	$::CFG->{map_shift_y} = $bh + $y - $oy;
178		204
179	$self->update;	205	$self->update;
180	};	206	};
181	} elsif ($ev->{button} == 3) {	207	} elsif ($ev->{button} == 3) {
182	(new CFPlus::UI::Menu	208	my @items = (
183	items => [
184	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	209	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	210	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	211	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	212	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	213	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
192	$::PICKUP_ENABLE->{state}	217	$::PICKUP_ENABLE->{state}
193	? "Disable automatic pickup"	218	? "Disable automatic pickup"
194	: "Enable automatic pickup",	219	: "Enable automatic pickup",
195	sub { $::PICKUP_ENABLE->toggle }	220	sub { $::PICKUP_ENABLE->toggle }
196	],	221	],
197	$::CONN && length $::CONN->{cvs_root}	222	);
		223
		224	if ($::CONN && $::CONN->{editor_support}) {
		225	push @items, [
198	? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	226	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199	\&editor_invoke]	227	\&editor_invoke,
200	: (),	228	];
201	$::CONN && length $::CONN->{test_server}	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, [
202	? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",	237	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
203	\&test_server_login]	238	sub { server_login $server },
204	: (),	239	];
		240	}
		241	}
		242
		243	push @items,
205	["Quit",	244	["Quit",
206	sub {	245	sub {
207	if ($::CONN) {	246	if ($::CONN) {
208	&::open_quit_dialog;	247	&::open_quit_dialog;
209	} else {	248	} else {
210	exit;	249	exit;
211	}
212	}	250	}
213	],	251	}
214	],	252	],
		253	;
		254
		255	(new CFPlus::UI::Menu
		256	items => \@items,
215	)->popup ($ev);	257	)->popup ($ev);
216	}	258	}
217		259
218	1	260	1
219	}	261	}
…		…
387	}	429	}
388		430
389	sub set_magicmap {	431	sub set_magicmap {
390	my ($self, $w, $h, $x, $y, $data) = @_;	432	my ($self, $w, $h, $x, $y, $data) = @_;
391		433
392	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	434	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	435	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394		436
395	$self->{magicmap} = [$x, $y, $w, $h, $data];	437	$self->{magicmap} = [$x, $y, $w, $h, $data];
396		438
397	$self->update;	439	$self->update;
398	}	440	}
…		…
409	unless $focused \|\| !$::FAST;	451	unless $focused \|\| !$::FAST;
410		452
411	if (delete $self->{need_update}) {	453	if (delete $self->{need_update}) {
412	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	454	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
413		455
		456	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		457	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		458
414	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	459	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
415	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	460	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
416		461
417	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	462	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
418	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	463	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
419		464
420	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	465	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
421	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	466	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
422		467
423	if ($::CFG->{fow_enable}) {	468	if ($::CFG->{fow_enable}) {
424	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);
425		470
426	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
427	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	472	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
428	glConvolutionFilter2D (	473	glConvolutionFilter2D (
429	GL_CONVOLUTION_2D,	474	GL_CONVOLUTION_2D,
…		…
451		496
452	glPushMatrix;	497	glPushMatrix;
453	glTranslate $sx0, $sy0;	498	glTranslate $sx0, $sy0;
454	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	499	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
455		500
456	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	501	$::MAP->draw ($dx, $dy, $sw, $sh);
457		502
458	glScale 32, 32;	503	glScale 32, 32;
459		504
460	if (my $tex = $self->{fow_texture}) {	505	if (my $tex = $self->{fow_texture}) {
461	glEnable GL_TEXTURE_2D;	506	glEnable GL_TEXTURE_2D;
…		…
468	}	513	}
469		514
470	if ($self->{magicmap}) {	515	if ($self->{magicmap}) {
471	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	516	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472		517
473	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	518	$x += $::MAP->ox + $self->{dx};
474	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	519	$y += $::MAP->oy + $self->{dy};
475		520
476	glTranslate - $x - 1, - $y - 1;	521	glTranslate - $x - 1, - $y - 1;
477	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	522	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	523	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479	}	524	}
…		…
836		881
837	$self->SUPER::_draw;	882	$self->SUPER::_draw;
838	}	883	}
839		884
840	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.84 by root, Sun Oct 1 18:17:38 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.84 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC