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.42 by root, Sun Apr 9 22:00:58 2006 UTC vs.
Revision 1.58 by root, Tue Apr 11 12:21:29 2006 UTC

… …
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use Crossfire::Client;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless { @_ }, $class
… …
44 99
45 $self->{w} = $w; 100 $self->{w} = $w;
46 $self->{h} = $h; 101 $self->{h} = $h;
47} 102}
48 103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109}
110
49sub focus_in { 111sub focus_in {
50 my ($widget) = @_; 112 my ($self) = @_;
51 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
52} 117}
53 118
54sub focus_out { 119sub focus_out {
55 my ($widget) = @_; 120 my ($self) = @_;
56}
57 121
58sub key_down { 122 return unless $FOCUS == $self;
59 my ($widget, $sdlev) = @_;
60}
61 123
62sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
63 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
64} 126}
65 127
128sub mouse_motion { }
129sub button_up { }
66sub button_down { 130sub button_down { }
67 my ($widget, $sdlev) = @_; 131sub key_down { }
68} 132sub key_up { }
69 133
70sub button_up {
71 my ($widget, $sdlev) = @_;
72}
73
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 139
80sub draw { 140sub draw {
81 my ($self) = @_; 141 my ($self) = @_;
82 142
83 glPushMatrix; 143 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
86 glPopMatrix; 157 glPopMatrix;
87} 158}
88 159
89sub _draw { 160sub _draw {
90 my ($self) = @_; 161 my ($self) = @_;
… …
162 233
163 @{$self->{children}} = 234 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} } 235 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 236 @{$self->{children}}, $chld;
166 237
167 $self->size_allocate ($self->{w}, $self->{h}); 238 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state"
168} 240}
169 241
170sub remove { 242sub remove {
171 my ($self, $widget) = @_; 243 my ($self, $widget) = @_;
172 244
… …
176} 248}
177 249
178sub find_widget { 250sub find_widget {
179 my ($self, $x, $y) = @_; 251 my ($self, $x, $y) = @_;
180 252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
181 my $res; 256 my $res;
182 257
183 for (@{ $self->{children} }) { 258 for (reverse @{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y) 259 $res = $_->find_widget ($x, $y)
185 and return $res; 260 and return $res;
186 } 261 }
187 262
188 () 263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
189}
190
191sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202} 264}
203 265
204sub _draw { 266sub _draw {
205 my ($self) = @_; 267 my ($self) = @_;
206 268
… …
223 my ($self, $w, $h) = @_; 285 my ($self, $w, $h) = @_;
224 286
225 $self->SUPER::size_allocate ($w, $h); 287 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h) 288 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0] 289 if $self->{children}[0]
228}
229
230#############################################################################
231
232package Crossfire::Client::Widget::Toplevel;
233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248} 290}
249 291
250############################################################################# 292#############################################################################
251 293
252package Crossfire::Client::Widget::Window; 294package Crossfire::Client::Widget::Window;
… …
299 or return; 341 or return;
300 342
301 glEnable GL_BLEND; 343 glEnable GL_BLEND;
302 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
304 glBindTexture GL_TEXTURE_2D, $tex->{name};
305 346
306 glBegin GL_QUADS; 347 $tex->draw_quad (0, 0, $w, $h);
307 glTexCoord 0, 0; glVertex 0, 0;
308 glTexCoord 0, 1; glVertex 0, $h;
309 glTexCoord 1, 1; glVertex $w, $h;
310 glTexCoord 1, 0; glVertex $w, 0;
311 glEnd;
312 348
313 glDisable GL_BLEND; 349 glDisable GL_BLEND;
314 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
315} 351}
316 352
… …
349 385
350 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
351 387
352 glBegin GL_QUADS; 388 glBegin GL_QUADS;
353 glColor 0, 0, 0; 389 glColor 0, 0, 0;
354 glTexCoord 0, 0; glVertex 0 , 0; 390 glVertex 0 , 0;
355 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
357 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
358 glEnd; 394 glEnd;
359 395
360 $chld->draw; 396 $chld->draw;
361} 397}
362 398
… …
395 $w -= $tex[2]->{width}; 431 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width}; 432 $w -= $tex[3]->{width};
397 433
398 $h = $h < 0 ? 0 : $h; 434 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w; 435 $w = $w < 0 ? 0 : $w;
400 warn "CHILD:$w $h\n"; 436
401 $self->child->size_allocate ($w, $h); 437 $self->child->size_allocate ($w, $h);
402 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 438 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
403} 439}
404 440
405sub _draw { 441sub _draw {
406 my ($self) = @_; 442 my ($self) = @_;
407 443
408 my ($w, $h) = ($self->w, $self->h); 444 my ($w, $h) = ($self->{w}, $self->{h});
409 my ($cw, $ch) = ($self->child->w, $self->child->h); 445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
410 446
411 glEnable GL_BLEND; 447 glEnable GL_BLEND;
412 glEnable GL_TEXTURE_2D; 448 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 451
416 my $top = $tex[1]; 452 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name}; 453 $top->draw_quad (0, 0, $w, $top->{height});
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425 454
426 my $left = $tex[3]; 455 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name}; 456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435 457
436 my $right = $tex[2]; 458 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name}; 459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445 460
446 my $bottom = $tex[4]; 461 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455 463
456 my $bg = $tex[0]; 464 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name}; 465 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461 469
462 my $rep_x = $cw / $bg->{width}; 470 my $rep_x = $cw / $bg->{width};
463 my $rep_y = $ch / $bg->{height}; 471 my $rep_y = $ch / $bg->{height};
464 472
465 glBegin GL_QUADS; 473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471 474
472 glDisable GL_BLEND; 475 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
474 477
475 $self->child->draw; 478 $self->child->draw;
… …
568package Crossfire::Client::Widget::VBox; 571package Crossfire::Client::Widget::VBox;
569 572
570our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = Crossfire::Client::Widget::Container::;
571 574
572use SDL::OpenGL; 575use SDL::OpenGL;
576
577sub size_request {
578 my ($self) = @_;
579
580 my @alloc = map [$_->size_request], @{$self->{children}};
581
582 (
583 (List::Util::max map $_->[0], @alloc),
584 (List::Util::sum map $_->[1], @alloc),
585 )
586}
573 587
574sub size_allocate { 588sub size_allocate {
575 my ($self, $w, $h) = @_; 589 my ($self, $w, $h) = @_;
576 590
577 $self->w ($w); 591 $self->w ($w);
… …
610 $y += $h; 624 $y += $h;
611 } 625 }
612 } 626 }
613} 627}
614 628
615sub _draw {
616 my ($self) = @_;
617
618 my ($x, $y);
619 for (@{$self->{children} || []}) {
620 $_->draw;
621 $y += $_->h;
622 }
623}
624
625############################################################################# 629#############################################################################
626 630
627package Crossfire::Client::Widget::Label; 631package Crossfire::Client::Widget::Label;
628 632
629our @ISA = Crossfire::Client::Widget::; 633our @ISA = Crossfire::Client::Widget::;
… …
631use SDL::OpenGL; 635use SDL::OpenGL;
632 636
633sub new { 637sub new {
634 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
635 639
640 $height ||= $::FONTSIZE;
641
636 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 643 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
638 644
639 $self->set_text ($text); 645 $self->set_text ($text);
640 646
… …
657} 663}
658 664
659sub size_request { 665sub size_request {
660 my ($self) = @_; 666 my ($self) = @_;
661 667
662 ( 668 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
669 (
663 $self->{texture}{width}, 670 $self->{texture}{width},
664 $self->{texture}{height}, 671 $self->{texture}{height},
672 )
673 } else {
674 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
675
676 ($w, $h)
665 ) 677 }
678
666} 679}
667 680
668sub _draw { 681sub _draw {
669 my ($self) = @_; 682 my ($self) = @_;
670 683
… …
672 685
673 glEnable GL_BLEND; 686 glEnable GL_BLEND;
674 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 688 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
677 glBindTexture GL_TEXTURE_2D, $tex->{name};
678 690
679 glColor 1, 0, 0, 1; # TODO color 691 glColor 1, 0, 0, 1; # TODO color
680 692
681 glBegin GL_QUADS; 693 $tex->draw_quad (0, 0);
682 glTexCoord 0, 0; glVertex 0 , 0;
683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
685 glTexCoord 1, 0; glVertex $tex->{width}, 0;
686 glEnd;
687 694
688 glDisable GL_BLEND; 695 glDisable GL_BLEND;
689 glDisable GL_TEXTURE_2D; 696 glDisable GL_TEXTURE_2D;
690} 697}
691 698
692############################################################################# 699#############################################################################
693 700
694package Crossfire::Client::Widget::TextEntry; 701package Crossfire::Client::Widget::Entry;
695 702
696our @ISA = Crossfire::Client::Widget::Label::; 703our @ISA = Crossfire::Client::Widget::Label::;
697 704
698use SDL; 705use SDL;
699use SDL::OpenGL; 706use SDL::OpenGL;
… …
702 my ($self, $ev) = @_; 709 my ($self, $ev) = @_;
703 710
704 my $mod = $ev->key_mod; 711 my $mod = $ev->key_mod;
705 my $sym = $ev->key_sym; 712 my $sym = $ev->key_sym;
706 713
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode; 714 my $uni = $ev->key_unicode;
709 715
710 my $text = $self->get_text; 716 my $text = $self->get_text;
711 717
712 if ($sym == SDLK_BACKSPACE) { 718 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, ''; 719 substr $text, -1, 1, '';
714
715 } elsif ($uni) { 720 } elsif ($uni) {
716 $text .= chr $uni; 721 $text .= chr $uni;
717 } 722 }
723
718 $self->set_text ($text); 724 $self->set_text ($text);
725}
726
727sub button_down {
728 my ($self, $ev) = @_;
729
730 $self->focus_in;
731}
732
733sub mouse_motion {
734 my ($self, $ev, $x, $y) = @_;
735 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
736}
737
738sub _draw {
739 my ($self) = @_;
740
741 if ($FOCUS == $self) {
742 glColor 1, 1, 1;
743 } else {
744 glColor 0.7, 0.7, 0.7;
745 }
746
747 glBegin GL_QUADS;
748 glVertex 0 , 0;
749 glVertex 0 , $self->{h} - 1;
750 glVertex $self->{w} - 1, $self->{h} - 1;
751 glVertex $self->{w} - 1, 0;
752 glEnd;
753
754 $self->SUPER::_draw;
719} 755}
720 756
721############################################################################# 757#############################################################################
722 758
723package Crossfire::Client::Widget::MapWidget; 759package Crossfire::Client::Widget::MapWidget;
… …
738 774
739sub key_up { 775sub key_up {
740} 776}
741 777
742sub size_request { 778sub size_request {
743 779 (
744} 780 1 + int $::WIDTH / 32,
745 781 1 + int $::HEIGHT / 32,
746sub size_allocate { 782 )
747} 783}
748 784
749sub _draw { 785sub _draw {
750 my ($self) = @_; 786 my ($self) = @_;
751 787
… …
774 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
775 glEnable GL_BLEND; 811 glEnable GL_BLEND;
776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
777 813
778 my $sw4 = ($sw + 3) & ~3; 814 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh); 815 my $darkness = "\x00" x ($sw4 * $sh);
780 816
781 for my $x (0 .. $sw - 1) { 817 for my $x (0 .. $sw - 1) {
818 my $row = $map->[$x + $xofs];
782 for my $y (0 .. $sh - 1) { 819 for my $y (0 .. $sh - 1) {
783 820
784 my $cell = $map->[$x + $xofs][$y + $yofs] 821 my $cell = $row->[$y + $yofs]
785 or next; 822 or next;
786 823
787 my $darkness = $cell->[0] * (1 / 255); 824 my $dark = $cell->[0];
788 if ($darkness < 0) { 825 if ($dark < 0) {
789 $darkness = 0.15; 826 substr $darkness, $y * $sw4 + $x, 1, chr 224;
827 } else {
828 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
790 } 829 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
792 830
793 for my $num (grep $_, @$cell[1,2,3]) { 831 for my $num (grep $_, @$cell[1,2,3]) {
794 my $tex = $::CONN->{face}[$num]{texture} || next; 832 my $tex = $::CONN->{face}[$num]{texture} || next;
795 833
796 glBindTexture GL_TEXTURE_2D, $tex->{name};
797
798 my $w = $tex->{width}; 834 my $w = $tex->{width};
799 my $h = $tex->{height}; 835 my $h = $tex->{height};
800 836
801 my $px = ($x + 1) * 32 - $w; 837 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
802 my $py = ($y + 1) * 32 - $h;
803
804 glBegin GL_QUADS;
805 glTexCoord 0, 0; glVertex $px , $py;
806 glTexCoord 0, 1; glVertex $px , $py + $h;
807 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
808 glTexCoord 1, 0; glVertex $px + $w, $py;
809 glEnd;
810 } 838 }
811 } 839 }
812 } 840 }
813 841
814# if (1) { # higher quality darkness 842# if (1) { # higher quality darkness
… …
819# 847#
820# $lighting = $pb->get_pixels; 848# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs; 849# $lighting =~ s/(.)../$1/gs;
822# } 850# }
823 851
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
854
824 $lighting = new Crossfire::Client::Texture 855 $darkness = new Crossfire::Client::Texture
825 width => $sw4, 856 width => $sw4,
826 height => $sh, 857 height => $sh,
827 data => $lighting, 858 data => $darkness,
828 internalformat => GL_ALPHA4, 859 internalformat => GL_ALPHA,
829 format => GL_ALPHA; 860 format => GL_ALPHA;
830 861
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 862 glColor 0.45, 0.45, 0.45, 1;
832 glColor 0, 0, 0, 0.75; 863 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
842 864
843 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
844 glDisable GL_BLEND; 866 glDisable GL_BLEND;
845} 867}
846 868
… …
905 927
906sub moveto { 928sub moveto {
907 my ($self, $x, $y) = @_; 929 my ($self, $x, $y) = @_;
908 930
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 931 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2; 932 $self->{speed} = 0.001;
911 $self->{time} = 1; 933 $self->{time} = 1;
912 934
913 ::animation_start $self; 935 ::animation_start $self;
914} 936}
915 937
… …
930 952
931sub _draw { 953sub _draw {
932 my ($self) = @_; 954 my ($self) = @_;
933 955
934 glPushMatrix; 956 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0; 957 glRotate $self->{time} * 1000, 0, 1, 0;
936 $self->{children}[0]->draw; 958 $self->{children}[0]->draw;
937 glPopMatrix; 959 glPopMatrix;
938} 960}
939 961
9401; 962#############################################################################
941 963
964package Crossfire::Client::Widget::Toplevel;
965
966our @ISA = Crossfire::Client::Widget::Container::;
967
968sub size_request {
969 ($::WIDTH, $::HEIGHT)
970}
971
972sub size_allocate {
973 my ($self, $w, $h) = @_;
974
975 $self->SUPER::size_allocate ($w, $h);
976
977 $_->size_allocate ($_->size_request)
978 for @{$self->{children}};
979}
980
981sub translate {
982 my ($self, $x, $y) = @_;
983
984 ($x, $y)
985}
986
987sub update {
988 my ($self) = @_;
989
990 $self->size_allocate ($self->size_request);
991 ::refresh ();
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->SUPER::add ($widget);
998
999 $widget->size_allocate ($widget->size_request);
1000}
1001
1002sub draw {
1003 my ($self) = @_;
1004
1005 $self->_draw;
1006}
1007
1008#############################################################################
1009
1010package Crossfire::Client::Widget;
1011
1012$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
1013
10141
1015

Diff Legend

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