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.122 by root, Wed Dec 5 10:49:17 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::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39
40 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
41} 36}
42 37
43sub add_command { 38sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 40
… …
47 42
48 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
51 46
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 48}
54 49
55sub clr_commands { 50sub clr_commands {
56 my ($self) = @_; 51 my ($self) = @_;
57 52
58 %{$self->{completer}{command}} = (); 53 %{$::COMPLETER->{command}} = ();
59 54
60 $self->{completer}->hide 55 $::COMPLETER->hide
61 if $self->{completer}; 56 if $::COMPLETER;
62} 57}
63 58
64sub test_server_login { 59sub server_login {
65 return unless 60 my ($server) = @_;
66 $::CONN && length $::CONN->{test_server};
67 61
68 my $server = $::CONN->{test_server};
69 ::stop_game (); 62 ::stop_game ();
70 local $::PROFILE->{host} = $server; 63 local $::PROFILE->{host} = $server;
71 ::start_game (); 64 ::start_game ();
72} 65}
73 66
74sub editor_invoke { 67sub editor_invoke {
75 return unless $::CONN; 68 my $editsup = $::CONN && $::CONN->{editor_support}
69 or return;
76 70
77 # putting the password into the env is somewhat tasteless 71 CFPlus::background {
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; 72 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 73
83 CFPlus::set_proxy; 74 my $server = $editsup->{gameserver} || "default";
75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 76
85 my $map = "map:$::CONN->{map_info}[0]"; 77 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
86 79
87 if (fork == 0) { 80 print "map directory is $mapdir\n";
88 $SIG{__DIE__} = sub { 81 print "lib directory is $libdir\n";
89 warn "@_"; 82
90 CFPlus::_exit 99; 83 my $ua = CFPlus::lwp_useragent;
84
85 for my $file (qw(archetypes crossfire.0)) {
86 my $url = "$editsup->{lib_root}$file";
87 print "mirroring $url...\n";
88 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
91 }; 90 }
92 91
93 # TODO: move into editor 92 if (1) { # upload a map
94 require LWP::UserAgent; 93 my $mapname = $::CONN->{map_info}[0];
95 94
96 my $ua = LWP::UserAgent->new ( 95 my $mappath = "$mapdir/$mapname";
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101 96
102 if ($map =~ /^map:(.*)/) { 97 -e $mappath and die "$mappath already exists\n";
103 my $mapname = $1; 98
99 print "getting map revision for $mapname...\n";
100
104 # try to get the most recent head revision, what a hack 101 # try to get the most recent head revision, what a hack,
102 # this should have been returned while downloading *sigh*
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; 103 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
106 104
107 if ($log =~ /\?rev=(\d+\.\d+)"/) { 105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1; 106 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; 107
110 warn "revision is $rev " .(length $map)."\n";#d# 108 print "downloading revision $rev...\n";
109
110 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
111
112 my $meta = {
113 %$editsup,
114 path => $mapname,
115 revision => $rev,
116 cf_login => $::PROFILE->{user},
117 };
118
119 require File::Basename;
120 require File::Path;
121
122 File::Path::mkpath (File::Basename::dirname ($mappath));
123 open my $fh, ">:raw:perlio", "$mappath.meta"
124 or die "$mappath.meta: $!\n";
125 print $fh CFPlus::encode_json $meta;
126 close $fh;
127 open my $fh, ">:raw:perlio:utf8", $mappath
128 or die "$mappath: $!\n";
129 print $fh $map;
130 close $fh;
131
132 print "saved as $mappath\n";
133
134 print "invoking editor...\n";
135 exec "/root/s2/gce $mappath";#d#
111 136
112 # now upload it 137 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common; 138# require HTTP::Request::Common;
116 139#
117 my $res = $ua->post ( 140# my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD}, 141# $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data', 142# Content_Type => 'multipart/form-data',
120 Content => [ 143# Content => [
121 path => $mapname, 144# path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR}, 145# mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map, 146# map => $map,
124 revision => $rev, 147# revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN}, 148# cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD}, 149# cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "", 150# comment => "",
128 ] 151# ]
129 ); 152# );
130 153#
131 if ($res->is_error) { 154# if ($res->is_error) {
132 # fatal condition 155# # fatal condition
133 warn $res->status_line; 156# warn $res->status_line;
134 } else { 157# } else {
135 # script replies are marked as {{..}} 158# # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; 159# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs; 160# warn map "$_\n", @msgs;
138 } 161# }
139 } else { 162 } else {
140 # error, could not detect revision 163 die "viewvc parse error, unable to detect revision\n";
141 } 164 }
142 } 165 }
143
144 CFPlus::_exit;
145 } 166 }
146} 167}
147 168
148sub invoke_button_down { 169sub invoke_button_down {
149 my ($self, $ev, $x, $y) = @_; 170 my ($self, $ev, $x, $y) = @_;
150 171
151 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
152 $self->grab_focus; 173 $self->grab_focus;
153 return unless $::CONN; 174 return unless $::CONN;
154 175
155 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 176 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}; 177 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
157 178
158 $x -= int 0.5 * $self->{sw}; 179 $x -= CFPlus::floor $::MAP->w * 0.5;
159 $y -= int 0.5 * $self->{sh}; 180 $y -= CFPlus::floor $::MAP->h * 0.5;
160 181
182 if ($::CONN) {
161 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
162 if $::CONN; 184 }
163 185
164 } elsif ($ev->{button} == 2) { 186 } elsif ($ev->{button} == 2) {
165 $self->grab_focus; 187 $self->grab_focus;
166 return unless $::CONN; 188 return unless $::CONN;
167 189
… …
177 $::CFG->{map_shift_y} = $bh + $y - $oy; 199 $::CFG->{map_shift_y} = $bh + $y - $oy;
178 200
179 $self->update; 201 $self->update;
180 }; 202 };
181 } elsif ($ev->{button} == 3) { 203 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu 204 my @items = (
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 205 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
192 $::PICKUP_ENABLE->{state} 213 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup" 214 ? "Disable automatic pickup"
194 : "Enable automatic pickup", 215 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle } 216 sub { $::PICKUP_ENABLE->toggle }
196 ], 217 ],
197 $::CONN && length $::CONN->{cvs_root} 218 );
219
220 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 222 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke] 223 \&editor_invoke,
200 : (), 224 ];
201 $::CONN && length $::CONN->{test_server} 225
226 for my $type (qw(test name)) {
227 $::CONN->{editor_support}{type} ne $type
228 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next;
231
232 push @items, [
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", 233 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
203 \&test_server_login] 234 sub { server_login $server },
204 : (), 235 ];
236 }
237 }
238
239 push @items,
205 ["Quit", 240 ["Quit",
206 sub { 241 sub {
207 if ($::CONN) { 242 if ($::CONN) {
208 &::open_quit_dialog; 243 &::open_quit_dialog;
209 } else { 244 } else {
210 exit; 245 exit;
211 }
212 } 246 }
213 ], 247 }
214 ], 248 ],
249 ;
250
251 (new CFPlus::UI::Menu
252 items => \@items,
215 )->popup ($ev); 253 )->popup ($ev);
216 } 254 }
217 255
218 1 256 1
219} 257}
… …
237 275
238 1 276 1
239} 277}
240 278
241sub size_request { 279sub size_request {
280 my ($self) = @_;
281
242 ( 282 (
243 32 * CFPlus::ceil $::WIDTH / 32, 283 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
244 32 * CFPlus::ceil $::HEIGHT / 32, 284 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
245 ) 285 )
246} 286}
247 287
248sub update { 288sub update {
249 my ($self) = @_; 289 my ($self) = @_;
… …
251 $self->{need_update} = 1; 291 $self->{need_update} = 1;
252 $self->SUPER::update; 292 $self->SUPER::update;
253} 293}
254 294
255my %DIR = ( 295my %DIR = (
296 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
256 CFPlus::SDLK_KP8, [1, "north"], 297 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
257 CFPlus::SDLK_KP9, [2, "northeast"], 298 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
258 CFPlus::SDLK_KP6, [3, "east"], 299 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
259 CFPlus::SDLK_KP3, [4, "southeast"], 300 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
260 CFPlus::SDLK_KP2, [5, "south"], 301 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
261 CFPlus::SDLK_KP1, [6, "southwest"], 302 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
262 CFPlus::SDLK_KP4, [7, "west"], 303 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
263 CFPlus::SDLK_KP7, [8, "northwest"], 304 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
264 305
265 CFPlus::SDLK_UP, [1, "north"], 306 ( "," . CFPlus::SDLK_UP ), [1, "north"],
307 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
266 CFPlus::SDLK_RIGHT, [3, "east"], 308 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
309 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
267 CFPlus::SDLK_DOWN, [5, "south"], 310 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
311 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
268 CFPlus::SDLK_LEFT, [7, "west"], 312 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
313 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
269); 314);
270 315
271sub invoke_key_down { 316sub invoke_key_down {
272 my ($self, $ev) = @_; 317 my ($self, $ev) = @_;
273 318
… …
275 my $sym = $ev->{sym}; 320 my $sym = $ev->{sym};
276 my $uni = $ev->{unicode}; 321 my $uni = $ev->{unicode};
277 322
278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 323 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279 324
280 if ($uni == ord "\t") { 325 if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
281 $::PL_WINDOW->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
287 ::toggle_player_page ($::SKILL_PAGE);
288 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
289 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::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) {
308 return 0; # bindings further down need a valid connection
309
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
311 $::CONN->user_send ("stay fire");
312 } elsif ($uni == ord ",") {
313 $::CONN->user_send ("take");
314 } elsif ($uni == ord " ") {
315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
318 } elsif ($uni == ord ".") {
319 $::CONN->user_send ($self->{completer}{last_command})
320 if exists $self->{completer}{last_command};
321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
322 $::CONN->user_send ($_) for @$bind_cmd;
323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
324 $::CONN->user_send ("rotateshoottype +");
325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
326 $::CONN->user_send ("rotateshoottype -");
327 } elsif ($uni == ord '"') {
328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
329 $self->{completer}->show;
330 } elsif ($uni == ord "'") {
331 $self->{completer}->set_prefix ("");
332 $self->{completer}->show;
333 } elsif (exists $DIR{$sym}) {
334 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & CFPlus::KMOD_SHIFT) {
335 $self->{shft}++; 327 $self->{shft}++;
336 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
337 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
338 } 330 }
339 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $DIR{$sym}[0];
340 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & CFPlus::KMOD_CTRL) {
341 $self->{ctrl}++; 333 $self->{ctrl}++;
342 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
343 } else { 335 } else {
344 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
345 } 337 }
346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
347 $self->{completer}->inject_key_down ($ev);
348 $self->{completer}->show;
349 } else {
350 return 0; 339 return 1;
351 }
352
353 1 340 }
341
342 0
354} 343}
355 344
356sub invoke_key_up { 345sub invoke_key_up {
357 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
358 347
… …
384 } 373 }
385 374
386 $res 375 $res
387} 376}
388 377
378sub invoke_visibility_change {
379 my ($self) = @_;
380
381 $self->refresh_hook;
382
383 0
384}
385
389sub set_magicmap { 386sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_; 387 my ($self, $w, $h, $x, $y, $data) = @_;
391 388
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 389 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 390 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394 391
395 $self->{magicmap} = [$x, $y, $w, $h, $data]; 392 $self->{magicmap} = [$x, $y, $w, $h, $data];
396 393
397 $self->update; 394 $self->update;
398} 395}
399 396
397sub refresh_hook {
398 my ($self) = @_;
399
400 if ($::MAP && $::CONN) {
401 if (delete $self->{need_update}) {
402 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
403
404 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
405 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
406
407 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
408 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
409
410 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
411 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
412
413 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
414 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
415
416 if ($::CFG->{fow_enable}) {
417 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
418
419 $self->{fow_texture} = new CFPlus::Texture
420 w => $w,
421 h => $h,
422 data => $data,
423 internalformat => GL_ALPHA,
424 format => GL_ALPHA;
425 } else {
426 delete $self->{fow_texture};
427 }
428
429 glNewList ($self->{list} ||= glGenList);
430
431 glPushMatrix;
432 glTranslate $sx0, $sy0;
433 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
434
435 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
436
437 glScale $self->{tilesize}, $self->{tilesize};
438
439 if (my $tex = $self->{fow_texture}) {
440 glPushMatrix;
441 glScale 1/3, 1/3;
442 glEnable GL_TEXTURE_2D;
443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
444
445 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
446 $self->{fow_texture}->draw_quad_alpha (0, 0);
447
448 glDisable GL_TEXTURE_2D;
449 glPopMatrix;
450 }
451
452 if ($self->{magicmap}) {
453 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
454
455 $x += $::MAP->ox + $self->{dx};
456 $y += $::MAP->oy + $self->{dy};
457
458 glTranslate - $x - 1, - $y - 1;
459 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
460 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
461 }
462
463 glPopMatrix;
464 glEndList;
465 }
466 } else {
467 glDeleteList delete $self->{list}
468 if $self->{list};
469 }
470}
471
400sub draw { 472sub draw {
401 my ($self) = @_; 473 my ($self) = @_;
402 474
403 return unless $::MAP; 475 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
476
477 return unless $self->{list};
404 478
405 my $focused = $CFPlus::UI::FOCUS == $self 479 my $focused = $CFPlus::UI::FOCUS == $self
406 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 480 || $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
407 481
408 return 482 return
409 unless $focused || !$::FAST; 483 unless $focused || !$::FAST;
410 484
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
485 glCallList $self->{list}; 485 glCallList $self->{list};
486 486
487 # TNT2 emulates logops in software (or worse :) 487 # TNT2 emulates logops in software (or worse :)
488 unless ($focused) { 488 unless ($focused) {
489 glColor 0.4, 0.2, 0.2, 0.6; 489 glColor_premultiply 0, 0, 1, 0.25;
490 glEnable GL_BLEND; 490 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glBegin GL_QUADS; 492 glBegin GL_QUADS;
493 glVertex 0, 0; 493 glVertex 0, 0;
494 glVertex 0, $::HEIGHT; 494 glVertex 0, $::HEIGHT;
495 glVertex $::WIDTH, $::HEIGHT; 495 glVertex $::WIDTH, $::HEIGHT;
496 glVertex $::WIDTH, 0; 496 glVertex $::WIDTH, 0;
… …
507 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
508} 508}
509 509
510package CFPlus::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
511 511
512use strict;
513use utf8;
514
512our @ISA = CFPlus::UI::Base::; 515our @ISA = CFPlus::UI::Base::;
513 516
514use Time::HiRes qw(time); 517use Time::HiRes qw(time);
515use CFPlus::OpenGL; 518use CFPlus::OpenGL;
516 519
517sub size_request { 520sub size_request {
518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 521 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
519} 522}
520 523
521sub invoke_size_allocate { 524sub refresh_hook {
522 my ($self, $w, $h) = @_; 525 my ($self) = @_;
523 526
524 $self->update; 527 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)}; 528 my ($w, $h) = @$self{qw(w h)};
542 529
543 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 530 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
544 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 531 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
545 532
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); 533 my $ox = 0.5 * ($w - $sw);
550 my $oy = 0.5 * ($h - $sh); 534 my $oy = 0.5 * ($h - $sh);
551 535
552 glEnable GL_BLEND; 536 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 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 538
557 if ($self->{texture_atime} < time) { 539 #TODO: map scale is completely borked
540
541 my $x0 = int $ox - $sx + 0.5;
542 my $y0 = int $oy - $sy + 0.5;
543
544 $self->{sw} = $sw;
545 $self->{sh} = $sh;
546
547 $self->{x0} = $x0;
548 $self->{y0} = $y0;
549
558 $self->{texture_atime} = time + 1/3; 550 $self->{texture_atime} = time + 1/3;
559 551
560 $self->{texture} = 552 $self->{texture} =
561 new CFPlus::Texture 553 new CFPlus::Texture
562 w => $w, 554 w => $w,
563 h => $h, 555 h => $h,
564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 556 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; 557 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
566 } 558 }
559}
560
561sub invoke_visibility_change {
562 my ($self) = @_;
563
564 $self->refresh_hook;
565
566 0
567}
568
569sub invoke_size_allocate {
570 my ($self, $w, $h) = @_;
571
572 $self->update;
573
574 1
575}
576
577sub update {
578 my ($self) = @_;
579
580 delete $self->{texture_atime};
581 $self->SUPER::update;
582}
583
584sub _draw {
585 my ($self) = @_;
586
587 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
588
589 $self->{texture} or return;
590
591 glEnable GL_BLEND;
592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
593 glEnable GL_TEXTURE_2D;
594 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
567 595
568 $self->{texture}->draw_quad (0, 0); 596 $self->{texture}->draw_quad (0, 0);
569 597
570 glDisable GL_TEXTURE_2D; 598 glDisable GL_TEXTURE_2D;
571 599
572 glTranslate 0.375, 0.375; 600 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 601
579 glColor 1, 1, 0, 1; 602 glColor 1, 1, 0, 1;
580 glBegin GL_LINE_LOOP; 603 glBegin GL_LINE_LOOP;
581 glVertex $x0 , $y0 ; 604 glVertex $self->{x0} , $self->{y0} ;
582 glVertex $x0 , $y0 + $sh; 605 glVertex $self->{x0} , $self->{y0} + $self->{sh};
583 glVertex $x0 + $sw, $y0 + $sh; 606 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
584 glVertex $x0 + $sw, $y0 ; 607 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
585 glEnd; 608 glEnd;
586 609
587 glDisable GL_BLEND; 610 glDisable GL_BLEND;
588} 611}
589 612
… …
625 648
626 if ($ev->{button} == 3) { 649 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu 650 (new CFPlus::UI::Menu
628 items => [ 651 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 652 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 653 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631 ], 654 ],
632 )->popup ($ev); 655 )->popup ($ev);
633 return 1; 656 return 1;
634 } 657 }
635 0 658 0
… …
836 859
837 $self->SUPER::_draw; 860 $self->SUPER::_draw;
838} 861}
839 862
8401 8631
864

Diff Legend

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