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.6 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.47 by root, Sun Apr 9 22:24:43 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2
2use strict; 3use strict;
3 4
4our $FOCUS; # the widget with current focus 5use Scalar::Util;
5our %ACTIVE_WIDGETS; 6
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
6 11
7# class methods for events 12# class methods for events
8sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
9sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
10sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
11sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
12 17
13sub new { 18sub new {
14 my $class = shift; 19 my $class = shift;
15 my $self = { @_ };
16 bless $self, $class;
17 return $self;
18}
19 20
20sub activate { 21 bless { @_ }, $class
21 $ACTIVE_WIDGETS{$_[0]} = $_[0];
22} 22}
23 23
24sub deactivate { 24sub move {
25 delete $ACTIVE_WIDGETS{$_[0]}; 25 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x;
27 $self->{y} = $y;
28 $self->{z} = $z if defined $z;
29}
30
31sub needs_redraw {
32 0
33}
34
35sub size_request {
36 require Carp;
37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
26} 45}
27 46
28sub focus_in { 47sub focus_in {
29 my ($widget) = @_; 48 my ($widget) = @_;
30 $FOCUS = $widget; 49 $::FOCUS = $widget;
31} 50}
32 51
33sub focus_out { 52sub focus_out {
34 my ($widget) = @_; 53 my ($widget) = @_;
35} 54}
… …
48 67
49sub button_up { 68sub button_up {
50 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
51} 70}
52 71
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
77
53sub draw { 78sub draw {
54 my ($widget) = @_; 79 my ($self) = @_;
80
81 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 1;
86 glBegin GL_LINES;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glVertex 0, 0;
92 glEnd;
93 }
94 glPopMatrix;
95}
96
97sub _draw {
98 my ($self) = @_;
99
100 warn "no draw defined for $self\n";
55} 101}
56 102
57sub bbox { 103sub bbox {
104 my ($self) = @_;
105 my ($w, $h) = $self->size_request;
106 (
107 $self->{x},
108 $self->{y},
109 $self->{x} = $w,
110 $self->{y} = $h
111 )
112}
113
114sub find_widget {
115 my ($self, $x, $y) = @_;
116
117 return $self
118 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
119 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
120
121 ()
122}
123
124sub del_parent { $_[0]->{parent} = undef }
125
126sub set_parent {
127 my ($self, $par) = @_;
128
129 $self->{parent} = $par;
130 Scalar::Util::weaken $self->{parent};
131}
132
133sub get_parent {
134 $_[0]->{parent}
135}
136
137sub update {
138 my ($self) = @_;
139
140 $self->{parent}->update
141 if $self->{parent};
142}
143
144sub DESTROY {
145 my ($self) = @_;
146
147 #$self->deactivate;
148}
149
150#############################################################################
151
152package Crossfire::Client::Widget::Container;
153
154our @ISA = Crossfire::Client::Widget::;
155
156sub new {
157 my ($class, @widgets) = @_;
158
159 my $self = $class->SUPER::new (children => []);
160 $self->add ($_) for @widgets;
161
162 $self
163}
164
165sub add {
166 my ($self, $chld, $expand) = @_;
167
168 $chld->{expand} = $expand;
169 $chld->set_parent ($self);
170
171 @{$self->{children}} =
172 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld;
174
175 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state"
177}
178
179sub remove {
58 my ($widget) = @_; 180 my ($self, $widget) = @_;
59}
60 181
61package Client::TextView; 182 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
183
184 $self->size_allocate ($self->{w}, $self->{h});
185}
186
187sub find_widget {
188 my ($self, $x, $y) = @_;
189
190 $x -= $self->{x};
191 $y -= $self->{y};
192
193 my $res;
194
195 for (reverse @{ $self->{children} }) {
196 $res = $_->find_widget ($x, $y)
197 and return $res;
198 }
199
200 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
201}
202
203sub _draw {
204 my ($self) = @_;
205
206 $_->draw for @{$self->{children}};
207}
208
209#############################################################################
210
211package Crossfire::Client::Widget::Bin;
212
213our @ISA = Crossfire::Client::Widget::Container::;
214
215sub child { $_[0]->{children}[0] }
216
217sub size_request {
218 $_[0]{children}[0]->size_request if $_[0]{children}[0];
219}
220
221sub size_allocate {
222 my ($self, $w, $h) = @_;
223
224 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0]
227}
228
229#############################################################################
230
231package Crossfire::Client::Widget::Toplevel;
232
233our @ISA = Crossfire::Client::Widget::Container::;
234
235sub update {
236 my ($self) = @_;
237
238 ::refresh ();
239}
240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
249#############################################################################
250
251package Crossfire::Client::Widget::Window;
252
253our @ISA = Crossfire::Client::Widget::Bin::;
254
255use SDL::OpenGL;
256
257sub new {
258 my ($class, $x, $y, $z, $w, $h) = @_;
259
260 my $self = $class->SUPER::new;
261
262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
263}
264
265sub update {
266 my ($self) = @_;
267
268 $self->render_chld;
269 $self->SUPER::update;
270}
271
272sub render_chld {
273 my ($self) = @_;
274
275 $self->{texture} =
276 Crossfire::Client::Texture->new_from_opengl (
277 $self->{w}, $self->{h}, sub { $self->child->draw }
278 );
279}
280
281sub size_allocate {
282 my ($self, $w, $h) = @_;
283
284 $self->{w} = $w;
285 $self->{h} = $h;
286
287 $self->child->size_allocate ($w, $h);
288
289 $self->render_chld;
290}
291
292sub _draw {
293 my ($self) = @_;
294
295 my ($w, $h) = ($self->w, $self->h);
296
297 my $tex = $self->{texture}
298 or return;
299
300 glEnable GL_BLEND;
301 glEnable GL_TEXTURE_2D;
302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
303 glBindTexture GL_TEXTURE_2D, $tex->{name};
304
305 glBegin GL_QUADS;
306 glTexCoord 0, 0; glVertex 0, 0;
307 glTexCoord 0, 1; glVertex 0, $h;
308 glTexCoord 1, 1; glVertex $w, $h;
309 glTexCoord 1, 0; glVertex $w, 0;
310 glEnd;
311
312 glDisable GL_BLEND;
313 glDisable GL_TEXTURE_2D;
314}
315
316#############################################################################
317
318package Crossfire::Client::Widget::Frame;
319
320our @ISA = Crossfire::Client::Widget::Bin::;
321
322use SDL::OpenGL;
323
324sub size_request {
325 my ($self) = @_;
326 my $chld = $self->child
327 or return (0, 0);
328
329 $chld->move (2, 2);
330
331 map { $_ + 4 } $chld->size_request;
332}
333
334sub size_allocate {
335 my ($self, $w, $h) = @_;
336
337 $self->{w} = $w;
338 $self->{h} = $h;
339
340 $self->child->size_allocate ($w - 4, $h - 4);
341 $self->child->move (2, 2);
342}
343
344sub _draw {
345 my ($self) = @_;
346
347 my $chld = $self->child;
348
349 my ($w, $h) = $chld->size_request;
350
351 glBegin GL_QUADS;
352 glColor 0, 0, 0;
353 glTexCoord 0, 0; glVertex 0 , 0;
354 glTexCoord 0, 1; glVertex 0 , $h + 4;
355 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
356 glTexCoord 1, 0; glVertex $w + 4 , 0;
357 glEnd;
358
359 $chld->draw;
360}
361
362#############################################################################
363
364package Crossfire::Client::Widget::FancyFrame;
365
366our @ISA = Crossfire::Client::Widget::Bin::;
367
368use SDL::OpenGL;
369
370my @tex =
371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
373
374sub size_request {
375 my ($self) = @_;
376
377 my ($w, $h) = $self->SUPER::size_request;
378
379 $h += $tex[1]->{height};
380 $h += $tex[4]->{height};
381 $w += $tex[2]->{width};
382 $w += $tex[3]->{width};
383
384 ($w, $h)
385}
386
387sub size_allocate {
388 my ($self, $w, $h) = @_;
389
390 $self->SUPER::size_allocate ($w, $h);
391
392 $h -= $tex[1]->{height};
393 $h -= $tex[4]->{height};
394 $w -= $tex[2]->{width};
395 $w -= $tex[3]->{width};
396
397 $h = $h < 0 ? 0 : $h;
398 $w = $w < 0 ? 0 : $w;
399
400 $self->child->size_allocate ($w, $h);
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
402}
403
404sub _draw {
405 my ($self) = @_;
406
407 my ($w, $h) = ($self->{w}, $self->{h});
408 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
409
410 glEnable GL_BLEND;
411 glEnable GL_TEXTURE_2D;
412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
414
415 my $top = $tex[1];
416 glBindTexture GL_TEXTURE_2D, $top->{name};
417
418 glBegin GL_QUADS;
419 glTexCoord 0, 0; glVertex 0 , 0;
420 glTexCoord 0, 1; glVertex 0 , $top->{height};
421 glTexCoord 1, 1; glVertex $w , $top->{height};
422 glTexCoord 1, 0; glVertex $w , 0;
423 glEnd;
424
425 my $left = $tex[3];
426 glBindTexture GL_TEXTURE_2D, $left->{name};
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , $top->{height};
430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
433 glEnd;
434
435 my $right = $tex[2];
436 glBindTexture GL_TEXTURE_2D, $right->{name};
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $w , $top->{height};
443 glEnd;
444
445 my $bottom = $tex[4];
446 glBindTexture GL_TEXTURE_2D, $bottom->{name};
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
450 glTexCoord 0, 1; glVertex 0 , $h;
451 glTexCoord 1, 1; glVertex $w , $h;
452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
453 glEnd;
454
455 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460
461 my $rep_x = $cw / $bg->{width};
462 my $rep_y = $ch / $bg->{height};
463
464 glBegin GL_QUADS;
465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
469 glEnd;
470
471 glDisable GL_BLEND;
472 glDisable GL_TEXTURE_2D;
473
474 $self->child->draw;
475
476}
477
478#############################################################################
479
480package Crossfire::Client::Widget::Table;
481
482our @ISA = Crossfire::Client::Widget::Bin::;
483
484use SDL::OpenGL;
485
486sub add {
487 my ($self, $x, $y, $chld) = @_;
488 my $old_chld = $self->{children}[$y][$x];
489
490 $self->{children}[$y][$x] = $chld;
491 $chld->set_parent ($self);
492 $self->update;
493}
494
495sub max_row_height {
496 my ($self, $row) = @_;
497
498 my $hs = 0;
499 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
500 my $c = $self->{children}->[$row]->[$xi];
501 if ($c) {
502 my ($w, $h) = $c->size_request;
503 if ($hs < $h) { $hs = $h }
504 }
505 }
506 return $hs;
507}
508
509sub max_col_width {
510 my ($self, $col) = @_;
511
512 my $ws = 0;
513 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
514 my $c = ($self->{children}->[$yi] || [])->[$col];
515 if ($c) {
516 my ($w, $h) = $c->size_request;
517 if ($ws < $w) { $ws = $w }
518 }
519 }
520 return $ws;
521}
522
523sub size_request {
524 my ($self) = @_;
525
526 my ($hs, $ws) = (0, 0);
527
528 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
529 $hs += $self->max_row_height ($yi);
530 }
531
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
533 my $wm = 0;
534 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
535 $wm += $self->max_col_width ($xi)
536 }
537 if ($ws < $wm) { $ws = $wm }
538 }
539
540 return ($ws, $hs);
541}
542
543sub _draw {
544 my ($self) = @_;
545
546 my $y = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
548 my $x = 0;
549
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
551
552 my $c = $self->{children}->[$yi]->[$xi];
553 if ($c) {
554 $c->move ($x, $y, 0); #TODO: Move to size_request
555 $c->draw if $c;
556 }
557
558 $x += $self->max_col_width ($xi);
559 }
560
561 $y += $self->max_row_height ($yi);
562 }
563}
564
565#############################################################################
566
567package Crossfire::Client::Widget::VBox;
568
569our @ISA = Crossfire::Client::Widget::Container::;
570
571use SDL::OpenGL;
572
573sub size_request {
574 my ($self) = @_;
575
576 my @alloc = map [$_->size_request], @{$self->{children}};
577
578 (
579 (List::Util::max map $_->[0], @alloc),
580 (List::Util::sum map $_->[1], @alloc),
581 )
582}
583
584sub size_allocate {
585 my ($self, $w, $h) = @_;
586
587 $self->w ($w);
588 $self->h ($h);
589
590 my $exp;
591 my @oth;
592 # find expand widget
593 for (@{$self->{children}}) {
594 if ($_->{expand}) {
595 $exp = $_;
596 last;
597 }
598 push @oth, $_;
599 }
600
601 my ($ow, $oh);
602
603 # get sizes of other widgets
604 for (@oth) {
605 my ($w, $h) = $_->size_request;
606 $oh += $h;
607 if ($ow < $w) { $ow = $w }
608 }
609
610 my $y = 0;
611 for (@{$self->{children}}) {
612 $_->move (0, $y);
613
614 if ($_ == $exp) {
615 $_->size_allocate ($w, $h - $oh);
616 $y += $h - $oh;
617 } else {
618 my ($cw, $h) = $_->size_request;
619 $_->size_allocate ($w, $h);
620 $y += $h;
621 }
622 }
623}
624
625#############################################################################
626
627package Crossfire::Client::Widget::Label;
628
629our @ISA = Crossfire::Client::Widget::;
630
631use SDL::OpenGL;
632
633sub new {
634 my ($class, $x, $y, $z, $height, $text) = @_;
635
636 # TODO: color, and make height, xyz etc. optional
637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
638
639 $self->set_text ($text);
640
641 $self
642}
643
644sub set_text {
645 my ($self, $text) = @_;
646
647 $self->{text} = $text;
648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
649
650 $self->update;
651}
652
653sub get_text {
654 my ($self, $text) = @_;
655
656 $self->{text}
657}
658
659sub size_request {
660 my ($self) = @_;
661
662 (
663 $self->{texture}{width},
664 $self->{texture}{height},
665 )
666}
667
668sub _draw {
669 my ($self) = @_;
670
671 my $tex = $self->{texture};
672
673 glEnable GL_BLEND;
674 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
677 glBindTexture GL_TEXTURE_2D, $tex->{name};
678
679 glColor 1, 0, 0, 1; # TODO color
680
681 glBegin GL_QUADS;
682 glTexCoord 0, 0; glVertex 0 , 0;
683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
685 glTexCoord 1, 0; glVertex $tex->{width}, 0;
686 glEnd;
687
688 glDisable GL_BLEND;
689 glDisable GL_TEXTURE_2D;
690}
691
692#############################################################################
693
694package Crossfire::Client::Widget::TextEntry;
695
696our @ISA = Crossfire::Client::Widget::Label::;
697
698use SDL;
699use SDL::OpenGL;
700
701sub key_down {
702 my ($self, $ev) = @_;
703
704 my $mod = $ev->key_mod;
705 my $sym = $ev->key_sym;
706
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode;
709
710 my $text = $self->get_text;
711
712 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, '';
714
715 } elsif ($uni) {
716 $text .= chr $uni;
717 }
718 $self->set_text ($text);
719}
720
721#############################################################################
722
723package Crossfire::Client::Widget::MapWidget;
62 724
63use strict; 725use strict;
64our @ISA = qw/Client::Widget/;
65 726
727use List::Util qw(min max);
728
729use SDL;
66use SDL::OpenGL; 730use SDL::OpenGL;
67use SDL::OpenGL::Constants; 731use SDL::OpenGL::Constants;
68 732
69sub add_line {
70 my ($self, $line) = @_;
71 push @{$self->{lines}}, $line;
72}
73
74sub draw {
75 my ($self) = @_;
76
77}
78
79package Client::MapWidget;
80
81use strict;
82our @ISA = qw/Client::Widget/; 733our @ISA = Crossfire::Client::Widget::;
83
84use SDL::OpenGL;
85use SDL::OpenGL::Constants;
86 734
87sub key_down { 735sub key_down {
88 print "MAPKEYDOWN\n"; 736 print "MAPKEYDOWN\n";
89} 737}
90 738
91sub key_up { 739sub key_up {
92} 740}
93 741
94my $x; 742sub size_request {
95 743
744}
745
746sub size_allocate {
747}
748
96sub draw { 749sub _draw {
750 my ($self) = @_;
751
752 my $mx = $::CONN->{mapx};
753 my $my = $::CONN->{mapy};
754
755 my $map = $::CONN->{map};
756
757 my ($xofs, $yofs);
758
759 my $sw = 1 + int $::WIDTH / 32;
760 my $sh = 1 + int $::HEIGHT / 32;
761
762 if ($::CONN->{mapw} > $sw) {
763 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
764 } else {
765 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
766 }
767
768 if ($::CONN->{maph} > $sh) {
769 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
770 } else {
771 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
772 }
773
97 glEnable GL_TEXTURE_2D; 774 glEnable GL_TEXTURE_2D;
98 glEnable GL_BLEND; 775 glEnable GL_BLEND;
776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
99 777
100 glPushMatrix; 778 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh);
101 780
102 my $map = $::CONN->{map}; 781 for my $x (0 .. $sw - 1) {
103
104 for my $x (0 .. $::CONN->{mapw} - 1) {
105 for my $y (0 .. $::CONN->{maph} - 1) { 782 for my $y (0 .. $sh - 1) {
106 783
107 my $cell = $map->[$x][$y] 784 my $cell = $map->[$x + $xofs][$y + $yofs]
108 or next; 785 or next;
109 786
110 my $darkness = $cell->[3] * (1 / 255); 787 my $darkness = $cell->[0] * (1 / 255);
111 glColor $darkness, $darkness, $darkness; 788 if ($darkness < 0) {
789 $darkness = 0.15;
790 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
112 792
113 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 793 for my $num (grep $_, @$cell[1,2,3]) {
114 my $tex = $::CONN->{face}[$num]{texture} || next; 794 my $tex = $::CONN->{face}[$num]{texture} || next;
115 795
116 glBindTexture GL_TEXTURE_2D, $tex->{name}; 796 glBindTexture GL_TEXTURE_2D, $tex->{name};
117 797
798 my $w = $tex->{width};
799 my $h = $tex->{height};
800
801 my $px = ($x + 1) * 32 - $w;
802 my $py = ($y + 1) * 32 - $h;
803
118 glBegin GL_QUADS; 804 glBegin GL_QUADS;
119 glTexCoord 0, 0; glVertex $x, $y; 805 glTexCoord 0, 0; glVertex $px , $py;
120 glTexCoord 0, 1; glVertex $x, $y + 1; 806 glTexCoord 0, 1; glVertex $px , $py + $h;
121 glTexCoord 1, 1; glVertex $x + 1, $y + 1; 807 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
122 glTexCoord 1, 0; glVertex $x + 1, $y; 808 glTexCoord 1, 0; glVertex $px + $w, $py;
123 glEnd; 809 glEnd;
124 } 810 }
125 } 811 }
126 } 812 }
127 813
128 glPopMatrix; 814# if (1) { # higher quality darkness
815# $lighting =~ s/(.)/$1$1$1/gs;
816# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
817#
818# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
819#
820# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs;
822# }
823
824 $lighting = new Crossfire::Client::Texture
825 width => $sw4,
826 height => $sh,
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
832 glColor 0, 0, 0, 0.75;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
129 842
130 glDisable GL_TEXTURE_2D; 843 glDisable GL_TEXTURE_2D;
131 glDisable GL_BLEND; 844 glDisable GL_BLEND;
132} 845}
133 846
847my %DIR = (
848 SDLK_KP8, [1, "north"],
849 SDLK_KP9, [2, "northeast"],
850 SDLK_KP6, [3, "east"],
851 SDLK_KP3, [4, "southeast"],
852 SDLK_KP2, [5, "south"],
853 SDLK_KP1, [6, "southwest"],
854 SDLK_KP4, [7, "west"],
855 SDLK_KP7, [8, "northwest"],
856
857 SDLK_UP, [1, "north"],
858 SDLK_RIGHT, [3, "east"],
859 SDLK_DOWN, [5, "south"],
860 SDLK_LEFT, [7, "west"],
861);
862
863sub key_down {
864 my ($self, $ev) = @_;
865
866 my $mod = $ev->key_mod;
867 my $sym = $ev->key_sym;
868
869 if ($sym == SDLK_KP5) {
870 $::CONN->send ("command stay fire");
871 } elsif (exists $DIR{$sym}) {
872 if ($mod & KMOD_SHIFT) {
873 $self->{shft}++;
874 $::CONN->send ("command fire $DIR{$sym}[0]");
875 } elsif ($mod & KMOD_CTRL) {
876 $self->{ctrl}++;
877 $::CONN->send ("command run $DIR{$sym}[0]");
878 } else {
879 $::CONN->send ("command $DIR{$sym}[1]");
880 }
881 }
882}
883
884sub key_up {
885 my ($self, $ev) = @_;
886
887 my $mod = $ev->key_mod;
888 my $sym = $ev->key_sym;
889
890 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
891 $::CONN->send ("command fire_stop");
892 }
893 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
894 $::CONN->send ("command run_stop");
895 }
896}
897
898#############################################################################
899
900package Crossfire::Client::Widget::Animator;
901
902use SDL::OpenGL;
903
904our @ISA = Crossfire::Client::Widget::Bin::;
905
906sub moveto {
907 my ($self, $x, $y) = @_;
908
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2;
911 $self->{time} = 1;
912
913 ::animation_start $self;
914}
915
916sub animate {
917 my ($self, $interval) = @_;
918
919 $self->{time} -= $interval * $self->{speed};
920 if ($self->{time} <= 0) {
921 $self->{time} = 0;
922 ::animation_stop $self;
923 }
924
925 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
926
927 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
928 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
929}
930
931sub _draw {
932 my ($self) = @_;
933
934 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0;
936 $self->{children}[0]->draw;
937 glPopMatrix;
938}
939
1341; 9401;
135 941

Diff Legend

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