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.42 by root, Sun Apr 9 22:00:58 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2
2use strict; 3use strict;
3 4
5use Scalar::Util;
6
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11
4our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
5our %ACTIVE_WIDGETS;
6 13
7# class methods for events 14# class methods for events
8sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
9sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
10sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
11sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
12 19
13sub new { 20sub new {
14 my $class = shift; 21 my $class = shift;
15 my $self = { @_ };
16 bless $self, $class;
17 return $self;
18}
19 22
20sub activate { 23 bless { @_ }, $class
21 $ACTIVE_WIDGETS{$_[0]} = $_[0];
22} 24}
23 25
24sub deactivate { 26sub move {
25 delete $ACTIVE_WIDGETS{$_[0]}; 27 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x;
29 $self->{y} = $y;
30 $self->{z} = $z if defined $z;
31}
32
33sub needs_redraw {
34 0
35}
36
37sub size_request {
38 require Carp;
39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
26} 47}
27 48
28sub focus_in { 49sub focus_in {
29 my ($widget) = @_; 50 my ($widget) = @_;
30 $FOCUS = $widget; 51 $FOCUS = $widget;
48 69
49sub button_up { 70sub button_up {
50 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
51} 72}
52 73
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
79
53sub draw { 80sub draw {
54 my ($widget) = @_; 81 my ($self) = @_;
82
83 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw;
86 glPopMatrix;
87}
88
89sub _draw {
90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
55} 93}
56 94
57sub bbox { 95sub bbox {
96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
134}
135
136sub DESTROY {
137 my ($self) = @_;
138
139 #$self->deactivate;
140}
141
142#############################################################################
143
144package Crossfire::Client::Widget::Container;
145
146our @ISA = Crossfire::Client::Widget::;
147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h});
168}
169
170sub remove {
58 my ($widget) = @_; 171 my ($self, $widget) = @_;
59}
60 172
61package Client::TextView; 173 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
174
175 $self->size_allocate ($self->{w}, $self->{h});
176}
177
178sub find_widget {
179 my ($self, $x, $y) = @_;
180
181 my $res;
182
183 for (@{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y)
185 and return $res;
186 }
187
188 ()
189}
190
191sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
212package Crossfire::Client::Widget::Bin;
213
214our @ISA = Crossfire::Client::Widget::Container::;
215
216sub child { $_[0]->{children}[0] }
217
218sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220}
221
222sub size_allocate {
223 my ($self, $w, $h) = @_;
224
225 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0]
228}
229
230#############################################################################
231
232package Crossfire::Client::Widget::Toplevel;
233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
254our @ISA = Crossfire::Client::Widget::Bin::;
255
256use SDL::OpenGL;
257
258sub new {
259 my ($class, $x, $y, $z, $w, $h) = @_;
260
261 my $self = $class->SUPER::new;
262
263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264}
265
266sub update {
267 my ($self) = @_;
268
269 $self->render_chld;
270 $self->SUPER::update;
271}
272
273sub render_chld {
274 my ($self) = @_;
275
276 $self->{texture} =
277 Crossfire::Client::Texture->new_from_opengl (
278 $self->{w}, $self->{h}, sub { $self->child->draw }
279 );
280}
281
282sub size_allocate {
283 my ($self, $w, $h) = @_;
284
285 $self->{w} = $w;
286 $self->{h} = $h;
287
288 $self->child->size_allocate ($w, $h);
289
290 $self->render_chld;
291}
292
293sub _draw {
294 my ($self) = @_;
295
296 my ($w, $h) = ($self->w, $self->h);
297
298 my $tex = $self->{texture}
299 or return;
300
301 glEnable GL_BLEND;
302 glEnable GL_TEXTURE_2D;
303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
304 glBindTexture GL_TEXTURE_2D, $tex->{name};
305
306 glBegin GL_QUADS;
307 glTexCoord 0, 0; glVertex 0, 0;
308 glTexCoord 0, 1; glVertex 0, $h;
309 glTexCoord 1, 1; glVertex $w, $h;
310 glTexCoord 1, 0; glVertex $w, 0;
311 glEnd;
312
313 glDisable GL_BLEND;
314 glDisable GL_TEXTURE_2D;
315}
316
317#############################################################################
318
319package Crossfire::Client::Widget::Frame;
320
321our @ISA = Crossfire::Client::Widget::Bin::;
322
323use SDL::OpenGL;
324
325sub size_request {
326 my ($self) = @_;
327 my $chld = $self->child
328 or return (0, 0);
329
330 $chld->move (2, 2);
331
332 map { $_ + 4 } $chld->size_request;
333}
334
335sub size_allocate {
336 my ($self, $w, $h) = @_;
337
338 $self->{w} = $w;
339 $self->{h} = $h;
340
341 $self->child->size_allocate ($w - 4, $h - 4);
342 $self->child->move (2, 2);
343}
344
345sub _draw {
346 my ($self) = @_;
347
348 my $chld = $self->child;
349
350 my ($w, $h) = $chld->size_request;
351
352 glBegin GL_QUADS;
353 glColor 0, 0, 0;
354 glTexCoord 0, 0; glVertex 0 , 0;
355 glTexCoord 0, 1; glVertex 0 , $h + 4;
356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
357 glTexCoord 1, 0; glVertex $w + 4 , 0;
358 glEnd;
359
360 $chld->draw;
361}
362
363#############################################################################
364
365package Crossfire::Client::Widget::FancyFrame;
366
367our @ISA = Crossfire::Client::Widget::Bin::;
368
369use SDL::OpenGL;
370
371my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374
375sub size_request {
376 my ($self) = @_;
377
378 my ($w, $h) = $self->SUPER::size_request;
379
380 $h += $tex[1]->{height};
381 $h += $tex[4]->{height};
382 $w += $tex[2]->{width};
383 $w += $tex[3]->{width};
384
385 ($w, $h)
386}
387
388sub size_allocate {
389 my ($self, $w, $h) = @_;
390
391 $self->SUPER::size_allocate ($w, $h);
392
393 $h -= $tex[1]->{height};
394 $h -= $tex[4]->{height};
395 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width};
397
398 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w;
400 warn "CHILD:$w $h\n";
401 $self->child->size_allocate ($w, $h);
402 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
403}
404
405sub _draw {
406 my ($self) = @_;
407
408 my ($w, $h) = ($self->w, $self->h);
409 my ($cw, $ch) = ($self->child->w, $self->child->h);
410
411 glEnable GL_BLEND;
412 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415
416 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name};
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425
426 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name};
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435
436 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name};
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445
446 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455
456 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461
462 my $rep_x = $cw / $bg->{width};
463 my $rep_y = $ch / $bg->{height};
464
465 glBegin GL_QUADS;
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471
472 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D;
474
475 $self->child->draw;
476
477}
478
479#############################################################################
480
481package Crossfire::Client::Widget::Table;
482
483our @ISA = Crossfire::Client::Widget::Bin::;
484
485use SDL::OpenGL;
486
487sub add {
488 my ($self, $x, $y, $chld) = @_;
489 my $old_chld = $self->{children}[$y][$x];
490
491 $self->{children}[$y][$x] = $chld;
492 $chld->set_parent ($self);
493 $self->update;
494}
495
496sub max_row_height {
497 my ($self, $row) = @_;
498
499 my $hs = 0;
500 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
501 my $c = $self->{children}->[$row]->[$xi];
502 if ($c) {
503 my ($w, $h) = $c->size_request;
504 if ($hs < $h) { $hs = $h }
505 }
506 }
507 return $hs;
508}
509
510sub max_col_width {
511 my ($self, $col) = @_;
512
513 my $ws = 0;
514 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
515 my $c = ($self->{children}->[$yi] || [])->[$col];
516 if ($c) {
517 my ($w, $h) = $c->size_request;
518 if ($ws < $w) { $ws = $w }
519 }
520 }
521 return $ws;
522}
523
524sub size_request {
525 my ($self) = @_;
526
527 my ($hs, $ws) = (0, 0);
528
529 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
530 $hs += $self->max_row_height ($yi);
531 }
532
533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
534 my $wm = 0;
535 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
536 $wm += $self->max_col_width ($xi)
537 }
538 if ($ws < $wm) { $ws = $wm }
539 }
540
541 return ($ws, $hs);
542}
543
544sub _draw {
545 my ($self) = @_;
546
547 my $y = 0;
548 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
549 my $x = 0;
550
551 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
552
553 my $c = $self->{children}->[$yi]->[$xi];
554 if ($c) {
555 $c->move ($x, $y, 0); #TODO: Move to size_request
556 $c->draw if $c;
557 }
558
559 $x += $self->max_col_width ($xi);
560 }
561
562 $y += $self->max_row_height ($yi);
563 }
564}
565
566#############################################################################
567
568package Crossfire::Client::Widget::VBox;
569
570our @ISA = Crossfire::Client::Widget::Container::;
571
572use SDL::OpenGL;
573
574sub size_allocate {
575 my ($self, $w, $h) = @_;
576
577 $self->w ($w);
578 $self->h ($h);
579
580 my $exp;
581 my @oth;
582 # find expand widget
583 for (@{$self->{children}}) {
584 if ($_->{expand}) {
585 $exp = $_;
586 last;
587 }
588 push @oth, $_;
589 }
590
591 my ($ow, $oh);
592
593 # get sizes of other widgets
594 for (@oth) {
595 my ($w, $h) = $_->size_request;
596 $oh += $h;
597 if ($ow < $w) { $ow = $w }
598 }
599
600 my $y = 0;
601 for (@{$self->{children}}) {
602 $_->move (0, $y);
603
604 if ($_ == $exp) {
605 $_->size_allocate ($w, $h - $oh);
606 $y += $h - $oh;
607 } else {
608 my ($cw, $h) = $_->size_request;
609 $_->size_allocate ($w, $h);
610 $y += $h;
611 }
612 }
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 my ($x, $y);
619 for (@{$self->{children} || []}) {
620 $_->draw;
621 $y += $_->h;
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