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.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.60 by root, Tue Apr 11 13:14:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS } 18sub feed_sdl_key_down_event {
14sub 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
15sub 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
16sub 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}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless { @_ }, $class
… …
42 99
43 $self->{w} = $w; 100 $self->{w} = $w;
44 $self->{h} = $h; 101 $self->{h} = $h;
45} 102}
46 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
47sub focus_in { 111sub focus_in {
48 my ($widget) = @_; 112 my ($self) = @_;
49 $::FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
50} 117}
51 118
52sub focus_out { 119sub focus_out {
53 my ($widget) = @_; 120 my ($self) = @_;
54}
55 121
56sub key_down { 122 return unless $FOCUS == $self;
57 my ($widget, $sdlev) = @_;
58}
59 123
60sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
61 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
62} 126}
63 127
128sub mouse_motion { }
129sub button_up { }
64sub button_down { 130sub button_down { }
65 my ($widget, $sdlev) = @_; 131sub key_down { }
66} 132sub key_up { }
67 133
68sub button_up {
69 my ($widget, $sdlev) = @_;
70}
71
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 139
78sub draw { 140sub draw {
79 my ($self) = @_; 141 my ($self) = @_;
80 142
81 glPushMatrix; 143 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 145 $self->_draw;
84 if ($self == $::HOVER) { 146 if ($self == $HOVER) {
85 glColor 1, 1, 1, 0.4; 147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
86 glBegin GL_QUADS; 149 glBegin GL_QUADS;
87 glVertex 0, 0; 150 glVertex 0 , 0;
88 glVertex $self->{w} - 1, 0; 151 glVertex $self->{w}, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1; 152 glVertex $self->{w}, $self->{h};
90 glVertex 0, $self->{h} - 1; 153 glVertex 0 , $self->{h};
91 glEnd; 154 glEnd;
155 glDisable GL_BLEND;
92 } 156 }
93 glPopMatrix; 157 glPopMatrix;
94} 158}
95 159
96sub _draw { 160sub _draw {
… …
146 #$self->deactivate; 210 #$self->deactivate;
147} 211}
148 212
149############################################################################# 213#############################################################################
150 214
151package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
152 216
153our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
154 218
155sub new { 219sub new {
156 my ($class, @widgets) = @_; 220 my ($class, @widgets) = @_;
157 221
158 my $self = $class->SUPER::new (children => []); 222 my $self = $class->SUPER::new (children => []);
… …
205 $_->draw for @{$self->{children}}; 269 $_->draw for @{$self->{children}};
206} 270}
207 271
208############################################################################# 272#############################################################################
209 273
210package Crossfire::Client::Widget::Bin; 274package CFClient::Widget::Bin;
211 275
212our @ISA = Crossfire::Client::Widget::Container::; 276our @ISA = CFClient::Widget::Container::;
213 277
214sub child { $_[0]->{children}[0] } 278sub child { $_[0]->{children}[0] }
215 279
216sub size_request { 280sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
225 if $self->{children}[0] 289 if $self->{children}[0]
226} 290}
227 291
228############################################################################# 292#############################################################################
229 293
230package Crossfire::Client::Widget::Toplevel;
231
232our @ISA = Crossfire::Client::Widget::Container::;
233
234sub update {
235 my ($self) = @_;
236
237 ::refresh ();
238}
239
240sub add {
241 my ($self, $widget) = @_;
242
243 $self->SUPER::add ($widget);
244
245 $widget->size_allocate ($widget->size_request);
246}
247
248#############################################################################
249
250package Crossfire::Client::Widget::Window; 294package CFClient::Widget::Window;
251 295
252our @ISA = Crossfire::Client::Widget::Bin::; 296our @ISA = CFClient::Widget::Bin::;
253 297
254use SDL::OpenGL; 298use SDL::OpenGL;
255 299
256sub new { 300sub new {
257 my ($class, $x, $y, $z, $w, $h) = @_; 301 my ($class, $x, $y, $z, $w, $h) = @_;
… …
270 314
271sub render_chld { 315sub render_chld {
272 my ($self) = @_; 316 my ($self) = @_;
273 317
274 $self->{texture} = 318 $self->{texture} =
275 Crossfire::Client::Texture->new_from_opengl ( 319 CFClient::Texture->new_from_opengl (
276 $self->{w}, $self->{h}, sub { $self->child->draw } 320 $self->{w}, $self->{h}, sub { $self->child->draw }
277 ); 321 );
278} 322}
279 323
280sub size_allocate { 324sub size_allocate {
… …
297 or return; 341 or return;
298 342
299 glEnable GL_BLEND; 343 glEnable GL_BLEND;
300 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
301 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
302 glBindTexture GL_TEXTURE_2D, $tex->{name};
303 346
304 glBegin GL_QUADS; 347 $tex->draw_quad (0, 0, $w, $h);
305 glTexCoord 0, 0; glVertex 0, 0;
306 glTexCoord 0, 1; glVertex 0, $h;
307 glTexCoord 1, 1; glVertex $w, $h;
308 glTexCoord 1, 0; glVertex $w, 0;
309 glEnd;
310 348
311 glDisable GL_BLEND; 349 glDisable GL_BLEND;
312 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
313} 351}
314 352
315############################################################################# 353#############################################################################
316 354
317package Crossfire::Client::Widget::Frame; 355package CFClient::Widget::Frame;
318 356
319our @ISA = Crossfire::Client::Widget::Bin::; 357our @ISA = CFClient::Widget::Bin::;
320 358
321use SDL::OpenGL; 359use SDL::OpenGL;
322 360
323sub size_request { 361sub size_request {
324 my ($self) = @_; 362 my ($self) = @_;
… …
347 385
348 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
349 387
350 glBegin GL_QUADS; 388 glBegin GL_QUADS;
351 glColor 0, 0, 0; 389 glColor 0, 0, 0;
352 glTexCoord 0, 0; glVertex 0 , 0; 390 glVertex 0 , 0;
353 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
354 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
355 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
356 glEnd; 394 glEnd;
357 395
358 $chld->draw; 396 $chld->draw;
359} 397}
360 398
361############################################################################# 399#############################################################################
362 400
363package Crossfire::Client::Widget::FancyFrame; 401package CFClient::Widget::FancyFrame;
364 402
365our @ISA = Crossfire::Client::Widget::Bin::; 403our @ISA = CFClient::Widget::Bin::;
366 404
367use SDL::OpenGL; 405use SDL::OpenGL;
368 406
369my @tex = 407my @tex =
370 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
371 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
372 410
373sub size_request { 411sub size_request {
374 my ($self) = @_; 412 my ($self) = @_;
375 413
… …
410 glEnable GL_TEXTURE_2D; 448 glEnable GL_TEXTURE_2D;
411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
413 451
414 my $top = $tex[1]; 452 my $top = $tex[1];
415 glBindTexture GL_TEXTURE_2D, $top->{name}; 453 $top->draw_quad (0, 0, $w, $top->{height});
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , 0;
419 glTexCoord 0, 1; glVertex 0 , $top->{height};
420 glTexCoord 1, 1; glVertex $w , $top->{height};
421 glTexCoord 1, 0; glVertex $w , 0;
422 glEnd;
423 454
424 my $left = $tex[3]; 455 my $left = $tex[3];
425 glBindTexture GL_TEXTURE_2D, $left->{name}; 456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , $top->{height};
429 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
432 glEnd;
433 457
434 my $right = $tex[2]; 458 my $right = $tex[2];
435 glBindTexture GL_TEXTURE_2D, $right->{name}; 459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
439 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $w , $top->{height};
442 glEnd;
443 460
444 my $bottom = $tex[4]; 461 my $bottom = $tex[4];
445 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
446
447 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
449 glTexCoord 0, 1; glVertex 0 , $h;
450 glTexCoord 1, 1; glVertex $w , $h;
451 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
452 glEnd;
453 463
454 my $bg = $tex[0]; 464 my $bg = $tex[0];
455 glBindTexture GL_TEXTURE_2D, $bg->{name}; 465 glBindTexture GL_TEXTURE_2D, $bg->{name};
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
459 469
460 my $rep_x = $cw / $bg->{width}; 470 my $rep_x = $cw / $bg->{width};
461 my $rep_y = $ch / $bg->{height}; 471 my $rep_y = $ch / $bg->{height};
462 472
463 glBegin GL_QUADS; 473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
464 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
465 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
467 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
468 glEnd;
469 474
470 glDisable GL_BLEND; 475 glDisable GL_BLEND;
471 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
472 477
473 $self->child->draw; 478 $self->child->draw;
474 479
475} 480}
476 481
477############################################################################# 482#############################################################################
478 483
479package Crossfire::Client::Widget::Table; 484package CFClient::Widget::Table;
480 485
481our @ISA = Crossfire::Client::Widget::Bin::; 486our @ISA = CFClient::Widget::Bin::;
482 487
483use SDL::OpenGL; 488use SDL::OpenGL;
484 489
485sub add { 490sub add {
486 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
… …
561 } 566 }
562} 567}
563 568
564############################################################################# 569#############################################################################
565 570
566package Crossfire::Client::Widget::VBox; 571package CFClient::Widget::VBox;
567 572
568our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = CFClient::Widget::Container::;
569 574
570use SDL::OpenGL; 575use SDL::OpenGL;
571 576
572sub size_request { 577sub size_request {
573 my ($self) = @_; 578 my ($self) = @_;
… …
621 } 626 }
622} 627}
623 628
624############################################################################# 629#############################################################################
625 630
626package Crossfire::Client::Widget::Label; 631package CFClient::Widget::Label;
627 632
628our @ISA = Crossfire::Client::Widget::; 633our @ISA = CFClient::Widget::;
629 634
630use SDL::OpenGL; 635use SDL::OpenGL;
631 636
632sub new { 637sub new {
633 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
634 639
640 $height ||= $::FONTSIZE;
641
635 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
636 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 643 my $self = $class->SUPER::new (
644 x => $x,
645 y => $y,
646 z => $z,
647 height => $height,
648 layout => new CFClient::Layout,
649 );
637 650
638 $self->set_text ($text); 651 $self->set_text ($text);
639 652
640 $self 653 $self
641} 654}
642 655
643sub set_text { 656sub set_text {
644 my ($self, $text) = @_; 657 my ($self, $text) = @_;
645 658
646 $self->{text} = $text; 659 $self->{text} = $text;
647 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 660 $self->{layout}->set_markup ($text);
648 661
649 $self->update; 662 delete $self->{texture};
650} 663}
651 664
652sub get_text { 665sub get_text {
653 my ($self, $text) = @_; 666 my ($self, $text) = @_;
654 667
… …
656} 669}
657 670
658sub size_request { 671sub size_request {
659 my ($self) = @_; 672 my ($self) = @_;
660 673
661 ( 674 $self->{layout}->set_width;
675 $self->{layout}->size
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
677# (
662 $self->{texture}{width}, 678# $self->{texture}{width},
663 $self->{texture}{height}, 679# $self->{texture}{height},
664 ) 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
665} 693}
666 694
667sub _draw { 695sub _draw {
668 my ($self) = @_; 696 my ($self) = @_;
669 697
670 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
671 702
672 glEnable GL_BLEND; 703 glEnable GL_BLEND;
673 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
674 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
676 glBindTexture GL_TEXTURE_2D, $tex->{name};
677 707
678 glColor 1, 0, 0, 1; # TODO color 708 glColor 1, 0, 0, 1; # TODO color
679 709
680 glBegin GL_QUADS; 710 $tex->draw_quad (0, 0);
681 glTexCoord 0, 0; glVertex 0 , 0;
682 glTexCoord 0, 1; glVertex 0 , $tex->{height};
683 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
684 glTexCoord 1, 0; glVertex $tex->{width}, 0;
685 glEnd;
686 711
687 glDisable GL_BLEND; 712 glDisable GL_BLEND;
688 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
689} 714}
690 715
691############################################################################# 716#############################################################################
692 717
693package Crossfire::Client::Widget::TextEntry; 718package CFClient::Widget::Entry;
694 719
695our @ISA = Crossfire::Client::Widget::Label::; 720our @ISA = CFClient::Widget::Label::;
696 721
697use SDL; 722use SDL;
698use SDL::OpenGL; 723use SDL::OpenGL;
699 724
700sub key_down { 725sub key_down {
701 my ($self, $ev) = @_; 726 my ($self, $ev) = @_;
702 727
703 my $mod = $ev->key_mod; 728 my $mod = $ev->key_mod;
704 my $sym = $ev->key_sym; 729 my $sym = $ev->key_sym;
705 730
706 $ev->set_unicode (1);
707 my $uni = $ev->key_unicode; 731 my $uni = $ev->key_unicode;
708 732
709 my $text = $self->get_text; 733 my $text = $self->get_text;
710 734
711 if ($sym == SDLK_BACKSPACE) { 735 if ($sym == SDLK_BACKSPACE) {
712 substr $text, -1, 1, ''; 736 substr $text, -1, 1, '';
713
714 } elsif ($uni) { 737 } elsif ($uni) {
715 $text .= chr $uni; 738 $text .= chr $uni;
716 } 739 }
740
717 $self->set_text ($text); 741 $self->set_text ($text);
718} 742}
719 743
720############################################################################# 744sub button_down {
745 my ($self, $ev) = @_;
721 746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
722package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
723 777
724use strict; 778use strict;
725 779
726use List::Util qw(min max); 780use List::Util qw(min max);
727 781
728use SDL; 782use SDL;
729use SDL::OpenGL; 783use SDL::OpenGL;
730use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
731 785
732our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
733 787
734sub key_down { 788sub key_down {
735 print "MAPKEYDOWN\n"; 789 print "MAPKEYDOWN\n";
736} 790}
737 791
738sub key_up { 792sub key_up {
739} 793}
740 794
741sub size_request { 795sub size_request {
742 796 (
743} 797 1 + int $::WIDTH / 32,
744 798 1 + int $::HEIGHT / 32,
745sub size_allocate { 799 )
746} 800}
747 801
748sub _draw { 802sub _draw {
749 my ($self) = @_; 803 my ($self) = @_;
750 804
… …
773 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
774 glEnable GL_BLEND; 828 glEnable GL_BLEND;
775 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776 830
777 my $sw4 = ($sw + 3) & ~3; 831 my $sw4 = ($sw + 3) & ~3;
778 my $lighting = "\x00" x ($sw4 * $sh); 832 my $darkness = "\x00" x ($sw4 * $sh);
779 833
780 for my $x (0 .. $sw - 1) { 834 for my $x (0 .. $sw - 1) {
835 my $row = $map->[$x + $xofs];
781 for my $y (0 .. $sh - 1) { 836 for my $y (0 .. $sh - 1) {
782 837
783 my $cell = $map->[$x + $xofs][$y + $yofs] 838 my $cell = $row->[$y + $yofs]
784 or next; 839 or next;
785 840
786 my $darkness = $cell->[0] * (1 / 255); 841 my $dark = $cell->[0];
787 if ($darkness < 0) { 842 if ($dark < 0) {
788 $darkness = 0.15; 843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
789 } 846 }
790 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
791 847
792 for my $num (grep $_, @$cell[1,2,3]) { 848 for my $num (grep $_, @$cell[1,2,3]) {
793 my $tex = $::CONN->{face}[$num]{texture} || next; 849 my $tex = $::CONN->{face}[$num]{texture} || next;
794 850
795 glBindTexture GL_TEXTURE_2D, $tex->{name};
796
797 my $w = $tex->{width}; 851 my $w = $tex->{width};
798 my $h = $tex->{height}; 852 my $h = $tex->{height};
799 853
800 my $px = ($x + 1) * 32 - $w; 854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
801 my $py = ($y + 1) * 32 - $h;
802
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex $px , $py;
805 glTexCoord 0, 1; glVertex $px , $py + $h;
806 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
807 glTexCoord 1, 0; glVertex $px + $w, $py;
808 glEnd;
809 } 855 }
810 } 856 }
811 } 857 }
812 858
813# if (1) { # higher quality darkness 859# if (1) { # higher quality darkness
… …
818# 864#
819# $lighting = $pb->get_pixels; 865# $lighting = $pb->get_pixels;
820# $lighting =~ s/(.)../$1/gs; 866# $lighting =~ s/(.)../$1/gs;
821# } 867# }
822 868
823 $lighting = new Crossfire::Client::Texture 869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871
872 $darkness = new CFClient::Texture
824 width => $sw4, 873 width => $sw4,
825 height => $sh, 874 height => $sh,
826 data => $lighting, 875 data => $darkness,
827 internalformat => GL_ALPHA4, 876 internalformat => GL_ALPHA,
828 format => GL_ALPHA; 877 format => GL_ALPHA;
829 878
830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 879 glColor 0.45, 0.45, 0.45, 1;
831 glColor 0, 0, 0, 0.75; 880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
833 glBindTexture GL_TEXTURE_2D, $lighting->{name};
834 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
835 glBegin GL_QUADS;
836 glTexCoord 0, 0; glVertex 0 , 0;
837 glTexCoord 0, 1; glVertex 0 , $sh * 32;
838 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
839 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
840 glEnd;
841 881
842 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
843 glDisable GL_BLEND; 883 glDisable GL_BLEND;
844} 884}
845 885
… …
894 } 934 }
895} 935}
896 936
897############################################################################# 937#############################################################################
898 938
899package Crossfire::Client::Widget::Animator; 939package CFClient::Widget::Animator;
900 940
901use SDL::OpenGL; 941use SDL::OpenGL;
902 942
903our @ISA = Crossfire::Client::Widget::Bin::; 943our @ISA = CFClient::Widget::Bin::;
904 944
905sub moveto { 945sub moveto {
906 my ($self, $x, $y) = @_; 946 my ($self, $x, $y) = @_;
907 947
908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909 $self->{speed} = 0.2; 949 $self->{speed} = 0.001;
910 $self->{time} = 1; 950 $self->{time} = 1;
911 951
912 ::animation_start $self; 952 ::animation_start $self;
913} 953}
914 954
… …
929 969
930sub _draw { 970sub _draw {
931 my ($self) = @_; 971 my ($self) = @_;
932 972
933 glPushMatrix; 973 glPushMatrix;
934 glRotate $self->{time} * 10000, 0, 1, 0; 974 glRotate $self->{time} * 1000, 0, 1, 0;
935 $self->{children}[0]->draw; 975 $self->{children}[0]->draw;
936 glPopMatrix; 976 glPopMatrix;
937} 977}
938 978
9391; 979#############################################################################
940 980
981package CFClient::Widget::Toplevel;
982
983our @ISA = CFClient::Widget::Container::;
984
985sub size_request {
986 ($::WIDTH, $::HEIGHT)
987}
988
989sub size_allocate {
990 my ($self, $w, $h) = @_;
991
992 $self->SUPER::size_allocate ($w, $h);
993
994 $_->size_allocate ($_->size_request)
995 for @{$self->{children}};
996}
997
998sub translate {
999 my ($self, $x, $y) = @_;
1000
1001 ($x, $y)
1002}
1003
1004sub update {
1005 my ($self) = @_;
1006
1007 $self->size_allocate ($self->size_request);
1008 ::refresh ();
1009}
1010
1011sub add {
1012 my ($self, $widget) = @_;
1013
1014 $self->SUPER::add ($widget);
1015
1016 $widget->size_allocate ($widget->size_request);
1017}
1018
1019sub draw {
1020 my ($self) = @_;
1021
1022 $self->_draw;
1023}
1024
1025#############################################################################
1026
1027package CFClient::Widget;
1028
1029$TOPLEVEL = new CFClient::Widget::Toplevel;
1030
10311
1032

Diff Legend

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