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.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

1package CFPlus::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use DC;
9use CFPlus::OpenGL; 9use DC::OpenGL;
10use CFPlus::UI; 10use DC::UI;
11use DC::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub new {
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
35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command},
37 tooltip => "<b>The Command Completer</b>\n\n"
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45 ;
46 28
47 $self 29 $self
48} 30}
49 31
50sub add_command { 32sub add_command {
… …
54 36
55 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
56 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
57 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
58 40
59 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
60} 42}
61 43
62sub clr_commands { 44sub clr_commands {
63 my ($self) = @_; 45 my ($self) = @_;
64 46
65 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
66 48
67 $self->{completer}->hide 49 $::COMPLETER->hide
68 if $self->{completer}; 50 if $::COMPLETER;
51}
52
53sub server_login {
54 my ($server) = @_;
55
56 ::stop_game ();
57 local $::PROFILE->{host} = $server;
58 ::start_game ();
59}
60
61sub editor_invoke {
62 my $editsup = $::CONN && $::CONN->{editor_support}
63 or return;
64
65 DC::background {
66 print "preparing editor startup...\n";
67
68 my $server = $editsup->{gameserver} || "default";
69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
70
71 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
72 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
73
74 print "map directory is $mapdir\n";
75 print "lib directory is $libdir\n";
76
77 my $ua = DC::lwp_useragent;
78
79 for my $file (qw(archetypes crossfire.0)) {
80 my $url = "$editsup->{lib_root}$file";
81 print "mirroring $url...\n";
82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
84 }
85
86 if (1) { # upload a map
87 my $mapname = $::CONN->{map_info}[0];
88
89 my $mappath = "$mapdir/$mapname";
90
91 -e $mappath and die "$mappath already exists\n";
92
93 print "getting map revision for $mapname...\n";
94
95 # try to get the most recent head revision, what a hack,
96 # this should have been returned while downloading *sigh*
97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
98
99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
100 my $rev = $1;
101
102 print "downloading revision $rev...\n";
103
104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
105
106 my $meta = {
107 %$editsup,
108 path => $mapname,
109 revision => $rev,
110 cf_login => $::PROFILE->{user},
111 };
112
113 require File::Basename;
114 require File::Path;
115
116 File::Path::mkpath (File::Basename::dirname ($mappath));
117 open my $fh, ">:raw:perlio", "$mappath.meta"
118 or die "$mappath.meta: $!\n";
119 print $fh DC::encode_json $meta;
120 close $fh;
121 open my $fh, ">:raw:perlio:utf8", $mappath
122 or die "$mappath: $!\n";
123 print $fh $map;
124 close $fh;
125
126 print "saved as $mappath\n";
127
128 print "invoking editor...\n";
129 exec "/root/s2/gce $mappath";#d#
130
131 # now upload it
132# require HTTP::Request::Common;
133#
134# my $res = $ua->post (
135# $ENV{CFPLUS_UPLOAD},
136# Content_Type => 'multipart/form-data',
137# Content => [
138# path => $mapname,
139# mapdir => $ENV{CROSSFIRE_MAPDIR},
140# map => $map,
141# revision => $rev,
142# cf_login => $ENV{CFPLUS_LOGIN},
143# cf_password => $ENV{CFPLUS_PASSWORD},
144# comment => "",
145# ]
146# );
147#
148# if ($res->is_error) {
149# # fatal condition
150# warn $res->status_line;
151# } else {
152# # script replies are marked as {{..}}
153# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
154# warn map "$_\n", @msgs;
155# }
156 } else {
157 die "viewvc parse error, unable to detect revision\n";
158 }
159 }
160 }
69} 161}
70 162
71sub invoke_button_down { 163sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
73 165
74 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
75 $self->grab_focus; 167 $self->grab_focus;
76 return unless $::CONN; 168 return unless $::CONN;
77 169
78 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
79 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
80 172
81 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
82 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
83 175
176 if ($::CONN) {
84 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
85 if $::CONN; 178 }
86 179
87 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
88 $self->grab_focus; 181 $self->grab_focus;
89 return unless $::CONN; 182 return unless $::CONN;
90 183
… …
100 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
101 194
102 $self->update; 195 $self->update;
103 }; 196 };
104 } elsif ($ev->{button} == 3) { 197 } elsif ($ev->{button} == 3) {
105 (new CFPlus::UI::Menu 198 my @items = (
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 199 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
112 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
113 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
114 [ 206 [
115 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
117 : "Enable automatic pickup", 209 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
119 ], 211 ],
212 );
213
214 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke,
218# ];
219
220 for my $type (qw(test name)) {
221 $::CONN->{editor_support}{type} ne $type
222 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next;
225
226 push @items, [
227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
228 sub { server_login $server },
229 ];
230 }
231 }
232
233 push @items,
120 ["Quit", 234 ["Quit",
121 sub { 235 sub {
122 if ($::CONN) { 236 if ($::CONN) {
123 &::open_quit_dialog; 237 &::open_quit_dialog;
124 } else { 238 } else {
125 exit; 239 exit;
126 }
127 } 240 }
128 ], 241 }
129 ], 242 ],
243 ;
244
245 (new DC::UI::Menu
246 items => \@items,
130 )->popup ($ev); 247 )->popup ($ev);
131 } 248 }
132 249
133 1 250 1
134} 251}
… …
152 269
153 1 270 1
154} 271}
155 272
156sub size_request { 273sub size_request {
274 my ($self) = @_;
275
157 ( 276 (
158 32 * CFPlus::ceil $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
159 32 * CFPlus::ceil $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
160 ) 279 )
161} 280}
162 281
163sub update { 282sub update {
164 my ($self) = @_; 283 my ($self) = @_;
… …
166 $self->{need_update} = 1; 285 $self->{need_update} = 1;
167 $self->SUPER::update; 286 $self->SUPER::update;
168} 287}
169 288
170my %DIR = ( 289my %DIR = (
171 CFPlus::SDLK_KP8, [1, "north"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"],
172 CFPlus::SDLK_KP9, [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
173 CFPlus::SDLK_KP6, [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
174 CFPlus::SDLK_KP3, [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
175 CFPlus::SDLK_KP2, [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
176 CFPlus::SDLK_KP1, [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
177 CFPlus::SDLK_KP4, [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
178 CFPlus::SDLK_KP7, [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
179 299
180 CFPlus::SDLK_UP, [1, "north"], 300 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
301 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
302 ( "," . DC::SDLK_END ), [6, "southwest"],
303 ( "," . DC::SDLK_HOME ), [8, "northwest"],
304
305 ( "," . DC::SDLK_UP ), [1, "north"],
306 ("1," . DC::SDLK_UP ), [2, "northeast"],
181 CFPlus::SDLK_RIGHT, [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
182 CFPlus::SDLK_DOWN, [5, "south"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
183 CFPlus::SDLK_LEFT, [7, "west"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
311 ( "," . DC::SDLK_LEFT ), [7, "west"],
312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
184); 313);
185 314
186sub invoke_key_down { 315sub invoke_key_down {
187 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
188 317
189 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
190 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
191 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
192 321
193 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
194 323
195 if ($uni == ord "\t") { 324 # ignore repeated keypresses
196 $::PL_WINDOW->toggle_visibility; 325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
197 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 326 $self->{last_mod} = $mod;
198 $::HELP_WINDOW->toggle_visibility; 327 $self->{last_sym} = $sym;
199 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection
223 328
224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
225 $::CONN->user_send ("stay fire"); 330
226 } elsif ($uni == ord ",") { 331 if ($::CONN && $dir) {
227 $::CONN->user_send ("take");
228 } elsif ($uni == ord " ") {
229 $::CONN->user_send ("apply");
230 } elsif ($uni == ord ".") {
231 $::CONN->user_send ($self->{completer}{last_command})
232 if exists $self->{completer}{last_command};
233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
234 $::CONN->user_send ($_) for @$bind_cmd;
235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
236 $::CONN->user_send ("rotateshoottype +");
237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
238 $::CONN->user_send ("rotateshoottype -");
239 } elsif ($uni == ord '"') {
240 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
241 $self->{completer}->show;
242 } elsif ($uni == ord "'") {
243 $self->{completer}->set_prefix ("");
244 $self->{completer}->show;
245 } elsif (exists $DIR{$sym}) {
246 if ($mod & CFPlus::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
247 $self->{shft}++; 333 $self->{shft}++;
248 if ($DIR{$sym}[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
249 $::CONN->user_send ("fire $DIR{$sym}[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
250 } 336 }
251 $self->{fire_dir} = $DIR{$sym}[0]; 337 $self->{fire_dir} = $dir->[0];
252 } elsif ($mod & CFPlus::KMOD_CTRL) { 338 } elsif ($mod & DC::KMOD_CTRL) {
253 $self->{ctrl}++; 339 $self->{ctrl}++;
254 $::CONN->user_send ("run $DIR{$sym}[0]"); 340 $::CONN->user_send ("run $dir->[0]");
255 } else { 341 } else {
256 $::CONN->user_send ("$DIR{$sym}[1]"); 342 $::CONN->user_send ("$dir->[1]");
257 } 343 }
258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 344
259 $self->{completer}->inject_key_down ($ev);
260 $self->{completer}->show;
261 } else {
262 return 0; 345 return 1;
263 }
264
265 1 346 }
347
348 0
266} 349}
267 350
268sub invoke_key_up { 351sub invoke_key_up {
269 my ($self, $ev) = @_; 352 my ($self, $ev) = @_;
270 353
271 my $res = 0; 354 my $res = 0;
272 my $mod = $ev->{mod}; 355 my $mod = $ev->{mod};
273 my $sym = $ev->{sym}; 356 my $sym = $ev->{sym};
274 357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
275 if ($::CFG->{shift_fire_stop}) { 361 if ($::CFG->{shift_fire_stop}) {
276 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
277 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
279 $res = 1; 365 $res = 1;
280 } 366 }
281 } else { 367 } else {
368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
282 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if ($dir && delete $self->{shft}) {
283 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
284 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
285 $res = 1; 373 $res = 1;
286 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
287 $::CONN->user_send ("fire_stop"); 376 $::CONN->user_send ("fire_stop");
288 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
289 $res = 1; 378 $res = 1;
290 } 379 }
291 } 380 }
292 381
293 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
294 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
295 $res = 1; 384 $res = 1;
296 } 385 }
297 386
298 $res 387 $res
299} 388}
300 389
390sub invoke_visibility_change {
391 my ($self) = @_;
392
393 $self->refresh_hook;
394
395 0
396}
397
398sub set_tilesize {
399 my ($self, $tilesize) = @_;
400
401 $self->{tilesize} = $tilesize;
402}
403
404sub scroll {
405 my ($self, $dx, $dy) = @_;
406
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update;
410
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize};
413}
414
301sub set_magicmap { 415sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_; 416 my ($self, $w, $h, $x, $y, $data) = @_;
303 417
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 418 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 419 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306 420
307 $self->{magicmap} = [$x, $y, $w, $h, $data]; 421 $self->{magicmap} = [$x, $y, $w, $h, $data];
308 422
309 $self->update; 423 $self->update;
310} 424}
311 425
426sub movement_update {
427 my ($self) = @_;
428
429 if ($::CFG->{smooth_movement}) {
430 if ($self->{sdx} || $self->{sdy}) {
431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433
434 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 }
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
463sub refresh_hook {
464 my ($self) = @_;
465
466 if ($::MAP && $::CONN) {
467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
475 # width/height of map, in tiles
476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
478
479 # the map displacement, in tiles
480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
482
483 # the upper left "visible" corner, in pixels
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489
490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d#
492 my ($w, $h, $data) = $::MAP->fow_texture (
493 $dx + (min 0, $sdx_t),
494 $dy + (min 0, $sdy_t),
495 $sw + abs $sdx_t,
496 $sh + abs $sdy_t
497 );
498
499 $self->{fow_texture} = new DC::Texture
500 w => $w,
501 h => $h,
502 data => $data,
503 internalformat => GL_ALPHA,
504 format => GL_ALPHA;
505 } else {
506 delete $self->{fow_texture};
507 }
508
509 glNewList ($self->{list} ||= glGenList);
510
511 glPushMatrix;
512 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy};
515
516 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize},
518 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy});
520
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
522 glScale $self->{tilesize}, $self->{tilesize};
523
524 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
527 glScale 1/3, 1/3;
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0);
533
534 glDisable GL_TEXTURE_2D;
535 glPopMatrix;
536 }
537
538 if ($self->{magicmap}) {
539 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
540
541 $x += $::MAP->ox + $self->{dx};
542 $y += $::MAP->oy + $self->{dy};
543
544 glTranslate - $x - 1, - $y - 1;
545 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
546 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
547 }
548
549 glPopMatrix;
550 glEndList;
551 }
552 } else {
553 glDeleteList delete $self->{list}
554 if $self->{list};
555 }
556}
557
312sub draw { 558sub draw {
313 my ($self) = @_; 559 my ($self) = @_;
314 560
315 return unless $::MAP; 561 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
316 562
563 return unless $self->{list};
564
317 my $focused = $CFPlus::UI::FOCUS == $self 565 my $focused = $DC::UI::FOCUS == $self
318 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 566 || $DC::UI::FOCUS == $::COMPLETER->{entry};
319 567
320 return 568 return
321 unless $focused || !$::FAST; 569 unless $focused || !$::FAST;
322 570
323 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325
326 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331
332 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
333 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
334
335 if ($::CFG->{fow_enable}) {
336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337
338 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D,
342 GL_ALPHA,
343 3, 3,
344 GL_ALPHA, GL_FLOAT,
345 (pack "f*", @{ $self->{smooth_matrix} }),
346 );
347 glEnable GL_CONVOLUTION_2D;
348 }
349
350 $self->{fow_texture} = new CFPlus::Texture
351 w => $w,
352 h => $h,
353 data => $data,
354 internalformat => GL_ALPHA,
355 format => GL_ALPHA;
356
357 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358 } else {
359 delete $self->{fow_texture};
360 }
361
362 glNewList $self->{list};
363
364 glPushMatrix;
365 glTranslate $sx0, $sy0;
366 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367
368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
369
370 glScale 32, 32;
371
372 if (my $tex = $self->{fow_texture}) {
373 glEnable GL_TEXTURE_2D;
374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375
376 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
377 $self->{fow_texture}->draw_quad_alpha (0, 0);
378
379 glDisable GL_TEXTURE_2D;
380 }
381
382 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
387
388 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 }
392
393 glPopMatrix;
394 glEndList;
395 }
396
397 glCallList $self->{list}; 571 glCallList $self->{list};
398 572
399 # TNT2 emulates logops in software (or worse :) 573 # TNT2 emulates logops in software (or worse :)
400 unless ($focused) { 574 unless ($focused) {
401 glColor 0.4, 0.2, 0.2, 0.6; 575 glColor_premultiply 0, 0, 1, 0.25;
402 glEnable GL_BLEND; 576 glEnable GL_BLEND;
403 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 577 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
404 glBegin GL_QUADS; 578 glBegin GL_QUADS;
405 glVertex 0, 0; 579 glVertex 0, 0;
406 glVertex 0, $::HEIGHT; 580 glVertex 0, $::HEIGHT;
407 glVertex $::WIDTH, $::HEIGHT; 581 glVertex $::WIDTH, $::HEIGHT;
408 glVertex $::WIDTH, 0; 582 glVertex $::WIDTH, 0;
… …
417 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
418 592
419 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
420} 594}
421 595
422package CFPlus::MapWidget::MapMap; 596package DC::MapWidget::MapMap;
423 597
598use strict;
599use utf8;
600
424our @ISA = CFPlus::UI::Base::; 601our @ISA = DC::UI::Base::;
425 602
426use Time::HiRes qw(time); 603use Time::HiRes qw(time);
427use CFPlus::OpenGL; 604use DC::OpenGL;
428 605
429sub size_request { 606sub size_request {
430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 607 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
608}
609
610sub refresh_hook {
611 my ($self) = @_;
612
613 if ($::MAP && $self->{texture_atime} < time) {
614 my ($w, $h) = @$self{qw(w h)};
615
616 return unless $w && $h;
617
618 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
619 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
620
621 my $ox = 0.5 * ($w - $sw);
622 my $oy = 0.5 * ($h - $sh);
623
624 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
625 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
626
627 #TODO: map scale is completely borked
628
629 my $x0 = int $ox - $sx + 0.5;
630 my $y0 = int $oy - $sy + 0.5;
631
632 $self->{sw} = $sw;
633 $self->{sh} = $sh;
634
635 $self->{x0} = $x0;
636 $self->{y0} = $y0;
637
638 $self->{texture_atime} = time + 1/3;
639
640 $self->{texture} =
641 new DC::Texture
642 w => $w,
643 h => $h,
644 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
645 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
646 }
647}
648
649sub invoke_visibility_change {
650 my ($self) = @_;
651
652 $self->refresh_hook;
653
654 0
431} 655}
432 656
433sub invoke_size_allocate { 657sub invoke_size_allocate {
434 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
435 659
… …
446} 670}
447 671
448sub _draw { 672sub _draw {
449 my ($self) = @_; 673 my ($self) = @_;
450 674
451 $::MAP or return; 675 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
452 676
453 my ($w, $h) = @$self{qw(w h)}; 677 $self->{texture} or return;
454
455 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
456 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
457
458 my $sx = int $::CFG->{map_shift_x} / 32;
459 my $sy = int $::CFG->{map_shift_y} / 32;
460
461 my $ox = 0.5 * ($w - $sw);
462 my $oy = 0.5 * ($h - $sh);
463 678
464 glEnable GL_BLEND; 679 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
466 glEnable GL_TEXTURE_2D; 681 glEnable GL_TEXTURE_2D;
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 683
469 if ($self->{texture_atime} < time) {
470 $self->{texture_atime} = time + 1/3;
471
472 $self->{texture} =
473 new CFPlus::Texture
474 w => $w,
475 h => $h,
476 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
477 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
478 }
479
480 $self->{texture}->draw_quad (0, 0); 684 $self->{texture}->draw_quad (0, 0);
481 685
482 glDisable GL_TEXTURE_2D; 686 glDisable GL_TEXTURE_2D;
483 687
484 glTranslate 0.375, 0.375; 688 glTranslate 0.375, 0.375;
485
486 #TODO: map scale is completely borked
487
488 my $x0 = int $ox - $sx + 0.5;
489 my $y0 = int $oy - $sy + 0.5;
490 689
491 glColor 1, 1, 0, 1; 690 glColor 1, 1, 0, 1;
492 glBegin GL_LINE_LOOP; 691 glBegin GL_LINE_LOOP;
493 glVertex $x0 , $y0 ; 692 glVertex $self->{x0} , $self->{y0} ;
494 glVertex $x0 , $y0 + $sh; 693 glVertex $self->{x0} , $self->{y0} + $self->{sh};
495 glVertex $x0 + $sw, $y0 + $sh; 694 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
496 glVertex $x0 + $sw, $y0 ; 695 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
497 glEnd; 696 glEnd;
498 697
499 glDisable GL_BLEND; 698 glDisable GL_BLEND;
500} 699}
501 700
502package CFPlus::MapWidget::Command; 701package DC::MapWidget::Command;
503 702
504use strict; 703use strict;
505 704
506use CFPlus::OpenGL; 705use DC::OpenGL;
507 706
508our @ISA = CFPlus::UI::Frame::; 707our @ISA = DC::UI::Frame::;
509 708
510sub new { 709sub new {
511 my $class = shift; 710 my $class = shift;
512 711
513 my $self = $class->SUPER::new ( 712 my $self = $class->SUPER::new (
514 bg => [0, 0, 0, 0.8], 713 bg => [0, 0, 0, 0.8],
515 @_, 714 @_,
516 ); 715 );
517 716
518 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 717 $self->add ($self->{vbox} = new DC::UI::VBox);
519 718
520 $self->{label} = [ 719 $self->{label} = [
521 map 720 map
522 CFPlus::UI::Label->new ( 721 DC::UI::Label->new (
722 align => 0,
523 can_hover => 1, 723 can_hover => 1,
524 can_events => 1, 724 can_events => 1,
525 tooltip_width => 0.33, 725 tooltip_width => 0.33,
526 fontsize => $_, 726 fontsize => $_,
527 ), (0.8) x 16 727 ), (0.8) x 16
528 ]; 728 ];
529 729
530 $self->{entry} = new CFPlus::UI::Entry 730 $self->{entry} = new DC::UI::Entry
531 on_changed => sub { 731 on_changed => sub {
532 $self->update_labels; 732 $self->update_labels;
533 0 733 0
534 }, 734 },
535 on_button_down => sub { 735 on_button_down => sub {
536 my ($entry, $ev, $x, $y) = @_; 736 my ($entry, $ev, $x, $y) = @_;
537 737
538 if ($ev->{button} == 3) { 738 if ($ev->{button} == 3) {
539 (new CFPlus::UI::Menu 739 (new DC::UI::Menu
540 items => [ 740 items => [
541 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 741 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 742 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543 ], 743 ],
544 )->popup ($ev); 744 )->popup ($ev);
545 return 1; 745 return 1;
546 } 746 }
547 0 747 0
… …
562 $self->hide; 762 $self->hide;
563 } 763 }
564 } elsif ($ev->{sym} == 27) { 764 } elsif ($ev->{sym} == 27) {
565 $self->{hist_ptr} = 0; 765 $self->{hist_ptr} = 0;
566 $self->hide; 766 $self->hide;
567 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 767 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
568 if ($self->{hist_ptr} > 1) { 768 if ($self->{hist_ptr} > 1) {
569 $self->{hist_ptr}--; 769 $self->{hist_ptr}--;
570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 770 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571 } elsif ($self->{hist_ptr} > 0) { 771 } elsif ($self->{hist_ptr} > 0) {
572 $self->{hist_ptr}--; 772 $self->{hist_ptr}--;
… …
574 } else { 774 } else {
575 ++$self->{select_offset} 775 ++$self->{select_offset}
576 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 776 if $self->{select_offset} < $#{ $self->{last_match} || [] };
577 } 777 }
578 $self->update_labels; 778 $self->update_labels;
579 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 779 } elsif ($ev->{sym} == DC::SDLK_UP) {
580 if ($self->{select_offset}) { 780 if ($self->{select_offset}) {
581 --$self->{select_offset} 781 --$self->{select_offset}
582 } else { 782 } else {
583 unless ($self->{hist_ptr}) { 783 unless ($self->{hist_ptr}) {
584 $self->{hist_saveback} = $self->{entry}->get_text; 784 $self->{hist_saveback} = $self->{entry}->get_text;
… …
742 942
743sub _draw { 943sub _draw {
744 my ($self) = @_; 944 my ($self) = @_;
745 945
746 # hack 946 # hack
747 local $CFPlus::UI::FOCUS = $self->{entry}; 947 local $DC::UI::FOCUS = $self->{entry};
748 948
749 $self->SUPER::_draw; 949 $self->SUPER::_draw;
750} 950}
751 951
7521 9521
953

Diff Legend

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