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.118 by elmex, Tue Aug 14 13:25:25 2007 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",
… …
19 my $class = shift; 20 my $class = shift;
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 tilesize => 32,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 26 @_
33 ); 27 );
34 28
35 $self->{completer} = new CFPlus::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 30 command => $self->{command},
… …
38 ; 32 ;
39 33
40 $self 34 $self
41} 35}
42 36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
41}
42
43sub add_command { 43sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 45
46 (my $data = $command) =~ s/\\//g; 46 (my $data = $command) =~ s/\\//g;
47 47
… …
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->{ctilesize};
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->{ctilesize};
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
187 if ($::CONN) {
102 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
103 if $::CONN; 189 }
104 190
105 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
106 $self->grab_focus; 192 $self->grab_focus;
107 return unless $::CONN; 193 return unless $::CONN;
108 194
… …
118 $::CFG->{map_shift_y} = $bh + $y - $oy; 204 $::CFG->{map_shift_y} = $bh + $y - $oy;
119 205
120 $self->update; 206 $self->update;
121 }; 207 };
122 } elsif ($ev->{button} == 3) { 208 } elsif ($ev->{button} == 3) {
123 (new CFPlus::UI::Menu 209 my @items = (
124 items => [
125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 210 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 211 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 212 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 213 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 214 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
133 $::PICKUP_ENABLE->{state} 218 $::PICKUP_ENABLE->{state}
134 ? "Disable automatic pickup" 219 ? "Disable automatic pickup"
135 : "Enable automatic pickup", 220 : "Enable automatic pickup",
136 sub { $::PICKUP_ENABLE->toggle } 221 sub { $::PICKUP_ENABLE->toggle }
137 ], 222 ],
138 $::CONN && length $::CONN->{cvs_root} 223 );
224
225 if ($::CONN && $::CONN->{editor_support}) {
226 push @items, [
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] 227 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140 : (), 228 \&editor_invoke,
141 $::CONN && length $::CONN->{test_server} 229 ];
142 ? ["Login on Test Server", \&test_server_login] 230
143 : (), 231 for my $type (qw(test name)) {
232 $::CONN->{editor_support}{type} ne $type
233 or next;
234 my $server = $::CONN->{editor_support}{"${type}server"}
235 or next;
236
237 push @items, [
238 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
239 sub { server_login $server },
240 ];
241 }
242 }
243
244 push @items,
144 ["Quit", 245 ["Quit",
145 sub { 246 sub {
146 if ($::CONN) { 247 if ($::CONN) {
147 &::open_quit_dialog; 248 &::open_quit_dialog;
148 } else { 249 } else {
149 exit; 250 exit;
150 }
151 } 251 }
152 ], 252 }
153 ], 253 ],
254 ;
255
256 (new CFPlus::UI::Menu
257 items => \@items,
154 )->popup ($ev); 258 )->popup ($ev);
155 } 259 }
156 260
157 1 261 1
158} 262}
… …
176 280
177 1 281 1
178} 282}
179 283
180sub size_request { 284sub size_request {
285 my ($self) = @_;
286
181 ( 287 (
182 32 * CFPlus::ceil $::WIDTH / 32, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
183 32 * CFPlus::ceil $::HEIGHT / 32, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
184 ) 290 )
185} 291}
186 292
187sub update { 293sub update {
188 my ($self) = @_; 294 my ($self) = @_;
… …
190 $self->{need_update} = 1; 296 $self->{need_update} = 1;
191 $self->SUPER::update; 297 $self->SUPER::update;
192} 298}
193 299
194my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
195 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
196 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
197 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
198 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
199 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
200 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
201 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
202 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
203 310
204 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
205 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
206 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
207 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
208); 319);
209 320
210sub invoke_key_down { 321sub invoke_key_down {
211 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
212 323
… …
214 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
215 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
216 327
217 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
218 329
219 if ($uni == ord "\t") { 330 if ($sym == 9) {
220 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
221 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
222 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
223 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
224 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
225 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
228 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
229 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
230 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
231 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
232 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
233 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { 344 } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
234 $::BIND_EDITOR->set_binding (undef, undef, [], 345 $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
235 sub {
236 my ($mod, $sym, $cmds) = @_;
237 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
238 });
239 $::BIND_EDITOR->start;
240 $::BIND_EDITOR->show;
241#TODO: elmex, what was this supposed to do? it currently crashes the client.
242# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
243# $::BIND_EDITOR->stop;
244# $::BIND_EDITOR->ask_for_bind_and_commit;
245# $::BIND_EDITOR->hide;
246 } elsif (!$::CONN) { 346 } elsif (!$::CONN) {
247 return 0; # bindings further down need a valid connection 347 return 0; # bindings further down need a valid connection
248 348
249 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
250 $::CONN->user_send ("stay fire");
251 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
252 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
253 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
254 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
255 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
256 $::CONN->user_send ("examine"); 354 $::MESSAGE_WINDOW->activate_current;
257 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
258 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
259 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
260 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
261 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
262 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
263 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
264 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
265 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
266 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
267 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
268 $self->{completer}->show; 369 $self->{completer}->show;
269 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
270 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
271 $self->{completer}->show; 372 $self->{completer}->show;
272 } elsif (exists $DIR{$sym}) { 373 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
273 if ($mod & CFPlus::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
274 $self->{shft}++; 375 $self->{shft}++;
275 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($dir->[0] != $self->{fire_dir}) {
276 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $dir->[0]");
277 } 378 }
278 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
279 } elsif ($mod & CFPlus::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
280 $self->{ctrl}++; 381 $self->{ctrl}++;
281 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $dir->[0]");
282 } else { 383 } else {
283 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$dir->[1]");
284 } 385 }
285 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
286 $self->{completer}->inject_key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
287 $self->{completer}->show; 388 $self->{completer}->show;
288 } else { 389 } else {
… …
323 } 424 }
324 425
325 $res 426 $res
326} 427}
327 428
429sub invoke_visibility_change {
430 my ($self) = @_;
431
432 $self->refresh_hook;
433
434 0
435}
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}
338 447
448sub refresh_hook {
449 my ($self) = @_;
450
451 if ($::MAP && $::CONN) {
452 if (delete $self->{need_update}) {
453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
454
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
457
458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
460
461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
463
464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
466
467 if ($::CFG->{fow_enable}) {
468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
469
470 $self->{fow_texture} = new CFPlus::Texture
471 w => $w,
472 h => $h,
473 data => $data,
474 internalformat => GL_ALPHA,
475 format => GL_ALPHA;
476 } else {
477 delete $self->{fow_texture};
478 }
479
480 glNewList ($self->{list} ||= glGenList);
481
482 glPushMatrix;
483 glTranslate $sx0, $sy0;
484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
485
486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
487
488 glScale $self->{tilesize}, $self->{tilesize};
489
490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
493 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
495
496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
497 $self->{fow_texture}->draw_quad_alpha (0, 0);
498
499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
501 }
502
503 if ($self->{magicmap}) {
504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
505
506 $x += $::MAP->ox + $self->{dx};
507 $y += $::MAP->oy + $self->{dy};
508
509 glTranslate - $x - 1, - $y - 1;
510 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
511 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
512 }
513
514 glPopMatrix;
515 glEndList;
516 }
517 } else {
518 glDeleteList delete $self->{list}
519 if $self->{list};
520 }
521}
522
339sub draw { 523sub draw {
340 my ($self) = @_; 524 my ($self) = @_;
341 525
342 return unless $::MAP; 526 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
527
528 return unless $self->{list};
343 529
344 my $focused = $CFPlus::UI::FOCUS == $self 530 my $focused = $CFPlus::UI::FOCUS == $self
345 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 531 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
346 532
347 return 533 return
348 unless $focused || !$::FAST; 534 unless $focused || !$::FAST;
349
350 if (delete $self->{need_update}) {
351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352
353 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355
356 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358
359 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
360 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
361
362 if ($::CFG->{fow_enable}) {
363 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
364
365 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);
367 glConvolutionFilter2D (
368 GL_CONVOLUTION_2D,
369 GL_ALPHA,
370 3, 3,
371 GL_ALPHA, GL_FLOAT,
372 (pack "f*", @{ $self->{smooth_matrix} }),
373 );
374 glEnable GL_CONVOLUTION_2D;
375 }
376
377 $self->{fow_texture} = new CFPlus::Texture
378 w => $w,
379 h => $h,
380 data => $data,
381 internalformat => GL_ALPHA,
382 format => GL_ALPHA;
383
384 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
385 } else {
386 delete $self->{fow_texture};
387 }
388
389 glNewList $self->{list};
390
391 glPushMatrix;
392 glTranslate $sx0, $sy0;
393 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394
395 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
396
397 glScale 32, 32;
398
399 if (my $tex = $self->{fow_texture}) {
400 glEnable GL_TEXTURE_2D;
401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
402
403 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
404 $self->{fow_texture}->draw_quad_alpha (0, 0);
405
406 glDisable GL_TEXTURE_2D;
407 }
408
409 if ($self->{magicmap}) {
410 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411
412 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
413 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
414
415 glTranslate - $x - 1, - $y - 1;
416 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418 }
419
420 glPopMatrix;
421 glEndList;
422 }
423 535
424 glCallList $self->{list}; 536 glCallList $self->{list};
425 537
426 # TNT2 emulates logops in software (or worse :) 538 # TNT2 emulates logops in software (or worse :)
427 unless ($focused) { 539 unless ($focused) {
… …
446 $self->SUPER::DESTROY; 558 $self->SUPER::DESTROY;
447} 559}
448 560
449package CFPlus::MapWidget::MapMap; 561package CFPlus::MapWidget::MapMap;
450 562
563use strict;
564use utf8;
565
451our @ISA = CFPlus::UI::Base::; 566our @ISA = CFPlus::UI::Base::;
452 567
453use Time::HiRes qw(time); 568use Time::HiRes qw(time);
454use CFPlus::OpenGL; 569use CFPlus::OpenGL;
455 570
456sub size_request { 571sub size_request {
457 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 572 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
458} 573}
459 574
460sub invoke_size_allocate { 575sub refresh_hook {
461 my ($self, $w, $h) = @_; 576 my ($self) = @_;
462 577
463 $self->update; 578 if ($::MAP && $self->{texture_atime} < time) {
464
465 1
466}
467
468sub update {
469 my ($self) = @_;
470
471 delete $self->{texture_atime};
472 $self->SUPER::update;
473}
474
475sub _draw {
476 my ($self) = @_;
477
478 $::MAP or return;
479
480 my ($w, $h) = @$self{qw(w h)}; 579 my ($w, $h) = @$self{qw(w h)};
481 580
482 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 581 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
483 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
484 583
485 my $sx = int $::CFG->{map_shift_x} / 32;
486 my $sy = int $::CFG->{map_shift_y} / 32;
487
488 my $ox = 0.5 * ($w - $sw); 584 my $ox = 0.5 * ($w - $sw);
489 my $oy = 0.5 * ($h - $sh); 585 my $oy = 0.5 * ($h - $sh);
490 586
491 glEnable GL_BLEND; 587 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 588 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
493 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
495 589
496 if ($self->{texture_atime} < time) { 590 #TODO: map scale is completely borked
591
592 my $x0 = int $ox - $sx + 0.5;
593 my $y0 = int $oy - $sy + 0.5;
594
595 $self->{sw} = $sw;
596 $self->{sh} = $sh;
597
598 $self->{x0} = $x0;
599 $self->{y0} = $y0;
600
497 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
498 602
499 $self->{texture} = 603 $self->{texture} =
500 new CFPlus::Texture 604 new CFPlus::Texture
501 w => $w, 605 w => $w,
502 h => $h, 606 h => $h,
503 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
504 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
505 } 609 }
610}
611
612sub invoke_visibility_change {
613 my ($self) = @_;
614
615 $self->refresh_hook;
616
617 0
618}
619
620sub invoke_size_allocate {
621 my ($self, $w, $h) = @_;
622
623 $self->update;
624
625 1
626}
627
628sub update {
629 my ($self) = @_;
630
631 delete $self->{texture_atime};
632 $self->SUPER::update;
633}
634
635sub _draw {
636 my ($self) = @_;
637
638 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
639
640 $self->{texture} or return;
641
642 glEnable GL_BLEND;
643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
644 glEnable GL_TEXTURE_2D;
645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
506 646
507 $self->{texture}->draw_quad (0, 0); 647 $self->{texture}->draw_quad (0, 0);
508 648
509 glDisable GL_TEXTURE_2D; 649 glDisable GL_TEXTURE_2D;
510 650
511 glTranslate 0.375, 0.375; 651 glTranslate 0.375, 0.375;
512
513 #TODO: map scale is completely borked
514
515 my $x0 = int $ox - $sx + 0.5;
516 my $y0 = int $oy - $sy + 0.5;
517 652
518 glColor 1, 1, 0, 1; 653 glColor 1, 1, 0, 1;
519 glBegin GL_LINE_LOOP; 654 glBegin GL_LINE_LOOP;
520 glVertex $x0 , $y0 ; 655 glVertex $self->{x0} , $self->{y0} ;
521 glVertex $x0 , $y0 + $sh; 656 glVertex $self->{x0} , $self->{y0} + $self->{sh};
522 glVertex $x0 + $sw, $y0 + $sh; 657 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
523 glVertex $x0 + $sw, $y0 ; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
524 glEnd; 659 glEnd;
525 660
526 glDisable GL_BLEND; 661 glDisable GL_BLEND;
527} 662}
528 663
… …
564 699
565 if ($ev->{button} == 3) { 700 if ($ev->{button} == 3) {
566 (new CFPlus::UI::Menu 701 (new CFPlus::UI::Menu
567 items => [ 702 items => [
568 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 703 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
569 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 704 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
570 ], 705 ],
571 )->popup ($ev); 706 )->popup ($ev);
572 return 1; 707 return 1;
573 } 708 }
574 0 709 0
… …
775 910
776 $self->SUPER::_draw; 911 $self->SUPER::_draw;
777} 912}
778 913
7791 9141
915

Diff Legend

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