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.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs.
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2 2
3use strict; 3use strict;
4
5use Scalar::Util;
6
4use SDL::OpenGL; 7use SDL::OpenGL;
5use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
6 9
7our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
8our @ACTIVE_WIDGETS; 11#our @ACTIVE_WIDGETS;
9 12
10# class methods for events 13# class methods for events
11sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
12sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
13sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 16sub feed_sdl_button_down_event { }
14sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 17sub feed_sdl_button_up_event { }
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my $class = shift;
18 21
19 bless { @_ }, $class 22 bless { @_ }, $class
20} 23}
21 24
22sub activate { 25#sub activate {
23 push @ACTIVE_WIDGETS, $_[0]; 26# push @ACTIVE_WIDGETS, $_[0];
24} 27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
25 29
26sub deactivate { 30#sub deactivate {
27 @ACTIVE_WIDGETS = 31# @ACTIVE_WIDGETS =
28 sort { $a->{z} <=> $b->{z} } 32# sort { $a->{z} <=> $b->{z} }
29 grep { $_ != $_[0] } 33# grep { $_ && $_ != $_[0] }
30 @ACTIVE_WIDGETS; 34# @ACTIVE_WIDGETS;
35#}
36
37sub move {
38 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x;
40 $self->{y} = $y;
41 $self->{z} = $z if defined $z;
42}
43
44sub needs_redraw {
45 0
31} 46}
32 47
33sub size_request { 48sub size_request {
34 die "size_request is abtract"; 49 die "size_request is abtract";
35} 50}
77sub _draw { 92sub _draw {
78 my ($widget) = @_; 93 my ($widget) = @_;
79} 94}
80 95
81sub bbox { 96sub bbox {
82 my ($widget) = @_; 97 my ($self) = @_;
98 my ($w, $h) = $self->size_request;
99 (
100 $self->{x},
101 $self->{y},
102 $self->{x} = $w,
103 $self->{y} = $h
104 )
105}
106
107sub del_parent { $_[0]->{parent} = undef }
108
109sub set_parent {
110 my ($self, $par) = @_;
111
112 $self->{parent} = $par;
113 Scalar::Util::weaken $self->{parent};
114}
115
116sub get_parent {
117 $_[0]->{parent}
118}
119
120sub update {
121 my ($self) = @_;
122
123 $self->{parent}->update
124 if $self->{parent};
125}
126
127sub DESTROY {
128 my ($self) = @_;
129
130 #$self->deactivate;
83} 131}
84 132
85package Crossfire::Client::Widget::Container; 133package Crossfire::Client::Widget::Container;
86 134
87our @ISA = Crossfire::Client::Widget::; 135our @ISA = Crossfire::Client::Widget::;
88 136
89use SDL::OpenGL; 137use SDL::OpenGL;
90 138
91sub add { $_[0]->{child} = $_[1] } 139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
92sub get { $_[0]->{child} } 140sub get { $_[0]->{child} }
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
93 146
94sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95 148
96sub _draw { die "Containers can't be drawn!" } 149sub _draw { die "Containers can't be drawn!" }
97 150
98package Crossfire::Client::Widget::Frame; 151package Crossfire::Client::Widget::Toplevel;
152
153our @ISA = Crossfire::Client::Widget::;
154
155use SDL::OpenGL;
156
157sub add {
158 my ($self, $chld) = @_;
159
160 push @{$self->{childs}}, $chld;
161 @{$self->{childs}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{childs}};
164
165 $chld->set_parent ($self);
166}
167
168sub remove {
169 my ($self, $chld) = @_;
170 @{$self->{childs}} =
171 sort { $a->{z} <=> $b->{z} }
172 grep { $_ && $_ != $_[0] }
173 @{$self->{childs}}
174}
175
176sub update {
177 my ($self) = @_;
178 ::refresh ();
179}
180
181sub _draw {
182 my ($self) = @_;
183
184 $_->draw for @{$self->{childs}};
185}
186
187package Crossfire::Client::Widget::Window;
99 188
100our @ISA = Crossfire::Client::Widget::Container::; 189our @ISA = Crossfire::Client::Widget::Container::;
101 190
102use SDL::OpenGL; 191use SDL::OpenGL;
192
193sub add {
194 my ($self, $chld) = @_;
195 $self->SUPER::add ($chld);
196 $chld->set_parent ($self);
197 $self->update; #TODO: Move this to the size_request event propably?
198}
199
200sub remove {
201 my ($self) = @_;
202 # TODO FIXME: removing a child from a window will crash, see render_chld
203 $self->update;
204}
205
206sub update {
207 my ($self) = @_;
208 $self->render_chld;
209}
210
211sub render_chld {
212 my ($self) = @_;
213 my $chld = $self->get;
214 my ($w, $h) = $self->size_request;
215
216 $self->{texture} =
217 Crossfire::Client::Texture->new_from_opengl (
218 $w, $h, sub { $chld->draw }
219 );
220 $self->{texture}->upload;
221}
103 222
104sub size_request { 223sub size_request {
105 my ($self) = @_; 224 my ($self) = @_;
106 my $chld = $self->get 225 my $chld = $self->get
107 or return (0, 0); 226 or return (0, 0);
227 $chld->size_request
228}
229
230sub _draw {
231 my ($self) = @_;
232
233 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
234
235 my $tex = $self->{texture}
236 or return;
237
238 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244
245 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h;
249 glTexCoord 1, 0; glVertex $w, 0;
250 glEnd;
251
252 glDisable GL_BLEND;
253 glDisable GL_TEXTURE_2D;
254}
255
256package Crossfire::Client::Widget::Frame;
257
258our @ISA = Crossfire::Client::Widget::Container::;
259
260use SDL::OpenGL;
261
262sub size_request {
263 my ($self) = @_;
264 my $chld = $self->get
265 or return (0, 0);
266
267 $chld->move (2, 2);
268
108 map { $_ + 4 } $chld->size_request; 269 map { $_ + 4 } $chld->size_request;
109} 270}
110 271
111sub _draw { 272sub _draw {
112 my ($self) = @_; 273 my ($self) = @_;
113 274
114 my $chld = $self->get; 275 my $chld = $self->get;
115 276
116 my ($w, $h) = $chld->size_request; 277 my ($w, $h) = $chld->size_request;
117 278
118 glColor 1, 0, 0;
119 glBegin GL_QUADS; 279 glBegin GL_QUADS;
280 glColor 0, 0, 0;
120 glTexCoord 0, 0; glVertex 0 , 0; 281 glTexCoord 0, 0; glVertex 0 , 0;
121 glTexCoord 0, 1; glVertex 0 , $h + 4; 282 glTexCoord 0, 1; glVertex 0 , $h + 4;
122 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 283 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 284 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 285 glEnd;
125 286
126 glPushMatrix;
127 glTranslate (2, 2, 0);
128 $chld->_draw; 287 $chld->draw;
129 glPopMatrix; 288}
289
290package Crossfire::Client::Widget::FancyFrame;
291
292our @ISA = Crossfire::Client::Widget::Frame::;
293
294use SDL::OpenGL;
295
296sub new {
297 my ($self, $theme) = @_;
298 $self = $self->SUPER::new;
299
300 $self->{txts} = [
301 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
302 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
303 ];
304 $self
305
306}
307
308sub size_request {
309 my ($self) = @_;
310 my ($w, $h) = $self->get->size_request;
311
312 $h += $self->{txts}->[1]->{height};
313 $h += $self->{txts}->[4]->{height};
314 $w += $self->{txts}->[2]->{width};
315 $w += $self->{txts}->[3]->{width};
316
317 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
318
319 ($w, $h)
320}
321
322sub _draw {
323 my ($self) = @_;
324
325 my ($w, $h) = $self->size_request;
326 my ($cw, $ch) = $self->get->size_request;
327
328 glEnable GL_BLEND;
329 glEnable GL_TEXTURE_2D;
330 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
332
333
334 my $top = $self->{txts}->[1];
335 glBindTexture GL_TEXTURE_2D, $top->{name};
336
337 glColor 1, 1, 1, 0.8;
338
339 glBegin GL_QUADS;
340 glTexCoord 0, 0; glVertex 0 , 0;
341 glTexCoord 0, 1; glVertex 0 , $top->{height};
342 glTexCoord 1, 1; glVertex $w , $top->{height};
343 glTexCoord 1, 0; glVertex $w , 0;
344 glEnd;
345
346 my $left = $self->{txts}->[3];
347 glBindTexture GL_TEXTURE_2D, $left->{name};
348
349 glColor 1, 1, 1, 0.8;
350
351 glBegin GL_QUADS;
352 glTexCoord 0, 0; glVertex 0 , $top->{height};
353 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
354 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
355 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
356 glEnd;
357
358 my $right = $self->{txts}->[2];
359 glBindTexture GL_TEXTURE_2D, $right->{name};
360
361 glColor 1, 1, 1, 0.8;
362
363 glBegin GL_QUADS;
364 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
365 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
366 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
367 glTexCoord 1, 0; glVertex $w , $top->{height};
368 glEnd;
369
370 my $bottom = $self->{txts}->[4];
371 glBindTexture GL_TEXTURE_2D, $bottom->{name};
372
373 glColor 1, 1, 1, 0.8;
374
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
377 glTexCoord 0, 1; glVertex 0 , $h;
378 glTexCoord 1, 1; glVertex $w , $h;
379 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
380 glEnd;
381
382 my $bg = $self->{txts}->[0];
383 glBindTexture GL_TEXTURE_2D, $bg->{name};
384 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
385 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
386
387 glColor 1, 1, 1, 0.8;
388
389 my $rep_x = $cw / $bg->{width};
390 my $rep_y = $ch / $bg->{height};
391
392 glBegin GL_QUADS;
393 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
394 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
395 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
396 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
397 glEnd;
398
399 $self->get->draw;
400
401 glDisable GL_BLEND;
402 glDisable GL_TEXTURE_2D;
130} 403}
131 404
132package Crossfire::Client::Widget::Table; 405package Crossfire::Client::Widget::Table;
133 406
134our @ISA = Crossfire::Client::Widget::Container::; 407our @ISA = Crossfire::Client::Widget::Container::;
135 408
136use SDL::OpenGL; 409use SDL::OpenGL;
137 410
138sub add { 411sub add {
139 my ($self, $x, $y, $chld) = @_; 412 my ($self, $x, $y, $chld) = @_;
413 my $old_chld = $self->{childs}[$y][$x];
414
140 $self->{childs}[$y][$x] = $chld; 415 $self->{childs}[$y][$x] = $chld;
416 $chld->set_parent ($self);
417 $self->update;
141} 418}
142 419
143sub max_row_height { 420sub max_row_height {
144 my ($self, $row) = @_; 421 my ($self, $row) = @_;
145 422
195 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 472 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
196 my $x = 0; 473 my $x = 0;
197 474
198 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 475 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
199 476
200 glPushMatrix;
201 glTranslate ($x, $y, 0);
202 my $c = $self->{childs}->[$yi]->[$xi]; 477 my $c = $self->{childs}->[$yi]->[$xi];
478 if ($c) {
479 $c->move ($x, $y, 0); #TODO: Move to size_request
203 $c->_draw if $c; 480 $c->draw if $c;
204 glPopMatrix; 481 }
205 482
206 $x += $self->max_col_width ($xi); 483 $x += $self->max_col_width ($xi);
207 } 484 }
208 485
209 $y += $self->max_row_height ($yi); 486 $y += $self->max_row_height ($yi);
217use SDL::OpenGL; 494use SDL::OpenGL;
218 495
219sub add { 496sub add {
220 my ($self, $chld) = @_; 497 my ($self, $chld) = @_;
221 push @{$self->{childs}}, $chld; 498 push @{$self->{childs}}, $chld;
499 $chld->set_parent ($self);
500 $self->update;
222} 501}
223 502
224sub size_request { 503sub size_request {
225 my ($self) = @_; 504 my ($self) = @_;
226 505
237sub _draw { 516sub _draw {
238 my ($self) = @_; 517 my ($self) = @_;
239 518
240 my ($x, $y); 519 my ($x, $y);
241 for (@{$self->{childs} || []}) { 520 for (@{$self->{childs} || []}) {
242 glPushMatrix; 521 $_->move (0, $y, 0); #TODO: move to size_request
243 glTranslate (0, $y, 0);
244 $_->_draw; 522 $_->draw;
245 glPopMatrix;
246 my ($w, $h) = $_->size_request; 523 my ($w, $h) = $_->size_request;
247 $y += $h; 524 $y += $h;
248 } 525 }
249} 526}
250 527
253our @ISA = Crossfire::Client::Widget::; 530our @ISA = Crossfire::Client::Widget::;
254 531
255use SDL::OpenGL; 532use SDL::OpenGL;
256 533
257sub new { 534sub new {
258 my ($class, $x, $y, $z, $ttf, $text) = @_; 535 my ($class, $x, $y, $z, $height, $text) = @_;
259 536
537 # TODO: color, and make height, xyz etc. optional
260 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 538 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
261 539
262 $self->set_text ($text); 540 $self->set_text ($text);
263 541
264 $self 542 $self
265} 543}
266 544
267sub set_text { 545sub set_text {
268 my ($self, $text) = @_; 546 my ($self, $text) = @_;
547
548 $self->{text} = $text;
269 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 549 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
550
551 $self->update;
270} 552}
271 553
272sub get_text { 554sub get_text {
273 my ($self, $text) = @_; 555 my ($self, $text) = @_;
556
274 $self->{text} 557 $self->{text}
275} 558}
276 559
277sub size_request { 560sub size_request {
278 my ($self) = @_; 561 my ($self) = @_;
286sub _draw { 569sub _draw {
287 my ($self) = @_; 570 my ($self) = @_;
288 571
289 my $tex = $self->{texture}; 572 my $tex = $self->{texture};
290 573
291 $self->{x}--;
292
293 glEnable GL_BLEND; 574 glEnable GL_BLEND;
294 glEnable GL_TEXTURE_2D; 575 glEnable GL_TEXTURE_2D;
576 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
296 glBindTexture GL_TEXTURE_2D, $tex->{name}; 578 glBindTexture GL_TEXTURE_2D, $tex->{name};
297 579
298 glColor 1, 1, 1; 580 glColor 1, 1, 1, 0.6; # TODO color
299 581
300 glBegin GL_QUADS; 582 glBegin GL_QUADS;
301 glTexCoord 0, 0; glVertex 0 , 0; 583 glTexCoord 0, 0; glVertex 0 , 0;
302 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 584 glTexCoord 0, 1; glVertex 0 , $tex->{height};
303 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 585 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
306 588
307 glDisable GL_BLEND; 589 glDisable GL_BLEND;
308 glDisable GL_TEXTURE_2D; 590 glDisable GL_TEXTURE_2D;
309} 591}
310 592
593package Crossfire::Client::Widget::TextEntry;
594
595our @ISA = Crossfire::Client::Widget::Label::;
596
597use SDL;
598use SDL::OpenGL;
599
600sub key_down {
601 my ($self, $ev) = @_;
602
603 my $mod = $ev->key_mod;
604 my $sym = $ev->key_sym;
605
606 $ev->set_unicode (1);
607 my $uni = $ev->key_unicode;
608
609 my $text = $self->get_text;
610
611 if ($sym == SDLK_BACKSPACE) {
612 substr $text, -1, 1, '';
613
614 } elsif ($uni) {
615 $text .= chr $uni;
616 }
617 $self->set_text ($text);
618}
619
620
621# XXX: TextView isn't neccessary with pango multiline text rendering
311package Crossfire::Client::Widget::TextView; 622package Crossfire::Client::Widget::TextView;
312 623
313use strict; 624use strict;
314 625
315our @ISA = qw/Crossfire::Client::Widget/; 626our @ISA = qw/Crossfire::Client::Widget/;
316 627
317use SDL::OpenGL; 628use SDL::OpenGL;
318use SDL::OpenGL::Constants; 629use SDL::OpenGL::Constants;
630
631sub new {
632 my ($class, $text, $h) = @_;
633 my $self = $class->SUPER::new ();
634
635 $self->{txt_height} = $h;
636 @{$self->{lines}} = split /\r?\n/, $text;
637
638 for (split /\r?\n/, $text) {
639 $self->add_line ($_);
640 }
641 $self
642}
643
644#sub render_lines {
645# my ($self) = @_;
646#
647# $self->{txt_lines} = [];
648#
649# for (@{$self->{lines}}) {
650# push @{$self->{txt_lines}},
651# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
652# }
653#}
319 654
320sub add_line { 655sub add_line {
321 my ($self, $line) = @_; 656 my ($self, $line) = @_;
322 push @{$self->{lines}}, $line; 657 push @{$self->{lines}}, $line;
323}
324 658
659 push @{$self->{txt_lines}},
660 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
661}
662
663sub size_request {
664 my ($self) = @_;
665
666 my $w = 0;
667 my $h = 0;
668
669 for (@{$self->{txt_lines}}) {
670 if ($w < $_->{width}) { $w = $_->{width} }
671 $h += $_->{height};
672 }
673
674 return ($w, $h);
675}
676
325sub _draw { 677sub draw_line {
326 my ($self) = @_; 678 my ($self, $tex, $y) = @_;
327 679
680 glBindTexture GL_TEXTURE_2D, $tex->{name};
681
682 glColor 1, 0, 1;
683
684 glBegin GL_QUADS;
685 glTexCoord 0, 0; glVertex 0 , $y;
686 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
687 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
688 glTexCoord 1, 0; glVertex $tex->{width}, $y;
689 glEnd;
690}
691
692sub _draw {
693 my ($self) = @_;
694
695 glEnable GL_BLEND;
696 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
698
699 my $l = 0;
700 for (@{$self->{txt_lines}}) {
701 $self->draw_line ($_, $l);
702 $l += $_->{height};
703 }
704
705 glDisable GL_BLEND;
706 glDisable GL_TEXTURE_2D;
328} 707}
329 708
330package Crossfire::Client::Widget::MapWidget; 709package Crossfire::Client::Widget::MapWidget;
331 710
332use strict; 711use strict;
333 712
334our @ISA = qw/Crossfire::Client::Widget/; 713use List::Util qw(min max);
335 714
336use SDL; 715use SDL;
337use SDL::OpenGL; 716use SDL::OpenGL;
338use SDL::OpenGL::Constants; 717use SDL::OpenGL::Constants;
718
719our @ISA = Crossfire::Client::Widget::;
339 720
340sub key_down { 721sub key_down {
341 print "MAPKEYDOWN\n"; 722 print "MAPKEYDOWN\n";
342} 723}
343 724
344sub key_up { 725sub key_up {
345} 726}
346 727
347sub _draw { 728sub _draw {
729 my ($self) = @_;
730
731 my $mx = $::CONN->{mapx};
732 my $my = $::CONN->{mapy};
733
734 my $map = $::CONN->{map};
735
736 my ($xofs, $yofs);
737
738 my $sw = 1 + int $::WIDTH / 32;
739 my $sh = 1 + int $::HEIGHT / 32;
740
741 if ($::CONN->{mapw} > $sw) {
742 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
743 } else {
744 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
745 }
746
747 if ($::CONN->{maph} > $sh) {
748 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
749 } else {
750 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
751 }
752
348 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
349 glEnable GL_BLEND; 754 glEnable GL_BLEND;
350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
351 756
352 my $map = $::CONN->{map}; 757 for my $x (0 .. $sw - 1) {
353
354 for my $x (0 .. $::CONN->{mapw} - 1) {
355 for my $y (0 .. $::CONN->{maph} - 1) { 758 for my $y (0 .. $sh - 1) {
356 759
357 my $cell = $map->[$x][$y] 760 my $cell = $map->[$x + $xofs][$y + $yofs]
358 or next; 761 or next;
359 762
360 my $darkness = $cell->[3] * (1 / 255); 763 my $darkness = $cell->[0] * (1 / 255);
764 if ($darkness < 0) {
765 glColor 0.3, 0.3, 0.3;
766 } else {
361 glColor $darkness, $darkness, $darkness; 767 glColor $darkness, $darkness, $darkness;
768 }
362 769
363 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 770 for my $num (grep $_, @$cell[1,2,3]) {
364 my $tex = $::CONN->{face}[$num]{texture} || next; 771 my $tex = $::CONN->{face}[$num]{texture} || next;
365 772
366 glBindTexture GL_TEXTURE_2D, $tex->{name}; 773 glBindTexture GL_TEXTURE_2D, $tex->{name};
367 774
775 my $w = $tex->{width};
776 my $h = $tex->{height};
777
778 my $px = ($x + 1) * 32 - $w;
779 my $py = ($y + 1) * 32 - $h;
780
368 glBegin GL_QUADS; 781 glBegin GL_QUADS;
369 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 782 glTexCoord 0, 0; glVertex $px , $py;
370 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 783 glTexCoord 0, 1; glVertex $px , $py + $h;
371 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 784 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
372 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 785 glTexCoord 1, 0; glVertex $px + $w, $py;
373 glEnd; 786 glEnd;
374 } 787 }
375 } 788 }
376 } 789 }
377 790
379 glDisable GL_BLEND; 792 glDisable GL_BLEND;
380} 793}
381 794
382my %DIR = ( 795my %DIR = (
383 SDLK_KP8, [1, "north"], 796 SDLK_KP8, [1, "north"],
384 SDLK_KP9, [2, "northest"], 797 SDLK_KP9, [2, "northeast"],
385 SDLK_KP6, [3, "east"], 798 SDLK_KP6, [3, "east"],
386 SDLK_KP3, [4, "southeast"], 799 SDLK_KP3, [4, "southeast"],
387 SDLK_KP2, [5, "south"], 800 SDLK_KP2, [5, "south"],
388 SDLK_KP1, [6, "southwest"], 801 SDLK_KP1, [6, "southwest"],
389 SDLK_KP4, [7, "west"], 802 SDLK_KP4, [7, "west"],
390 SDLK_KP7, [8, "northwest"], 803 SDLK_KP7, [8, "northwest"],
804
805 SDLK_UP, [1, "north"],
806 SDLK_RIGHT, [3, "east"],
807 SDLK_DOWN, [5, "south"],
808 SDLK_LEFT, [7, "west"],
391); 809);
392 810
393sub key_down { 811sub key_down {
394 my ($self, $ev) = @_; 812 my ($self, $ev) = @_;
395 813
398 816
399 if ($sym == SDLK_KP5) { 817 if ($sym == SDLK_KP5) {
400 $::CONN->send ("command stay fire"); 818 $::CONN->send ("command stay fire");
401 } elsif (exists $DIR{$sym}) { 819 } elsif (exists $DIR{$sym}) {
402 if ($mod & KMOD_SHIFT) { 820 if ($mod & KMOD_SHIFT) {
821 $self->{shft}++;
403 $::CONN->send ("command fire $DIR{$sym}[0]"); 822 $::CONN->send ("command fire $DIR{$sym}[0]");
404 } elsif ($mod & KMOD_CTRL) { 823 } elsif ($mod & KMOD_CTRL) {
824 $self->{ctrl}++;
405 $::CONN->send ("command run $DIR{$sym}[0]"); 825 $::CONN->send ("command run $DIR{$sym}[0]");
406 } else { 826 } else {
827 $::CONN->send ("command $DIR{$sym}[1]");
407 } 828 }
408 } 829 }
409} 830}
410 831
411sub key_up { 832sub key_up {
412 my ($self, $ev) = @_; 833 my ($self, $ev) = @_;
413 834
414 my $mod = $ev->key_mod; 835 my $mod = $ev->key_mod;
415 my $sym = $ev->key_sym; 836 my $sym = $ev->key_sym;
416 837
417 if (exists $DIR{$sym}) { 838 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
418 if ($mod & KMOD_SHIFT) {
419 $::CONN->send ("command fire_stop"); 839 $::CONN->send ("command fire_stop");
420 } else { 840 }
841 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->send ("command run_stop"); 842 $::CONN->send ("command run_stop");
422 }
423 } 843 }
424} 844}
425 845
4261; 8461;
427 847

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines