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.34 by elmex, Sun Apr 9 02:44:51 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) = @_;
… …
402 glDisable GL_TEXTURE_2D; 406 glDisable GL_TEXTURE_2D;
403} 407}
404 408
405package Crossfire::Client::Widget::Table; 409package Crossfire::Client::Widget::Table;
406 410
407our @ISA = Crossfire::Client::Widget::Container::; 411our @ISA = Crossfire::Client::Widget::Bin::;
408 412
409use SDL::OpenGL; 413use SDL::OpenGL;
410 414
411sub add { 415sub add {
412 my ($self, $x, $y, $chld) = @_; 416 my ($self, $x, $y, $chld) = @_;
… …
487 } 491 }
488} 492}
489 493
490package Crossfire::Client::Widget::VBox; 494package Crossfire::Client::Widget::VBox;
491 495
492our @ISA = Crossfire::Client::Widget::Container::; 496our @ISA = Crossfire::Client::Widget::Bin::;
493 497
494use SDL::OpenGL; 498use SDL::OpenGL;
495 499
496sub add { 500sub add {
497 my ($self, $chld) = @_; 501 my ($self, $chld) = @_;
… …
750 $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};
751 } 755 }
752 756
753 glEnable GL_TEXTURE_2D; 757 glEnable GL_TEXTURE_2D;
754 glEnable GL_BLEND; 758 glEnable GL_BLEND;
755 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);
756 763
757 for my $x (0 .. $sw - 1) { 764 for my $x (0 .. $sw - 1) {
758 for my $y (0 .. $sh - 1) { 765 for my $y (0 .. $sh - 1) {
759 766
760 my $cell = $map->[$x + $xofs][$y + $yofs] 767 my $cell = $map->[$x + $xofs][$y + $yofs]
761 or next; 768 or next;
762 769
763 my $darkness = $cell->[0] * (1 / 255); 770 my $darkness = $cell->[0] * (1 / 255);
764 if ($darkness < 0) { 771 if ($darkness < 0) {
765 glColor 0.3, 0.3, 0.3; 772 $darkness = 0.15;
766 } else {
767 glColor $darkness, $darkness, $darkness;
768 } 773 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
769 775
770 for my $num (grep $_, @$cell[1,2,3]) { 776 for my $num (grep $_, @$cell[1,2,3]) {
771 my $tex = $::CONN->{face}[$num]{texture} || next; 777 my $tex = $::CONN->{face}[$num]{texture} || next;
772 778
773 glBindTexture GL_TEXTURE_2D, $tex->{name}; 779 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
785 glTexCoord 1, 0; glVertex $px + $w, $py; 791 glTexCoord 1, 0; glVertex $px + $w, $py;
786 glEnd; 792 glEnd;
787 } 793 }
788 } 794 }
789 } 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;
790 825
791 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
792 glDisable GL_BLEND; 827 glDisable GL_BLEND;
793} 828}
794 829
… …
841 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
842 $::CONN->send ("command run_stop"); 877 $::CONN->send ("command run_stop");
843 } 878 }
844} 879}
845 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
8461; 9211;
847 922

Diff Legend

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