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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.91 by root, Tue Nov 7 22:41:27 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
		72	sub check_lwp($) {
		73	my ($res) = @_;
		74
		75	$res->is_error
		76	and die $res->status_line;
		77
		78	$res
		79	}
		80
74	sub editor_invoke {	81	sub editor_invoke {
75	return unless $::CONN;	82	my $editsup = $::CONN && $::CONN->{editor_support}
		83	or return;
76		84
77	# putting the password into the env is somewhat tasteless	85	CFPlus::background {
78	local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};	86	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
83	# CFPlus::set_proxy;	87	CFPlus::set_proxy;
84		88
85	# TODO: move into editor	89	my $server = $editsup->{gameserver} \|\| "default";
86	require LWP::Simple;	90	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		91
		92	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		93	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
		94
		95	print "map directory is $mapdir\n";
		96	print "lib directory is $libdir\n";
		97
		98	require LWP::UserAgent;
		99
		100	my $ua = LWP::UserAgent->new (
		101	agent => "cfplus $CFPlus::VERSION",
		102	keep_alive => 1,
		103	env_proxy => 1,
		104	timeout => 30,
		105	);
		106
		107	for my $file (qw(archetypes crossfire.0)) {
		108	my $url = "$editsup->{lib_root}$file";
		109	print "mirroring $url...\n";
		110	check_lwp $ua->mirror ($url, "$libdir/$file");
		111	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		112	}
		113
		114	if (1) { # upload a map
		115	my $mapname = $::CONN->{map_info}[0];
		116
		117	my $mappath = "$mapdir/$mapname";
		118
		119	-e $mappath and die "$mappath already exists\n";
		120
		121	print "getting map revision for $mapname...\n";
		122
		123	# try to get the most recent head revision, what a hack,
		124	# this should have been returned while downloading sigh
		125	my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		126
		127	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		128	my $rev = $1;
		129
		130	print "downloading revision $rev...\n";
		131
		132	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		133
		134	my $meta = {
		135	%$editsup,
		136	path => $mapname,
		137	revision => $rev,
		138	cf_login => $::PROFILE->{user},
		139	};
		140
		141	require File::Basename;
		142	require File::Path;
		143
		144	File::Path::mkpath (File::Basename::dirname ($mappath));
		145	open my $fh, ">:raw:perlio", "$mappath.meta"
		146	or die "$mappath.meta: $!\n";
		147	print $fh CFPlus::to_json $meta;
		148	close $fh;
		149	open my $fh, ">:raw:perlio:utf8", $mappath
		150	or die "$mappath: $!\n";
		151	print $fh $map;
		152	close $fh;
		153
		154	print "saved as $mappath\n";
		155
		156	print "invoking editor...\n";
		157	exec "/root/s2/gce $mappath";#d#
		158
		159	# now upload it
		160	# require HTTP::Request::Common;
		161	#
		162	# my $res = $ua->post (
		163	# $ENV{CFPLUS_UPLOAD},
		164	# Content_Type => 'multipart/form-data',
		165	# Content => [
		166	# path => $mapname,
		167	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		168	# map => $map,
		169	# revision => $rev,
		170	# cf_login => $ENV{CFPLUS_LOGIN},
		171	# cf_password => $ENV{CFPLUS_PASSWORD},
		172	# comment => "",
		173	# ]
		174	# );
		175	#
		176	# if ($res->is_error) {
		177	# # fatal condition
		178	# warn $res->status_line;
		179	# } else {
		180	# # script replies are marked as {{..}}
		181	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		182	# warn map "$_\n", @msgs;
		183	# }
		184	} else {
		185	die "viewvc parse error, unable to detect revision\n";
		186	}
		187	}
		188	}
