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.21 by root, Sat Apr 8 18:15:59 2006 UTC vs.
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC

… …
123use SDL::OpenGL; 123use SDL::OpenGL;
124 124
125sub add { 125sub add {
126 my ($self, $chld) = @_; 126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld); 127 $self->SUPER::add ($chld);
128 $self->render_chld; 128 $self->render_chld; #TODO: Move this to the size_request event propably?
129} 129}
130 130
131sub render_chld { 131sub render_chld {
132 my ($self) = @_; 132 my ($self) = @_;
133 my $chld = $self->get; 133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 134 my ($w, $h) = $self->size_request;
135 135
136 $self->{texture} = 136 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 137 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { 138 $w, $h, sub { $chld->draw }
139 my ($txt, $w, $h) = @_;
140 $chld->_draw;
141 }
142 ); 139 );
143 $self->{texture}->upload; 140 $self->{texture}->upload;
144} 141}
145 142
146sub size_request { 143sub size_request {
… …
151} 148}
152 149
153sub _draw { 150sub _draw {
154 my ($self) = @_; 151 my ($self) = @_;
155 152
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
154
156 my $tex = $self->{texture} 155 my $tex = $self->{texture}
157 or return; 156 or return;
158 157
159 warn "DRAW TEX: $tex->{width} $tex->{height}\n";
160 glEnable GL_BLEND; 158 glEnable GL_BLEND;
161 glEnable GL_TEXTURE_2D; 159 glEnable GL_TEXTURE_2D;
162 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
163 glBindTexture GL_TEXTURE_2D, $tex->{name}; 161 glBindTexture GL_TEXTURE_2D, $tex->{name};
164 162
165 glColor 1, 1, 1; 163 glColor 1, 0, 1;
166 164
167 glBegin GL_QUADS; 165 glBegin GL_QUADS;
168 glTexCoord 0, 0; glVertex 0 , 0; 166 glTexCoord 0, 0; glVertex 0, 0;
169 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 167 glTexCoord 0, 1; glVertex 0, $h;
170 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 168 glTexCoord 1, 1; glVertex $w, $h;
171 glTexCoord 1, 0; glVertex $tex->{width}, 0; 169 glTexCoord 1, 0; glVertex $w, 0;
172 glEnd; 170 glEnd;
173 171
174 glDisable GL_BLEND; 172 glDisable GL_BLEND;
175 glDisable GL_TEXTURE_2D; 173 glDisable GL_TEXTURE_2D;
176} 174}
… …
183 181
184sub size_request { 182sub size_request {
185 my ($self) = @_; 183 my ($self) = @_;
186 my $chld = $self->get 184 my $chld = $self->get
187 or return (0, 0); 185 or return (0, 0);
186
187 $chld->move (2, 2);
188
188 map { $_ + 4 } $chld->size_request; 189 map { $_ + 4 } $chld->size_request;
189} 190}
190 191
191sub _draw { 192sub _draw {
192 my ($self) = @_; 193 my ($self) = @_;
193 194
194 my $chld = $self->get; 195 my $chld = $self->get;
195 196
196 my ($w, $h) = $chld->size_request; 197 my ($w, $h) = $chld->size_request;
197 198
198 glColor 1, 0, 0;
199 glBegin GL_QUADS; 199 glBegin GL_QUADS;
200 glColor 0, 0, 0;
200 glTexCoord 0, 0; glVertex 0 , 0; 201 glTexCoord 0, 0; glVertex 0 , 0;
201 glTexCoord 0, 1; glVertex 0 , $h + 4; 202 glTexCoord 0, 1; glVertex 0 , $h + 4;
202 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
203 glTexCoord 1, 0; glVertex $w + 4 , 0; 204 glTexCoord 1, 0; glVertex $w + 4 , 0;
204 glEnd; 205 glEnd;
205 206
206 glPushMatrix;
207 glTranslate (2, 2, 0);
208 $chld->_draw; 207 $chld->draw;
209 glPopMatrix;
210} 208}
209
210package Crossfire::Client::Widget::FancyFrame;
211
212our @ISA = Crossfire::Client::Widget::Frame::;
213
214use SDL::OpenGL;
215
216#TODO: implement themed frame
211 217
212package Crossfire::Client::Widget::Table; 218package Crossfire::Client::Widget::Table;
213 219
214our @ISA = Crossfire::Client::Widget::Container::; 220our @ISA = Crossfire::Client::Widget::Container::;
215 221
… …
275 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
276 my $x = 0; 282 my $x = 0;
277 283
278 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
279 285
280 glPushMatrix;
281 glTranslate ($x, $y, 0);
282 my $c = $self->{childs}->[$yi]->[$xi]; 286 my $c = $self->{childs}->[$yi]->[$xi];
287 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request
283 $c->_draw if $c; 289 $c->draw if $c;
284 glPopMatrix; 290 }
285 291
286 $x += $self->max_col_width ($xi); 292 $x += $self->max_col_width ($xi);
287 } 293 }
288 294
289 $y += $self->max_row_height ($yi); 295 $y += $self->max_row_height ($yi);
… …
317sub _draw { 323sub _draw {
318 my ($self) = @_; 324 my ($self) = @_;
319 325
320 my ($x, $y); 326 my ($x, $y);
321 for (@{$self->{childs} || []}) { 327 for (@{$self->{childs} || []}) {
322 glPushMatrix; 328 $_->move (0, $y, 0); #TODO: move to size_request
323 glTranslate (0, $y, 0);
324 $_->_draw; 329 $_->draw;
325 glPopMatrix;
326 my ($w, $h) = $_->size_request; 330 my ($w, $h) = $_->size_request;
327 $y += $h; 331 $y += $h;
328 } 332 }
329} 333}
330 334
… …
333our @ISA = Crossfire::Client::Widget::; 337our @ISA = Crossfire::Client::Widget::;
334 338
335use SDL::OpenGL; 339use SDL::OpenGL;
336 340
337sub new { 341sub new {
338 my ($class, $x, $y, $z, $ttf, $text) = @_; 342 my ($class, $x, $y, $z, $height, $text) = @_;
339 343
340 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
341 345
342 $self->set_text ($text); 346 $self->set_text ($text);
343 347
344 $self 348 $self
345} 349}
346 350
347sub set_text { 351sub set_text {
348 my ($self, $text) = @_; 352 my ($self, $text) = @_;
353
354 $self->{text} = $text;
355
349 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
350} 357}
351 358
352sub get_text { 359sub get_text {
353 my ($self, $text) = @_; 360 my ($self, $text) = @_;
361
354 $self->{text} 362 $self->{text}
355} 363}
356 364
357sub size_request { 365sub size_request {
358 my ($self) = @_; 366 my ($self) = @_;
… …
368 376
369 my $tex = $self->{texture}; 377 my $tex = $self->{texture};
370 378
371 glEnable GL_BLEND; 379 glEnable GL_BLEND;
372 glEnable GL_TEXTURE_2D; 380 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
374 glBindTexture GL_TEXTURE_2D, $tex->{name}; 383 glBindTexture GL_TEXTURE_2D, $tex->{name};
375 384
376 glColor 1, 1, 1; 385 glColor 1, 1, 1, 0.8;
377 386
378 glBegin GL_QUADS; 387 glBegin GL_QUADS;
379 glTexCoord 0, 0; glVertex 0 , 0; 388 glTexCoord 0, 0; glVertex 0 , 0;
380 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 389 glTexCoord 0, 1; glVertex 0 , $tex->{height};
381 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
384 393
385 glDisable GL_BLEND; 394 glDisable GL_BLEND;
386 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
387} 396}
388 397
398package Crossfire::Client::Widget::TextEntry;
399
400our @ISA = Crossfire::Client::Widget::Label::;
401
402use SDL;
403use SDL::OpenGL;
404
405sub key_down {
406 my ($self, $ev) = @_;
407
408 my $mod = $ev->key_mod;
409 my $sym = $ev->key_sym;
410
411 $ev->set_unicode (1);
412 my $uni = $ev->key_unicode;
413
414 my $text = $self->get_text;
415
416 if ($sym == SDLK_BACKSPACE) {
417 substr $text, -1, 1, '';
418
419 } elsif ($uni) {
420 $text .= chr $uni;
421 }
422 $self->set_text ($text);
423}
424
425
426# XXX: TextView isn't neccessary with pango multiline text rendering
389package Crossfire::Client::Widget::TextView; 427package Crossfire::Client::Widget::TextView;
390 428
391use strict; 429use strict;
392 430
393our @ISA = qw/Crossfire::Client::Widget/; 431our @ISA = qw/Crossfire::Client::Widget/;
394 432
395use SDL::OpenGL; 433use SDL::OpenGL;
396use SDL::OpenGL::Constants; 434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_;
438 my $self = $class->SUPER::new ();
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447}
448
449#sub render_lines {
450# my ($self) = @_;
451#
452# $self->{txt_lines} = [];
453#
454# for (@{$self->{lines}}) {
455# push @{$self->{txt_lines}},
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# }
458#}
397 459
398sub add_line { 460sub add_line {
399 my ($self, $line) = @_; 461 my ($self, $line) = @_;
400 push @{$self->{lines}}, $line; 462 push @{$self->{lines}}, $line;
401}
402 463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
403sub _draw { 482sub draw_line {
404 my ($self) = @_; 483 my ($self, $tex, $y) = @_;
405 484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488
489 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
493 glTexCoord 1, 0; glVertex $tex->{width}, $y;
494 glEnd;
495}
496
497sub _draw {
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
406} 512}
407 513
408package Crossfire::Client::Widget::MapWidget; 514package Crossfire::Client::Widget::MapWidget;
409 515
410use strict; 516use strict;
411 517
412our @ISA = qw/Crossfire::Client::Widget/; 518use List::Util qw(min max);
413 519
414use SDL; 520use SDL;
415use SDL::OpenGL; 521use SDL::OpenGL;
416use SDL::OpenGL::Constants; 522use SDL::OpenGL::Constants;
523
524our @ISA = Crossfire::Client::Widget::;
417 525
418sub key_down { 526sub key_down {
419 print "MAPKEYDOWN\n"; 527 print "MAPKEYDOWN\n";
420} 528}
421 529
422sub key_up { 530sub key_up {
423} 531}
424 532
425sub _draw { 533sub _draw {
426 my ($self) = @_; 534 my ($self) = @_;
535
536 my $mx = $::CONN->{mapx};
537 my $my = $::CONN->{mapy};
538
539 my $map = $::CONN->{map};
540
541 my ($xofs, $yofs);
542
543 my $sw = 1 + int $::WIDTH / 32;
544 my $sh = 1 + int $::HEIGHT / 32;
545
546 if ($::CONN->{mapw} > $sw) {
547 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
548 } else {
549 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
550 }
551
552 if ($::CONN->{maph} > $sh) {
553 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
554 } else {
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 }
427 557
428 glEnable GL_TEXTURE_2D; 558 glEnable GL_TEXTURE_2D;
429 glEnable GL_BLEND; 559 glEnable GL_BLEND;
430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
431 561
432 my $map = $::CONN->{map}; 562 for my $x (0 .. $sw - 1) {
563 for my $y (0 .. $sh - 1) {
433 564
434 for my $x (0 .. int $::WIDTH / 32) { 565 my $cell = $map->[$x + $xofs][$y + $yofs]
435 for my $y (0 .. int $::HEIGHT / 32) {
436
437 my $cell = $map->[$x + $::CONN->{mapx}]
438 [$y + $::CONN->{mapy}]
439 or next; 566 or next;
440 567
441 my $darkness = $cell->[0] * (1 / 255); 568 my $darkness = $cell->[0] * (1 / 255);
442 if ($darkness < 0) { 569 if ($darkness < 0) {
443 $darkness = 0.5; 570 glColor 0.3, 0.3, 0.3;
571 } else {
572 glColor $darkness, $darkness, $darkness;
444 } 573 }
445 glColor $darkness, $darkness, $darkness;
446 574
447 for my $num (grep $_, @$cell[1,2,3]) { 575 for my $num (grep $_, @$cell[1,2,3]) {
448 my $tex = $::CONN->{face}[$num]{texture} || next; 576 my $tex = $::CONN->{face}[$num]{texture} || next;
449 577
450 glBindTexture GL_TEXTURE_2D, $tex->{name}; 578 glBindTexture GL_TEXTURE_2D, $tex->{name};

Diff Legend

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