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.61 by root, Tue Apr 11 13:17:24 2006 UTC vs.
Revision 1.62 by root, Tue Apr 11 13:27:48 2006 UTC

639 639
640 $height ||= $::FONTSIZE; 640 $height ||= $::FONTSIZE;
641 641
642 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 643 my $self = $class->SUPER::new (
644 color => [1, 1, 1],
644 x => $x, 645 x => $x,
645 y => $y, 646 y => $y,
646 z => $z, 647 z => $z,
647 height => $height, 648 height => $height,
648 layout => new CFClient::Layout $height, 649 layout => new CFClient::Layout $height,
703 glEnable GL_BLEND; 704 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 705 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
707 708
708 glColor 1, 0, 0, 1; # TODO color 709 glColor @{$self->{color}};
709 710
710 $tex->draw_quad (0, 0); 711 $tex->draw_quad (0, 0);
711 712
712 glDisable GL_BLEND; 713 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 714 glDisable GL_TEXTURE_2D;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines