[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.94 by elmex, Mon Dec 4 15:17:14 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
		187	if ($::CONN) {
		188	if ($::IN_BUILD_MODE) {
		189	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		190	} else {
161	$::CONN->lookat ($x, $y)	191	$::CONN->lookat ($x, $y)
162	if $::CONN;	192	}
		193	}
163		194
164	} elsif ($ev->{button} == 2) {	195	} elsif ($ev->{button} == 2) {
165	$self->grab_focus;	196	$self->grab_focus;
166	return unless $::CONN;	197	return unless $::CONN;
167		198
…		…
177	$::CFG->{map_shift_y} = $bh + $y - $oy;	208	$::CFG->{map_shift_y} = $bh + $y - $oy;
178		209
179	$self->update;	210	$self->update;
180	};	211	};
181	} elsif ($ev->{button} == 3) {	212	} elsif ($ev->{button} == 3) {
182	(new CFPlus::UI::Menu	213	my @items = (
183	items => [
184	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	214	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	215	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	216	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	217	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	218	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
192	$::PICKUP_ENABLE->{state}	222	$::PICKUP_ENABLE->{state}
193	? "Disable automatic pickup"	223	? "Disable automatic pickup"
194	: "Enable automatic pickup",	224	: "Enable automatic pickup",
195	sub { $::PICKUP_ENABLE->toggle }	225	sub { $::PICKUP_ENABLE->toggle }
196	],	226	],
197	$::CONN && length $::CONN->{cvs_root}	227	);
		228
		229	if ($::CONN && $::CONN->{editor_support}) {
		230	push @items, [
198	? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	231	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199	\&editor_invoke]	232	\&editor_invoke,
200	: (),	233	];
201	$::CONN && length $::CONN->{test_server}	234
		235	for my $type (qw(test name)) {
		236	$::CONN->{editor_support}{type} ne $type
		237	or next;
		238	my $server = $::CONN->{editor_support}{"${type}server"}
		239	or next;
		240
		241	push @items, [
202	? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",	242	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
203	\&test_server_login]	243	sub { server_login $server },
204	: (),	244	];
		245	}
		246	}
		247
		248	push @items,
205	["Quit",	249	["Quit",
206	sub {	250	sub {
207	if ($::CONN) {	251	if ($::CONN) {
208	&::open_quit_dialog;	252	&::open_quit_dialog;
209	} else {	253	} else {
210	exit;	254	exit;
211	}
212	}	255	}
213	],	256	}
214	],	257	],
		258	;
		259
		260	(new CFPlus::UI::Menu
		261	items => \@items,
215	)->popup ($ev);	262	)->popup ($ev);
216	}	263	}
217		264
218	1	265	1
219	}	266	}
…		…
387	}	434	}
388		435
389	sub set_magicmap {	436	sub set_magicmap {
390	my ($self, $w, $h, $x, $y, $data) = @_;	437	my ($self, $w, $h, $x, $y, $data) = @_;
391		438
392	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	439	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	440	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394		441
395	$self->{magicmap} = [$x, $y, $w, $h, $data];	442	$self->{magicmap} = [$x, $y, $w, $h, $data];
396		443
397	$self->update;	444	$self->update;
398	}	445	}
…		…
409	unless $focused \|\| !$::FAST;	456	unless $focused \|\| !$::FAST;
410		457
411	if (delete $self->{need_update}) {	458	if (delete $self->{need_update}) {
412	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	459	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
413		460
		461	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		462	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		463
414	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	464	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
415	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	465	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
416		466
417	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	467	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
418	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	468	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
419		469
420	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	470	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
421	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	471	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
422		472
423	if ($::CFG->{fow_enable}) {	473	if ($::CFG->{fow_enable}) {
424	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	474	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
425		475
426	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	476	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);	477	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
428	glConvolutionFilter2D (	478	glConvolutionFilter2D (
429	GL_CONVOLUTION_2D,	479	GL_CONVOLUTION_2D,
…		…
451		501
452	glPushMatrix;	502	glPushMatrix;
453	glTranslate $sx0, $sy0;	503	glTranslate $sx0, $sy0;
454	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	504	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
455		505
456	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	506	$::MAP->draw ($dx, $dy, $sw, $sh);
457		507
458	glScale 32, 32;	508	glScale 32, 32;
459		509
460	if (my $tex = $self->{fow_texture}) {	510	if (my $tex = $self->{fow_texture}) {
461	glEnable GL_TEXTURE_2D;	511	glEnable GL_TEXTURE_2D;
…		…
468	}	518	}
469		519
470	if ($self->{magicmap}) {	520	if ($self->{magicmap}) {
471	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	521	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472		522
473	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	523	$x += $::MAP->ox + $self->{dx};
474	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	524	$y += $::MAP->oy + $self->{dy};
475		525
476	glTranslate - $x - 1, - $y - 1;	526	glTranslate - $x - 1, - $y - 1;
477	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	527	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	528	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479	}	529	}
…		…
836		886
837	$self->SUPER::_draw;	887	$self->SUPER::_draw;
838	}	888	}
839		889
840	1	890	1
		891

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.94 by elmex, Mon Dec 4 15:17:14 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.94 by elmex, Mon Dec 4 15:17:14 2006 UTC