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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.36 by elmex, Sun Apr 9 17:39:56 2006 UTC

… …
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42 $self->w ($w);
43 $self->h ($h);
50} 44}
51 45
52sub focus_in { 46sub focus_in {
53 my ($widget) = @_; 47 my ($widget) = @_;
54 $FOCUS = $widget; 48 $FOCUS = $widget;
… …
72 66
73sub button_up { 67sub button_up {
74 my ($widget, $sdlev) = @_; 68 my ($widget, $sdlev) = @_;
75} 69}
76 70
77sub w { $_[0]->{w} } 71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 76
83sub draw { 77sub draw {
… …
92sub _draw { 86sub _draw {
93 my ($widget) = @_; 87 my ($widget) = @_;
94} 88}
95 89
96sub bbox { 90sub bbox {
97 my ($widget) = @_; 91 my ($self) = @_;
92 my ($w, $h) = $self->size_request;
93 (
94 $self->{x},
95 $self->{y},
96 $self->{x} = $w,
97 $self->{y} = $h
98 )
99}
100
101sub del_parent { $_[0]->{parent} = undef }
102
103sub set_parent {
104 my ($self, $par) = @_;
105
106 $self->{parent} = $par;
107 Scalar::Util::weaken $self->{parent};
108}
109
110sub get_parent {
111 $_[0]->{parent}
112}
113
114sub update {
115 my ($self) = @_;
116
117 $self->{parent}->update
118 if $self->{parent};
98} 119}
99 120
100sub DESTROY { 121sub DESTROY {
101 my ($self) = @_; 122 my ($self) = @_;
102 123
103 $self->deactivate; 124 #$self->deactivate;
104} 125}
105 126
106package Crossfire::Client::Widget::Container; 127package Crossfire::Client::Widget::Bin;
107 128
108our @ISA = Crossfire::Client::Widget::; 129our @ISA = Crossfire::Client::Widget::;
109 130
110use SDL::OpenGL; 131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] }
111
112sub add { $_[0]->{child} = $_[1] }
113sub get { $_[0]->{child} } 132sub get { $_[0]->{child} }
114 133
134sub remove {
135 my ($self, $chld) = @_;
136 delete $self->{child}
137 if $self->{child} == $chld;
138}
139
140sub size_request {
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 141 $_[0]->{child}->size_request if $_[0]->{child}
142}
143sub size_allocate {
144 my ($self, $w, $h) = @_;
145 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h)
147 if $self->{child}
148}
116 149
117sub _draw { die "Containers can't be drawn!" } 150sub _draw {
151 my ($self) = @_;
118 152
153 $self->{child}->draw;
154}
155
119package Crossfire::Client::Widget::Window; 156package Crossfire::Client::Widget::Toplevel;
120 157
121our @ISA = Crossfire::Client::Widget::Container::; 158our @ISA = Crossfire::Client::Widget::;
122 159
123use SDL::OpenGL; 160use SDL::OpenGL;
124 161
125sub add { 162sub add {
126 my ($self, $chld) = @_; 163 my ($self, $chld) = @_;
164
165 push @{$self->{childs}}, $chld;
166 @{$self->{childs}} =
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169
170 $chld->set_parent ($self);
171 $chld->size_allocate ($chld->size_request);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
127 $self->SUPER::add ($chld); 202 $self->SUPER::add ($chld);
128 $self->render_chld; #TODO: Move this to the size_request event propably? 203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
129} 215}
130 216
131sub render_chld { 217sub render_chld {
132 my ($self) = @_; 218 my ($self) = @_;
133 my $chld = $self->get; 219 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 220 my ($w, $h) = $self->size_request;
135 221
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
136 $self->{texture} = 225 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 226 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 227 $w, $h, sub { $chld->draw }
139 ); 228 );
140 $self->{texture}->upload; 229 $self->{texture}->upload;
141} 230}
142 231
143sub size_request { 232sub size_request {
144 my ($self) = @_; 233 my ($self) = @_;
145 my $chld = $self->get 234 ($self->w, $self->h)
146 or return (0, 0);
147 $chld->size_request
148} 235}
149 236
150sub _draw { 237sub size_allocate {
151 my ($self) = @_; 238 my ($self, $w, $h) = @_;
152 239
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 240 $self->w ($w);
241 $self->h ($h);
242 $self->get->size_allocate ($w, $h);
243
244 $self->update; #TODO: Move this to the size_request event propably?
245}
246
247sub _draw {
248 my ($self) = @_;
249
250 my ($w, $h) = ($self->w, $self->h);
154 251
155 my $tex = $self->{texture} 252 my $tex = $self->{texture}
156 or return; 253 or return;
157 254
158 glEnable GL_BLEND; 255 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 256 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name}; 258 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 0, 1;
164 259
165 glBegin GL_QUADS; 260 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0; 261 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h; 262 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h; 263 glTexCoord 1, 1; glVertex $w, $h;
… …
173 glDisable GL_TEXTURE_2D; 268 glDisable GL_TEXTURE_2D;
174} 269}
175 270
176package Crossfire::Client::Widget::Frame; 271package Crossfire::Client::Widget::Frame;
177 272
178our @ISA = Crossfire::Client::Widget::Container::; 273our @ISA = Crossfire::Client::Widget::Bin::;
179 274
180use SDL::OpenGL; 275use SDL::OpenGL;
181 276
182sub size_request { 277sub size_request {
183 my ($self) = @_; 278 my ($self) = @_;
… …
185 or return (0, 0); 280 or return (0, 0);
186 281
187 $chld->move (2, 2); 282 $chld->move (2, 2);
188 283
189 map { $_ + 4 } $chld->size_request; 284 map { $_ + 4 } $chld->size_request;
285}
286
287sub size_allocate {
288 my ($self, $w, $h) = @_;
289
290 $self->w ($w);
291 $self->h ($h);
292
293 $self->get->size_allocate ($w - 4, $h - 4);
294 $self->get->move (2, 2);
190} 295}
191 296
192sub _draw { 297sub _draw {
193 my ($self) = @_; 298 my ($self) = @_;
194 299
… …
211 316
212our @ISA = Crossfire::Client::Widget::Frame::; 317our @ISA = Crossfire::Client::Widget::Frame::;
213 318
214use SDL::OpenGL; 319use SDL::OpenGL;
215 320
216#TODO: implement themed frame 321sub new {
322 my ($self, $theme) = @_;
323 $self = $self->SUPER::new;
324
325 $self->{txts} = [
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
328 ];
329 $self
330}
331
332sub size_request {
333 my ($self) = @_;
334 my ($w, $h) = $self->get->size_request;
335
336 $h += $self->{txts}->[1]->{height};
337 $h += $self->{txts}->[4]->{height};
338 $w += $self->{txts}->[2]->{width};
339 $w += $self->{txts}->[3]->{width};
340
341 ($w, $h)
342}
343
344sub size_allocate {
345 my ($self, $w, $h) = @_;
346
347 $self->w ($w);
348 $self->h ($h);
349 $h -= $self->{txts}->[1]->{height};
350 $h -= $self->{txts}->[4]->{height};
351 $w -= $self->{txts}->[2]->{width};
352 $w -= $self->{txts}->[3]->{width};
353
354 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n";
357 $self->get->size_allocate ($w, $h);
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
359}
360
361sub _draw {
362 my ($self) = @_;
363
364 my ($w, $h) = ($self->w, $self->h);
365 my ($cw, $ch) = ($self->get->w, $self->get->h);
366
367 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371
372 my $top = $self->{txts}->[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name};
374
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name};
384
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name};
394
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name};
404
405 glBegin GL_QUADS;
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417
418 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height};
420
421 glBegin GL_QUADS;
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427
428 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D;
430
431 $self->get->draw;
432
433}
217 434
218package Crossfire::Client::Widget::Table; 435package Crossfire::Client::Widget::Table;
219 436
220our @ISA = Crossfire::Client::Widget::Container::; 437our @ISA = Crossfire::Client::Widget::Bin::;
221 438
222use SDL::OpenGL; 439use SDL::OpenGL;
223 440
224sub add { 441sub add {
225 my ($self, $x, $y, $chld) = @_; 442 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x];
444
226 $self->{childs}[$y][$x] = $chld; 445 $self->{childs}[$y][$x] = $chld;
446 $chld->set_parent ($self);
447 $self->update;
227} 448}
228 449
229sub max_row_height { 450sub max_row_height {
230 my ($self, $row) = @_; 451 my ($self, $row) = @_;
231 452
… …
296 } 517 }
297} 518}
298 519
299package Crossfire::Client::Widget::VBox; 520package Crossfire::Client::Widget::VBox;
300 521
301our @ISA = Crossfire::Client::Widget::Container::; 522our @ISA = Crossfire::Client::Widget::Bin::;
302 523
303use SDL::OpenGL; 524use SDL::OpenGL;
304 525
305sub add { 526sub add {
306 my ($self, $chld) = @_; 527 my ($self, $chld, $expand) = @_;
307 push @{$self->{childs}}, $chld; 528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update;
308} 532}
309 533
310sub size_request { 534sub size_request {
311 my ($self) = @_; 535 my ($self) = @_;
312 536
… …
318 } 542 }
319 543
320 return ($ws, $hs); 544 return ($ws, $hs);
321} 545}
322 546
547sub size_allocate {
548 my ($self, $w, $h) = @_;
549
550 $self->w ($w);
551 $self->h ($h);
552
553 my $exp;
554 my @oth;
555 # find expand widget
556 for (@{$self->{childs}}) {
557 if ($_->{expand}) {
558 $exp = $_;
559 last;
560 }
561 push @oth, $_;
562 }
563
564 my ($ow, $oh);
565
566 # get sizes of other widgets
567 for (@oth) {
568 my ($w, $h) = $_->size_request;
569 $oh += $h;
570 if ($ow < $w) { $ow = $w }
571 }
572
573 my $y = 0;
574 for (@{$self->{childs}}) {
575 $_->move (0, $y);
576
577 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh;
580 } else {
581 my ($cw, $h) = $_->size_request;
582 $_->size_allocate ($w, $h);
583 $y += $h;
584 }
585 }
586}
587
323sub _draw { 588sub _draw {
324 my ($self) = @_; 589 my ($self) = @_;
325 590
326 my ($x, $y); 591 my ($x, $y);
327 for (@{$self->{childs} || []}) { 592 for (@{$self->{childs} || []}) {
328 $_->move (0, $y, 0); #TODO: move to size_request
329 $_->draw; 593 $_->draw;
330 my ($w, $h) = $_->size_request;
331 $y += $h; 594 $y += $_->h;
332 } 595 }
333} 596}
334 597
335package Crossfire::Client::Widget::Label; 598package Crossfire::Client::Widget::Label;
336 599
… …
339use SDL::OpenGL; 602use SDL::OpenGL;
340 603
341sub new { 604sub new {
342 my ($class, $x, $y, $z, $height, $text) = @_; 605 my ($class, $x, $y, $z, $height, $text) = @_;
343 606
607 # TODO: color, and make height, xyz etc. optional
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345 609
346 $self->set_text ($text); 610 $self->set_text ($text);
347 611
348 $self 612 $self
… …
350 614
351sub set_text { 615sub set_text {
352 my ($self, $text) = @_; 616 my ($self, $text) = @_;
353 617
354 $self->{text} = $text; 618 $self->{text} = $text;
355
356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
620
621 $self->update;
357} 622}
358 623
359sub get_text { 624sub get_text {
360 my ($self, $text) = @_; 625 my ($self, $text) = @_;
361 626
… …
380 glEnable GL_TEXTURE_2D; 645 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383 glBindTexture GL_TEXTURE_2D, $tex->{name}; 648 glBindTexture GL_TEXTURE_2D, $tex->{name};
384 649
385 glColor 1, 1, 1, 0.8; 650 glColor 1, 0, 0, 1; # TODO color
386 651
387 glBegin GL_QUADS; 652 glBegin GL_QUADS;
388 glTexCoord 0, 0; glVertex 0 , 0; 653 glTexCoord 0, 0; glVertex 0 , 0;
389 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 654 glTexCoord 0, 1; glVertex 0 , $tex->{height};
390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
420 $text .= chr $uni; 685 $text .= chr $uni;
421 } 686 }
422 $self->set_text ($text); 687 $self->set_text ($text);
423} 688}
424 689
425
426# XXX: TextView isn't neccessary with pango multiline text rendering
427package Crossfire::Client::Widget::TextView;
428
429use strict;
430
431our @ISA = qw/Crossfire::Client::Widget/;
432
433use SDL::OpenGL;
434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_;
438 my $self = $class->SUPER::new ();
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447}
448
449#sub render_lines {
450# my ($self) = @_;
451#
452# $self->{txt_lines} = [];
453#
454# for (@{$self->{lines}}) {
455# push @{$self->{txt_lines}},
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# }
458#}
459
460sub add_line {
461 my ($self, $line) = @_;
462 push @{$self->{lines}}, $line;
463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
482sub draw_line {
483 my ($self, $tex, $y) = @_;
484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488
489 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
493 glTexCoord 1, 0; glVertex $tex->{width}, $y;
494 glEnd;
495}
496
497sub _draw {
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
512}
513
514package Crossfire::Client::Widget::MapWidget; 690package Crossfire::Client::Widget::MapWidget;
515 691
516use strict; 692use strict;
517 693
518use List::Util qw(min max); 694use List::Util qw(min max);
… …
526sub key_down { 702sub key_down {
527 print "MAPKEYDOWN\n"; 703 print "MAPKEYDOWN\n";
528} 704}
529 705
530sub key_up { 706sub key_up {
707}
708
709sub size_request {
710
711}
712
713sub size_allocate {
531} 714}
532 715
533sub _draw { 716sub _draw {
534 my ($self) = @_; 717 my ($self) = @_;
535 718
… …
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 } 739 }
557 740
558 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
559 glEnable GL_BLEND; 742 glEnable GL_BLEND;
560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh);
561 747
562 for my $x (0 .. $sw - 1) { 748 for my $x (0 .. $sw - 1) {
563 for my $y (0 .. $sh - 1) { 749 for my $y (0 .. $sh - 1) {
564 750
565 my $cell = $map->[$x + $xofs][$y + $yofs] 751 my $cell = $map->[$x + $xofs][$y + $yofs]
566 or next; 752 or next;
567 753
568 my $darkness = $cell->[0] * (1 / 255); 754 my $darkness = $cell->[0] * (1 / 255);
569 if ($darkness < 0) { 755 if ($darkness < 0) {
570 glColor 0.3, 0.3, 0.3; 756 $darkness = 0.15;
571 } else {
572 glColor $darkness, $darkness, $darkness;
573 } 757 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
574 759
575 for my $num (grep $_, @$cell[1,2,3]) { 760 for my $num (grep $_, @$cell[1,2,3]) {
576 my $tex = $::CONN->{face}[$num]{texture} || next; 761 my $tex = $::CONN->{face}[$num]{texture} || next;
577 762
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 763 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
590 glTexCoord 1, 0; glVertex $px + $w, $py; 775 glTexCoord 1, 0; glVertex $px + $w, $py;
591 glEnd; 776 glEnd;
592 } 777 }
593 } 778 }
594 } 779 }
780
781# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784#
785# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
786#
787# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs;
789# }
790
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
595 809
596 glDisable GL_TEXTURE_2D; 810 glDisable GL_TEXTURE_2D;
597 glDisable GL_BLEND; 811 glDisable GL_BLEND;
598} 812}
599 813
… …
646 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647 $::CONN->send ("command run_stop"); 861 $::CONN->send ("command run_stop");
648 } 862 }
649} 863}
650 864
865package Crossfire::Client::Widget::Animator;
866
867use SDL::OpenGL;
868
869our @ISA = Crossfire::Client::Widget::Bin::;
870
871sub moveto {
872 my ($self, $x, $y) = @_;
873
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.01;
876 $self->{time} = 1;
877
878 ::animation_start $self;
879}
880
881sub animate {
882 my ($self, $interval) = @_;
883
884 $self->{time} -= $interval * $self->{speed};
885 if ($self->{time} <= 0) {
886 $self->{time} = 0;
887 ::animation_stop $self;
888 }
889
890 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
891
892 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
893 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
894}
895
896sub _draw {
897 my ($self) = @_;
898
899 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0;
901 $self->{child}->draw;
902 glPopMatrix;
903}
904
6511; 9051;
652 906

Diff Legend

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