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.84 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.114 by root, Mon Jul 23 23:52: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",
… …
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 my $map = "map:$::CONN->{map_info}[0]"; 82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
86 84
87 if (fork == 0) { 85 print "map directory is $mapdir\n";
88 $SIG{__DIE__} = sub { 86 print "lib directory is $libdir\n";
89 warn "@_"; 87
90 CFPlus::_exit 99; 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";
91 }; 95 }
92 96
93 # TODO: move into editor 97 if (1) { # upload a map
94 require LWP::UserAgent; 98 my $mapname = $::CONN->{map_info}[0];
95 99
96 my $ua = LWP::UserAgent->new ( 100 my $mappath = "$mapdir/$mapname";
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101 101
102 if ($map =~ /^map:(.*)/) { 102 -e $mappath and die "$mappath already exists\n";
103 my $mapname = $1; 103
104 print "getting map revision for $mapname...\n";
105
104 # try to get the most recent head revision, what a hack 106 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh*
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; 108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
106 109
107 if ($log =~ /\?rev=(\d+\.\d+)"/) { 110 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1; 111 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; 112
110 warn "revision is $rev " .(length $map)."\n";#d# 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#
111 141
112 # now upload it 142 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common; 143# require HTTP::Request::Common;
116 144#
117 my $res = $ua->post ( 145# my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD}, 146# $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data', 147# Content_Type => 'multipart/form-data',
120 Content => [ 148# Content => [
121 path => $mapname, 149# path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR}, 150# mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map, 151# map => $map,
124 revision => $rev, 152# revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN}, 153# cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD}, 154# cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "", 155# comment => "",
128 ] 156# ]
129 ); 157# );
130 158#
131 if ($res->is_error) { 159# if ($res->is_error) {
132 # fatal condition 160# # fatal condition
133 warn $res->status_line; 161# warn $res->status_line;
134 } else { 162# } else {
135 # script replies are marked as {{..}} 163# # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; 164# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs; 165# warn map "$_\n", @msgs;
138 } 166# }
139 } else { 167 } else {
140 # error, could not detect revision 168 die "viewvc parse error, unable to detect revision\n";
141 } 169 }
142 } 170 }
143
144 CFPlus::_exit;
145 } 171 }
146} 172}
147 173
148sub invoke_button_down { 174sub invoke_button_down {
149 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
150 176
151 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
152 $self->grab_focus; 178 $self->grab_focus;
153 return unless $::CONN; 179 return unless $::CONN;
154 180
155 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};
156 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};
157 183
158 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
159 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
160 186
187 if ($::CONN) {
188 if ($::IN_BUILD_MODE) {
189 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190 } else {
161 $::CONN->lookat ($x, $y) 191 $::CONN->lookat ($x, $y)
162 if $::CONN; 192 }
193 }
163 194
164 } elsif ($ev->{button} == 2) { 195 } elsif ($ev->{button} == 2) {
165 $self->grab_focus; 196 $self->grab_focus;
166 return unless $::CONN; 197 return unless $::CONN;
167 198
… …
177 $::CFG->{map_shift_y} = $bh + $y - $oy; 208 $::CFG->{map_shift_y} = $bh + $y - $oy;
178 209
179 $self->update; 210 $self->update;
180 }; 211 };
181 } elsif ($ev->{button} == 3) { 212 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu 213 my @items = (
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 214 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 215 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 216 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 217 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 218 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
192 $::PICKUP_ENABLE->{state} 222 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup" 223 ? "Disable automatic pickup"
194 : "Enable automatic pickup", 224 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle } 225 sub { $::PICKUP_ENABLE->toggle }
196 ], 226 ],
197 $::CONN && length $::CONN->{cvs_root} 227 );
228
229 if ($::CONN && $::CONN->{editor_support}) {
230 push @items, [
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 231 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke] 232 \&editor_invoke,
200 : (), 233 ];
201 $::CONN && length $::CONN->{test_server} 234
235 for my $type (qw(test name)) {
236 $::CONN->{editor_support}{type} ne $type
237 or next;
238 my $server = $::CONN->{editor_support}{"${type}server"}
239 or next;
240
241 push @items, [
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", 242 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
203 \&test_server_login] 243 sub { server_login $server },
204 : (), 244 ];
245 }
246 }
247
248 push @items,
205 ["Quit", 249 ["Quit",
206 sub { 250 sub {
207 if ($::CONN) { 251 if ($::CONN) {
208 &::open_quit_dialog; 252 &::open_quit_dialog;
209 } else { 253 } else {
210 exit; 254 exit;
211 }
212 } 255 }
213 ], 256 }
214 ], 257 ],
258 ;
259
260 (new CFPlus::UI::Menu
261 items => \@items,
215 )->popup ($ev); 262 )->popup ($ev);
216 } 263 }
217 264
218 1 265 1
219} 266}
… …
237 284
238 1 285 1
239} 286}
240 287
241sub size_request { 288sub size_request {
289 my ($self) = @_;
290
242 ( 291 (
243 32 * CFPlus::ceil $::WIDTH / 32, 292 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
244 32 * CFPlus::ceil $::HEIGHT / 32, 293 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
245 ) 294 )
246} 295}
247 296
248sub update { 297sub update {
249 my ($self) = @_; 298 my ($self) = @_;
… …
251 $self->{need_update} = 1; 300 $self->{need_update} = 1;
252 $self->SUPER::update; 301 $self->SUPER::update;
253} 302}
254 303
255my %DIR = ( 304my %DIR = (
305 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
256 CFPlus::SDLK_KP8, [1, "north"], 306 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
257 CFPlus::SDLK_KP9, [2, "northeast"], 307 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
258 CFPlus::SDLK_KP6, [3, "east"], 308 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
259 CFPlus::SDLK_KP3, [4, "southeast"], 309 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
260 CFPlus::SDLK_KP2, [5, "south"], 310 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
261 CFPlus::SDLK_KP1, [6, "southwest"], 311 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
262 CFPlus::SDLK_KP4, [7, "west"], 312 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
263 CFPlus::SDLK_KP7, [8, "northwest"], 313 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
264 314
265 CFPlus::SDLK_UP, [1, "north"], 315 ( "," . CFPlus::SDLK_UP ), [1, "north"],
316 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
266 CFPlus::SDLK_RIGHT, [3, "east"], 317 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
318 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
267 CFPlus::SDLK_DOWN, [5, "south"], 319 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
320 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
268 CFPlus::SDLK_LEFT, [7, "west"], 321 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
322 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
269); 323);
270 324
271sub invoke_key_down { 325sub invoke_key_down {
272 my ($self, $ev) = @_; 326 my ($self, $ev) = @_;
273 327
… …
275 my $sym = $ev->{sym}; 329 my $sym = $ev->{sym};
276 my $uni = $ev->{unicode}; 330 my $uni = $ev->{unicode};
277 331
278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 332 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279 333
280 if ($uni == ord "\t") { 334 if ($sym == 9) {
281 $::PL_WINDOW->toggle_visibility; 335 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility; 337 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE); 339 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
289 ::toggle_player_page ($::SPELL_PAGE); 343 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE); 345 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 346 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::SETUP_DIALOG->toggle_visibility; 347 $::SETUP_DIALOG->toggle_visibility;
294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
295 $::BIND_EDITOR->set_binding (undef, undef, [],
296 sub {
297 my ($mod, $sym, $cmds) = @_;
298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
299 });
300 $::BIND_EDITOR->start;
301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
304# $::BIND_EDITOR->stop;
305# $::BIND_EDITOR->ask_for_bind_and_commit;
306# $::BIND_EDITOR->hide;
307 } elsif (!$::CONN) { 348 } elsif (!$::CONN) {
308 return 0; # bindings further down need a valid connection 349 return 0; # bindings further down need a valid connection
309 350
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
311 $::CONN->user_send ("stay fire");
312 } elsif ($uni == ord ",") { 351 } elsif ($uni == ord ",") {
313 $::CONN->user_send ("take"); 352 $::CONN->user_send ("take");
314 } elsif ($uni == ord " ") { 353 } elsif ($uni == ord " ") {
315 $::CONN->user_send ("apply"); 354 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) { 355 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine"); 356 $::CONN->user_send ("examine");
318 } elsif ($uni == ord ".") { 357 } elsif ($uni == ord ".") {
319 $::CONN->user_send ($self->{completer}{last_command}) 358 $::CONN->user_send ($self->{completer}{last_command})
320 if exists $self->{completer}{last_command}; 359 if exists $self->{completer}{last_command};
321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 360 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
322 $::CONN->user_send ($_) for @$bind_cmd; 361 $::CONN->macro_send ($_) for @macros;
323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 362 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
324 $::CONN->user_send ("rotateshoottype +"); 363 $::CONN->user_send ("rotateshoottype +");
325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 364 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
326 $::CONN->user_send ("rotateshoottype -"); 365 $::CONN->user_send ("rotateshoottype -");
366 } elsif ($uni == ord '!') {
367 $self->{completer}->set_prefix ("shout ");
368 $self->{completer}->show;
327 } elsif ($uni == ord '"') { 369 } elsif ($uni == ord '"') {
328 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 370 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
329 $self->{completer}->show; 371 $self->{completer}->show;
330 } elsif ($uni == ord "'") { 372 } elsif ($uni == ord "'") {
331 $self->{completer}->set_prefix (""); 373 $self->{completer}->set_prefix ("");
332 $self->{completer}->show; 374 $self->{completer}->show;
333 } elsif (exists $DIR{$sym}) { 375 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
334 if ($mod & CFPlus::KMOD_SHIFT) { 376 if ($mod & CFPlus::KMOD_SHIFT) {
335 $self->{shft}++; 377 $self->{shft}++;
336 if ($DIR{$sym}[0] != $self->{fire_dir}) { 378 if ($dir->[0] != $self->{fire_dir}) {
337 $::CONN->user_send ("fire $DIR{$sym}[0]"); 379 $::CONN->user_send ("fire $dir->[0]");
338 } 380 }
339 $self->{fire_dir} = $DIR{$sym}[0]; 381 $self->{fire_dir} = $DIR{$sym}[0];
340 } elsif ($mod & CFPlus::KMOD_CTRL) { 382 } elsif ($mod & CFPlus::KMOD_CTRL) {
341 $self->{ctrl}++; 383 $self->{ctrl}++;
342 $::CONN->user_send ("run $DIR{$sym}[0]"); 384 $::CONN->user_send ("run $dir->[0]");
343 } else { 385 } else {
344 $::CONN->user_send ("$DIR{$sym}[1]"); 386 $::CONN->user_send ("$dir->[1]");
345 } 387 }
346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 388 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
347 $self->{completer}->inject_key_down ($ev); 389 $self->{completer}->inject_key_down ($ev);
348 $self->{completer}->show; 390 $self->{completer}->show;
349 } else { 391 } else {
… …
384 } 426 }
385 427
386 $res 428 $res
387} 429}
388 430
431sub invoke_visibility_change {
432 my ($self) = @_;
433
434 $self->refresh_hook;
435
436 0
437}
438
389sub set_magicmap { 439sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_; 440 my ($self, $w, $h, $x, $y, $data) = @_;
391 441
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 442 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 443 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394 444
395 $self->{magicmap} = [$x, $y, $w, $h, $data]; 445 $self->{magicmap} = [$x, $y, $w, $h, $data];
396 446
397 $self->update; 447 $self->update;
398} 448}
399 449
450sub refresh_hook {
451 my ($self) = @_;
452
453 if ($::MAP) {
454 if (delete $self->{need_update}) {
455 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
456
457 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
458 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
459
460 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
461 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
462
463 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
464 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
465
466 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
467 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
468
469 if ($::CFG->{fow_enable}) {
470 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
471
472 $self->{fow_texture} = new CFPlus::Texture
473 w => $w,
474 h => $h,
475 data => $data,
476 internalformat => GL_ALPHA,
477 format => GL_ALPHA;
478 } else {
479 delete $self->{fow_texture};
480 }
481
482 glNewList ($self->{list} ||= glGenList);
483
484 glPushMatrix;
485 glTranslate $sx0, $sy0;
486 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
487
488 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
489
490 glScale $self->{tilesize}, $self->{tilesize};
491
492 if (my $tex = $self->{fow_texture}) {
493 glPushMatrix;
494 glScale 1/3, 1/3;
495 glEnable GL_TEXTURE_2D;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
497
498 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
499 $self->{fow_texture}->draw_quad_alpha (0, 0);
500
501 glDisable GL_TEXTURE_2D;
502 glPopMatrix;
503 }
504
505 if ($self->{magicmap}) {
506 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
507
508 $x += $::MAP->ox + $self->{dx};
509 $y += $::MAP->oy + $self->{dy};
510
511 glTranslate - $x - 1, - $y - 1;
512 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
513 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
514 }
515
516 glPopMatrix;
517 glEndList;
518 }
519 } else {
520 glDeleteList delete $self->{list}
521 if $self->{list};
522 }
523}
524
400sub draw { 525sub draw {
401 my ($self) = @_; 526 my ($self) = @_;
402 527
403 return unless $::MAP; 528 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
529
530 return unless $self->{list};
404 531
405 my $focused = $CFPlus::UI::FOCUS == $self 532 my $focused = $CFPlus::UI::FOCUS == $self
406 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 533 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
407 534
408 return 535 return
409 unless $focused || !$::FAST; 536 unless $focused || !$::FAST;
410
411 if (delete $self->{need_update}) {
412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
413
414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
416
417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
419
420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
422
423 if ($::CFG->{fow_enable}) {
424 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
425
426 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
428 glConvolutionFilter2D (
429 GL_CONVOLUTION_2D,
430 GL_ALPHA,
431 3, 3,
432 GL_ALPHA, GL_FLOAT,
433 (pack "f*", @{ $self->{smooth_matrix} }),
434 );
435 glEnable GL_CONVOLUTION_2D;
436 }
437
438 $self->{fow_texture} = new CFPlus::Texture
439 w => $w,
440 h => $h,
441 data => $data,
442 internalformat => GL_ALPHA,
443 format => GL_ALPHA;
444
445 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
446 } else {
447 delete $self->{fow_texture};
448 }
449
450 glNewList $self->{list};
451
452 glPushMatrix;
453 glTranslate $sx0, $sy0;
454 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
455
456 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
457
458 glScale 32, 32;
459
460 if (my $tex = $self->{fow_texture}) {
461 glEnable GL_TEXTURE_2D;
462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
463
464 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
465 $self->{fow_texture}->draw_quad_alpha (0, 0);
466
467 glDisable GL_TEXTURE_2D;
468 }
469
470 if ($self->{magicmap}) {
471 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472
473 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
474 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
475
476 glTranslate - $x - 1, - $y - 1;
477 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479 }
480
481 glPopMatrix;
482 glEndList;
483 }
484 537
485 glCallList $self->{list}; 538 glCallList $self->{list};
486 539
487 # TNT2 emulates logops in software (or worse :) 540 # TNT2 emulates logops in software (or worse :)
488 unless ($focused) { 541 unless ($focused) {
… …
507 $self->SUPER::DESTROY; 560 $self->SUPER::DESTROY;
508} 561}
509 562
510package CFPlus::MapWidget::MapMap; 563package CFPlus::MapWidget::MapMap;
511 564
565use strict;
566use utf8;
567
512our @ISA = CFPlus::UI::Base::; 568our @ISA = CFPlus::UI::Base::;
513 569
514use Time::HiRes qw(time); 570use Time::HiRes qw(time);
515use CFPlus::OpenGL; 571use CFPlus::OpenGL;
516 572
517sub size_request { 573sub size_request {
518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 574 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
519} 575}
520 576
521sub invoke_size_allocate { 577sub refresh_hook {
522 my ($self, $w, $h) = @_; 578 my ($self) = @_;
523 579
524 $self->update; 580 if ($::MAP && $self->{texture_atime} < time) {
525
526 1
527}
528
529sub update {
530 my ($self) = @_;
531
532 delete $self->{texture_atime};
533 $self->SUPER::update;
534}
535
536sub _draw {
537 my ($self) = @_;
538
539 $::MAP or return;
540
541 my ($w, $h) = @$self{qw(w h)}; 581 my ($w, $h) = @$self{qw(w h)};
542 582
543 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 583 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
544 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 584 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
545 585
546 my $sx = int $::CFG->{map_shift_x} / 32;
547 my $sy = int $::CFG->{map_shift_y} / 32;
548
549 my $ox = 0.5 * ($w - $sw); 586 my $ox = 0.5 * ($w - $sw);
550 my $oy = 0.5 * ($h - $sh); 587 my $oy = 0.5 * ($h - $sh);
551 588
552 glEnable GL_BLEND; 589 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 590 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
554 glEnable GL_TEXTURE_2D;
555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
556 591
557 if ($self->{texture_atime} < time) { 592 #TODO: map scale is completely borked
593
594 my $x0 = int $ox - $sx + 0.5;
595 my $y0 = int $oy - $sy + 0.5;
596
597 $self->{sw} = $sw;
598 $self->{sh} = $sh;
599
600 $self->{x0} = $x0;
601 $self->{y0} = $y0;
602
558 $self->{texture_atime} = time + 1/3; 603 $self->{texture_atime} = time + 1/3;
559 604
560 $self->{texture} = 605 $self->{texture} =
561 new CFPlus::Texture 606 new CFPlus::Texture
562 w => $w, 607 w => $w,
563 h => $h, 608 h => $h,
564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 609 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
565 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 610 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
566 } 611 }
612}
613
614sub invoke_visibility_change {
615 my ($self) = @_;
616
617 $self->refresh_hook;
618
619 0
620}
621
622sub invoke_size_allocate {
623 my ($self, $w, $h) = @_;
624
625 $self->update;
626
627 1
628}
629
630sub update {
631 my ($self) = @_;
632
633 delete $self->{texture_atime};
634 $self->SUPER::update;
635}
636
637sub _draw {
638 my ($self) = @_;
639
640 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
641
642 $self->{texture} or return;
643
644 glEnable GL_BLEND;
645 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
646 glEnable GL_TEXTURE_2D;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
567 648
568 $self->{texture}->draw_quad (0, 0); 649 $self->{texture}->draw_quad (0, 0);
569 650
570 glDisable GL_TEXTURE_2D; 651 glDisable GL_TEXTURE_2D;
571 652
572 glTranslate 0.375, 0.375; 653 glTranslate 0.375, 0.375;
573
574 #TODO: map scale is completely borked
575
576 my $x0 = int $ox - $sx + 0.5;
577 my $y0 = int $oy - $sy + 0.5;
578 654
579 glColor 1, 1, 0, 1; 655 glColor 1, 1, 0, 1;
580 glBegin GL_LINE_LOOP; 656 glBegin GL_LINE_LOOP;
581 glVertex $x0 , $y0 ; 657 glVertex $self->{x0} , $self->{y0} ;
582 glVertex $x0 , $y0 + $sh; 658 glVertex $self->{x0} , $self->{y0} + $self->{sh};
583 glVertex $x0 + $sw, $y0 + $sh; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
584 glVertex $x0 + $sw, $y0 ; 660 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
585 glEnd; 661 glEnd;
586 662
587 glDisable GL_BLEND; 663 glDisable GL_BLEND;
588} 664}
589 665
… …
625 701
626 if ($ev->{button} == 3) { 702 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu 703 (new CFPlus::UI::Menu
628 items => [ 704 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 705 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 706 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631 ], 707 ],
632 )->popup ($ev); 708 )->popup ($ev);
633 return 1; 709 return 1;
634 } 710 }
635 0 711 0
… …
836 912
837 $self->SUPER::_draw; 913 $self->SUPER::_draw;
838} 914}
839 915
8401 9161
917

Diff Legend

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