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.142 by root, Sat Aug 30 08:04:01 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_file DC::Texture DC::find_rcfile "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 => "#completer_help",
38 ;
39 28
40 $self 29 $self
41} 30}
42 31
43sub add_command { 32sub add_command {
… …
47 36
48 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
51 40
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 42}
54 43
55sub clr_commands { 44sub clr_commands {
56 my ($self) = @_; 45 my ($self) = @_;
57 46
58 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
59 48
60 $self->{completer}->hide 49 $::COMPLETER->hide
61 if $self->{completer}; 50 if $::COMPLETER;
62} 51}
63 52
64sub test_server_login { 53sub server_login {
65 return unless 54 my ($server) = @_;
66 $::CONN && length $::CONN->{test_server};
67 55
68 my $server = $::CONN->{test_server};
69 ::stop_game (); 56 ::stop_game ();
70 local $::PROFILE->{host} = $server; 57 local $::PROFILE->{host} = $server;
71 ::start_game (); 58 ::start_game ();
72} 59}
73 60
74sub editor_invoke { 61sub editor_invoke {
75 return unless $::CONN; 62 my $editsup = $::CONN && $::CONN->{editor_support}
63 or return;
76 64
77 # putting the password into the env is somewhat tasteless 65 DC::background {
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; 66 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 67
83 CFPlus::set_proxy; 68 my $server = $editsup->{gameserver} || "default";
69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 70
85 my $map = "map:$::CONN->{map_info}[0]"; 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;
86 73
87 if (fork == 0) { 74 print "map directory is $mapdir\n";
88 $SIG{__DIE__} = sub { 75 print "lib directory is $libdir\n";
89 warn "@_"; 76
90 CFPlus::_exit 99; 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";
91 }; 84 }
92 85
93 # TODO: move into editor 86 if (1) { # upload a map
94 require LWP::UserAgent; 87 my $mapname = $::CONN->{map_info}[0];
95 88
96 my $ua = LWP::UserAgent->new ( 89 my $mappath = "$mapdir/$mapname";
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101 90
102 if ($map =~ /^map:(.*)/) { 91 -e $mappath and die "$mappath already exists\n";
103 my $mapname = $1; 92
93 print "getting map revision for $mapname...\n";
94
104 # try to get the most recent head revision, what a hack 95 # try to get the most recent head revision, what a hack,
96 # this should have been returned while downloading *sigh*
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; 97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
106 98
107 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1; 100 my $rev = $1;
101
102 print "downloading revision $rev...\n";
103
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; 104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
110 warn "revision is $rev " .(length $map)."\n";#d# 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#
111 130
112 # now upload it 131 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common; 132# require HTTP::Request::Common;
116 133#
117 my $res = $ua->post ( 134# my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD}, 135# $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data', 136# Content_Type => 'multipart/form-data',
120 Content => [ 137# Content => [
121 path => $mapname, 138# path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR}, 139# mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map, 140# map => $map,
124 revision => $rev, 141# revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN}, 142# cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD}, 143# cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "", 144# comment => "",
128 ] 145# ]
129 ); 146# );
130 147#
131 if ($res->is_error) { 148# if ($res->is_error) {
132 # fatal condition 149# # fatal condition
133 warn $res->status_line; 150# warn $res->status_line;
134 } else { 151# } else {
135 # script replies are marked as {{..}} 152# # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; 153# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs; 154# warn map "$_\n", @msgs;
138 } 155# }
139 } else { 156 } else {
140 # error, could not detect revision 157 die "viewvc parse error, unable to detect revision\n";
141 } 158 }
142 } 159 }
143
144 CFPlus::_exit;
145 } 160 }
146} 161}
147 162
148sub invoke_button_down { 163sub invoke_button_down {
149 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
150 165
151 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
152 $self->grab_focus; 167 $self->grab_focus;
153 return unless $::CONN; 168 return unless $::CONN;
154 169
155 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};
156 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};
157 172
158 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
159 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
160 175
176 if ($::CONN) {
161 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
162 if $::CONN; 178 }
163 179
164 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
165 $self->grab_focus; 181 $self->grab_focus;
166 return unless $::CONN; 182 return unless $::CONN;
167 183
… …
177 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
178 194
179 $self->update; 195 $self->update;
180 }; 196 };
181 } elsif ($ev->{button} == 3) { 197 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu 198 my @items = (
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 199 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
190 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
191 [ 206 [
192 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
194 : "Enable automatic pickup", 209 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
196 ], 211 ],
197 $::CONN && length $::CONN->{cvs_root} 212 );
213
214 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke] 217# \&editor_invoke,
200 : (), 218# ];
201 $::CONN && length $::CONN->{test_server} 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, [
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", 227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
203 \&test_server_login] 228 sub { server_login $server },
204 : (), 229 ];
230 }
231 }
232
233 push @items,
205 ["Quit", 234 ["Quit",
206 sub { 235 sub {
207 if ($::CONN) { 236 if ($::CONN) {
208 &::open_quit_dialog; 237 &::open_quit_dialog;
209 } else { 238 } else {
210 exit; 239 exit;
211 }
212 } 240 }
213 ], 241 }
214 ], 242 ],
243 ;
244
245 (new DC::UI::Menu
246 items => \@items,
215 )->popup ($ev); 247 )->popup ($ev);
216 } 248 }
217 249
218 1 250 1
219} 251}
… …
237 269
238 1 270 1
239} 271}
240 272
241sub size_request { 273sub size_request {
274 my ($self) = @_;
275
242 ( 276 (
243 32 * CFPlus::ceil $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
244 32 * CFPlus::ceil $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
245 ) 279 )
246} 280}
247 281
248sub update { 282sub update {
249 my ($self) = @_; 283 my ($self) = @_;
… …
251 $self->{need_update} = 1; 285 $self->{need_update} = 1;
252 $self->SUPER::update; 286 $self->SUPER::update;
253} 287}
254 288
255my %DIR = ( 289my %DIR = (
256 CFPlus::SDLK_KP8, [1, "north"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"],
257 CFPlus::SDLK_KP9, [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
258 CFPlus::SDLK_KP6, [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
259 CFPlus::SDLK_KP3, [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
260 CFPlus::SDLK_KP2, [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
261 CFPlus::SDLK_KP1, [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
262 CFPlus::SDLK_KP4, [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
263 CFPlus::SDLK_KP7, [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
264 299
265 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"],
266 CFPlus::SDLK_RIGHT, [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
267 CFPlus::SDLK_DOWN, [5, "south"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
268 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"],
269); 313);
270 314
271sub invoke_key_down { 315sub invoke_key_down {
272 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
273 317
274 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
275 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
276 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
277 321
278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
279 323
280 if ($uni == ord "\t") { 324 # ignore repeated keypresses
281 $::PL_WINDOW->toggle_visibility; 325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 326 $self->{last_mod} = $mod;
283 $::HELP_WINDOW->toggle_visibility; 327 $self->{last_sym} = $sym;
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 328
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
311 $::CONN->user_send ("stay fire"); 330
312 } elsif ($uni == ord ",") { 331 if ($::CONN && $dir) {
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) { 332 if ($mod & DC::KMOD_SHIFT) {
335 $self->{shft}++; 333 $self->{shft}++;
336 if ($DIR{$sym}[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
337 $::CONN->user_send ("fire $DIR{$sym}[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
338 } 336 }
339 $self->{fire_dir} = $DIR{$sym}[0]; 337 $self->{fire_dir} = $dir->[0];
340 } elsif ($mod & CFPlus::KMOD_CTRL) { 338 } elsif ($mod & DC::KMOD_CTRL) {
341 $self->{ctrl}++; 339 $self->{ctrl}++;
342 $::CONN->user_send ("run $DIR{$sym}[0]"); 340 $::CONN->user_send ("run $dir->[0]");
343 } else { 341 } else {
344 $::CONN->user_send ("$DIR{$sym}[1]"); 342 $::CONN->user_send ("$dir->[1]");
345 } 343 }
346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 344
347 $self->{completer}->inject_key_down ($ev);
348 $self->{completer}->show;
349 } else {
350 return 0; 345 return 1;
351 }
352
353 1 346 }
347
348 0
354} 349}
355 350
356sub invoke_key_up { 351sub invoke_key_up {
357 my ($self, $ev) = @_; 352 my ($self, $ev) = @_;
358 353
359 my $res = 0; 354 my $res = 0;
360 my $mod = $ev->{mod}; 355 my $mod = $ev->{mod};
361 my $sym = $ev->{sym}; 356 my $sym = $ev->{sym};
362 357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
363 if ($::CFG->{shift_fire_stop}) { 361 if ($::CFG->{shift_fire_stop}) {
364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
365 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
367 $res = 1; 365 $res = 1;
368 } 366 }
369 } else { 367 } else {
368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
370 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if ($dir && delete $self->{shft}) {
371 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
372 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
373 $res = 1; 373 $res = 1;
374 } 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?
375 $::CONN->user_send ("fire_stop"); 376 $::CONN->user_send ("fire_stop");
376 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
377 $res = 1; 378 $res = 1;
378 } 379 }
379 } 380 }
380 381
381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
382 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
383 $res = 1; 384 $res = 1;
384 } 385 }
385 386
386 $res 387 $res
387} 388}
388 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
389sub set_magicmap { 415sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_; 416 my ($self, $w, $h, $x, $y, $data) = @_;
391 417
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 418 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 419 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394 420
395 $self->{magicmap} = [$x, $y, $w, $h, $data]; 421 $self->{magicmap} = [$x, $y, $w, $h, $data];
396 422
397 $self->update; 423 $self->update;
398} 424}
399 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
400sub draw { 558sub draw {
401 my ($self) = @_; 559 my ($self) = @_;
402 560
403 return unless $::MAP; 561 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
404 562
563 return unless $self->{list};
564
405 my $focused = $CFPlus::UI::FOCUS == $self 565 my $focused = $DC::UI::FOCUS == $self
406 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 566 || $DC::UI::FOCUS == $::COMPLETER->{entry};
407 567
408 return 568 return
409 unless $focused || !$::FAST; 569 unless $focused || !$::FAST;
410 570
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}; 571 glCallList $self->{list};
486 572
487 # TNT2 emulates logops in software (or worse :) 573 # TNT2 emulates logops in software (or worse :)
488 unless ($focused) { 574 unless ($focused) {
489 glColor 0.4, 0.2, 0.2, 0.6; 575 glColor_premultiply 0, 0, 1, 0.25;
490 glEnable GL_BLEND; 576 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 577 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glBegin GL_QUADS; 578 glBegin GL_QUADS;
493 glVertex 0, 0; 579 glVertex 0, 0;
494 glVertex 0, $::HEIGHT; 580 glVertex 0, $::HEIGHT;
495 glVertex $::WIDTH, $::HEIGHT; 581 glVertex $::WIDTH, $::HEIGHT;
496 glVertex $::WIDTH, 0; 582 glVertex $::WIDTH, 0;
… …
505 glDeleteList $self->{list}; 591 glDeleteList $self->{list};
506 592
507 $self->SUPER::DESTROY; 593 $self->SUPER::DESTROY;
508} 594}
509 595
510package CFPlus::MapWidget::MapMap; 596package DC::MapWidget::MapMap;
511 597
598use strict;
599use utf8;
600
512our @ISA = CFPlus::UI::Base::; 601our @ISA = DC::UI::Base::;
513 602
514use Time::HiRes qw(time); 603use Time::HiRes qw(time);
515use CFPlus::OpenGL; 604use DC::OpenGL;
516 605
517sub size_request { 606sub size_request {
518 ($::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 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
617 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
618
619 my $ox = 0.5 * ($w - $sw);
620 my $oy = 0.5 * ($h - $sh);
621
622 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
623 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
624
625 #TODO: map scale is completely borked
626
627 my $x0 = int $ox - $sx + 0.5;
628 my $y0 = int $oy - $sy + 0.5;
629
630 $self->{sw} = $sw;
631 $self->{sh} = $sh;
632
633 $self->{x0} = $x0;
634 $self->{y0} = $y0;
635
636 $self->{texture_atime} = time + 1/3;
637
638 $self->{texture} =
639 new DC::Texture
640 w => $w,
641 h => $h,
642 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
643 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
644 }
645}
646
647sub invoke_visibility_change {
648 my ($self) = @_;
649
650 $self->refresh_hook;
651
652 0
519} 653}
520 654
521sub invoke_size_allocate { 655sub invoke_size_allocate {
522 my ($self, $w, $h) = @_; 656 my ($self, $w, $h) = @_;
523 657
… …
534} 668}
535 669
536sub _draw { 670sub _draw {
537 my ($self) = @_; 671 my ($self) = @_;
538 672
539 $::MAP or return; 673 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
540 674
541 my ($w, $h) = @$self{qw(w h)}; 675 $self->{texture} or return;
542
543 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
544 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
545
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);
550 my $oy = 0.5 * ($h - $sh);
551 676
552 glEnable GL_BLEND; 677 glEnable GL_BLEND;
553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
554 glEnable GL_TEXTURE_2D; 679 glEnable GL_TEXTURE_2D;
555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
556 681
557 if ($self->{texture_atime} < time) {
558 $self->{texture_atime} = time + 1/3;
559
560 $self->{texture} =
561 new CFPlus::Texture
562 w => $w,
563 h => $h,
564 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;
566 }
567
568 $self->{texture}->draw_quad (0, 0); 682 $self->{texture}->draw_quad (0, 0);
569 683
570 glDisable GL_TEXTURE_2D; 684 glDisable GL_TEXTURE_2D;
571 685
572 glTranslate 0.375, 0.375; 686 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 687
579 glColor 1, 1, 0, 1; 688 glColor 1, 1, 0, 1;
580 glBegin GL_LINE_LOOP; 689 glBegin GL_LINE_LOOP;
581 glVertex $x0 , $y0 ; 690 glVertex $self->{x0} , $self->{y0} ;
582 glVertex $x0 , $y0 + $sh; 691 glVertex $self->{x0} , $self->{y0} + $self->{sh};
583 glVertex $x0 + $sw, $y0 + $sh; 692 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
584 glVertex $x0 + $sw, $y0 ; 693 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
585 glEnd; 694 glEnd;
586 695
587 glDisable GL_BLEND; 696 glDisable GL_BLEND;
588} 697}
589 698
590package CFPlus::MapWidget::Command; 699package DC::MapWidget::Command;
591 700
592use strict; 701use strict;
593 702
594use CFPlus::OpenGL; 703use DC::OpenGL;
595 704
596our @ISA = CFPlus::UI::Frame::; 705our @ISA = DC::UI::Frame::;
597 706
598sub new { 707sub new {
599 my $class = shift; 708 my $class = shift;
600 709
601 my $self = $class->SUPER::new ( 710 my $self = $class->SUPER::new (
602 bg => [0, 0, 0, 0.8], 711 bg => [0, 0, 0, 0.8],
603 @_, 712 @_,
604 ); 713 );
605 714
606 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 715 $self->add ($self->{vbox} = new DC::UI::VBox);
607 716
608 $self->{label} = [ 717 $self->{label} = [
609 map 718 map
610 CFPlus::UI::Label->new ( 719 DC::UI::Label->new (
720 align => 0,
611 can_hover => 1, 721 can_hover => 1,
612 can_events => 1, 722 can_events => 1,
613 tooltip_width => 0.33, 723 tooltip_width => 0.33,
614 fontsize => $_, 724 fontsize => $_,
615 ), (0.8) x 16 725 ), (0.8) x 16
616 ]; 726 ];
617 727
618 $self->{entry} = new CFPlus::UI::Entry 728 $self->{entry} = new DC::UI::Entry
619 on_changed => sub { 729 on_changed => sub {
620 $self->update_labels; 730 $self->update_labels;
621 0 731 0
622 }, 732 },
623 on_button_down => sub { 733 on_button_down => sub {
624 my ($entry, $ev, $x, $y) = @_; 734 my ($entry, $ev, $x, $y) = @_;
625 735
626 if ($ev->{button} == 3) { 736 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu 737 (new DC::UI::Menu
628 items => [ 738 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 739 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 740 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631 ], 741 ],
632 )->popup ($ev); 742 )->popup ($ev);
633 return 1; 743 return 1;
634 } 744 }
635 0 745 0
… …
650 $self->hide; 760 $self->hide;
651 } 761 }
652 } elsif ($ev->{sym} == 27) { 762 } elsif ($ev->{sym} == 27) {
653 $self->{hist_ptr} = 0; 763 $self->{hist_ptr} = 0;
654 $self->hide; 764 $self->hide;
655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 765 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
656 if ($self->{hist_ptr} > 1) { 766 if ($self->{hist_ptr} > 1) {
657 $self->{hist_ptr}--; 767 $self->{hist_ptr}--;
658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 768 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
659 } elsif ($self->{hist_ptr} > 0) { 769 } elsif ($self->{hist_ptr} > 0) {
660 $self->{hist_ptr}--; 770 $self->{hist_ptr}--;
… …
662 } else { 772 } else {
663 ++$self->{select_offset} 773 ++$self->{select_offset}
664 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 774 if $self->{select_offset} < $#{ $self->{last_match} || [] };
665 } 775 }
666 $self->update_labels; 776 $self->update_labels;
667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 777 } elsif ($ev->{sym} == DC::SDLK_UP) {
668 if ($self->{select_offset}) { 778 if ($self->{select_offset}) {
669 --$self->{select_offset} 779 --$self->{select_offset}
670 } else { 780 } else {
671 unless ($self->{hist_ptr}) { 781 unless ($self->{hist_ptr}) {
672 $self->{hist_saveback} = $self->{entry}->get_text; 782 $self->{hist_saveback} = $self->{entry}->get_text;
… …
830 940
831sub _draw { 941sub _draw {
832 my ($self) = @_; 942 my ($self) = @_;
833 943
834 # hack 944 # hack
835 local $CFPlus::UI::FOCUS = $self->{entry}; 945 local $DC::UI::FOCUS = $self->{entry};
836 946
837 $self->SUPER::_draw; 947 $self->SUPER::_draw;
838} 948}
839 949
8401 9501
951

Diff Legend

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