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.85 by root, Sun Oct 8 21:22:30 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",
… …
67 ::stop_game (); 68 ::stop_game ();
68 local $::PROFILE->{host} = $server; 69 local $::PROFILE->{host} = $server;
69 ::start_game (); 70 ::start_game ();
70} 71}
71 72
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 73sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 74 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 75 or return;
84 76
85 # putting the password into the env is somewhat tasteless 77 CFPlus::background {
86# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90 my ($pid, $fh);
91 unless ($pid = open $fh, "-|:utf8", "-") {
92 $SIG{__DIE__} = sub {
93 warn "@_\n";
94 CFPlus::_exit 99;
95 };
96
97 open STDERR, ">&STDOUT";
98 binmode STDOUT, ":utf8";
99 binmode STDERR, ":utf8";
100 close $fh;
101
102 $| = 1;
103 print "preparing editor startup...\n"; 78 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105 79
106 my $server = $editsup->{gameserver} || "default"; 80 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108 82
109 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
110 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
111 85
112 print "map directory is $mapdir\n"; 86 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n"; 87 print "lib directory is $libdir\n";
114 88
115 require LWP::UserAgent; 89 my $ua = CFPlus::lwp_useragent;
116
117 my $ua = LWP::UserAgent->new (
118 agent => "cfplus $CFPlus::VERSION",
119 keep_alive => 1,
120 env_proxy => 1,
121 timeout => 30,
122 );
123 90
124 for my $file (qw(archetypes crossfire.0)) { 91 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file"; 92 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n"; 93 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file"); 94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 } 96 }
130 97
131 if (1) { # upload a map 98 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0]; 99 my $mapname = $::CONN->{map_info}[0];
133 100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
134 print "getting map revision for $mapname...\n"; 105 print "getting map revision for $mapname...\n";
135 106
136 # try to get the most recent head revision, what a hack, 107 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh* 108 # this should have been returned while downloading *sigh*
138 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139 110
140 if ($log =~ /\?rev=(\d+\.\d+)"/) { 111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1; 112 my $rev = $1;
142 113
143 print "downloading revision $rev...\n"; 114 print "downloading revision $rev...\n";
144 115
145 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 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#
146 142
147 # now upload it 143 # now upload it
148# require HTTP::Request::Common; 144# require HTTP::Request::Common;
149# 145#
150# my $res = $ua->post ( 146# my $res = $ua->post (
… …
171# } 167# }
172 } else { 168 } else {
173 die "viewvc parse error, unable to detect revision\n"; 169 die "viewvc parse error, unable to detect revision\n";
174 } 170 }
175 } 171 }
176
177 print "invoking editor...\n";
178 exec "/root/s2/gce";#d#
179
180 CFPlus::_exit;
181 }
182
183 my $buffer;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 unless (sysread $fh, $buffer, 4096, length $buffer) {
187 $_[0]->w->cancel;
188 $buffer .= "done\n";
189 }
190
191 while ($buffer =~ s/^(.*)\n//) {
192 ::message ({
193 markup => "editor($pid): " . CFPlus::asxml $1,
194 });
195 }
196 }); 172 }
197} 173}
198 174
199sub invoke_button_down { 175sub invoke_button_down {
200 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
201 177
202 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
203 $self->grab_focus; 179 $self->grab_focus;
204 return unless $::CONN; 180 return unless $::CONN;
205 181
206 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};
207 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};
208 184
209 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
210 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
211 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
212 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
213 if $::CONN; 193 }
194 }
214 195
215 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
216 $self->grab_focus; 197 $self->grab_focus;
217 return unless $::CONN; 198 return unless $::CONN;
218 199
… …
454} 435}
455 436
456sub set_magicmap { 437sub set_magicmap {
457 my ($self, $w, $h, $x, $y, $data) = @_; 438 my ($self, $w, $h, $x, $y, $data) = @_;
458 439
459 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461 442
462 $self->{magicmap} = [$x, $y, $w, $h, $data]; 443 $self->{magicmap} = [$x, $y, $w, $h, $data];
463 444
464 $self->update; 445 $self->update;
465} 446}
… …
476 unless $focused || !$::FAST; 457 unless $focused || !$::FAST;
477 458
478 if (delete $self->{need_update}) { 459 if (delete $self->{need_update}) {
479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480 461
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464
481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 466 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483 467
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 468 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 469 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486 470
487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 471 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 472 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489 473
490 if ($::CFG->{fow_enable}) { 474 if ($::CFG->{fow_enable}) {
491 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);
492 476
493 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
494 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 478 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495 glConvolutionFilter2D ( 479 glConvolutionFilter2D (
496 GL_CONVOLUTION_2D, 480 GL_CONVOLUTION_2D,
… …
518 502
519 glPushMatrix; 503 glPushMatrix;
520 glTranslate $sx0, $sy0; 504 glTranslate $sx0, $sy0;
521 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 505 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522 506
523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 507 $::MAP->draw ($dx, $dy, $sw, $sh);
524 508
525 glScale 32, 32; 509 glScale 32, 32;
526 510
527 if (my $tex = $self->{fow_texture}) { 511 if (my $tex = $self->{fow_texture}) {
528 glEnable GL_TEXTURE_2D; 512 glEnable GL_TEXTURE_2D;
… …
535 } 519 }
536 520
537 if ($self->{magicmap}) { 521 if ($self->{magicmap}) {
538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 522 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539 523
540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 524 $x += $::MAP->ox + $self->{dx};
541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 525 $y += $::MAP->oy + $self->{dy};
542 526
543 glTranslate - $x - 1, - $y - 1; 527 glTranslate - $x - 1, - $y - 1;
544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 528 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 529 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546 } 530 }
… …
692 676
693 if ($ev->{button} == 3) { 677 if ($ev->{button} == 3) {
694 (new CFPlus::UI::Menu 678 (new CFPlus::UI::Menu
695 items => [ 679 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 680 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 681 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698 ], 682 ],
699 )->popup ($ev); 683 )->popup ($ev);
700 return 1; 684 return 1;
701 } 685 }
702 0 686 0

Diff Legend

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