1 | package CFClient::MapWidget; |
1 | package CFPlus::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFClient; |
8 | use CFPlus; |
9 | use CFClient::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFClient::UI; |
10 | use CFPlus::UI; |
11 | |
11 | |
12 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFPlus::UI::Base::; |
13 | |
13 | |
14 | my $magicmap_tex = |
14 | my $magicmap_tex = |
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
17 | |
18 | sub new { |
18 | sub new { |
19 | my $class = shift; |
19 | my $class = shift; |
20 | |
20 | |
… | |
… | |
30 | ], |
30 | ], |
31 | |
31 | |
32 | @_ |
32 | @_ |
33 | ); |
33 | ); |
34 | |
34 | |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
36 | command => $self->{command}, |
36 | command => $self->{command}, |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | tooltip => "#completer_help", |
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 | ; |
38 | ; |
46 | |
39 | |
47 | $self |
40 | $self |
48 | } |
41 | } |
49 | |
42 | |
… | |
… | |
66 | |
59 | |
67 | $self->{completer}->hide |
60 | $self->{completer}->hide |
68 | if $self->{completer}; |
61 | if $self->{completer}; |
69 | } |
62 | } |
70 | |
63 | |
|
|
64 | sub test_server_login { |
|
|
65 | return unless |
|
|
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
|
|
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
|
|
70 | local $::PROFILE->{host} = $server; |
|
|
71 | ::start_game (); |
|
|
72 | } |
|
|
73 | |
|
|
74 | sub editor_invoke { |
|
|
75 | return unless $::CONN; |
|
|
76 | |
|
|
77 | # putting the password into the env is somewhat tasteless |
|
|
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
|
|
79 | local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
80 | local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
81 | local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root}; |
|
|
82 | |
|
|
83 | # CFPlus::set_proxy; |
|
|
84 | |
|
|
85 | # TODO: move into editor |
|
|
86 | require LWP::Simple; |
|
|
87 | } |
|
|
88 | |
71 | sub invoke_button_down { |
89 | sub invoke_button_down { |
72 | my ($self, $ev, $x, $y) = @_; |
90 | my ($self, $ev, $x, $y) = @_; |
73 | |
91 | |
74 | if ($ev->{button} == 1) { |
92 | if ($ev->{button} == 1) { |
75 | $self->grab_focus; |
93 | $self->grab_focus; |
76 | return unless $::CONN; |
94 | return unless $::CONN; |
77 | |
95 | |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
96 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
79 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
97 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
80 | |
98 | |
81 | $x -= int 0.5 * $self->{sw}; |
99 | $x -= int 0.5 * $self->{sw}; |
82 | $y -= int 0.5 * $self->{sh}; |
100 | $y -= int 0.5 * $self->{sh}; |
83 | |
101 | |
84 | $::CONN->lookat ($x, $y) |
102 | $::CONN->lookat ($x, $y) |
… | |
… | |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
118 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
101 | |
119 | |
102 | $self->update; |
120 | $self->update; |
103 | }; |
121 | }; |
104 | } elsif ($ev->{button} == 3) { |
122 | } elsif ($ev->{button} == 3) { |
105 | (new CFClient::UI::Menu |
123 | (new CFPlus::UI::Menu |
106 | items => [ |
124 | items => [ |
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
125 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
126 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
127 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
128 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
… | |
… | |
115 | $::PICKUP_ENABLE->{state} |
133 | $::PICKUP_ENABLE->{state} |
116 | ? "Disable automatic pickup" |
134 | ? "Disable automatic pickup" |
117 | : "Enable automatic pickup", |
135 | : "Enable automatic pickup", |
118 | sub { $::PICKUP_ENABLE->toggle } |
136 | sub { $::PICKUP_ENABLE->toggle } |
119 | ], |
137 | ], |
|
|
138 | $::CONN && length $::CONN->{cvs_root} |
|
|
139 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke] |
|
|
140 | : (), |
|
|
141 | $::CONN && length $::CONN->{test_server} |
|
|
142 | ? ["Login on Test Server", \&test_server_login] |
|
|
143 | : (), |
|
|
144 | ["Quit", |
|
|
145 | sub { |
|
|
146 | if ($::CONN) { |
|
|
147 | &::open_quit_dialog; |
|
|
148 | } else { |
|
|
149 | exit; |
|
|
150 | } |
|
|
151 | } |
|
|
152 | ], |
120 | ], |
153 | ], |
121 | )->popup ($ev); |
154 | )->popup ($ev); |
122 | } |
155 | } |
123 | |
156 | |
124 | 1 |
157 | 1 |
… | |
… | |
144 | 1 |
177 | 1 |
145 | } |
178 | } |
146 | |
179 | |
147 | sub size_request { |
180 | sub size_request { |
148 | ( |
181 | ( |
149 | 32 * CFClient::ceil $::WIDTH / 32, |
182 | 32 * CFPlus::ceil $::WIDTH / 32, |
150 | 32 * CFClient::ceil $::HEIGHT / 32, |
183 | 32 * CFPlus::ceil $::HEIGHT / 32, |
151 | ) |
184 | ) |
152 | } |
185 | } |
153 | |
186 | |
154 | sub update { |
187 | sub update { |
155 | my ($self) = @_; |
188 | my ($self) = @_; |
… | |
… | |
157 | $self->{need_update} = 1; |
190 | $self->{need_update} = 1; |
158 | $self->SUPER::update; |
191 | $self->SUPER::update; |
159 | } |
192 | } |
160 | |
193 | |
161 | my %DIR = ( |
194 | my %DIR = ( |
162 | CFClient::SDLK_KP8, [1, "north"], |
195 | CFPlus::SDLK_KP8, [1, "north"], |
163 | CFClient::SDLK_KP9, [2, "northeast"], |
196 | CFPlus::SDLK_KP9, [2, "northeast"], |
164 | CFClient::SDLK_KP6, [3, "east"], |
197 | CFPlus::SDLK_KP6, [3, "east"], |
165 | CFClient::SDLK_KP3, [4, "southeast"], |
198 | CFPlus::SDLK_KP3, [4, "southeast"], |
166 | CFClient::SDLK_KP2, [5, "south"], |
199 | CFPlus::SDLK_KP2, [5, "south"], |
167 | CFClient::SDLK_KP1, [6, "southwest"], |
200 | CFPlus::SDLK_KP1, [6, "southwest"], |
168 | CFClient::SDLK_KP4, [7, "west"], |
201 | CFPlus::SDLK_KP4, [7, "west"], |
169 | CFClient::SDLK_KP7, [8, "northwest"], |
202 | CFPlus::SDLK_KP7, [8, "northwest"], |
170 | |
203 | |
171 | CFClient::SDLK_UP, [1, "north"], |
204 | CFPlus::SDLK_UP, [1, "north"], |
172 | CFClient::SDLK_RIGHT, [3, "east"], |
205 | CFPlus::SDLK_RIGHT, [3, "east"], |
173 | CFClient::SDLK_DOWN, [5, "south"], |
206 | CFPlus::SDLK_DOWN, [5, "south"], |
174 | CFClient::SDLK_LEFT, [7, "west"], |
207 | CFPlus::SDLK_LEFT, [7, "west"], |
175 | ); |
208 | ); |
176 | |
209 | |
177 | sub invoke_key_down { |
210 | sub invoke_key_down { |
178 | my ($self, $ev) = @_; |
211 | my ($self, $ev) = @_; |
179 | |
212 | |
180 | my $mod = $ev->{mod}; |
213 | my $mod = $ev->{mod}; |
181 | my $sym = $ev->{sym}; |
214 | my $sym = $ev->{sym}; |
182 | my $uni = $ev->{unicode}; |
215 | my $uni = $ev->{unicode}; |
183 | |
216 | |
184 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
217 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
185 | |
218 | |
186 | if ($uni == ord "\t") { |
219 | if ($uni == ord "\t") { |
187 | $::PL_WINDOW->toggle_visibility; |
220 | $::PL_WINDOW->toggle_visibility; |
188 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
221 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
189 | $::HELP_WINDOW->toggle_visibility; |
222 | $::HELP_WINDOW->toggle_visibility; |
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
223 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
191 | ::toggle_player_page ($::STATS_PAGE); |
224 | ::toggle_player_page ($::STATS_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
225 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
193 | ::toggle_player_page ($::SKILL_PAGE); |
226 | ::toggle_player_page ($::SKILL_PAGE); |
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
227 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
195 | ::toggle_player_page ($::SPELL_PAGE); |
228 | ::toggle_player_page ($::SPELL_PAGE); |
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
229 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
230 | ::toggle_player_page ($::INVENTORY_PAGE); |
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
231 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
199 | $::SETUP_DIALOG->toggle_visibility; |
232 | $::SETUP_DIALOG->toggle_visibility; |
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
233 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
234 | $::BIND_EDITOR->set_binding (undef, undef, [], |
202 | sub { |
235 | sub { |
203 | my ($mod, $sym, $cmds) = @_; |
236 | my ($mod, $sym, $cmds) = @_; |
204 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
237 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
205 | }); |
238 | }); |
206 | $::BIND_EDITOR->start; |
239 | $::BIND_EDITOR->start; |
207 | $::BIND_EDITOR->show; |
240 | $::BIND_EDITOR->show; |
|
|
241 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
208 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
242 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
209 | $::BIND_EDITOR->stop; |
243 | # $::BIND_EDITOR->stop; |
210 | $::BIND_EDITOR->ask_for_bind_and_commit; |
244 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
211 | $::BIND_EDITOR->hide; |
245 | # $::BIND_EDITOR->hide; |
212 | } elsif (!$::CONN) { |
246 | } elsif (!$::CONN) { |
213 | return 0; # bindings further down need a valid connection |
247 | return 0; # bindings further down need a valid connection |
214 | |
248 | |
215 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
249 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
216 | $::CONN->user_send ("stay fire"); |
250 | $::CONN->user_send ("stay fire"); |
217 | } elsif ($uni == ord ",") { |
251 | } elsif ($uni == ord ",") { |
218 | $::CONN->user_send ("take"); |
252 | $::CONN->user_send ("take"); |
219 | } elsif ($uni == ord " ") { |
253 | } elsif ($uni == ord " ") { |
220 | $::CONN->user_send ("apply"); |
254 | $::CONN->user_send ("apply"); |
|
|
255 | } elsif ($uni == 13) { |
|
|
256 | $::CONN->user_send ("examine"); |
221 | } elsif ($uni == ord ".") { |
257 | } elsif ($uni == ord ".") { |
222 | $::CONN->user_send ($self->{completer}{last_command}) |
258 | $::CONN->user_send ($self->{completer}{last_command}) |
223 | if exists $self->{completer}{last_command}; |
259 | if exists $self->{completer}{last_command}; |
224 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
260 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
225 | $::CONN->user_send ($_) for @$bind_cmd; |
261 | $::CONN->user_send ($_) for @$bind_cmd; |
226 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
262 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
227 | $::CONN->user_send ("rotateshoottype +"); |
263 | $::CONN->user_send ("rotateshoottype +"); |
228 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
264 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
229 | $::CONN->user_send ("rotateshoottype -"); |
265 | $::CONN->user_send ("rotateshoottype -"); |
230 | } elsif ($uni == ord '"') { |
266 | } elsif ($uni == ord '"') { |
231 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
267 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
232 | $self->{completer}->show; |
268 | $self->{completer}->show; |
233 | } elsif ($uni == ord "'") { |
269 | } elsif ($uni == ord "'") { |
234 | $self->{completer}->set_prefix (""); |
270 | $self->{completer}->set_prefix (""); |
235 | $self->{completer}->show; |
271 | $self->{completer}->show; |
236 | } elsif (exists $DIR{$sym}) { |
272 | } elsif (exists $DIR{$sym}) { |
237 | if ($mod & CFClient::KMOD_SHIFT) { |
273 | if ($mod & CFPlus::KMOD_SHIFT) { |
238 | $self->{shft}++; |
274 | $self->{shft}++; |
239 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
275 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
240 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
276 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
241 | } |
277 | } |
242 | $self->{fire_dir} = $DIR{$sym}[0]; |
278 | $self->{fire_dir} = $DIR{$sym}[0]; |
243 | } elsif ($mod & CFClient::KMOD_CTRL) { |
279 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
244 | $self->{ctrl}++; |
280 | $self->{ctrl}++; |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
281 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
246 | } else { |
282 | } else { |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
283 | $::CONN->user_send ("$DIR{$sym}[1]"); |
248 | } |
284 | } |
… | |
… | |
262 | my $res = 0; |
298 | my $res = 0; |
263 | my $mod = $ev->{mod}; |
299 | my $mod = $ev->{mod}; |
264 | my $sym = $ev->{sym}; |
300 | my $sym = $ev->{sym}; |
265 | |
301 | |
266 | if ($::CFG->{shift_fire_stop}) { |
302 | if ($::CFG->{shift_fire_stop}) { |
267 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
303 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
268 | $::CONN->user_send ("fire_stop"); |
304 | $::CONN->user_send ("fire_stop"); |
269 | delete $self->{fire_dir}; |
305 | delete $self->{fire_dir}; |
270 | $res = 1; |
306 | $res = 1; |
271 | } |
307 | } |
272 | } else { |
308 | } else { |
273 | if (exists $DIR{$sym} && delete $self->{shft}) { |
309 | if (exists $DIR{$sym} && delete $self->{shft}) { |
274 | $::CONN->user_send ("fire_stop"); |
310 | $::CONN->user_send ("fire_stop"); |
275 | delete $self->{fire_dir}; |
311 | delete $self->{fire_dir}; |
276 | $res = 1; |
312 | $res = 1; |
277 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
313 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
278 | $::CONN->user_send ("fire_stop"); |
314 | $::CONN->user_send ("fire_stop"); |
279 | delete $self->{fire_dir}; |
315 | delete $self->{fire_dir}; |
280 | $res = 1; |
316 | $res = 1; |
281 | } |
317 | } |
282 | } |
318 | } |
283 | |
319 | |
284 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
320 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
285 | $::CONN->user_send ("run_stop"); |
321 | $::CONN->user_send ("run_stop"); |
286 | $res = 1; |
322 | $res = 1; |
287 | } |
323 | } |
288 | |
324 | |
289 | $res |
325 | $res |
… | |
… | |
303 | sub draw { |
339 | sub draw { |
304 | my ($self) = @_; |
340 | my ($self) = @_; |
305 | |
341 | |
306 | return unless $::MAP; |
342 | return unless $::MAP; |
307 | |
343 | |
308 | my $focused = $CFClient::UI::FOCUS == $self |
344 | my $focused = $CFPlus::UI::FOCUS == $self |
309 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
345 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
310 | |
346 | |
311 | return |
347 | return |
312 | unless $focused || !$::FAST; |
348 | unless $focused || !$::FAST; |
313 | |
349 | |
314 | if (delete $self->{need_update}) { |
350 | if (delete $self->{need_update}) { |
315 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
351 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
316 | |
352 | |
317 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
353 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
318 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
354 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
319 | |
355 | |
320 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
356 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
321 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
357 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
322 | |
358 | |
323 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
359 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
324 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
360 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
325 | |
361 | |
326 | if ($::CFG->{fow_enable}) { |
362 | if ($::CFG->{fow_enable}) { |
327 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
363 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
328 | |
364 | |
329 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
365 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
330 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
366 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
331 | glConvolutionFilter2D ( |
367 | glConvolutionFilter2D ( |
332 | GL_CONVOLUTION_2D, |
368 | GL_CONVOLUTION_2D, |
333 | GL_ALPHA, |
369 | GL_ALPHA, |
334 | 3, 3, |
370 | 3, 3, |
… | |
… | |
336 | (pack "f*", @{ $self->{smooth_matrix} }), |
372 | (pack "f*", @{ $self->{smooth_matrix} }), |
337 | ); |
373 | ); |
338 | glEnable GL_CONVOLUTION_2D; |
374 | glEnable GL_CONVOLUTION_2D; |
339 | } |
375 | } |
340 | |
376 | |
341 | $self->{fow_texture} = new CFClient::Texture |
377 | $self->{fow_texture} = new CFPlus::Texture |
342 | w => $w, |
378 | w => $w, |
343 | h => $h, |
379 | h => $h, |
344 | data => $data, |
380 | data => $data, |
345 | internalformat => GL_ALPHA, |
381 | internalformat => GL_ALPHA, |
346 | format => GL_ALPHA; |
382 | format => GL_ALPHA; |
… | |
… | |
408 | glDeleteList $self->{list}; |
444 | glDeleteList $self->{list}; |
409 | |
445 | |
410 | $self->SUPER::DESTROY; |
446 | $self->SUPER::DESTROY; |
411 | } |
447 | } |
412 | |
448 | |
413 | package CFClient::MapWidget::MapMap; |
449 | package CFPlus::MapWidget::MapMap; |
414 | |
450 | |
415 | our @ISA = CFClient::UI::Base::; |
451 | our @ISA = CFPlus::UI::Base::; |
416 | |
452 | |
417 | use Time::HiRes qw(time); |
453 | use Time::HiRes qw(time); |
418 | use CFClient::OpenGL; |
454 | use CFPlus::OpenGL; |
419 | |
455 | |
420 | sub size_request { |
456 | sub size_request { |
421 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
457 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
422 | } |
458 | } |
423 | |
459 | |
… | |
… | |
459 | |
495 | |
460 | if ($self->{texture_atime} < time) { |
496 | if ($self->{texture_atime} < time) { |
461 | $self->{texture_atime} = time + 1/3; |
497 | $self->{texture_atime} = time + 1/3; |
462 | |
498 | |
463 | $self->{texture} = |
499 | $self->{texture} = |
464 | new CFClient::Texture |
500 | new CFPlus::Texture |
465 | w => $w, |
501 | w => $w, |
466 | h => $h, |
502 | h => $h, |
467 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
503 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
468 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
504 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
469 | } |
505 | } |
470 | |
506 | |
471 | $self->{texture}->draw_quad (0, 0); |
507 | $self->{texture}->draw_quad (0, 0); |
472 | |
508 | |
473 | glDisable GL_TEXTURE_2D; |
509 | glDisable GL_TEXTURE_2D; |
… | |
… | |
488 | glEnd; |
524 | glEnd; |
489 | |
525 | |
490 | glDisable GL_BLEND; |
526 | glDisable GL_BLEND; |
491 | } |
527 | } |
492 | |
528 | |
493 | package CFClient::MapWidget::Command; |
529 | package CFPlus::MapWidget::Command; |
494 | |
530 | |
495 | use strict; |
531 | use strict; |
496 | |
532 | |
497 | use CFClient::OpenGL; |
533 | use CFPlus::OpenGL; |
498 | |
534 | |
499 | our @ISA = CFClient::UI::Frame::; |
535 | our @ISA = CFPlus::UI::Frame::; |
500 | |
536 | |
501 | sub new { |
537 | sub new { |
502 | my $class = shift; |
538 | my $class = shift; |
503 | |
539 | |
504 | my $self = $class->SUPER::new ( |
540 | my $self = $class->SUPER::new ( |
505 | bg => [0, 0, 0, 0.8], |
541 | bg => [0, 0, 0, 0.8], |
506 | @_, |
542 | @_, |
507 | ); |
543 | ); |
508 | |
544 | |
509 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
545 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
510 | |
546 | |
511 | $self->{label} = [ |
547 | $self->{label} = [ |
512 | map |
548 | map |
513 | CFClient::UI::Label->new ( |
549 | CFPlus::UI::Label->new ( |
514 | can_hover => 1, |
550 | can_hover => 1, |
515 | can_events => 1, |
551 | can_events => 1, |
516 | tooltip_width => 0.33, |
552 | tooltip_width => 0.33, |
517 | fontsize => $_, |
553 | fontsize => $_, |
518 | ), (0.8) x 16 |
554 | ), (0.8) x 16 |
519 | ]; |
555 | ]; |
520 | |
556 | |
521 | $self->{entry} = new CFClient::UI::Entry |
557 | $self->{entry} = new CFPlus::UI::Entry |
522 | on_changed => sub { |
558 | on_changed => sub { |
523 | $self->update_labels; |
559 | $self->update_labels; |
524 | 0 |
560 | 0 |
525 | }, |
561 | }, |
526 | on_button_down => sub { |
562 | on_button_down => sub { |
527 | my ($entry, $ev, $x, $y) = @_; |
563 | my ($entry, $ev, $x, $y) = @_; |
528 | |
564 | |
529 | if ($ev->{button} == 3) { |
565 | if ($ev->{button} == 3) { |
530 | (new CFClient::UI::Menu |
566 | (new CFPlus::UI::Menu |
531 | items => [ |
567 | items => [ |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
568 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
569 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
534 | ], |
570 | ], |
535 | )->popup ($ev); |
571 | )->popup ($ev); |
536 | return 1; |
572 | return 1; |
537 | } |
573 | } |
… | |
… | |
553 | $self->hide; |
589 | $self->hide; |
554 | } |
590 | } |
555 | } elsif ($ev->{sym} == 27) { |
591 | } elsif ($ev->{sym} == 27) { |
556 | $self->{hist_ptr} = 0; |
592 | $self->{hist_ptr} = 0; |
557 | $self->hide; |
593 | $self->hide; |
558 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
594 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
559 | if ($self->{hist_ptr} > 1) { |
595 | if ($self->{hist_ptr} > 1) { |
560 | $self->{hist_ptr}--; |
596 | $self->{hist_ptr}--; |
561 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
597 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
562 | } elsif ($self->{hist_ptr} > 0) { |
598 | } elsif ($self->{hist_ptr} > 0) { |
563 | $self->{hist_ptr}--; |
599 | $self->{hist_ptr}--; |
… | |
… | |
565 | } else { |
601 | } else { |
566 | ++$self->{select_offset} |
602 | ++$self->{select_offset} |
567 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
603 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
568 | } |
604 | } |
569 | $self->update_labels; |
605 | $self->update_labels; |
570 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
606 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
571 | if ($self->{select_offset}) { |
607 | if ($self->{select_offset}) { |
572 | --$self->{select_offset} |
608 | --$self->{select_offset} |
573 | } else { |
609 | } else { |
574 | unless ($self->{hist_ptr}) { |
610 | unless ($self->{hist_ptr}) { |
575 | $self->{hist_saveback} = $self->{entry}->get_text; |
611 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
733 | |
769 | |
734 | sub _draw { |
770 | sub _draw { |
735 | my ($self) = @_; |
771 | my ($self) = @_; |
736 | |
772 | |
737 | # hack |
773 | # hack |
738 | local $CFClient::UI::FOCUS = $self->{entry}; |
774 | local $CFPlus::UI::FOCUS = $self->{entry}; |
739 | |
775 | |
740 | $self->SUPER::_draw; |
776 | $self->SUPER::_draw; |
741 | } |
777 | } |
742 | |
778 | |
743 | 1 |
779 | 1 |