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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.20 by root, Tue Apr 25 14:04:37 2006 UTC

… …
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11 11
12sub new { 12sub new {
13 my $class = shift; 13 my $class = shift;
14 14
15 $class->SUPER::new ( 15 my $self = $class->SUPER::new (
16 z => -1, 16 z => -1,
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ) 20 );
21
22 $self->add_command ("killpets", "kills all your summoned and charmed creates");
23
24 $self
21} 25}
22 26
23sub DESTROY { 27sub DESTROY {
24 my $self = shift; 28 my $self = shift;
25 29
… …
81 85
82 if (delete $self->{need_update}) { 86 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 87 glNewList $self->{list};
84 88
85 if ($::MAP) { 89 if ($::MAP) {
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}); 90 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); 91 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
92
93 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
94 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
88 95
89 glPushMatrix; 96 glPushMatrix;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 97 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
91
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
94 98
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 99 glTranslate $sx0 - 32, $sy0 - 32, 0;
96 100
97 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);
98 102
… …
131 135
132 glDisable GL_TEXTURE_2D; 136 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND; 137 glDisable GL_BLEND;
134 } 138 }
135 139
136 # HACK BEGIN
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139
140 glTranslate 0, 30;
141 my ($w, $h) = (250, 250);
142
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
144
145 glEnable GL_BLEND;
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150 glPopMatrix; 140 glPopMatrix;
151
152 $self->{mapmap_texture} =
153 new CFClient::Texture
154 w => $w,
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159 $self->{mapmap_texture}->draw_quad (0, 0);
160
161 glDisable GL_TEXTURE_2D;
162
163 glTranslate 0.375, 0.375;
164
165 glColor 1, 1, 0, 1;
166 glBegin GL_LINE_LOOP;
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172
173 glDisable GL_BLEND;
174 }
175 # HACK END
176 } 141 }
177 142
178 glEndList; 143 glEndList;
179 } 144 }
180 145
… …
276sub add_command { 241sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_; 242 my ($self, $command, $tooltip, $widget, $cb) = @_;
278 243
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 244 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280 245
246 $self->{command} = [
281 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;
282} 329}
283 330
284package CFClient::MapWidget::Command; 331package CFClient::MapWidget::Command;
285 332
286use strict; 333use strict;
… …
323 my @found; 370 my @found;
324 371
325 for (@$command) { 372 for (@$command) {
326 if ($_->[0] =~ $search_abbrev) { 373 if ($_->[0] =~ $search_abbrev) {
327 push @found, [$_->[0], $_]; 374 push @found, [$_->[0], $_];
328 } elsif ($_->[1] =~ $search_full) { 375 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
329 push @found, [$_->[1], $_]; 376 push @found, [$_->[1], $_];
330 } 377 }
331 } 378 }
332 379
333 @found = sort { $a->[0] cmp $b->[0] } @found; 380 @found = sort { $a->[0] cmp $b->[0] } @found;

Diff Legend

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