ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs.
Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2 2
3use strict; 3use strict;
4
5use Scalar::Util;
6
4use SDL::OpenGL; 7use SDL::OpenGL;
5use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
6 9
7our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
8our @ACTIVE_WIDGETS; 11#our @ACTIVE_WIDGETS;
9 12
10# class methods for events 13# class methods for events
11sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
12sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
13sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 16sub feed_sdl_button_down_event { }
14sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 17sub feed_sdl_button_up_event { }
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my $class = shift;
18 21
19 bless { @_ }, $class 22 bless { @_ }, $class
20} 23}
21 24
22sub activate { 25#sub activate {
23 push @ACTIVE_WIDGETS, $_[0]; 26# push @ACTIVE_WIDGETS, $_[0];
24} 27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
25 29
26sub deactivate { 30#sub deactivate {
27 @ACTIVE_WIDGETS = 31# @ACTIVE_WIDGETS =
28 sort { $a->{z} <=> $b->{z} } 32# sort { $a->{z} <=> $b->{z} }
29 grep { $_ != $_[0] } 33# grep { $_ && $_ != $_[0] }
30 @ACTIVE_WIDGETS; 34# @ACTIVE_WIDGETS;
35#}
36
37sub move {
38 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x;
40 $self->{y} = $y;
41 $self->{z} = $z if defined $z;
42}
43
44sub needs_redraw {
45 0
31} 46}
32 47
33sub size_request { 48sub size_request {
34 die "size_request is abtract"; 49 die "size_request is abtract";
35} 50}
… …
77sub _draw { 92sub _draw {
78 my ($widget) = @_; 93 my ($widget) = @_;
79} 94}
80 95
81sub bbox { 96sub bbox {
82 my ($widget) = @_; 97 my ($self) = @_;
98 my ($w, $h) = $self->size_request;
99 (
100 $self->{x},
101 $self->{y},
102 $self->{x} = $w,
103 $self->{y} = $h
104 )
83} 105}
84 106
107sub del_parent { $_[0]->{parent} = undef }
108
109sub set_parent {
110 my ($self, $par) = @_;
111
112 $self->{parent} = $par;
113 Scalar::Util::weaken $self->{parent};
114}
115
116sub get_parent {
117 $_[0]->{parent}
118}
119
120sub update {
121 my ($self) = @_;
122
123 $self->{parent}->update
124 if $self->{parent};
125}
126
127sub DESTROY {
128 my ($self) = @_;
129
130 #$self->deactivate;
131}
132
85package Crossfire::Client::Widget::Container; 133package Crossfire::Client::Widget::Bin;
86 134
87our @ISA = Crossfire::Client::Widget::; 135our @ISA = Crossfire::Client::Widget::;
88 136
89use SDL::OpenGL; 137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
90 138
91sub add { $_[0]->{child} = $_[1] }
92sub get { $_[0]->{child} } 139sub get { $_[0]->{child} }
93 140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146
147sub size_request {
94sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 148 $_[0]->{child}->size_request if $_[0]->{child}
149}
95 150
96sub _draw { die "Containers can't be drawn!" } 151sub _draw {
152 my ($self) = @_;
97 153
154 $self->{child}->draw;
155}
156
98package Crossfire::Client::Widget::Frame; 157package Crossfire::Client::Widget::Toplevel;
99 158
159our @ISA = Crossfire::Client::Widget::;
160
161use SDL::OpenGL;
162
163sub add {
164 my ($self, $chld) = @_;
165
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
100our @ISA = Crossfire::Client::Widget::Container::; 195our @ISA = Crossfire::Client::Widget::Bin::;
101 196
102use SDL::OpenGL; 197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
215}
216
217sub render_chld {
218 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221
222 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw }
225 );
226 $self->{texture}->upload;
227}
103 228
104sub size_request { 229sub size_request {
105 my ($self) = @_; 230 my ($self) = @_;
106 my $chld = $self->get 231 my $chld = $self->get
107 or return (0, 0); 232 or return (0, 0);
233 $chld->size_request
234}
235
236sub _draw {
237 my ($self) = @_;
238
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240
241 my $tex = $self->{texture}
242 or return;
243
244 glEnable GL_BLEND;
245 glEnable GL_TEXTURE_2D;
246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247 glBindTexture GL_TEXTURE_2D, $tex->{name};
248
249 glBegin GL_QUADS;
250 glTexCoord 0, 0; glVertex 0, 0;
251 glTexCoord 0, 1; glVertex 0, $h;
252 glTexCoord 1, 1; glVertex $w, $h;
253 glTexCoord 1, 0; glVertex $w, 0;
254 glEnd;
255
256 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D;
258}
259
260package Crossfire::Client::Widget::Frame;
261
262our @ISA = Crossfire::Client::Widget::Bin::;
263
264use SDL::OpenGL;
265
266sub size_request {
267 my ($self) = @_;
268 my $chld = $self->get
269 or return (0, 0);
270
271 $chld->move (2, 2);
272
108 map { $_ + 4 } $chld->size_request; 273 map { $_ + 4 } $chld->size_request;
109} 274}
110 275
111sub _draw { 276sub _draw {
112 my ($self) = @_; 277 my ($self) = @_;
113 278
114 my $chld = $self->get; 279 my $chld = $self->get;
115 280
116 my ($w, $h) = $chld->size_request; 281 my ($w, $h) = $chld->size_request;
117 282
118 glColor 1, 0, 0;
119 glBegin GL_QUADS; 283 glBegin GL_QUADS;
284 glColor 0, 0, 0;
120 glTexCoord 0, 0; glVertex 0 , 0; 285 glTexCoord 0, 0; glVertex 0 , 0;
121 glTexCoord 0, 1; glVertex 0 , $h + 4; 286 glTexCoord 0, 1; glVertex 0 , $h + 4;
122 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 287 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 288 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 289 glEnd;
125 290
126 glPushMatrix;
127 glTranslate (2, 2, 0);
128 $chld->_draw; 291 $chld->draw;
129 glPopMatrix; 292}
293
294package Crossfire::Client::Widget::FancyFrame;
295
296our @ISA = Crossfire::Client::Widget::Frame::;
297
298use SDL::OpenGL;
299
300sub new {
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
307 ];
308 $self
309
310}
311
312sub size_request {
313 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request;
315
316 $h += $self->{txts}->[1]->{height};
317 $h += $self->{txts}->[4]->{height};
318 $w += $self->{txts}->[2]->{width};
319 $w += $self->{txts}->[3]->{width};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322
323 ($w, $h)
324}
325
326sub _draw {
327 my ($self) = @_;
328
329 my ($w, $h) = $self->size_request;
330 my ($cw, $ch) = $self->get->size_request;
331
332 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
336
337
338 my $top = $self->{txts}->[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name};
340
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name};
352
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name};
364
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name};
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height};
395
396 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404
405 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D;
130} 407}
131 408
132package Crossfire::Client::Widget::Table; 409package Crossfire::Client::Widget::Table;
133 410
134our @ISA = Crossfire::Client::Widget::Container::; 411our @ISA = Crossfire::Client::Widget::Bin::;
135 412
136use SDL::OpenGL; 413use SDL::OpenGL;
137 414
138sub add { 415sub add {
139 my ($self, $x, $y, $chld) = @_; 416 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x];
418
140 $self->{childs}[$y][$x] = $chld; 419 $self->{childs}[$y][$x] = $chld;
420 $chld->set_parent ($self);
421 $self->update;
141} 422}
142 423
143sub max_row_height { 424sub max_row_height {
144 my ($self, $row) = @_; 425 my ($self, $row) = @_;
145 426
… …
195 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
196 my $x = 0; 477 my $x = 0;
197 478
198 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
199 480
200 glPushMatrix;
201 glTranslate ($x, $y, 0);
202 my $c = $self->{childs}->[$yi]->[$xi]; 481 my $c = $self->{childs}->[$yi]->[$xi];
482 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request
203 $c->_draw if $c; 484 $c->draw if $c;
204 glPopMatrix; 485 }
205 486
206 $x += $self->max_col_width ($xi); 487 $x += $self->max_col_width ($xi);
207 } 488 }
208 489
209 $y += $self->max_row_height ($yi); 490 $y += $self->max_row_height ($yi);
210 } 491 }
211} 492}
212 493
213package Crossfire::Client::Widget::VBox; 494package Crossfire::Client::Widget::VBox;
214 495
215our @ISA = Crossfire::Client::Widget::Container::; 496our @ISA = Crossfire::Client::Widget::Bin::;
216 497
217use SDL::OpenGL; 498use SDL::OpenGL;
218 499
219sub add { 500sub add {
220 my ($self, $chld) = @_; 501 my ($self, $chld) = @_;
221 push @{$self->{childs}}, $chld; 502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
222} 505}
223 506
224sub size_request { 507sub size_request {
225 my ($self) = @_; 508 my ($self) = @_;
226 509
… …
237sub _draw { 520sub _draw {
238 my ($self) = @_; 521 my ($self) = @_;
239 522
240 my ($x, $y); 523 my ($x, $y);
241 for (@{$self->{childs} || []}) { 524 for (@{$self->{childs} || []}) {
242 glPushMatrix; 525 $_->move (0, $y, 0); #TODO: move to size_request
243 glTranslate (0, $y, 0);
244 $_->_draw; 526 $_->draw;
245 glPopMatrix;
246 my ($w, $h) = $_->size_request; 527 my ($w, $h) = $_->size_request;
247 $y += $h; 528 $y += $h;
248 } 529 }
249} 530}
250 531
… …
253our @ISA = Crossfire::Client::Widget::; 534our @ISA = Crossfire::Client::Widget::;
254 535
255use SDL::OpenGL; 536use SDL::OpenGL;
256 537
257sub new { 538sub new {
258 my ($class, $x, $y, $z, $ttf, $text) = @_; 539 my ($class, $x, $y, $z, $height, $text) = @_;
259 540
541 # TODO: color, and make height, xyz etc. optional
260 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
261 543
262 $self->set_text ($text); 544 $self->set_text ($text);
263 545
264 $self 546 $self
265} 547}
266 548
267sub set_text { 549sub set_text {
268 my ($self, $text) = @_; 550 my ($self, $text) = @_;
551
552 $self->{text} = $text;
269 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 553 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
554
555 $self->update;
270} 556}
271 557
272sub get_text { 558sub get_text {
273 my ($self, $text) = @_; 559 my ($self, $text) = @_;
560
274 $self->{text} 561 $self->{text}
275} 562}
276 563
277sub size_request { 564sub size_request {
278 my ($self) = @_; 565 my ($self) = @_;
… …
286sub _draw { 573sub _draw {
287 my ($self) = @_; 574 my ($self) = @_;
288 575
289 my $tex = $self->{texture}; 576 my $tex = $self->{texture};
290 577
291 $self->{x}--;
292
293 glEnable GL_BLEND; 578 glEnable GL_BLEND;
294 glEnable GL_TEXTURE_2D; 579 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
296 glBindTexture GL_TEXTURE_2D, $tex->{name}; 582 glBindTexture GL_TEXTURE_2D, $tex->{name};
297 583
298 glColor 1, 1, 1; 584 glColor 1, 1, 1, 0.6; # TODO color
299 585
300 glBegin GL_QUADS; 586 glBegin GL_QUADS;
301 glTexCoord 0, 0; glVertex 0 , 0; 587 glTexCoord 0, 0; glVertex 0 , 0;
302 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 588 glTexCoord 0, 1; glVertex 0 , $tex->{height};
303 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
306 592
307 glDisable GL_BLEND; 593 glDisable GL_BLEND;
308 glDisable GL_TEXTURE_2D; 594 glDisable GL_TEXTURE_2D;
309} 595}
310 596
597package Crossfire::Client::Widget::TextEntry;
598
599our @ISA = Crossfire::Client::Widget::Label::;
600
601use SDL;
602use SDL::OpenGL;
603
604sub key_down {
605 my ($self, $ev) = @_;
606
607 my $mod = $ev->key_mod;
608 my $sym = $ev->key_sym;
609
610 $ev->set_unicode (1);
611 my $uni = $ev->key_unicode;
612
613 my $text = $self->get_text;
614
615 if ($sym == SDLK_BACKSPACE) {
616 substr $text, -1, 1, '';
617
618 } elsif ($uni) {
619 $text .= chr $uni;
620 }
621 $self->set_text ($text);
622}
623
624
625# XXX: TextView isn't neccessary with pango multiline text rendering
311package Crossfire::Client::Widget::TextView; 626package Crossfire::Client::Widget::TextView;
312 627
313use strict; 628use strict;
314 629
315our @ISA = qw/Crossfire::Client::Widget/; 630our @ISA = qw/Crossfire::Client::Widget/;
316 631
317use SDL::OpenGL; 632use SDL::OpenGL;
318use SDL::OpenGL::Constants; 633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
319 658
320sub add_line { 659sub add_line {
321 my ($self, $line) = @_; 660 my ($self, $line) = @_;
322 push @{$self->{lines}}, $line; 661 push @{$self->{lines}}, $line;
323}
324 662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
325sub _draw { 681sub draw_line {
326 my ($self) = @_; 682 my ($self, $tex, $y) = @_;
327 683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
328} 711}
329 712
330package Crossfire::Client::Widget::MapWidget; 713package Crossfire::Client::Widget::MapWidget;
331 714
332use strict; 715use strict;
333 716
334our @ISA = qw/Crossfire::Client::Widget/; 717use List::Util qw(min max);
335 718
336use SDL; 719use SDL;
337use SDL::OpenGL; 720use SDL::OpenGL;
338use SDL::OpenGL::Constants; 721use SDL::OpenGL::Constants;
722
723our @ISA = Crossfire::Client::Widget::;
339 724
340sub key_down { 725sub key_down {
341 print "MAPKEYDOWN\n"; 726 print "MAPKEYDOWN\n";
342} 727}
343 728
344sub key_up { 729sub key_up {
345} 730}
346 731
347sub _draw { 732sub _draw {
733 my ($self) = @_;
734
735 my $mx = $::CONN->{mapx};
736 my $my = $::CONN->{mapy};
737
738 my $map = $::CONN->{map};
739
740 my ($xofs, $yofs);
741
742 my $sw = 1 + int $::WIDTH / 32;
743 my $sh = 1 + int $::HEIGHT / 32;
744
745 if ($::CONN->{mapw} > $sw) {
746 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
747 } else {
748 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
749 }
750
751 if ($::CONN->{maph} > $sh) {
752 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
753 } else {
754 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
755 }
756
348 glEnable GL_TEXTURE_2D; 757 glEnable GL_TEXTURE_2D;
349 glEnable GL_BLEND; 758 glEnable GL_BLEND;
350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
351 760
352 my $map = $::CONN->{map}; 761 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh);
353 763
354 for my $x (0 .. $::CONN->{mapw} - 1) { 764 for my $x (0 .. $sw - 1) {
355 for my $y (0 .. $::CONN->{maph} - 1) { 765 for my $y (0 .. $sh - 1) {
356 766
357 my $cell = $map->[$x][$y] 767 my $cell = $map->[$x + $xofs][$y + $yofs]
358 or next; 768 or next;
359 769
360 my $darkness = $cell->[3] * (1 / 255); 770 my $darkness = $cell->[0] * (1 / 255);
361 glColor $darkness, $darkness, $darkness; 771 if ($darkness < 0) {
772 $darkness = 0.15;
773 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
362 775
363 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 776 for my $num (grep $_, @$cell[1,2,3]) {
364 my $tex = $::CONN->{face}[$num]{texture} || next; 777 my $tex = $::CONN->{face}[$num]{texture} || next;
365 778
366 glBindTexture GL_TEXTURE_2D, $tex->{name}; 779 glBindTexture GL_TEXTURE_2D, $tex->{name};
367 780
781 my $w = $tex->{width};
782 my $h = $tex->{height};
783
784 my $px = ($x + 1) * 32 - $w;
785 my $py = ($y + 1) * 32 - $h;
786
368 glBegin GL_QUADS; 787 glBegin GL_QUADS;
369 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 788 glTexCoord 0, 0; glVertex $px , $py;
370 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 789 glTexCoord 0, 1; glVertex $px , $py + $h;
371 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 790 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
372 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 791 glTexCoord 1, 0; glVertex $px + $w, $py;
373 glEnd; 792 glEnd;
374 } 793 }
375 } 794 }
376 } 795 }
377 796
797# if (1) { # higher quality darkness
798# $lighting =~ s/(.)/$1$1$1/gs;
799# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800#
801# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
802#
803# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs;
805# }
806
807 $lighting = new Crossfire::Client::Texture
808 width => $sw4,
809 height => $sh,
810 data => $lighting,
811 internalformat => GL_ALPHA4,
812 format => GL_ALPHA;
813
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glColor 0, 0, 0, 0.75;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
825
378 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
379 glDisable GL_BLEND; 827 glDisable GL_BLEND;
380} 828}
381 829
382my %DIR = ( 830my %DIR = (
383 SDLK_KP8, [1, "north"], 831 SDLK_KP8, [1, "north"],
384 SDLK_KP9, [2, "northest"], 832 SDLK_KP9, [2, "northeast"],
385 SDLK_KP6, [3, "east"], 833 SDLK_KP6, [3, "east"],
386 SDLK_KP3, [4, "southeast"], 834 SDLK_KP3, [4, "southeast"],
387 SDLK_KP2, [5, "south"], 835 SDLK_KP2, [5, "south"],
388 SDLK_KP1, [6, "southwest"], 836 SDLK_KP1, [6, "southwest"],
389 SDLK_KP4, [7, "west"], 837 SDLK_KP4, [7, "west"],
390 SDLK_KP7, [8, "northwest"], 838 SDLK_KP7, [8, "northwest"],
839
840 SDLK_UP, [1, "north"],
841 SDLK_RIGHT, [3, "east"],
842 SDLK_DOWN, [5, "south"],
843 SDLK_LEFT, [7, "west"],
391); 844);
392 845
393sub key_down { 846sub key_down {
394 my ($self, $ev) = @_; 847 my ($self, $ev) = @_;
395 848
… …
398 851
399 if ($sym == SDLK_KP5) { 852 if ($sym == SDLK_KP5) {
400 $::CONN->send ("command stay fire"); 853 $::CONN->send ("command stay fire");
401 } elsif (exists $DIR{$sym}) { 854 } elsif (exists $DIR{$sym}) {
402 if ($mod & KMOD_SHIFT) { 855 if ($mod & KMOD_SHIFT) {
856 $self->{shft}++;
403 $::CONN->send ("command fire $DIR{$sym}[0]"); 857 $::CONN->send ("command fire $DIR{$sym}[0]");
404 } elsif ($mod & KMOD_CTRL) { 858 } elsif ($mod & KMOD_CTRL) {
859 $self->{ctrl}++;
405 $::CONN->send ("command run $DIR{$sym}[0]"); 860 $::CONN->send ("command run $DIR{$sym}[0]");
406 } else { 861 } else {
862 $::CONN->send ("command $DIR{$sym}[1]");
407 } 863 }
408 } 864 }
409} 865}
410 866
411sub key_up { 867sub key_up {
412 my ($self, $ev) = @_; 868 my ($self, $ev) = @_;
413 869
414 my $mod = $ev->key_mod; 870 my $mod = $ev->key_mod;
415 my $sym = $ev->key_sym; 871 my $sym = $ev->key_sym;
416 872
417 if (exists $DIR{$sym}) { 873 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
418 if ($mod & KMOD_SHIFT) {
419 $::CONN->send ("command fire_stop"); 874 $::CONN->send ("command fire_stop");
420 } else { 875 }
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->send ("command run_stop"); 877 $::CONN->send ("command run_stop");
878 }
879}
880
881package Crossfire::Client::Widget::Animator;
882
883use SDL::OpenGL;
884
885our @ISA = Crossfire::Client::Widget::Bin::;
886
887sub moveto {
888 my ($self, $x, $y) = @_;
889
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01;
892 $self->{time} = 1;
893
894 ::animation_start $self;
895}
896
897sub animate {
898 my ($self, $interval) = @_;
899
900 $self->{time} -= $interval * $self->{speed};
901 if ($self->{time} <= 0) {
902 $self->{time} = 0;
903 ::animation_stop $self;
904 }
905
906 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
422 } 907
423 } 908 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
909 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
910}
911
912sub _draw {
913 my ($self) = @_;
914
915 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw;
918 glPopMatrix;
424} 919}
425 920
4261; 9211;
427 922

Diff Legend

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