ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

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.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
64sub test_server_login { 64sub 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
74sub editor_invoke { 72sub 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 # TODO: move into editor 82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86 require LWP::Simple; 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 }
87} 172}
88 173
89sub invoke_button_down { 174sub invoke_button_down {
90 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
91 176
92 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
93 $self->grab_focus; 178 $self->grab_focus;
94 return unless $::CONN; 179 return unless $::CONN;
95 180
96 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};
97 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};
98 183
99 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
100 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
101 186
102 $::CONN->lookat ($x, $y) 187 $::CONN->lookat ($x, $y)
103 if $::CONN; 188 if $::CONN;
104 189
105 } elsif ($ev->{button} == 2) { 190 } elsif ($ev->{button} == 2) {
… …
118 $::CFG->{map_shift_y} = $bh + $y - $oy; 203 $::CFG->{map_shift_y} = $bh + $y - $oy;
119 204
120 $self->update; 205 $self->update;
121 }; 206 };
122 } elsif ($ev->{button} == 3) { 207 } elsif ($ev->{button} == 3) {
123 (new CFPlus::UI::Menu 208 my @items = (
124 items => [
125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 209 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 210 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 211 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 212 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 213 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
133 $::PICKUP_ENABLE->{state} 217 $::PICKUP_ENABLE->{state}
134 ? "Disable automatic pickup" 218 ? "Disable automatic pickup"
135 : "Enable automatic pickup", 219 : "Enable automatic pickup",
136 sub { $::PICKUP_ENABLE->toggle } 220 sub { $::PICKUP_ENABLE->toggle }
137 ], 221 ],
138 $::CONN && length $::CONN->{cvs_root} 222 );
223
224 if ($::CONN && $::CONN->{editor_support}) {
225 push @items, [
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] 226 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140 : (), 227 \&editor_invoke,
141 $::CONN && length $::CONN->{test_server} 228 ];
142 ? ["Login on Test Server", \&test_server_login] 229
143 : (), 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,
144 ["Quit", 244 ["Quit",
145 sub { 245 sub {
146 if ($::CONN) { 246 if ($::CONN) {
147 &::open_quit_dialog; 247 &::open_quit_dialog;
148 } else { 248 } else {
149 exit; 249 exit;
150 }
151 } 250 }
152 ], 251 }
153 ], 252 ],
253 ;
254
255 (new CFPlus::UI::Menu
256 items => \@items,
154 )->popup ($ev); 257 )->popup ($ev);
155 } 258 }
156 259
157 1 260 1
158} 261}
… …
326} 429}
327 430
328sub set_magicmap { 431sub set_magicmap {
329 my ($self, $w, $h, $x, $y, $data) = @_; 432 my ($self, $w, $h, $x, $y, $data) = @_;
330 433
331 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 434 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
332 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 435 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
333 436
334 $self->{magicmap} = [$x, $y, $w, $h, $data]; 437 $self->{magicmap} = [$x, $y, $w, $h, $data];
335 438
336 $self->update; 439 $self->update;
337} 440}
… …
348 unless $focused || !$::FAST; 451 unless $focused || !$::FAST;
349 452
350 if (delete $self->{need_update}) { 453 if (delete $self->{need_update}) {
351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 454 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352 455
456 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458
353 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 459 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 460 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355 461
356 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 462 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 463 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358 464
359 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 465 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
360 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 466 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
361 467
362 if ($::CFG->{fow_enable}) { 468 if ($::CFG->{fow_enable}) {
363 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);
364 470
365 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
366 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 472 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367 glConvolutionFilter2D ( 473 glConvolutionFilter2D (
368 GL_CONVOLUTION_2D, 474 GL_CONVOLUTION_2D,
… …
390 496
391 glPushMatrix; 497 glPushMatrix;
392 glTranslate $sx0, $sy0; 498 glTranslate $sx0, $sy0;
393 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 499 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394 500
395 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 501 $::MAP->draw ($dx, $dy, $sw, $sh);
396 502
397 glScale 32, 32; 503 glScale 32, 32;
398 504
399 if (my $tex = $self->{fow_texture}) { 505 if (my $tex = $self->{fow_texture}) {
400 glEnable GL_TEXTURE_2D; 506 glEnable GL_TEXTURE_2D;
… …
407 } 513 }
408 514
409 if ($self->{magicmap}) { 515 if ($self->{magicmap}) {
410 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 516 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411 517
412 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 518 $x += $::MAP->ox + $self->{dx};
413 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 519 $y += $::MAP->oy + $self->{dy};
414 520
415 glTranslate - $x - 1, - $y - 1; 521 glTranslate - $x - 1, - $y - 1;
416 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 522 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 523 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418 } 524 }
… …
775 881
776 $self->SUPER::_draw; 882 $self->SUPER::_draw;
777} 883}
778 884
7791 8851
886

Diff Legend

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