87	}	189	}
88		190
89	sub invoke_button_down {	191	sub invoke_button_down {
90	my ($self, $ev, $x, $y) = @_;	192	my ($self, $ev, $x, $y) = @_;
91		193
92	if ($ev->{button} == 1) {	194	if ($ev->{button} == 1) {
93	$self->grab_focus;	195	$self->grab_focus;
94	return unless $::CONN;	196	return unless $::CONN;
95		197
96	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	198	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
97	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	199	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
98		200
99	$x -= int 0.5 * $self->{sw};	201	$x -= CFPlus::floor $::MAP->w * 0.5;
100	$y -= int 0.5 * $self->{sh};	202	$y -= CFPlus::floor $::MAP->h * 0.5;
101		203
102	$::CONN->lookat ($x, $y)	204	$::CONN->lookat ($x, $y)
103	if $::CONN;	205	if $::CONN;
104		206
105	} elsif ($ev->{button} == 2) {	207	} elsif ($ev->{button} == 2) {
…		…
118	$::CFG->{map_shift_y} = $bh + $y - $oy;	220	$::CFG->{map_shift_y} = $bh + $y - $oy;
119		221
120	$self->update;	222	$self->update;
121	};	223	};
122	} elsif ($ev->{button} == 3) {	224	} elsif ($ev->{button} == 3) {
123	(new CFPlus::UI::Menu	225	my @items = (
124	items => [
125	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	226	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	227	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	228	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	229	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	230	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
133	$::PICKUP_ENABLE->{state}	234	$::PICKUP_ENABLE->{state}
134	? "Disable automatic pickup"	235	? "Disable automatic pickup"
135	: "Enable automatic pickup",	236	: "Enable automatic pickup",
136	sub { $::PICKUP_ENABLE->toggle }	237	sub { $::PICKUP_ENABLE->toggle }
137	],	238	],
138	$::CONN && length $::CONN->{cvs_root}	239	);
		240
		241	if ($::CONN && $::CONN->{editor_support}) {
		242	push @items, [
139	? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke]	243	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140	: (),	244	\&editor_invoke,
141	$::CONN && length $::CONN->{test_server}	245	];
142	? ["Login on Test Server", \&test_server_login]	246
143	: (),	247	for my $type (qw(test name)) {
		248	$::CONN->{editor_support}{type} ne $type
		249	or next;
		250	my $server = $::CONN->{editor_support}{"${type}server"}
		251	or next;
		252
		253	push @items, [
		254	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		255	sub { server_login $server },
		256	];
		257	}
		258	}
		259
		260	push @items,
144	["Quit",	261	["Quit",
145	sub {	262	sub {
146	if ($::CONN) {	263	if ($::CONN) {
147	&::open_quit_dialog;	264	&::open_quit_dialog;
148	} else {	265	} else {
149	exit;	266	exit;
150	}
151	}	267	}
152	],	268	}
153	],	269	],
		270	;
		271
		272	(new CFPlus::UI::Menu
		273	items => \@items,
154	)->popup ($ev);	274	)->popup ($ev);
155	}	275	}
156		276
157	1	277	1
158	}	278	}
…		…
348	unless $focused \|\| !$::FAST;	468	unless $focused \|\| !$::FAST;
349		469
350	if (delete $self->{need_update}) {	470	if (delete $self->{need_update}) {
351	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	471	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352		472
		473	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		474	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		475
353	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	476	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	477	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355		478
356	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	479	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	480	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358		481
359	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	482	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
360	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	483	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
361		484
362	if ($::CFG->{fow_enable}) {	485	if ($::CFG->{fow_enable}) {
363	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	486	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
364		487
365	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	488	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
366	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	489	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367	glConvolutionFilter2D (	490	glConvolutionFilter2D (
368	GL_CONVOLUTION_2D,	491	GL_CONVOLUTION_2D,
…		…
390		513
391	glPushMatrix;	514	glPushMatrix;
392	glTranslate $sx0, $sy0;	515	glTranslate $sx0, $sy0;
393	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	516	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394		517
395	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	518	$::MAP->draw ($dx, $dy, $sw, $sh);
396		519
397	glScale 32, 32;	520	glScale 32, 32;
398		521
399	if (my $tex = $self->{fow_texture}) {	522	if (my $tex = $self->{fow_texture}) {
400	glEnable GL_TEXTURE_2D;	523	glEnable GL_TEXTURE_2D;
…		…
775		898
776	$self->SUPER::_draw;	899	$self->SUPER::_draw;
777	}	900	}
778		901
779	1	902	1
		903

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs. Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC