… | |
… | |
39 | $self->{x} = $x; |
39 | $self->{x} = $x; |
40 | $self->{y} = $y; |
40 | $self->{y} = $y; |
41 | $self->{z} = $z if defined $z; |
41 | $self->{z} = $z if defined $z; |
42 | } |
42 | } |
43 | |
43 | |
|
|
44 | sub needs_redraw { |
|
|
45 | 0 |
|
|
46 | } |
|
|
47 | |
44 | sub size_request { |
48 | sub size_request { |
45 | die "size_request is abtract"; |
49 | die "size_request is abtract"; |
46 | } |
50 | } |
47 | |
51 | |
48 | sub focus_in { |
52 | sub focus_in { |
… | |
… | |
110 | |
114 | |
111 | sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } |
115 | sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } |
112 | |
116 | |
113 | sub _draw { die "Containers can't be drawn!" } |
117 | sub _draw { die "Containers can't be drawn!" } |
114 | |
118 | |
|
|
119 | package Crossfire::Client::Widget::Window; |
|
|
120 | |
|
|
121 | our @ISA = Crossfire::Client::Widget::Container::; |
|
|
122 | |
|
|
123 | use SDL::OpenGL; |
|
|
124 | |
|
|
125 | sub add { |
|
|
126 | my ($self, $chld) = @_; |
|
|
127 | $self->SUPER::add ($chld); |
|
|
128 | $self->render_chld; #TODO: Move this to the size_request event propably? |
|
|
129 | } |
|
|
130 | |
|
|
131 | sub render_chld { |
|
|
132 | my ($self) = @_; |
|
|
133 | my $chld = $self->get; |
|
|
134 | my ($w, $h) = $self->size_request; |
|
|
135 | |
|
|
136 | $self->{texture} = |
|
|
137 | Crossfire::Client::Texture->new_from_opengl ( |
|
|
138 | $w, $h, sub { $chld->draw } |
|
|
139 | ); |
|
|
140 | $self->{texture}->upload; |
|
|
141 | } |
|
|
142 | |
|
|
143 | sub size_request { |
|
|
144 | my ($self) = @_; |
|
|
145 | my $chld = $self->get |
|
|
146 | or return (0, 0); |
|
|
147 | $chld->size_request |
|
|
148 | } |
|
|
149 | |
|
|
150 | sub _draw { |
|
|
151 | my ($self) = @_; |
|
|
152 | |
|
|
153 | my ($w, $h) = $self->size_request;#TODO# use widht/height of texture |
|
|
154 | my $tex = $self->{texture} |
|
|
155 | or return; |
|
|
156 | |
|
|
157 | glEnable GL_BLEND; |
|
|
158 | glEnable GL_TEXTURE_2D; |
|
|
159 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
160 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
|
|
161 | |
|
|
162 | glColor 1, 1, 1; |
|
|
163 | |
|
|
164 | glBegin GL_QUADS; |
|
|
165 | glTexCoord 0, 0; glVertex 0, 0; |
|
|
166 | glTexCoord 0, 1; glVertex 0, $h; |
|
|
167 | glTexCoord 1, 1; glVertex $w, $h; |
|
|
168 | glTexCoord 1, 0; glVertex $w, 0; |
|
|
169 | glEnd; |
|
|
170 | |
|
|
171 | glDisable GL_BLEND; |
|
|
172 | glDisable GL_TEXTURE_2D; |
|
|
173 | } |
|
|
174 | |
115 | package Crossfire::Client::Widget::Frame; |
175 | package Crossfire::Client::Widget::Frame; |
116 | |
176 | |
117 | our @ISA = Crossfire::Client::Widget::Container::; |
177 | our @ISA = Crossfire::Client::Widget::Container::; |
118 | |
178 | |
119 | use SDL::OpenGL; |
179 | use SDL::OpenGL; |
… | |
… | |
127 | |
187 | |
128 | sub _draw { |
188 | sub _draw { |
129 | my ($self) = @_; |
189 | my ($self) = @_; |
130 | |
190 | |
131 | my $chld = $self->get; |
191 | my $chld = $self->get; |
|
|
192 | |
|
|
193 | $chld->move (2, 2, 0); #TODO:move to size_request |
132 | |
194 | |
133 | my ($w, $h) = $chld->size_request; |
195 | my ($w, $h) = $chld->size_request; |
134 | |
196 | |
135 | glColor 1, 0, 0; |
197 | glColor 1, 0, 0; |
136 | glBegin GL_QUADS; |
198 | glBegin GL_QUADS; |
… | |
… | |
138 | glTexCoord 0, 1; glVertex 0 , $h + 4; |
200 | glTexCoord 0, 1; glVertex 0 , $h + 4; |
139 | glTexCoord 1, 1; glVertex $w + 4 , $h + 4; |
201 | glTexCoord 1, 1; glVertex $w + 4 , $h + 4; |
140 | glTexCoord 1, 0; glVertex $w + 4 , 0; |
202 | glTexCoord 1, 0; glVertex $w + 4 , 0; |
141 | glEnd; |
203 | glEnd; |
142 | |
204 | |
143 | glPushMatrix; |
|
|
144 | glTranslate (2, 2, 0); |
|
|
145 | $chld->_draw; |
205 | $chld->draw; |
146 | glPopMatrix; |
|
|
147 | } |
206 | } |
148 | |
207 | |
149 | package Crossfire::Client::Widget::Table; |
208 | package Crossfire::Client::Widget::Table; |
150 | |
209 | |
151 | our @ISA = Crossfire::Client::Widget::Container::; |
210 | our @ISA = Crossfire::Client::Widget::Container::; |
… | |
… | |
212 | for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { |
271 | for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { |
213 | my $x = 0; |
272 | my $x = 0; |
214 | |
273 | |
215 | for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { |
274 | for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { |
216 | |
275 | |
217 | glPushMatrix; |
|
|
218 | glTranslate ($x, $y, 0); |
|
|
219 | 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 |
220 | $c->_draw if $c; |
279 | $c->draw if $c; |
221 | glPopMatrix; |
280 | } |
222 | |
281 | |
223 | $x += $self->max_col_width ($xi); |
282 | $x += $self->max_col_width ($xi); |
224 | } |
283 | } |
225 | |
284 | |
226 | $y += $self->max_row_height ($yi); |
285 | $y += $self->max_row_height ($yi); |
… | |
… | |
254 | sub _draw { |
313 | sub _draw { |
255 | my ($self) = @_; |
314 | my ($self) = @_; |
256 | |
315 | |
257 | my ($x, $y); |
316 | my ($x, $y); |
258 | for (@{$self->{childs} || []}) { |
317 | for (@{$self->{childs} || []}) { |
259 | glPushMatrix; |
318 | $_->move (0, $y, 0); #TODO: move to size_request |
260 | glTranslate (0, $y, 0); |
|
|
261 | $_->_draw; |
319 | $_->draw; |
262 | glPopMatrix; |
|
|
263 | my ($w, $h) = $_->size_request; |
320 | my ($w, $h) = $_->size_request; |
264 | $y += $h; |
321 | $y += $h; |
265 | } |
322 | } |
266 | } |
323 | } |
267 | |
324 | |
… | |
… | |
305 | |
362 | |
306 | my $tex = $self->{texture}; |
363 | my $tex = $self->{texture}; |
307 | |
364 | |
308 | glEnable GL_BLEND; |
365 | glEnable GL_BLEND; |
309 | glEnable GL_TEXTURE_2D; |
366 | glEnable GL_TEXTURE_2D; |
310 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
367 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL; |
311 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
368 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
312 | |
369 | |
313 | glColor 1, 1, 1; |
370 | glColor 1, 0, 1; |
314 | |
371 | |
315 | glBegin GL_QUADS; |
372 | glBegin GL_QUADS; |
316 | glTexCoord 0, 0; glVertex 0 , 0; |
373 | glTexCoord 0, 0; glVertex 0 , 0; |
317 | glTexCoord 0, 1; glVertex 0 , $tex->{height}; |
374 | glTexCoord 0, 1; glVertex 0 , $tex->{height}; |
318 | glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; |
375 | glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; |
… | |
… | |
344 | |
401 | |
345 | package Crossfire::Client::Widget::MapWidget; |
402 | package Crossfire::Client::Widget::MapWidget; |
346 | |
403 | |
347 | use strict; |
404 | use strict; |
348 | |
405 | |
349 | our @ISA = qw/Crossfire::Client::Widget/; |
406 | use List::Util qw(min max); |
350 | |
407 | |
351 | use SDL; |
408 | use SDL; |
352 | use SDL::OpenGL; |
409 | use SDL::OpenGL; |
353 | use SDL::OpenGL::Constants; |
410 | use SDL::OpenGL::Constants; |
|
|
411 | |
|
|
412 | our @ISA = Crossfire::Client::Widget::; |
354 | |
413 | |
355 | sub key_down { |
414 | sub key_down { |
356 | print "MAPKEYDOWN\n"; |
415 | print "MAPKEYDOWN\n"; |
357 | } |
416 | } |
358 | |
417 | |
359 | sub key_up { |
418 | sub key_up { |
360 | } |
419 | } |
361 | |
420 | |
362 | sub _draw { |
421 | sub _draw { |
|
|
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 | } |
|
|
445 | |
363 | glEnable GL_TEXTURE_2D; |
446 | glEnable GL_TEXTURE_2D; |
364 | glEnable GL_BLEND; |
447 | glEnable GL_BLEND; |
365 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
448 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
366 | |
449 | |
367 | my $map = $::CONN->{map}; |
450 | for my $x (0 .. $sw - 1) { |
368 | |
|
|
369 | for my $x (0 .. $::CONN->{mapw} - 1) { |
|
|
370 | for my $y (0 .. $::CONN->{maph} - 1) { |
451 | for my $y (0 .. $sh - 1) { |
371 | |
452 | |
372 | my $cell = $map->[$x][$y] |
453 | my $cell = $map->[$x + $xofs][$y + $yofs] |
373 | or next; |
454 | or next; |
374 | |
455 | |
375 | my $darkness = $cell->[3] * (1 / 255); |
456 | my $darkness = $cell->[0] * (1 / 255); |
|
|
457 | if ($darkness < 0) { |
|
|
458 | glColor 0.3, 0.3, 0.3; |
|
|
459 | } else { |
376 | glColor $darkness, $darkness, $darkness; |
460 | glColor $darkness, $darkness, $darkness; |
|
|
461 | } |
377 | |
462 | |
378 | for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { |
463 | for my $num (grep $_, @$cell[1,2,3]) { |
379 | my $tex = $::CONN->{face}[$num]{texture} || next; |
464 | my $tex = $::CONN->{face}[$num]{texture} || next; |
380 | |
465 | |
381 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
466 | glBindTexture GL_TEXTURE_2D, $tex->{name}; |
382 | |
467 | |
383 | my $w = $tex->{width}; |
468 | my $w = $tex->{width}; |