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.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC

128 my ($self) = @_; 128 my ($self) = @_;
129 129
130 #$self->deactivate; 130 #$self->deactivate;
131} 131}
132 132
133package Crossfire::Client::Widget::Container; 133package Crossfire::Client::Widget::Bin;
134 134
135our @ISA = Crossfire::Client::Widget::; 135our @ISA = Crossfire::Client::Widget::;
136 136
137use SDL::OpenGL;
138
139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
140sub get { $_[0]->{child} } 139sub get { $_[0]->{child} }
140
141sub remove { 141sub remove {
142 my ($self, $chld) = @_; 142 my ($self, $chld) = @_;
143 delete $self->{child} 143 delete $self->{child}
144 if $self->{child} == $chld; 144 if $self->{child} == $chld;
145} 145}
146 146
147sub size_request {
147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 148 $_[0]->{child}->size_request if $_[0]->{child}
149}
148 150
149sub _draw { die "Containers can't be drawn!" } 151sub _draw {
152 my ($self) = @_;
153
154 $self->{child}->draw;
155}
150 156
151package Crossfire::Client::Widget::Toplevel; 157package Crossfire::Client::Widget::Toplevel;
152 158
153our @ISA = Crossfire::Client::Widget::; 159our @ISA = Crossfire::Client::Widget::;
154 160
184 $_->draw for @{$self->{childs}}; 190 $_->draw for @{$self->{childs}};
185} 191}
186 192
187package Crossfire::Client::Widget::Window; 193package Crossfire::Client::Widget::Window;
188 194
189our @ISA = Crossfire::Client::Widget::Container::; 195our @ISA = Crossfire::Client::Widget::Bin::;
190 196
191use SDL::OpenGL; 197use SDL::OpenGL;
192 198
193sub add { 199sub add {
194 my ($self, $chld) = @_; 200 my ($self, $chld) = @_;
235 my $tex = $self->{texture} 241 my $tex = $self->{texture}
236 or return; 242 or return;
237 243
238 glEnable GL_BLEND; 244 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D; 245 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 247 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244 248
245 glBegin GL_QUADS; 249 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0; 250 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h; 251 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h; 252 glTexCoord 1, 1; glVertex $w, $h;
253 glDisable GL_TEXTURE_2D; 257 glDisable GL_TEXTURE_2D;
254} 258}
255 259
256package Crossfire::Client::Widget::Frame; 260package Crossfire::Client::Widget::Frame;
257 261
258our @ISA = Crossfire::Client::Widget::Container::; 262our @ISA = Crossfire::Client::Widget::Bin::;
259 263
260use SDL::OpenGL; 264use SDL::OpenGL;
261 265
262sub size_request { 266sub size_request {
263 my ($self) = @_; 267 my ($self) = @_;
291 295
292our @ISA = Crossfire::Client::Widget::Frame::; 296our @ISA = Crossfire::Client::Widget::Frame::;
293 297
294use SDL::OpenGL; 298use SDL::OpenGL;
295 299
296#TODO: implement themed frame 300sub new {
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
307 ];
308 $self
309
310}
311
312sub size_request {
313 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request;
315
316 $h += $self->{txts}->[1]->{height};
317 $h += $self->{txts}->[4]->{height};
318 $w += $self->{txts}->[2]->{width};
319 $w += $self->{txts}->[3]->{width};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322
323 ($w, $h)
324}
325
326sub _draw {
327 my ($self) = @_;
328
329 my ($w, $h) = $self->size_request;
330 my ($cw, $ch) = $self->get->size_request;
331
332 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
336
337
338 my $top = $self->{txts}->[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name};
340
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name};
352
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name};
364
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name};
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height};
395
396 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404
405 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D;
407}
297 408
298package Crossfire::Client::Widget::Table; 409package Crossfire::Client::Widget::Table;
299 410
300our @ISA = Crossfire::Client::Widget::Container::; 411our @ISA = Crossfire::Client::Widget::Bin::;
301 412
302use SDL::OpenGL; 413use SDL::OpenGL;
303 414
304sub add { 415sub add {
305 my ($self, $x, $y, $chld) = @_; 416 my ($self, $x, $y, $chld) = @_;
380 } 491 }
381} 492}
382 493
383package Crossfire::Client::Widget::VBox; 494package Crossfire::Client::Widget::VBox;
384 495
385our @ISA = Crossfire::Client::Widget::Container::; 496our @ISA = Crossfire::Client::Widget::Bin::;
386 497
387use SDL::OpenGL; 498use SDL::OpenGL;
388 499
389sub add { 500sub add {
390 my ($self, $chld) = @_; 501 my ($self, $chld) = @_;
425use SDL::OpenGL; 536use SDL::OpenGL;
426 537
427sub new { 538sub new {
428 my ($class, $x, $y, $z, $height, $text) = @_; 539 my ($class, $x, $y, $z, $height, $text) = @_;
429 540
541 # TODO: color, and make height, xyz etc. optional
430 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
431 543
432 $self->set_text ($text); 544 $self->set_text ($text);
433 545
434 $self 546 $self
467 glEnable GL_TEXTURE_2D; 579 glEnable GL_TEXTURE_2D;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
470 glBindTexture GL_TEXTURE_2D, $tex->{name}; 582 glBindTexture GL_TEXTURE_2D, $tex->{name};
471 583
472 glColor 1, 1, 1, 0.8; 584 glColor 1, 1, 1, 0.6; # TODO color
473 585
474 glBegin GL_QUADS; 586 glBegin GL_QUADS;
475 glTexCoord 0, 0; glVertex 0 , 0; 587 glTexCoord 0, 0; glVertex 0 , 0;
476 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 588 glTexCoord 0, 1; glVertex 0 , $tex->{height};
477 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
642 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 754 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
643 } 755 }
644 756
645 glEnable GL_TEXTURE_2D; 757 glEnable GL_TEXTURE_2D;
646 glEnable GL_BLEND; 758 glEnable GL_BLEND;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760
761 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh);
648 763
649 for my $x (0 .. $sw - 1) { 764 for my $x (0 .. $sw - 1) {
650 for my $y (0 .. $sh - 1) { 765 for my $y (0 .. $sh - 1) {
651 766
652 my $cell = $map->[$x + $xofs][$y + $yofs] 767 my $cell = $map->[$x + $xofs][$y + $yofs]
653 or next; 768 or next;
654 769
655 my $darkness = $cell->[0] * (1 / 255); 770 my $darkness = $cell->[0] * (1 / 255);
656 if ($darkness < 0) { 771 if ($darkness < 0) {
657 glColor 0.3, 0.3, 0.3; 772 $darkness = 0.15;
658 } else {
659 glColor $darkness, $darkness, $darkness;
660 } 773 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
661 775
662 for my $num (grep $_, @$cell[1,2,3]) { 776 for my $num (grep $_, @$cell[1,2,3]) {
663 my $tex = $::CONN->{face}[$num]{texture} || next; 777 my $tex = $::CONN->{face}[$num]{texture} || next;
664 778
665 glBindTexture GL_TEXTURE_2D, $tex->{name}; 779 glBindTexture GL_TEXTURE_2D, $tex->{name};
677 glTexCoord 1, 0; glVertex $px + $w, $py; 791 glTexCoord 1, 0; glVertex $px + $w, $py;
678 glEnd; 792 glEnd;
679 } 793 }
680 } 794 }
681 } 795 }
796
797# if (1) { # higher quality darkness
798# $lighting =~ s/(.)/$1$1$1/gs;
799# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800#
801# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
802#
803# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs;
805# }
806
807 $lighting = new Crossfire::Client::Texture
808 width => $sw4,
809 height => $sh,
810 data => $lighting,
811 internalformat => GL_ALPHA4,
812 format => GL_ALPHA;
813
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glColor 0, 0, 0, 0.75;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
682 825
683 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 827 glDisable GL_BLEND;
685} 828}
686 829
733 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
734 $::CONN->send ("command run_stop"); 877 $::CONN->send ("command run_stop");
735 } 878 }
736} 879}
737 880
881package Crossfire::Client::Widget::Animator;
882
883use SDL::OpenGL;
884
885our @ISA = Crossfire::Client::Widget::Bin::;
886
887sub moveto {
888 my ($self, $x, $y) = @_;
889
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01;
892 $self->{time} = 1;
893
894 ::animation_start $self;
895}
896
897sub animate {
898 my ($self, $interval) = @_;
899
900 $self->{time} -= $interval * $self->{speed};
901 if ($self->{time} <= 0) {
902 $self->{time} = 0;
903 ::animation_stop $self;
904 }
905
906 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
907
908 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
909 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
910}
911
912sub _draw {
913 my ($self) = @_;
914
915 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw;
918 glPopMatrix;
919}
920
7381; 9211;
739 922

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines