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.95 by root, Sat Dec 9 02:21:25 2006 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
59 60
60 $self->{completer}->hide 61 $self->{completer}->hide
61 if $self->{completer}; 62 if $self->{completer};
62} 63}
63 64
64sub test_server_login { 65sub server_login {
65 return unless 66 my ($server) = @_;
66 $::CONN && length $::CONN->{test_server};
67 67
68 my $server = $::CONN->{test_server};
69 ::stop_game (); 68 ::stop_game ();
70 local $::PROFILE->{host} = $server; 69 local $::PROFILE->{host} = $server;
71 ::start_game (); 70 ::start_game ();
72} 71}
73 72
74sub editor_invoke { 73sub editor_invoke {
75 return unless $::CONN; 74 my $editsup = $::CONN && $::CONN->{editor_support}
75 or return;
76 76
77 # putting the password into the env is somewhat tasteless 77 CFPlus::background {
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; 78 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 79
83# CFPlus::set_proxy; 80 my $server = $editsup->{gameserver} || "default";
81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 82
85 # TODO: move into editor 83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86 require LWP::Simple; 84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
85
86 print "map directory is $mapdir\n";
87 print "lib directory is $libdir\n";
88
89 my $ua = CFPlus::lwp_useragent;
90
91 for my $file (qw(archetypes crossfire.0)) {
92 my $url = "$editsup->{lib_root}$file";
93 print "mirroring $url...\n";
94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
96 }
97
98 if (1) { # upload a map
99 my $mapname = $::CONN->{map_info}[0];
100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
105 print "getting map revision for $mapname...\n";
106
107 # try to get the most recent head revision, what a hack,
108 # this should have been returned while downloading *sigh*
109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
110
111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
112 my $rev = $1;
113
114 print "downloading revision $rev...\n";
115
116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
117
118 my $meta = {
119 %$editsup,
120 path => $mapname,
121 revision => $rev,
122 cf_login => $::PROFILE->{user},
123 };
124
125 require File::Basename;
126 require File::Path;
127
128 File::Path::mkpath (File::Basename::dirname ($mappath));
129 open my $fh, ">:raw:perlio", "$mappath.meta"
130 or die "$mappath.meta: $!\n";
131 print $fh CFPlus::to_json $meta;
132 close $fh;
133 open my $fh, ">:raw:perlio:utf8", $mappath
134 or die "$mappath: $!\n";
135 print $fh $map;
136 close $fh;
137
138 print "saved as $mappath\n";
139
140 print "invoking editor...\n";
141 exec "/root/s2/gce $mappath";#d#
142
143 # now upload it
144# require HTTP::Request::Common;
145#
146# my $res = $ua->post (
147# $ENV{CFPLUS_UPLOAD},
148# Content_Type => 'multipart/form-data',
149# Content => [
150# path => $mapname,
151# mapdir => $ENV{CROSSFIRE_MAPDIR},
152# map => $map,
153# revision => $rev,
154# cf_login => $ENV{CFPLUS_LOGIN},
155# cf_password => $ENV{CFPLUS_PASSWORD},
156# comment => "",
157# ]
158# );
159#
160# if ($res->is_error) {
161# # fatal condition
162# warn $res->status_line;
163# } else {
164# # script replies are marked as {{..}}
165# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
166# warn map "$_\n", @msgs;
167# }
168 } else {
169 die "viewvc parse error, unable to detect revision\n";
170 }
171 }
172 }
87} 173}
88 174
89sub invoke_button_down { 175sub invoke_button_down {
90 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
91 177
92 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
93 $self->grab_focus; 179 $self->grab_focus;
94 return unless $::CONN; 180 return unless $::CONN;
95 181
96 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 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}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
98 184
99 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
100 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
101 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
102 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
103 if $::CONN; 193 }
194 }
104 195
105 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
106 $self->grab_focus; 197 $self->grab_focus;
107 return unless $::CONN; 198 return unless $::CONN;
108 199
… …
118 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
119 210
120 $self->update; 211 $self->update;
121 }; 212 };
122 } elsif ($ev->{button} == 3) { 213 } elsif ($ev->{button} == 3) {
123 (new CFPlus::UI::Menu 214 my @items = (
124 items => [
125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 215 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
133 $::PICKUP_ENABLE->{state} 223 $::PICKUP_ENABLE->{state}
134 ? "Disable automatic pickup" 224 ? "Disable automatic pickup"
135 : "Enable automatic pickup", 225 : "Enable automatic pickup",
136 sub { $::PICKUP_ENABLE->toggle } 226 sub { $::PICKUP_ENABLE->toggle }
137 ], 227 ],
138 $::CONN && length $::CONN->{cvs_root} 228 );
229
230 if ($::CONN && $::CONN->{editor_support}) {
231 push @items, [
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] 232 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140 : (), 233 \&editor_invoke,
141 $::CONN && length $::CONN->{test_server} 234 ];
142 ? ["Login on Test Server", \&test_server_login] 235
143 : (), 236 for my $type (qw(test name)) {
237 $::CONN->{editor_support}{type} ne $type
238 or next;
239 my $server = $::CONN->{editor_support}{"${type}server"}
240 or next;
241
242 push @items, [
243 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
244 sub { server_login $server },
245 ];
246 }
247 }
248
249 push @items,
144 ["Quit", 250 ["Quit",
145 sub { 251 sub {
146 if ($::CONN) { 252 if ($::CONN) {
147 &::open_quit_dialog; 253 &::open_quit_dialog;
148 } else { 254 } else {
149 exit; 255 exit;
150 }
151 } 256 }
152 ], 257 }
153 ], 258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
154 )->popup ($ev); 263 )->popup ($ev);
155 } 264 }
156 265
157 1 266 1
158} 267}
… …
326} 435}
327 436
328sub set_magicmap { 437sub set_magicmap {
329 my ($self, $w, $h, $x, $y, $data) = @_; 438 my ($self, $w, $h, $x, $y, $data) = @_;
330 439
331 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
332 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
333 442
334 $self->{magicmap} = [$x, $y, $w, $h, $data]; 443 $self->{magicmap} = [$x, $y, $w, $h, $data];
335 444
336 $self->update; 445 $self->update;
337} 446}
… …
348 unless $focused || !$::FAST; 457 unless $focused || !$::FAST;
349 458
350 if (delete $self->{need_update}) { 459 if (delete $self->{need_update}) {
351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352 461
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464
353 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 466 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355 467
356 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 468 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 469 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358 470
359 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 471 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
360 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 472 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
361 473
362 if ($::CFG->{fow_enable}) { 474 if ($::CFG->{fow_enable}) {
363 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 475 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
364 476
365 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 477 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); 478 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367 glConvolutionFilter2D ( 479 glConvolutionFilter2D (
368 GL_CONVOLUTION_2D, 480 GL_CONVOLUTION_2D,
… …
390 502
391 glPushMatrix; 503 glPushMatrix;
392 glTranslate $sx0, $sy0; 504 glTranslate $sx0, $sy0;
393 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 505 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394 506
395 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 507 $::MAP->draw ($dx, $dy, $sw, $sh);
396 508
397 glScale 32, 32; 509 glScale 32, 32;
398 510
399 if (my $tex = $self->{fow_texture}) { 511 if (my $tex = $self->{fow_texture}) {
400 glEnable GL_TEXTURE_2D; 512 glEnable GL_TEXTURE_2D;
… …
407 } 519 }
408 520
409 if ($self->{magicmap}) { 521 if ($self->{magicmap}) {
410 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 522 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411 523
412 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 524 $x += $::MAP->ox + $self->{dx};
413 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 525 $y += $::MAP->oy + $self->{dy};
414 526
415 glTranslate - $x - 1, - $y - 1; 527 glTranslate - $x - 1, - $y - 1;
416 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 528 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 529 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418 } 530 }
… …
564 676
565 if ($ev->{button} == 3) { 677 if ($ev->{button} == 3) {
566 (new CFPlus::UI::Menu 678 (new CFPlus::UI::Menu
567 items => [ 679 items => [
568 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 680 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
569 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 681 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
570 ], 682 ],
571 )->popup ($ev); 683 )->popup ($ev);
572 return 1; 684 return 1;
573 } 685 }
574 0 686 0
… …
775 887
776 $self->SUPER::_draw; 888 $self->SUPER::_draw;
777} 889}
778 890
7791 8911
892

Diff Legend

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