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.24 by root, Sat Apr 8 20:25:26 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; 11our @ACTIVE_WIDGETS;
… …
19 bless { @_ }, $class 22 bless { @_ }, $class
20} 23}
21 24
22sub activate { 25sub activate {
23 push @ACTIVE_WIDGETS, $_[0]; 26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
24} 28}
25 29
26sub deactivate { 30sub 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}
… …
80 95
81sub bbox { 96sub bbox {
82 my ($widget) = @_; 97 my ($widget) = @_;
83} 98}
84 99
100sub DESTROY {
101 my ($self) = @_;
102
103 $self->deactivate;
104}
105
85package Crossfire::Client::Widget::Container; 106package Crossfire::Client::Widget::Container;
86 107
87our @ISA = Crossfire::Client::Widget::; 108our @ISA = Crossfire::Client::Widget::;
88 109
89use SDL::OpenGL; 110use SDL::OpenGL;
… …
92sub get { $_[0]->{child} } 113sub get { $_[0]->{child} }
93 114
94sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95 116
96sub _draw { die "Containers can't be drawn!" } 117sub _draw { die "Containers can't be drawn!" }
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld);
128 $self->render_chld;
129}
130
131sub render_chld {
132 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135
136 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw }
139 );
140 $self->{texture}->upload;
141}
142
143sub size_request {
144 my ($self) = @_;
145 my $chld = $self->get
146 or return (0, 0);
147 $chld->size_request
148}
149
150sub _draw {
151 my ($self) = @_;
152
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture
154 my $tex = $self->{texture}
155 or return;
156
157 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163
164 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h;
168 glTexCoord 1, 0; glVertex $w, 0;
169 glEnd;
170
171 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D;
173}
97 174
98package Crossfire::Client::Widget::Frame; 175package Crossfire::Client::Widget::Frame;
99 176
100our @ISA = Crossfire::Client::Widget::Container::; 177our @ISA = Crossfire::Client::Widget::Container::;
101 178
… …
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 200 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 201 glEnd;
125 202
126 glPushMatrix; 203 glPushMatrix;
127 glTranslate (2, 2, 0); 204 glTranslate (2, 2, 0);
128 $chld->_draw; 205 $chld->draw;
129 glPopMatrix; 206 glPopMatrix;
130} 207}
131 208
132package Crossfire::Client::Widget::Table; 209package Crossfire::Client::Widget::Table;
133 210
… …
196 my $x = 0; 273 my $x = 0;
197 274
198 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
199 276
200 glPushMatrix; 277 glPushMatrix;
201 glTranslate ($x, $y, 0); 278 glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
202 my $c = $self->{childs}->[$yi]->[$xi]; 279 my $c = $self->{childs}->[$yi]->[$xi];
203 $c->_draw if $c; 280 $c->draw if $c;
204 glPopMatrix; 281 glPopMatrix;
205 282
206 $x += $self->max_col_width ($xi); 283 $x += $self->max_col_width ($xi);
207 } 284 }
208 285
… …
238 my ($self) = @_; 315 my ($self) = @_;
239 316
240 my ($x, $y); 317 my ($x, $y);
241 for (@{$self->{childs} || []}) { 318 for (@{$self->{childs} || []}) {
242 glPushMatrix; 319 glPushMatrix;
243 glTranslate (0, $y, 0); 320 glTranslate (0, $y, 0);# see above TODO
244 $_->_draw; 321 $_->draw;
245 glPopMatrix; 322 glPopMatrix;
246 my ($w, $h) = $_->size_request; 323 my ($w, $h) = $_->size_request;
247 $y += $h; 324 $y += $h;
248 } 325 }
249} 326}
… …
285 362
286sub _draw { 363sub _draw {
287 my ($self) = @_; 364 my ($self) = @_;
288 365
289 my $tex = $self->{texture}; 366 my $tex = $self->{texture};
290
291 $self->{x}--;
292 367
293 glEnable GL_BLEND; 368 glEnable GL_BLEND;
294 glEnable GL_TEXTURE_2D; 369 glEnable GL_TEXTURE_2D;
295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
296 glBindTexture GL_TEXTURE_2D, $tex->{name}; 371 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
343 418
344sub key_up { 419sub key_up {
345} 420}
346 421
347sub _draw { 422sub _draw {
423 my ($self) = @_;
424
348 glEnable GL_TEXTURE_2D; 425 glEnable GL_TEXTURE_2D;
349 glEnable GL_BLEND; 426 glEnable GL_BLEND;
350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
351 428
352 my $map = $::CONN->{map}; 429 my $map = $::CONN->{map};
353 430
354 for my $x (0 .. $::CONN->{mapw} - 1) { 431 for my $x (0 .. int $::WIDTH / 32) {
355 for my $y (0 .. $::CONN->{maph} - 1) { 432 for my $y (0 .. int $::HEIGHT / 32) {
356 433
357 my $cell = $map->[$x][$y] 434 my $cell = $map->[$x + $::CONN->{mapx}]
435 [$y + $::CONN->{mapy}]
358 or next; 436 or next;
359 437
360 my $darkness = $cell->[3] * (1 / 255); 438 my $darkness = $cell->[0] * (1 / 255);
439 if ($darkness < 0) {
440 glColor 0.3, 0.3, 0.3;
441 } else {
361 glColor $darkness, $darkness, $darkness; 442 glColor $darkness, $darkness, $darkness;
443 }
362 444
363 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 445 for my $num (grep $_, @$cell[1,2,3]) {
364 my $tex = $::CONN->{face}[$num]{texture} || next; 446 my $tex = $::CONN->{face}[$num]{texture} || next;
365 447
366 glBindTexture GL_TEXTURE_2D, $tex->{name}; 448 glBindTexture GL_TEXTURE_2D, $tex->{name};
367 449
450 my $w = $tex->{width};
451 my $h = $tex->{height};
452
453 my $px = ($x + 1) * 32 - $w;
454 my $py = ($y + 1) * 32 - $h;
455
368 glBegin GL_QUADS; 456 glBegin GL_QUADS;
369 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 457 glTexCoord 0, 0; glVertex $px , $py;
370 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 458 glTexCoord 0, 1; glVertex $px , $py + $h;
371 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 459 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
372 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 460 glTexCoord 1, 0; glVertex $px + $w, $py;
373 glEnd; 461 glEnd;
374 } 462 }
375 } 463 }
376 } 464 }
377 465
… …
379 glDisable GL_BLEND; 467 glDisable GL_BLEND;
380} 468}
381 469
382my %DIR = ( 470my %DIR = (
383 SDLK_KP8, [1, "north"], 471 SDLK_KP8, [1, "north"],
384 SDLK_KP9, [2, "northest"], 472 SDLK_KP9, [2, "northeast"],
385 SDLK_KP6, [3, "east"], 473 SDLK_KP6, [3, "east"],
386 SDLK_KP3, [4, "southeast"], 474 SDLK_KP3, [4, "southeast"],
387 SDLK_KP2, [5, "south"], 475 SDLK_KP2, [5, "south"],
388 SDLK_KP1, [6, "southwest"], 476 SDLK_KP1, [6, "southwest"],
389 SDLK_KP4, [7, "west"], 477 SDLK_KP4, [7, "west"],
390 SDLK_KP7, [8, "northwest"], 478 SDLK_KP7, [8, "northwest"],
479
480 SDLK_UP, [1, "north"],
481 SDLK_RIGHT, [3, "east"],
482 SDLK_DOWN, [5, "south"],
483 SDLK_LEFT, [7, "west"],
391); 484);
392 485
393sub key_down { 486sub key_down {
394 my ($self, $ev) = @_; 487 my ($self, $ev) = @_;
395 488
… …
398 491
399 if ($sym == SDLK_KP5) { 492 if ($sym == SDLK_KP5) {
400 $::CONN->send ("command stay fire"); 493 $::CONN->send ("command stay fire");
401 } elsif (exists $DIR{$sym}) { 494 } elsif (exists $DIR{$sym}) {
402 if ($mod & KMOD_SHIFT) { 495 if ($mod & KMOD_SHIFT) {
496 $self->{shft}++;
403 $::CONN->send ("command fire $DIR{$sym}[0]"); 497 $::CONN->send ("command fire $DIR{$sym}[0]");
404 } elsif ($mod & KMOD_CTRL) { 498 } elsif ($mod & KMOD_CTRL) {
499 $self->{ctrl}++;
405 $::CONN->send ("command run $DIR{$sym}[0]"); 500 $::CONN->send ("command run $DIR{$sym}[0]");
406 } else { 501 } else {
502 $::CONN->send ("command $DIR{$sym}[1]");
407 } 503 }
408 } 504 }
409} 505}
410 506
411sub key_up { 507sub key_up {
412 my ($self, $ev) = @_; 508 my ($self, $ev) = @_;
413 509
414 my $mod = $ev->key_mod; 510 my $mod = $ev->key_mod;
415 my $sym = $ev->key_sym; 511 my $sym = $ev->key_sym;
416 512
417 if (exists $DIR{$sym}) { 513 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
418 if ($mod & KMOD_SHIFT) {
419 $::CONN->send ("command fire_stop"); 514 $::CONN->send ("command fire_stop");
420 } else { 515 }
516 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->send ("command run_stop"); 517 $::CONN->send ("command run_stop");
422 }
423 } 518 }
424} 519}
425 520
4261; 5211;
427 522

Diff Legend

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