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

Diff Legend

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