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.110 by root, Thu Jul 19 13:45:18 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,
26 tilesize => 32,
25 27
26 smooth_matrix => [ 28 smooth_matrix => [
27 0.05, 0.13, 0.05, 29 0.30, 0.50, 0.30,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 30 0.50, 0.50, 0.50,
31 0.30, 0.50, 0.30,
30 ], 32 ],
31 33
32 @_ 34 @_
33 ); 35 );
34 36
… …
38 ; 40 ;
39 41
40 $self 42 $self
41} 43}
42 44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
49}
50
43sub add_command { 51sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 53
46 (my $data = $command) =~ s/\\//g; 54 (my $data = $command) =~ s/\\//g;
47 55
… …
59 67
60 $self->{completer}->hide 68 $self->{completer}->hide
61 if $self->{completer}; 69 if $self->{completer};
62} 70}
63 71
64sub test_server_login { 72sub server_login {
65 return unless 73 my ($server) = @_;
66 $::CONN && length $::CONN->{test_server};
67 74
68 my $server = $::CONN->{test_server};
69 ::stop_game (); 75 ::stop_game ();
70 local $::PROFILE->{host} = $server; 76 local $::PROFILE->{host} = $server;
71 ::start_game (); 77 ::start_game ();
72} 78}
73 79
74sub editor_invoke { 80sub editor_invoke {
75 return unless $::CONN; 81 my $editsup = $::CONN && $::CONN->{editor_support}
82 or return;
76 83
77 # putting the password into the env is somewhat tasteless 84 CFPlus::background {
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; 85 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 86
83# CFPlus::set_proxy; 87 my $server = $editsup->{gameserver} || "default";
88 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 89
85 # TODO: move into editor 90 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86 require LWP::Simple; 91 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
92
93 print "map directory is $mapdir\n";
94 print "lib directory is $libdir\n";
95
96 my $ua = CFPlus::lwp_useragent;
97
98 for my $file (qw(archetypes crossfire.0)) {
99 my $url = "$editsup->{lib_root}$file";
100 print "mirroring $url...\n";
101 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
102 printf "%s size %d octets\n", $file, -s "$libdir/$file";
103 }
104
105 if (1) { # upload a map
106 my $mapname = $::CONN->{map_info}[0];
107
108 my $mappath = "$mapdir/$mapname";
109
110 -e $mappath and die "$mappath already exists\n";
111
112 print "getting map revision for $mapname...\n";
113
114 # try to get the most recent head revision, what a hack,
115 # this should have been returned while downloading *sigh*
116 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
117
118 if ($log =~ /\?rev=(\d+\.\d+)"/) {
119 my $rev = $1;
120
121 print "downloading revision $rev...\n";
122
123 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
124
125 my $meta = {
126 %$editsup,
127 path => $mapname,
128 revision => $rev,
129 cf_login => $::PROFILE->{user},
130 };
131
132 require File::Basename;
133 require File::Path;
134
135 File::Path::mkpath (File::Basename::dirname ($mappath));
136 open my $fh, ">:raw:perlio", "$mappath.meta"
137 or die "$mappath.meta: $!\n";
138 print $fh CFPlus::to_json $meta;
139 close $fh;
140 open my $fh, ">:raw:perlio:utf8", $mappath
141 or die "$mappath: $!\n";
142 print $fh $map;
143 close $fh;
144
145 print "saved as $mappath\n";
146
147 print "invoking editor...\n";
148 exec "/root/s2/gce $mappath";#d#
149
150 # now upload it
151# require HTTP::Request::Common;
152#
153# my $res = $ua->post (
154# $ENV{CFPLUS_UPLOAD},
155# Content_Type => 'multipart/form-data',
156# Content => [
157# path => $mapname,
158# mapdir => $ENV{CROSSFIRE_MAPDIR},
159# map => $map,
160# revision => $rev,
161# cf_login => $ENV{CFPLUS_LOGIN},
162# cf_password => $ENV{CFPLUS_PASSWORD},
163# comment => "",
164# ]
165# );
166#
167# if ($res->is_error) {
168# # fatal condition
169# warn $res->status_line;
170# } else {
171# # script replies are marked as {{..}}
172# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
173# warn map "$_\n", @msgs;
174# }
175 } else {
176 die "viewvc parse error, unable to detect revision\n";
177 }
178 }
179 }
87} 180}
88 181
89sub invoke_button_down { 182sub invoke_button_down {
90 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
91 184
92 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
93 $self->grab_focus; 186 $self->grab_focus;
94 return unless $::CONN; 187 return unless $::CONN;
95 188
96 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 189 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}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
98 191
99 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
100 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
101 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
102 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
103 if $::CONN; 200 }
201 }
104 202
105 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
106 $self->grab_focus; 204 $self->grab_focus;
107 return unless $::CONN; 205 return unless $::CONN;
108 206
… …
118 $::CFG->{map_shift_y} = $bh + $y - $oy; 216 $::CFG->{map_shift_y} = $bh + $y - $oy;
119 217
120 $self->update; 218 $self->update;
121 }; 219 };
122 } elsif ($ev->{button} == 3) { 220 } elsif ($ev->{button} == 3) {
123 (new CFPlus::UI::Menu 221 my @items = (
124 items => [
125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 222 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 223 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 224 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 225 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 226 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
133 $::PICKUP_ENABLE->{state} 230 $::PICKUP_ENABLE->{state}
134 ? "Disable automatic pickup" 231 ? "Disable automatic pickup"
135 : "Enable automatic pickup", 232 : "Enable automatic pickup",
136 sub { $::PICKUP_ENABLE->toggle } 233 sub { $::PICKUP_ENABLE->toggle }
137 ], 234 ],
138 $::CONN && length $::CONN->{cvs_root} 235 );
236
237 if ($::CONN && $::CONN->{editor_support}) {
238 push @items, [
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] 239 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140 : (), 240 \&editor_invoke,
141 $::CONN && length $::CONN->{test_server} 241 ];
142 ? ["Login on Test Server", \&test_server_login] 242
143 : (), 243 for my $type (qw(test name)) {
244 $::CONN->{editor_support}{type} ne $type
245 or next;
246 my $server = $::CONN->{editor_support}{"${type}server"}
247 or next;
248
249 push @items, [
250 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
251 sub { server_login $server },
252 ];
253 }
254 }
255
256 push @items,
144 ["Quit", 257 ["Quit",
145 sub { 258 sub {
146 if ($::CONN) { 259 if ($::CONN) {
147 &::open_quit_dialog; 260 &::open_quit_dialog;
148 } else { 261 } else {
149 exit; 262 exit;
150 }
151 } 263 }
152 ], 264 }
153 ], 265 ],
266 ;
267
268 (new CFPlus::UI::Menu
269 items => \@items,
154 )->popup ($ev); 270 )->popup ($ev);
155 } 271 }
156 272
157 1 273 1
158} 274}
… …
176 292
177 1 293 1
178} 294}
179 295
180sub size_request { 296sub size_request {
297 my ($self) = @_;
298
181 ( 299 (
182 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
183 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
184 ) 302 )
185} 303}
186 304
187sub update { 305sub update {
188 my ($self) = @_; 306 my ($self) = @_;
… …
190 $self->{need_update} = 1; 308 $self->{need_update} = 1;
191 $self->SUPER::update; 309 $self->SUPER::update;
192} 310}
193 311
194my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
195 CFPlus::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
196 CFPlus::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
197 CFPlus::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
198 CFPlus::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
199 CFPlus::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
… …
214 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
215 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
216 335
217 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
218 337
219 if ($uni == ord "\t") { 338 if ($sym == 9) {
220 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
221 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
222 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
223 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
224 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
225 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
228 ::toggle_player_page ($::SPELL_PAGE); 347 ::toggle_player_page ($::SPELL_PAGE);
229 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
230 ::toggle_player_page ($::INVENTORY_PAGE); 349 ::toggle_player_page ($::INVENTORY_PAGE);
231 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
232 $::SETUP_DIALOG->toggle_visibility; 351 $::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) { 352 } elsif (!$::CONN) {
247 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
248 354
249 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
250 $::CONN->user_send ("stay fire");
251 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
252 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
253 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
254 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
255 } elsif ($uni == 13) { 359 } elsif ($uni == 13) {
256 $::CONN->user_send ("examine"); 360 $::CONN->user_send ("examine");
257 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
258 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
259 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
260 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
261 $::CONN->user_send ($_) for @$bind_cmd; 365 $::CONN->macro_send ($_) for @macros;
262 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
263 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
264 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
265 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
266 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
267 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
268 $self->{completer}->show; 375 $self->{completer}->show;
269 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
270 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
… …
323 } 430 }
324 431
325 $res 432 $res
326} 433}
327 434
435sub invoke_visibility_change {
436 my ($self) = @_;
437
438 $self->refresh_hook;
439
440 0
441}
442
328sub set_magicmap { 443sub set_magicmap {
329 my ($self, $w, $h, $x, $y, $data) = @_; 444 my ($self, $w, $h, $x, $y, $data) = @_;
330 445
331 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 446 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
332 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 447 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
333 448
334 $self->{magicmap} = [$x, $y, $w, $h, $data]; 449 $self->{magicmap} = [$x, $y, $w, $h, $data];
335 450
336 $self->update; 451 $self->update;
337} 452}
338 453
339sub draw { 454sub refresh_hook {
340 my ($self) = @_; 455 my ($self) = @_;
341 456
342 return unless $::MAP; 457 return unless $::MAP;
343 458
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}) { 459 if (delete $self->{need_update}) {
351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
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 (
364 476 $dx, $dy, $sw, $sh,
365 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 477 $::CFG->{fow_smooth},
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} }), 478 pack "f*", @{ $self->{smooth_matrix} },
373 ); 479 );
374 glEnable GL_CONVOLUTION_2D;
375 }
376 480
377 $self->{fow_texture} = new CFPlus::Texture 481 $self->{fow_texture} = new CFPlus::Texture
378 w => $w, 482 w => $w,
379 h => $h, 483 h => $h,
380 data => $data, 484 data => $data,
381 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
382 format => GL_ALPHA; 486 format => GL_ALPHA;
383
384 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
385 } else { 487 } else {
386 delete $self->{fow_texture}; 488 delete $self->{fow_texture};
387 } 489 }
388 490
389 glNewList $self->{list}; 491 glNewList $self->{list};
390 492
391 glPushMatrix; 493 glPushMatrix;
392 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
393 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394 496
395 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 497 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
396 498
397 glScale 32, 32; 499 glScale $self->{tilesize}, $self->{tilesize};
398 500
399 if (my $tex = $self->{fow_texture}) { 501 if (my $tex = $self->{fow_texture}) {
502 glPushMatrix;
503 #glScale 1/3, 1/3 if $::CFG->{fow_smooth};
400 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
402 506
403 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 507 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
404 $self->{fow_texture}->draw_quad_alpha (0, 0); 508 $self->{fow_texture}->draw_quad_alpha (0, 0);
405 509
406 glDisable GL_TEXTURE_2D; 510 glDisable GL_TEXTURE_2D;
511 glPopMatrix;
407 } 512 }
408 513
409 if ($self->{magicmap}) { 514 if ($self->{magicmap}) {
410 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 515 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411 516
412 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 517 $x += $::MAP->ox + $self->{dx};
413 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 518 $y += $::MAP->oy + $self->{dy};
414 519
415 glTranslate - $x - 1, - $y - 1; 520 glTranslate - $x - 1, - $y - 1;
416 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 521 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 522 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418 } 523 }
419 524
420 glPopMatrix; 525 glPopMatrix;
421 glEndList; 526 glEndList;
422 } 527 }
528
529}
530
531sub draw {
532 my ($self) = @_;
533
534 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
535
536 return unless $self->{list};
537
538 my $focused = $CFPlus::UI::FOCUS == $self
539 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
540
541 return
542 unless $focused || !$::FAST;
423 543
424 glCallList $self->{list}; 544 glCallList $self->{list};
425 545
426 # TNT2 emulates logops in software (or worse :) 546 # TNT2 emulates logops in software (or worse :)
427 unless ($focused) { 547 unless ($focused) {
… …
446 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
447} 567}
448 568
449package CFPlus::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
450 570
571use strict;
572use utf8;
573
451our @ISA = CFPlus::UI::Base::; 574our @ISA = CFPlus::UI::Base::;
452 575
453use Time::HiRes qw(time); 576use Time::HiRes qw(time);
454use CFPlus::OpenGL; 577use CFPlus::OpenGL;
455 578
456sub size_request { 579sub size_request {
457 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
458} 581}
459 582
460sub invoke_size_allocate { 583sub refresh_hook {
461 my ($self, $w, $h) = @_; 584 my ($self) = @_;
462 585
463 $self->update; 586 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)}; 587 my ($w, $h) = @$self{qw(w h)};
481 588
482 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 589 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
483 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 590 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
484 591
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); 592 my $ox = 0.5 * ($w - $sw);
489 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
490 594
491 glEnable GL_BLEND; 595 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 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 597
496 if ($self->{texture_atime} < time) { 598 #TODO: map scale is completely borked
599
600 my $x0 = int $ox - $sx + 0.5;
601 my $y0 = int $oy - $sy + 0.5;
602
603 $self->{sw} = $sw;
604 $self->{sh} = $sh;
605
606 $self->{x0} = $x0;
607 $self->{y0} = $y0;
608
497 $self->{texture_atime} = time + 1/3; 609 $self->{texture_atime} = time + 1/3;
498 610
499 $self->{texture} = 611 $self->{texture} =
500 new CFPlus::Texture 612 new CFPlus::Texture
501 w => $w, 613 w => $w,
502 h => $h, 614 h => $h,
503 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 615 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; 616 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
505 } 617 }
618}
619
620sub invoke_visibility_change {
621 my ($self) = @_;
622
623 $self->refresh_hook;
624
625 0
626}
627
628sub invoke_size_allocate {
629 my ($self, $w, $h) = @_;
630
631 $self->update;
632
633 1
634}
635
636sub update {
637 my ($self) = @_;
638
639 delete $self->{texture_atime};
640 $self->SUPER::update;
641}
642
643sub _draw {
644 my ($self) = @_;
645
646 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
647
648 $self->{texture} or return;
649
650 glEnable GL_BLEND;
651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
652 glEnable GL_TEXTURE_2D;
653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
506 654
507 $self->{texture}->draw_quad (0, 0); 655 $self->{texture}->draw_quad (0, 0);
508 656
509 glDisable GL_TEXTURE_2D; 657 glDisable GL_TEXTURE_2D;
510 658
511 glTranslate 0.375, 0.375; 659 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 660
518 glColor 1, 1, 0, 1; 661 glColor 1, 1, 0, 1;
519 glBegin GL_LINE_LOOP; 662 glBegin GL_LINE_LOOP;
520 glVertex $x0 , $y0 ; 663 glVertex $self->{x0} , $self->{y0} ;
521 glVertex $x0 , $y0 + $sh; 664 glVertex $self->{x0} , $self->{y0} + $self->{sh};
522 glVertex $x0 + $sw, $y0 + $sh; 665 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
523 glVertex $x0 + $sw, $y0 ; 666 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
524 glEnd; 667 glEnd;
525 668
526 glDisable GL_BLEND; 669 glDisable GL_BLEND;
527} 670}
528 671
… …
564 707
565 if ($ev->{button} == 3) { 708 if ($ev->{button} == 3) {
566 (new CFPlus::UI::Menu 709 (new CFPlus::UI::Menu
567 items => [ 710 items => [
568 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 711 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
569 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 712 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
570 ], 713 ],
571 )->popup ($ev); 714 )->popup ($ev);
572 return 1; 715 return 1;
573 } 716 }
574 0 717 0
… …
775 918
776 $self->SUPER::_draw; 919 $self->SUPER::_draw;
777} 920}
778 921
7791 9221
923

Diff Legend

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