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.24 by root, Sat Apr 8 20:25:26 2006 UTC vs.
Revision 1.27 by root, Sat Apr 8 22:25:37 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;
… …
187 187
188sub _draw { 188sub _draw {
189 my ($self) = @_; 189 my ($self) = @_;
190 190
191 my $chld = $self->get; 191 my $chld = $self->get;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
192 194
193 my ($w, $h) = $chld->size_request; 195 my ($w, $h) = $chld->size_request;
194 196
195 glColor 1, 0, 0; 197 glColor 1, 0, 0;
196 glBegin GL_QUADS; 198 glBegin GL_QUADS;
… …
198 glTexCoord 0, 1; glVertex 0 , $h + 4; 200 glTexCoord 0, 1; glVertex 0 , $h + 4;
199 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
200 glTexCoord 1, 0; glVertex $w + 4 , 0; 202 glTexCoord 1, 0; glVertex $w + 4 , 0;
201 glEnd; 203 glEnd;
202 204
203 glPushMatrix;
204 glTranslate (2, 2, 0);
205 $chld->draw; 205 $chld->draw;
206 glPopMatrix;
207} 206}
208 207
209package Crossfire::Client::Widget::Table; 208package Crossfire::Client::Widget::Table;
210 209
211our @ISA = Crossfire::Client::Widget::Container::; 210our @ISA = Crossfire::Client::Widget::Container::;
… …
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
273 my $x = 0; 272 my $x = 0;
274 273
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
276 275
277 glPushMatrix;
278 glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
279 my $c = $self->{childs}->[$yi]->[$xi]; 276 my $c = $self->{childs}->[$yi]->[$xi];
277 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 279 $c->draw if $c;
281 glPopMatrix; 280 }
282 281
283 $x += $self->max_col_width ($xi); 282 $x += $self->max_col_width ($xi);
284 } 283 }
285 284
286 $y += $self->max_row_height ($yi); 285 $y += $self->max_row_height ($yi);
… …
314sub _draw { 313sub _draw {
315 my ($self) = @_; 314 my ($self) = @_;
316 315
317 my ($x, $y); 316 my ($x, $y);
318 for (@{$self->{childs} || []}) { 317 for (@{$self->{childs} || []}) {
319 glPushMatrix; 318 $_->move (0, $y, 0); #TODO: move to size_request
320 glTranslate (0, $y, 0);# see above TODO
321 $_->draw; 319 $_->draw;
322 glPopMatrix;
323 my ($w, $h) = $_->size_request; 320 my ($w, $h) = $_->size_request;
324 $y += $h; 321 $y += $h;
325 } 322 }
326} 323}
327 324
… …
365 362
366 my $tex = $self->{texture}; 363 my $tex = $self->{texture};
367 364
368 glEnable GL_BLEND; 365 glEnable GL_BLEND;
369 glEnable GL_TEXTURE_2D; 366 glEnable GL_TEXTURE_2D;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 367 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
371 glBindTexture GL_TEXTURE_2D, $tex->{name}; 368 glBindTexture GL_TEXTURE_2D, $tex->{name};
372 369
373 glColor 1, 1, 1; 370 glColor 1, 0, 1;
374 371
375 glBegin GL_QUADS; 372 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0; 373 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 374 glTexCoord 0, 1; glVertex 0 , $tex->{height};
378 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 375 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
404 401
405package Crossfire::Client::Widget::MapWidget; 402package Crossfire::Client::Widget::MapWidget;
406 403
407use strict; 404use strict;
408 405
409our @ISA = qw/Crossfire::Client::Widget/; 406use List::Util qw(min max);
410 407
411use SDL; 408use SDL;
412use SDL::OpenGL; 409use SDL::OpenGL;
413use SDL::OpenGL::Constants; 410use SDL::OpenGL::Constants;
411
412our @ISA = Crossfire::Client::Widget::;
414 413
415sub key_down { 414sub key_down {
416 print "MAPKEYDOWN\n"; 415 print "MAPKEYDOWN\n";
417} 416}
418 417
419sub key_up { 418sub key_up {
420} 419}
421 420
422sub _draw { 421sub _draw {
423 my ($self) = @_; 422 my ($self) = @_;
423
424 my $mx = $::CONN->{mapx};
425 my $my = $::CONN->{mapy};
426
427 my $map = $::CONN->{map};
428
429 my ($xofs, $yofs);
430
431 my $sw = 1 + int $::WIDTH / 32;
432 my $sh = 1 + int $::HEIGHT / 32;
433
434 if ($::CONN->{mapw} > $sw) {
435 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
436 } else {
437 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
438 }
439
440 if ($::CONN->{maph} > $sh) {
441 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
442 } else {
443 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
444 }
424 445
425 glEnable GL_TEXTURE_2D; 446 glEnable GL_TEXTURE_2D;
426 glEnable GL_BLEND; 447 glEnable GL_BLEND;
427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
428 449
429 my $map = $::CONN->{map}; 450 for my $x (0 .. $sw - 1) {
451 for my $y (0 .. $sh - 1) {
430 452
431 for my $x (0 .. int $::WIDTH / 32) { 453 my $cell = $map->[$x + $xofs][$y + $yofs]
432 for my $y (0 .. int $::HEIGHT / 32) {
433
434 my $cell = $map->[$x + $::CONN->{mapx}]
435 [$y + $::CONN->{mapy}]
436 or next; 454 or next;
437 455
438 my $darkness = $cell->[0] * (1 / 255); 456 my $darkness = $cell->[0] * (1 / 255);
439 if ($darkness < 0) { 457 if ($darkness < 0) {
440 glColor 0.3, 0.3, 0.3; 458 glColor 0.3, 0.3, 0.3;

Diff Legend

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