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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC

… …
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1062 },
1063 ; 1063 ;
1064 1064
1065 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1067 can_events => 1, 1068 can_events => 1,
1068 hslider => $hslider, 1069 hslider => $hslider,
1069 vslider => $vslider, 1070 vslider => $vslider,
1070 col_expand => [1, 0], 1071 col_expand => [1, 0],
1071 row_expand => [1, 0], 1072 row_expand => [1, 0],
1072 %arg, 1073 %arg,
1073 ); 1074 );
1074 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1075 $self->SUPER::add (0, 0, $self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1077 $self->SUPER::add (0, 1, $self->{hslider}); 1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1078 1085
1079 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1080 1087
1081 $self 1088 $self
1082} 1089}
… …
3321 3328
3322sub new { 3329sub new {
3323 my $class = shift; 3330 my $class = shift;
3324 3331
3325 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
3326 aspect => 1, 3335 aspect => 1,
3327 can_events => 0, 3336 can_events => 0,
3328 @_, 3337 @_,
3329 ); 3338 );
3330 3339
… …
3334 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3345 hard => 1,
3337 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
3338 cb => sub { 3347 cb => sub {
3339 delete $self->{wait_face}; 3348 return unless $::CONN;
3349
3340 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
3341 $widget->update; 3352 $self->update;
3342 }, 3353 },
3343 ); 3354 );
3355
3356 $self->update_face;
3344 } 3357 }
3345 3358
3346 $self 3359 $self
3347} 3360}
3348 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
3349sub size_request { 3375sub size_request {
3350 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3391}
3352 3392
3353sub update { 3393sub update {
3354 my ($self) = @_; 3394 my ($self) = @_;
3355 3395
… …
3363 3403
3364 return unless $::CONN; 3404 return unless $::CONN;
3365 3405
3366 $self->SUPER::_draw; 3406 $self->SUPER::_draw;
3367 3407
3368 my $face;
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}] 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
3378 or return; 3409 or return;
3379 3410
3380 my $tex = $::CONN->{texture}[$faceid]; 3411 my $tex = $::CONN->{texture}[$faceid];
3381 3412
3382 if ($tex) { 3413 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3418 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3419 }
3393} 3420}
3394 3421
3395sub destroy { 3422sub destroy {
3396 my ($self) = @_; 3423 my ($self) = @_;

Diff Legend

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