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.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.20 by root, Tue Apr 25 14:04:37 2006 UTC

1package CFClient::MapWidget; 1package CFClient::MapWidget;
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use List::Util qw(min max); 6use List::Util qw(min max);
6 7
7use CFClient::OpenGL; 8use CFClient::OpenGL;
8 9
9our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
10 11
11sub new { 12sub new {
12 my $class = shift; 13 my $class = shift;
13 14
14 $class->SUPER::new ( 15 my $self = $class->SUPER::new (
15 z => -1, 16 z => -1,
16 can_focus => 1, 17 can_focus => 1,
17 list => glGenList, 18 list => glGenList,
18 @_ 19 @_
19 ) 20 );
21
22 $self->add_command ("killpets", "kills all your summoned and charmed creates");
23
24 $self
20} 25}
21 26
22sub DESTROY { 27sub DESTROY {
23 my $self = shift; 28 my $self = shift;
24 29
… …
80 85
81 if (delete $self->{need_update}) { 86 if (delete $self->{need_update}) {
82 glNewList $self->{list}; 87 glNewList $self->{list};
83 88
84 if ($::MAP) { 89 if ($::MAP) {
85 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}); 90 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); 91 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87
88 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
89 92
90 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 93 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
91 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 94 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
95
96 glPushMatrix;
97 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
92 98
93 glTranslate $sx0 - 32, $sy0 - 32, 0; 99 glTranslate $sx0 - 32, $sy0 - 32, 0;
94 100
95 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 101 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
96 102
… …
129 135
130 glDisable GL_TEXTURE_2D; 136 glDisable GL_TEXTURE_2D;
131 glDisable GL_BLEND; 137 glDisable GL_BLEND;
132 } 138 }
133 139
134 # HACK BEGIN 140 glPopMatrix;
135 {
136 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
137
138 glTranslate 0, 30;
139 my ($w, $h) = (250, 250);
140
141 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
142
143 glEnable GL_BLEND;
144 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
145 glEnable GL_TEXTURE_2D;
146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
147
148 $self->{mapmap_texture} =
149 new CFClient::Texture
150 w => $w,
151 h => $h,
152 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
153 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
154
155 $self->{mapmap_texture}->draw_quad (0, 0);
156
157 glDisable GL_TEXTURE_2D;
158
159 glTranslate 0.375, 0.375;
160
161 glColor 1, 1, 0, 1;
162 glBegin GL_LINE_LOOP;
163 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
164 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
165 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
166 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
167 glEnd;
168
169 glDisable GL_BLEND;
170 }
171 # HACK END
172 } 141 }
173 142
174 glEndList; 143 glEndList;
175 } 144 }
176 145
… …
214 my $mod = $ev->{mod}; 183 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 184 my $sym = $ev->{sym};
216 185
217 if ($sym == CFClient::SDLK_KP5) { 186 if ($sym == CFClient::SDLK_KP5) {
218 $::CONN->user_send ("stay fire"); 187 $::CONN->user_send ("stay fire");
188 } elsif ($sym == ord ",") {
189 $::CONN->user_send ("take");
219 } elsif ($sym == ord "a") { 190 } elsif ($sym == ord "a") {
220 $::CONN->user_send ("apply"); 191 $::CONN->user_send ("apply");
221 } elsif ($sym == ord "'") { 192 } elsif ($sym == ord "'") {
222 $self->emit ('activate_console'); 193 $self->emit ('activate_console');
223 } elsif ($sym == ord "/") { 194 } elsif ($sym == ord "/") {
… …
270sub add_command { 241sub add_command {
271 my ($self, $command, $tooltip, $widget, $cb) = @_; 242 my ($self, $command, $tooltip, $widget, $cb) = @_;
272 243
273 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 244 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
274 245
246 $self->{command} = [
275 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; 247 [$abbrev, $command, $tooltip, $widget, $cb],
248 grep $_->[1] ne $command, @{ $self->{command} },
249 ];
250}
251
252package CFClient::MapWidget::MapMap;
253
254our @ISA = CFClient::UI::Base::;
255
256use Time::HiRes qw(time);
257use CFClient::OpenGL;
258
259sub size_request {
260 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
261}
262
263sub size_allocate {
264 my ($self, $w, $h) = @_;
265
266 $self->SUPER::size_allocate ($w, $h);
267 $self->update;
268}
269
270sub update {
271 my ($self) = @_;
272
273 delete $self->{texture_atime};
274 $self->SUPER::update;
275}
276
277sub _draw {
278 my ($self) = @_;
279
280 $::MAP or return;
281
282 my ($w, $h) = @$self{qw(w h)};
283
284 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
285 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
286
287 my $sx = int $::CFG->{map_shift_x} / 32;
288 my $sy = int $::CFG->{map_shift_y} / 32;
289
290 my $ox = 0.5 * ($w - $sw);
291 my $oy = 0.5 * ($h - $sh);
292
293 glEnable GL_BLEND;
294 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
295 glEnable GL_TEXTURE_2D;
296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
297
298 if ($self->{texture_atime} < time) {
299 $self->{texture_atime} = time + 1/3;
300
301 $self->{texture} =
302 new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
306 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
307 }
308
309 $self->{texture}->draw_quad (0, 0);
310
311 glDisable GL_TEXTURE_2D;
312
313 glTranslate 0.375, 0.375;
314
315 #TODO: map scale is completely borked
316
317 my $x0 = int $ox - $sx + 0.5;
318 my $y0 = int $oy - $sy + 0.5;
319
320 glColor 1, 1, 0, 1;
321 glBegin GL_LINE_LOOP;
322 glVertex $x0 , $y0 ;
323 glVertex $x0 , $y0 + $sh;
324 glVertex $x0 + $sw, $y0 + $sh;
325 glVertex $x0 + $sw, $y0 ;
326 glEnd;
327
328 glDisable GL_BLEND;
276} 329}
277 330
278package CFClient::MapWidget::Command; 331package CFClient::MapWidget::Command;
279 332
280use strict; 333use strict;
… …
317 my @found; 370 my @found;
318 371
319 for (@$command) { 372 for (@$command) {
320 if ($_->[0] =~ $search_abbrev) { 373 if ($_->[0] =~ $search_abbrev) {
321 push @found, [$_->[0], $_]; 374 push @found, [$_->[0], $_];
322 } elsif ($_[1] =~ $search_full) { 375 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
323 push @found, [$_->[1], $_]; 376 push @found, [$_->[1], $_];
324 } 377 }
325 } 378 }
326 379
327 @found = sort { $a->[0] cmp $b->[0] } @found; 380 @found = sort { $a->[0] cmp $b->[0] } @found;
… …
354 $self->emit (execute => $self->{select}); 407 $self->emit (execute => $self->{select});
355 $self->emit ("close"); 408 $self->emit ("close");
356 } 409 }
357 } elsif ($ev->{sym} == 27) { 410 } elsif ($ev->{sym} == 27) {
358 $self->emit ("close"); 411 $self->emit ("close");
412 return;
359 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 413 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
360 $self->{search} .= chr $ev->{unicode}; 414 $self->{search} .= chr $ev->{unicode};
361 $self->update_labels; 415 $self->update_labels;
362 } 416 }
363 417

Diff Legend

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