… | |
… | |
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; |
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 | |
146 | sub size_request { |
143 | sub size_request { |
… | |
… | |
151 | } |
148 | } |
152 | |
149 | |
153 | sub _draw { |
150 | sub _draw { |
154 | my ($self) = @_; |
151 | my ($self) = @_; |
155 | |
152 | |
|
|
153 | my ($w, $h) = $self->size_request;#TODO# use widht/height of texture |
156 | my $tex = $self->{texture} |
154 | my $tex = $self->{texture} |
157 | or return; |
155 | or return; |
158 | |
156 | |
159 | warn "DRAW TEX: $tex->{width} $tex->{height}\n"; |
|
|
160 | glEnable GL_BLEND; |
157 | glEnable GL_BLEND; |
161 | glEnable GL_TEXTURE_2D; |
158 | glEnable GL_TEXTURE_2D; |
162 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
159 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
163 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
160 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
164 | |
161 | |
165 | glColor 1, 1, 1; |
162 | glColor 1, 1, 1; |
166 | |
163 | |
167 | glBegin GL_QUADS; |
164 | glBegin GL_QUADS; |
168 | glTexCoord 0, 0; glVertex 0 , 0; |
165 | glTexCoord 0, 0; glVertex 0, 0; |
169 | glTexCoord 0, 1; glVertex 0 , $tex->{height}; |
166 | glTexCoord 0, 1; glVertex 0, $h; |
170 | glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; |
167 | glTexCoord 1, 1; glVertex $w, $h; |
171 | glTexCoord 1, 0; glVertex $tex->{width}, 0; |
168 | glTexCoord 1, 0; glVertex $w, 0; |
172 | glEnd; |
169 | glEnd; |
173 | |
170 | |
174 | glDisable GL_BLEND; |
171 | glDisable GL_BLEND; |
175 | glDisable GL_TEXTURE_2D; |
172 | glDisable GL_TEXTURE_2D; |
176 | } |
173 | } |
… | |
… | |
190 | |
187 | |
191 | sub _draw { |
188 | sub _draw { |
192 | my ($self) = @_; |
189 | my ($self) = @_; |
193 | |
190 | |
194 | my $chld = $self->get; |
191 | my $chld = $self->get; |
|
|
192 | |
|
|
193 | $chld->move (2, 2, 0); #TODO:move to size_request |
195 | |
194 | |
196 | my ($w, $h) = $chld->size_request; |
195 | my ($w, $h) = $chld->size_request; |
197 | |
196 | |
198 | glColor 1, 0, 0; |
197 | glColor 1, 0, 0; |
199 | glBegin GL_QUADS; |
198 | glBegin GL_QUADS; |
… | |
… | |
201 | glTexCoord 0, 1; glVertex 0 , $h + 4; |
200 | glTexCoord 0, 1; glVertex 0 , $h + 4; |
202 | glTexCoord 1, 1; glVertex $w + 4 , $h + 4; |
201 | glTexCoord 1, 1; glVertex $w + 4 , $h + 4; |
203 | glTexCoord 1, 0; glVertex $w + 4 , 0; |
202 | glTexCoord 1, 0; glVertex $w + 4 , 0; |
204 | glEnd; |
203 | glEnd; |
205 | |
204 | |
206 | glPushMatrix; |
|
|
207 | glTranslate (2, 2, 0); |
|
|
208 | $chld->_draw; |
205 | $chld->draw; |
209 | glPopMatrix; |
|
|
210 | } |
206 | } |
211 | |
207 | |
212 | package Crossfire::Client::Widget::Table; |
208 | package Crossfire::Client::Widget::Table; |
213 | |
209 | |
214 | our @ISA = Crossfire::Client::Widget::Container::; |
210 | our @ISA = Crossfire::Client::Widget::Container::; |
… | |
… | |
275 | for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { |
271 | for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { |
276 | my $x = 0; |
272 | my $x = 0; |
277 | |
273 | |
278 | for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { |
274 | for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { |
279 | |
275 | |
280 | glPushMatrix; |
|
|
281 | glTranslate ($x, $y, 0); |
|
|
282 | 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 |
283 | $c->_draw if $c; |
279 | $c->draw if $c; |
284 | glPopMatrix; |
280 | } |
285 | |
281 | |
286 | $x += $self->max_col_width ($xi); |
282 | $x += $self->max_col_width ($xi); |
287 | } |
283 | } |
288 | |
284 | |
289 | $y += $self->max_row_height ($yi); |
285 | $y += $self->max_row_height ($yi); |
… | |
… | |
317 | sub _draw { |
313 | sub _draw { |
318 | my ($self) = @_; |
314 | my ($self) = @_; |
319 | |
315 | |
320 | my ($x, $y); |
316 | my ($x, $y); |
321 | for (@{$self->{childs} || []}) { |
317 | for (@{$self->{childs} || []}) { |
322 | glPushMatrix; |
318 | $_->move (0, $y, 0); #TODO: move to size_request |
323 | glTranslate (0, $y, 0); |
|
|
324 | $_->_draw; |
319 | $_->draw; |
325 | glPopMatrix; |
|
|
326 | my ($w, $h) = $_->size_request; |
320 | my ($w, $h) = $_->size_request; |
327 | $y += $h; |
321 | $y += $h; |
328 | } |
322 | } |
329 | } |
323 | } |
330 | |
324 | |
… | |
… | |
333 | our @ISA = Crossfire::Client::Widget::; |
327 | our @ISA = Crossfire::Client::Widget::; |
334 | |
328 | |
335 | use SDL::OpenGL; |
329 | use SDL::OpenGL; |
336 | |
330 | |
337 | sub new { |
331 | sub new { |
338 | my ($class, $x, $y, $z, $ttf, $text) = @_; |
332 | my ($class, $x, $y, $z, $height, $text) = @_; |
339 | |
333 | |
340 | my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); |
334 | my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); |
341 | |
335 | |
342 | $self->set_text ($text); |
336 | $self->set_text ($text); |
343 | |
337 | |
344 | $self |
338 | $self |
345 | } |
339 | } |
346 | |
340 | |
347 | sub set_text { |
341 | sub set_text { |
348 | my ($self, $text) = @_; |
342 | my ($self, $text) = @_; |
|
|
343 | |
|
|
344 | $self->{text} = $text; |
|
|
345 | |
349 | $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; |
346 | $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; |
350 | } |
347 | } |
351 | |
348 | |
352 | sub get_text { |
349 | sub get_text { |
353 | my ($self, $text) = @_; |
350 | my ($self, $text) = @_; |
|
|
351 | |
354 | $self->{text} |
352 | $self->{text} |
355 | } |
353 | } |
356 | |
354 | |
357 | sub size_request { |
355 | sub size_request { |
358 | my ($self) = @_; |
356 | my ($self) = @_; |
… | |
… | |
371 | glEnable GL_BLEND; |
369 | glEnable GL_BLEND; |
372 | glEnable GL_TEXTURE_2D; |
370 | glEnable GL_TEXTURE_2D; |
373 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
371 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
374 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
372 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
375 | |
373 | |
376 | glColor 1, 1, 1; |
374 | glColor 1, 0, 1; |
377 | |
375 | |
378 | glBegin GL_QUADS; |
376 | glBegin GL_QUADS; |
379 | glTexCoord 0, 0; glVertex 0 , 0; |
377 | glTexCoord 0, 0; glVertex 0 , 0; |
380 | glTexCoord 0, 1; glVertex 0 , $tex->{height}; |
378 | glTexCoord 0, 1; glVertex 0 , $tex->{height}; |
381 | glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; |
379 | glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; |
… | |
… | |
407 | |
405 | |
408 | package Crossfire::Client::Widget::MapWidget; |
406 | package Crossfire::Client::Widget::MapWidget; |
409 | |
407 | |
410 | use strict; |
408 | use strict; |
411 | |
409 | |
412 | our @ISA = qw/Crossfire::Client::Widget/; |
410 | use List::Util qw(min max); |
413 | |
411 | |
414 | use SDL; |
412 | use SDL; |
415 | use SDL::OpenGL; |
413 | use SDL::OpenGL; |
416 | use SDL::OpenGL::Constants; |
414 | use SDL::OpenGL::Constants; |
|
|
415 | |
|
|
416 | our @ISA = Crossfire::Client::Widget::; |
417 | |
417 | |
418 | sub key_down { |
418 | sub key_down { |
419 | print "MAPKEYDOWN\n"; |
419 | print "MAPKEYDOWN\n"; |
420 | } |
420 | } |
421 | |
421 | |
422 | sub key_up { |
422 | sub key_up { |
423 | } |
423 | } |
424 | |
424 | |
425 | sub _draw { |
425 | sub _draw { |
|
|
426 | my ($self) = @_; |
|
|
427 | |
|
|
428 | my $mx = $::CONN->{mapx}; |
|
|
429 | my $my = $::CONN->{mapy}; |
|
|
430 | |
|
|
431 | my $map = $::CONN->{map}; |
|
|
432 | |
|
|
433 | my ($xofs, $yofs); |
|
|
434 | |
|
|
435 | my $sw = 1 + int $::WIDTH / 32; |
|
|
436 | my $sh = 1 + int $::HEIGHT / 32; |
|
|
437 | |
|
|
438 | if ($::CONN->{mapw} > $sw) { |
|
|
439 | $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; |
|
|
440 | } else { |
|
|
441 | $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; |
|
|
442 | } |
|
|
443 | |
|
|
444 | if ($::CONN->{maph} > $sh) { |
|
|
445 | $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; |
|
|
446 | } else { |
|
|
447 | $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; |
|
|
448 | } |
|
|
449 | |
426 | glEnable GL_TEXTURE_2D; |
450 | glEnable GL_TEXTURE_2D; |
427 | glEnable GL_BLEND; |
451 | glEnable GL_BLEND; |
428 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
452 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
429 | |
453 | |
430 | my $map = $::CONN->{map}; |
454 | for my $x (0 .. $sw - 1) { |
431 | |
|
|
432 | for my $x (0 .. $::CONN->{mapw} - 1) { |
|
|
433 | for my $y (0 .. $::CONN->{maph} - 1) { |
455 | for my $y (0 .. $sh - 1) { |
434 | |
456 | |
435 | my $cell = $map->[$x][$y] |
457 | my $cell = $map->[$x + $xofs][$y + $yofs] |
436 | or next; |
458 | or next; |
437 | |
459 | |
438 | my $darkness = $cell->[3] * (1 / 255); |
460 | my $darkness = $cell->[0] * (1 / 255); |
|
|
461 | if ($darkness < 0) { |
|
|
462 | glColor 0.3, 0.3, 0.3; |
|
|
463 | } else { |
439 | glColor $darkness, $darkness, $darkness; |
464 | glColor $darkness, $darkness, $darkness; |
|
|
465 | } |
440 | |
466 | |
441 | for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { |
467 | for my $num (grep $_, @$cell[1,2,3]) { |
442 | my $tex = $::CONN->{face}[$num]{texture} || next; |
468 | my $tex = $::CONN->{face}[$num]{texture} || next; |
443 | |
469 | |
444 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
470 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
445 | |
471 | |
446 | my $w = $tex->{width}; |
472 | my $w = $tex->{width}; |