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.6 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC

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

Diff Legend

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