… | |
… | |
123 | use SDL::OpenGL; |
123 | use SDL::OpenGL; |
124 | |
124 | |
125 | sub add { |
125 | sub 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 | |
131 | sub render_chld { |
131 | sub render_chld { |
132 | my ($self) = @_; |
132 | my ($self) = @_; |
133 | my $chld = $self->get; |
133 | my $chld = $self->get; |
… | |
… | |
187 | |
187 | |
188 | sub _draw { |
188 | sub _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 | |
209 | package Crossfire::Client::Widget::Table; |
208 | package Crossfire::Client::Widget::Table; |
210 | |
209 | |
211 | our @ISA = Crossfire::Client::Widget::Container::; |
210 | our @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); |
… | |
… | |
314 | sub _draw { |
313 | sub _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}; |
… | |
… | |
433 | |
430 | |
434 | my $sw = 1 + int $::WIDTH / 32; |
431 | my $sw = 1 + int $::WIDTH / 32; |
435 | my $sh = 1 + int $::HEIGHT / 32; |
432 | my $sh = 1 + int $::HEIGHT / 32; |
436 | |
433 | |
437 | if ($::CONN->{mapw} > $sw) { |
434 | if ($::CONN->{mapw} > $sw) { |
438 | $xofs = ($sw - $::CONN->{mapw}) * 0.5; |
435 | $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; |
439 | } else { |
436 | } else { |
440 | $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; |
437 | $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; |
441 | } |
438 | } |
442 | |
439 | |
443 | if ($::CONN->{maph} > $sh) { |
440 | if ($::CONN->{maph} > $sh) { |
444 | $yofs = ($sh - $::CONN->{maph}) * 0.5; |
441 | $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; |
445 | } else { |
442 | } else { |
446 | $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; |
443 | $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; |
447 | } |
444 | } |
448 | |
445 | |
449 | glEnable GL_TEXTURE_2D; |
446 | glEnable GL_TEXTURE_2D; |
450 | glEnable GL_BLEND; |
447 | glEnable GL_BLEND; |
451 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
448 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
452 | |
|
|
453 | warn "<$mx,$my> <$xofs,$yofs>\n";#d# |
|
|
454 | |
449 | |
455 | for my $x (0 .. $sw - 1) { |
450 | for my $x (0 .. $sw - 1) { |
456 | for my $y (0 .. $sh - 1) { |
451 | for my $y (0 .. $sh - 1) { |
457 | |
452 | |
458 | my $cell = $map->[$x + $xofs][$y + $yofs] |
453 | my $cell = $map->[$x + $xofs][$y + $yofs] |