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

Diff Legend

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