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.30 by root, Sun Apr 9 00:18:45 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, 1, 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}
211 209
212package Crossfire::Client::Widget::Table; 210package Crossfire::Client::Widget::Table;
213 211
214our @ISA = Crossfire::Client::Widget::Container::; 212our @ISA = Crossfire::Client::Widget::Container::;
275 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
276 my $x = 0; 274 my $x = 0;
277 275
278 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
279 277
280 glPushMatrix;
281 glTranslate ($x, $y, 0);
282 my $c = $self->{childs}->[$yi]->[$xi]; 278 my $c = $self->{childs}->[$yi]->[$xi];
279 if ($c) {
280 $c->move ($x, $y, 0); #TODO: Move to size_request
283 $c->_draw if $c; 281 $c->draw if $c;
284 glPopMatrix; 282 }
285 283
286 $x += $self->max_col_width ($xi); 284 $x += $self->max_col_width ($xi);
287 } 285 }
288 286
289 $y += $self->max_row_height ($yi); 287 $y += $self->max_row_height ($yi);
317sub _draw { 315sub _draw {
318 my ($self) = @_; 316 my ($self) = @_;
319 317
320 my ($x, $y); 318 my ($x, $y);
321 for (@{$self->{childs} || []}) { 319 for (@{$self->{childs} || []}) {
322 glPushMatrix; 320 $_->move (0, $y, 0); #TODO: move to size_request
323 glTranslate (0, $y, 0);
324 $_->_draw; 321 $_->draw;
325 glPopMatrix;
326 my ($w, $h) = $_->size_request; 322 my ($w, $h) = $_->size_request;
327 $y += $h; 323 $y += $h;
328 } 324 }
329} 325}
330 326
333our @ISA = Crossfire::Client::Widget::; 329our @ISA = Crossfire::Client::Widget::;
334 330
335use SDL::OpenGL; 331use SDL::OpenGL;
336 332
337sub new { 333sub new {
338 my ($class, $x, $y, $z, $ttf, $text) = @_; 334 my ($class, $x, $y, $z, $height, $text) = @_;
339 335
340 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 336 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
341 337
342 $self->set_text ($text); 338 $self->set_text ($text);
343 339
344 $self 340 $self
345} 341}
346 342
347sub set_text { 343sub set_text {
348 my ($self, $text) = @_; 344 my ($self, $text) = @_;
345
346 $self->{text} = $text;
347
349 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 348 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
350} 349}
351 350
352sub get_text { 351sub get_text {
353 my ($self, $text) = @_; 352 my ($self, $text) = @_;
353
354 $self->{text} 354 $self->{text}
355} 355}
356 356
357sub size_request { 357sub size_request {
358 my ($self) = @_; 358 my ($self) = @_;
368 368
369 my $tex = $self->{texture}; 369 my $tex = $self->{texture};
370 370
371 glEnable GL_BLEND; 371 glEnable GL_BLEND;
372 glEnable GL_TEXTURE_2D; 372 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
374 glBindTexture GL_TEXTURE_2D, $tex->{name}; 375 glBindTexture GL_TEXTURE_2D, $tex->{name};
375 376
376 glColor 1, 1, 1; 377 glColor 1, 1, 1, 0.8;
377 378
378 glBegin GL_QUADS; 379 glBegin GL_QUADS;
379 glTexCoord 0, 0; glVertex 0 , 0; 380 glTexCoord 0, 0; glVertex 0 , 0;
380 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 381 glTexCoord 0, 1; glVertex 0 , $tex->{height};
381 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
407 408
408package Crossfire::Client::Widget::MapWidget; 409package Crossfire::Client::Widget::MapWidget;
409 410
410use strict; 411use strict;
411 412
412our @ISA = qw/Crossfire::Client::Widget/; 413use List::Util qw(min max);
413 414
414use SDL; 415use SDL;
415use SDL::OpenGL; 416use SDL::OpenGL;
416use SDL::OpenGL::Constants; 417use SDL::OpenGL::Constants;
418
419our @ISA = Crossfire::Client::Widget::;
417 420
418sub key_down { 421sub key_down {
419 print "MAPKEYDOWN\n"; 422 print "MAPKEYDOWN\n";
420} 423}
421 424
422sub key_up { 425sub key_up {
423} 426}
424 427
425sub _draw { 428sub _draw {
426 my ($self) = @_; 429 my ($self) = @_;
430
431 my $mx = $::CONN->{mapx};
432 my $my = $::CONN->{mapy};
433
434 my $map = $::CONN->{map};
435
436 my ($xofs, $yofs);
437
438 my $sw = 1 + int $::WIDTH / 32;
439 my $sh = 1 + int $::HEIGHT / 32;
440
441 if ($::CONN->{mapw} > $sw) {
442 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
443 } else {
444 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
445 }
446
447 if ($::CONN->{maph} > $sh) {
448 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
449 } else {
450 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451 }
427 452
428 glEnable GL_TEXTURE_2D; 453 glEnable GL_TEXTURE_2D;
429 glEnable GL_BLEND; 454 glEnable GL_BLEND;
430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
431 456
432 my $map = $::CONN->{map}; 457 for my $x (0 .. $sw - 1) {
458 for my $y (0 .. $sh - 1) {
433 459
434 for my $x (0 .. int $::WIDTH / 32) { 460 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; 461 or next;
440 462
441 my $darkness = $cell->[0] * (1 / 255); 463 my $darkness = $cell->[0] * (1 / 255);
442 if ($darkness < 0) { 464 if ($darkness < 0) {
443 $darkness = 0.5; 465 glColor 0.3, 0.3, 0.3;
466 } else {
467 glColor $darkness, $darkness, $darkness;
444 } 468 }
445 glColor $darkness, $darkness, $darkness;
446 469
447 for my $num (grep $_, @$cell[1,2,3]) { 470 for my $num (grep $_, @$cell[1,2,3]) {
448 my $tex = $::CONN->{face}[$num]{texture} || next; 471 my $tex = $::CONN->{face}[$num]{texture} || next;
449 472
450 glBindTexture GL_TEXTURE_2D, $tex->{name}; 473 glBindTexture GL_TEXTURE_2D, $tex->{name};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines