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.19 by root, Sat Apr 8 14:04:14 2006 UTC vs.
Revision 1.29 by root, Sun Apr 9 00:09:50 2006 UTC

… …
39 $self->{x} = $x; 39 $self->{x} = $x;
40 $self->{y} = $y; 40 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 41 $self->{z} = $z if defined $z;
42} 42}
43 43
44sub needs_redraw {
45 0
46}
47
44sub size_request { 48sub size_request {
45 die "size_request is abtract"; 49 die "size_request is abtract";
46} 50}
47 51
48sub focus_in { 52sub focus_in {
… …
110 114
111sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
112 116
113sub _draw { die "Containers can't be drawn!" } 117sub _draw { die "Containers can't be drawn!" }
114 118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld);
128 $self->render_chld; #TODO: Move this to the size_request event propably?
129}
130
131sub render_chld {
132 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135
136 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw }
139 );
140 $self->{texture}->upload;
141}
142
143sub size_request {
144 my ($self) = @_;
145 my $chld = $self->get
146 or return (0, 0);
147 $chld->size_request
148}
149
150sub _draw {
151 my ($self) = @_;
152
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
154
155 my $tex = $self->{texture}
156 or return;
157
158 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 1, 1;
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171
172 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D;
174}
175
115package Crossfire::Client::Widget::Frame; 176package Crossfire::Client::Widget::Frame;
116 177
117our @ISA = Crossfire::Client::Widget::Container::; 178our @ISA = Crossfire::Client::Widget::Container::;
118 179
119use SDL::OpenGL; 180use SDL::OpenGL;
… …
127 188
128sub _draw { 189sub _draw {
129 my ($self) = @_; 190 my ($self) = @_;
130 191
131 my $chld = $self->get; 192 my $chld = $self->get;
193
194 $chld->move (2, 2, 0); #TODO:move to size_request
132 195
133 my ($w, $h) = $chld->size_request; 196 my ($w, $h) = $chld->size_request;
134 197
135 glColor 1, 0, 0; 198 glColor 1, 0, 0;
136 glBegin GL_QUADS; 199 glBegin GL_QUADS;
… …
138 glTexCoord 0, 1; glVertex 0 , $h + 4; 201 glTexCoord 0, 1; glVertex 0 , $h + 4;
139 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 202 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
140 glTexCoord 1, 0; glVertex $w + 4 , 0; 203 glTexCoord 1, 0; glVertex $w + 4 , 0;
141 glEnd; 204 glEnd;
142 205
143 glPushMatrix;
144 glTranslate (2, 2, 0);
145 $chld->_draw; 206 $chld->draw;
146 glPopMatrix;
147} 207}
148 208
149package Crossfire::Client::Widget::Table; 209package Crossfire::Client::Widget::Table;
150 210
151our @ISA = Crossfire::Client::Widget::Container::; 211our @ISA = Crossfire::Client::Widget::Container::;
… …
212 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
213 my $x = 0; 273 my $x = 0;
214 274
215 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
216 276
217 glPushMatrix;
218 glTranslate ($x, $y, 0);
219 my $c = $self->{childs}->[$yi]->[$xi]; 277 my $c = $self->{childs}->[$yi]->[$xi];
278 if ($c) {
279 $c->move ($x, $y, 0); #TODO: Move to size_request
220 $c->_draw if $c; 280 $c->draw if $c;
221 glPopMatrix; 281 }
222 282
223 $x += $self->max_col_width ($xi); 283 $x += $self->max_col_width ($xi);
224 } 284 }
225 285
226 $y += $self->max_row_height ($yi); 286 $y += $self->max_row_height ($yi);
… …
254sub _draw { 314sub _draw {
255 my ($self) = @_; 315 my ($self) = @_;
256 316
257 my ($x, $y); 317 my ($x, $y);
258 for (@{$self->{childs} || []}) { 318 for (@{$self->{childs} || []}) {
259 glPushMatrix; 319 $_->move (0, $y, 0); #TODO: move to size_request
260 glTranslate (0, $y, 0);
261 $_->_draw; 320 $_->draw;
262 glPopMatrix;
263 my ($w, $h) = $_->size_request; 321 my ($w, $h) = $_->size_request;
264 $y += $h; 322 $y += $h;
265 } 323 }
266} 324}
267 325
… …
270our @ISA = Crossfire::Client::Widget::; 328our @ISA = Crossfire::Client::Widget::;
271 329
272use SDL::OpenGL; 330use SDL::OpenGL;
273 331
274sub new { 332sub new {
275 my ($class, $x, $y, $z, $ttf, $text) = @_; 333 my ($class, $x, $y, $z, $height, $text) = @_;
276 334
277 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 335 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
278 336
279 $self->set_text ($text); 337 $self->set_text ($text);
280 338
281 $self 339 $self
282} 340}
283 341
284sub set_text { 342sub set_text {
285 my ($self, $text) = @_; 343 my ($self, $text) = @_;
344
345 $self->{text} = $text;
346
286 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 347 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
287} 348}
288 349
289sub get_text { 350sub get_text {
290 my ($self, $text) = @_; 351 my ($self, $text) = @_;
352
291 $self->{text} 353 $self->{text}
292} 354}
293 355
294sub size_request { 356sub size_request {
295 my ($self) = @_; 357 my ($self) = @_;
… …
308 glEnable GL_BLEND; 370 glEnable GL_BLEND;
309 glEnable GL_TEXTURE_2D; 371 glEnable GL_TEXTURE_2D;
310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
311 glBindTexture GL_TEXTURE_2D, $tex->{name}; 373 glBindTexture GL_TEXTURE_2D, $tex->{name};
312 374
313 glColor 1, 1, 1; 375 glColor 1, 1, 1, 0.8;
314 376
315 glBegin GL_QUADS; 377 glBegin GL_QUADS;
316 glTexCoord 0, 0; glVertex 0 , 0; 378 glTexCoord 0, 0; glVertex 0 , 0;
317 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 379 glTexCoord 0, 1; glVertex 0 , $tex->{height};
318 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 380 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
344 406
345package Crossfire::Client::Widget::MapWidget; 407package Crossfire::Client::Widget::MapWidget;
346 408
347use strict; 409use strict;
348 410
349our @ISA = qw/Crossfire::Client::Widget/; 411use List::Util qw(min max);
350 412
351use SDL; 413use SDL;
352use SDL::OpenGL; 414use SDL::OpenGL;
353use SDL::OpenGL::Constants; 415use SDL::OpenGL::Constants;
416
417our @ISA = Crossfire::Client::Widget::;
354 418
355sub key_down { 419sub key_down {
356 print "MAPKEYDOWN\n"; 420 print "MAPKEYDOWN\n";
357} 421}
358 422
359sub key_up { 423sub key_up {
360} 424}
361 425
362sub _draw { 426sub _draw {
427 my ($self) = @_;
428
429 my $mx = $::CONN->{mapx};
430 my $my = $::CONN->{mapy};
431
432 my $map = $::CONN->{map};
433
434 my ($xofs, $yofs);
435
436 my $sw = 1 + int $::WIDTH / 32;
437 my $sh = 1 + int $::HEIGHT / 32;
438
439 if ($::CONN->{mapw} > $sw) {
440 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
441 } else {
442 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
443 }
444
445 if ($::CONN->{maph} > $sh) {
446 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
447 } else {
448 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
449 }
450
363 glEnable GL_TEXTURE_2D; 451 glEnable GL_TEXTURE_2D;
364 glEnable GL_BLEND; 452 glEnable GL_BLEND;
365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
366 454
367 my $map = $::CONN->{map}; 455 for my $x (0 .. $sw - 1) {
368
369 for my $x (0 .. $::CONN->{mapw} - 1) {
370 for my $y (0 .. $::CONN->{maph} - 1) { 456 for my $y (0 .. $sh - 1) {
371 457
372 my $cell = $map->[$x][$y] 458 my $cell = $map->[$x + $xofs][$y + $yofs]
373 or next; 459 or next;
374 460
375 my $darkness = $cell->[3] * (1 / 255); 461 my $darkness = $cell->[0] * (1 / 255);
462 if ($darkness < 0) {
463 glColor 0.3, 0.3, 0.3;
464 } else {
376 glColor $darkness, $darkness, $darkness; 465 glColor $darkness, $darkness, $darkness;
466 }
377 467
378 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 468 for my $num (grep $_, @$cell[1,2,3]) {
379 my $tex = $::CONN->{face}[$num]{texture} || next; 469 my $tex = $::CONN->{face}[$num]{texture} || next;
380 470
381 glBindTexture GL_TEXTURE_2D, $tex->{name}; 471 glBindTexture GL_TEXTURE_2D, $tex->{name};
382 472
383 my $w = $tex->{width}; 473 my $w = $tex->{width};

Diff Legend

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