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.7 by elmex, Fri Apr 7 20:04:59 2006 UTC vs.
Revision 1.13 by elmex, Fri Apr 7 20:57:29 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2
2use strict; 3use strict;
4use SDL::OpenGL;
5use SDL::OpenGL::Constants;
3 6
4our $FOCUS; # the widget with current focus 7our $FOCUS; # the widget with current focus
5our %ACTIVE_WIDGETS; 8our @ACTIVE_WIDGETS;
6 9
7# class methods for events 10# class methods for events
8sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 11sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
9sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 12sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
10sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 13sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }
11sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 14sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }
12 15
13sub new { 16sub new {
14 my $class = shift; 17 my $class = shift;
15 my $self = { @_ }; 18
16 bless $self, $class; 19 bless { @_ }, $class
17 return $self;
18} 20}
19 21
20sub activate { 22sub activate {
21 $ACTIVE_WIDGETS{$_[0]} = $_[0]; 23 push @ACTIVE_WIDGETS, $_[0];
22} 24}
23 25
24sub deactivate { 26sub deactivate {
25 delete $ACTIVE_WIDGETS{$_[0]}; 27 @ACTIVE_WIDGETS =
28 sort { $a->{z} <=> $b->{z} }
29 grep { $_ != $_[0] }
30 @ACTIVE_WIDGETS;
26} 31}
27 32
28sub focus_in { 33sub focus_in {
29 my ($widget) = @_; 34 my ($widget) = @_;
30 $FOCUS = $widget; 35 $FOCUS = $widget;
… …
48 53
49sub button_up { 54sub button_up {
50 my ($widget, $sdlev) = @_; 55 my ($widget, $sdlev) = @_;
51} 56}
52 57
58sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
59sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
60sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
61
53sub draw { 62sub draw {
63 my ($self) = @_;
64
65 glPushMatrix;
66 glTranslate $self->{x}, $self->{y}, 0;
67 $self->_draw;
68 glPopMatrix;
69}
70
71sub _draw {
54 my ($widget) = @_; 72 my ($widget) = @_;
55} 73}
56 74
57sub bbox { 75sub bbox {
58 my ($widget) = @_; 76 my ($widget) = @_;
59} 77}
60 78
61package Client::TextView; 79package Crossfire::Client::Widget::Label;
80
81our @ISA = Crossfire::Client::Widget::;
82
83use SDL::OpenGL;
84
85sub new {
86 my ($class, $x, $y, $z, $ttf, $text) = @_;
87
88 my $self = $class->SUPER::new (x => $x, y => $y, z => $z);
89
90 $self->{texture} = new_from_ttf Crossfire::Client::Texture $ttf, $text;
91
92 $self
93}
94
95sub _draw {
96 my ($self) = @_;
97
98 my $tex = $self->{texture};
99
100 $self->{x}--;
101
102 glEnable GL_BLEND;
103 glEnable GL_TEXTURE_2D;
104 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
105 glBindTexture GL_TEXTURE_2D, $tex->{name};
106
107 glColor 1, 1, 1;
108
109 glBegin GL_QUADS;
110 glTexCoord 0, 0; glVertex 0 , 0;
111 glTexCoord 0, 1; glVertex 0 , $tex->{height};
112 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
113 glTexCoord 1, 0; glVertex $tex->{width}, 0;
114 glEnd;
115
116 glDisable GL_BLEND;
117 glDisable GL_TEXTURE_2D;
118}
119
120package Crossfire::Client::Widget::TextView;
62 121
63use strict; 122use strict;
123
64our @ISA = qw/Client::Widget/; 124our @ISA = qw/Crossfire::Client::Widget/;
65 125
66use SDL::OpenGL; 126use SDL::OpenGL;
67use SDL::OpenGL::Constants; 127use SDL::OpenGL::Constants;
68 128
69sub add_line { 129sub add_line {
70 my ($self, $line) = @_; 130 my ($self, $line) = @_;
71 push @{$self->{lines}}, $line; 131 push @{$self->{lines}}, $line;
72} 132}
73 133
74sub draw { 134sub _draw {
75 my ($self) = @_; 135 my ($self) = @_;
76 136
77} 137}
78 138
79package Client::MapWidget; 139package Crossfire::Client::Widget::MapWidget;
80 140
81use strict; 141use strict;
82 142
83our @ISA = qw/Client::Widget/; 143our @ISA = qw/Crossfire::Client::Widget/;
84 144
85use SDL::OpenGL; 145use SDL::OpenGL;
86use SDL::OpenGL::Constants; 146use SDL::OpenGL::Constants;
87 147
88sub key_down { 148sub key_down {
… …
90} 150}
91 151
92sub key_up { 152sub key_up {
93} 153}
94 154
95my $x;
96
97sub draw { 155sub _draw {
98 glEnable GL_TEXTURE_2D; 156 glEnable GL_TEXTURE_2D;
99 glEnable GL_BLEND; 157 glEnable GL_BLEND;
100 158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
101 glPushMatrix;
102 159
103 my $map = $::CONN->{map}; 160 my $map = $::CONN->{map};
104 161
105 for my $x (0 .. $::CONN->{mapw} - 1) { 162 for my $x (0 .. $::CONN->{mapw} - 1) {
106 for my $y (0 .. $::CONN->{maph} - 1) { 163 for my $y (0 .. $::CONN->{maph} - 1) {
… …
115 my $tex = $::CONN->{face}[$num]{texture} || next; 172 my $tex = $::CONN->{face}[$num]{texture} || next;
116 173
117 glBindTexture GL_TEXTURE_2D, $tex->{name}; 174 glBindTexture GL_TEXTURE_2D, $tex->{name};
118 175
119 glBegin GL_QUADS; 176 glBegin GL_QUADS;
120 glTexCoord 0, 0; glVertex $x, $y; 177 glTexCoord 0, 0; glVertex $x * 32 , $y * 32;
121 glTexCoord 0, 1; glVertex $x, $y + 1; 178 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;
122 glTexCoord 1, 1; glVertex $x + 1, $y + 1; 179 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;
123 glTexCoord 1, 0; glVertex $x + 1, $y; 180 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;
124 glEnd; 181 glEnd;
125 } 182 }
126 } 183 }
127 } 184 }
128
129 glPopMatrix;
130 185
131 glDisable GL_TEXTURE_2D; 186 glDisable GL_TEXTURE_2D;
132 glDisable GL_BLEND; 187 glDisable GL_BLEND;
133} 188}
134 189

Diff Legend

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