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.378 by root, Mon Jul 16 20:22:39 2007 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

… …
1355 1355
1356my @border = 1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1360sub new { 1364sub new {
1361 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1362 1366
1363 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1537
1534 my $border = $self->border; 1538 my $border = $self->border;
1535 1539
1536 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1559
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1544 1562
1545 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
2381 2399
2382use CFPlus::OpenGL; 2400use CFPlus::OpenGL;
2383 2401
2384my @tex = 2402my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
2387 2405
2388sub new { 2406sub new {
2389 my $class = shift; 2407 my $class = shift;
2390 2408
2391 $class->SUPER::new ( 2409 $class->SUPER::new (
2392 padding_x => 4, 2410 padding_x => 4,
2393 padding_y => 4, 2411 padding_y => 4,
2394 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
2395 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
2396 can_hover => 1, 2414 can_hover => 1,
2397 align => 0, 2415 align => 0,
2398 valign => 0, 2416 valign => 0,
2399 can_events => 1, 2417 can_events => 1,
2400 @_ 2418 @_
… …
2418 2436
2419 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
2422 2440
2441 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2443
2425 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2426 2445
2427 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
2428} 2447}
… …
3493 ); 3512 );
3494 3513
3495 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
3497 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3498 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3500 hard => 1, 3520 parked => 1,
3501 interval => $self->{animspeed},
3502 cb => sub { 3521 cb => sub {
3503 return unless $::CONN; 3522 return unless $::CONN && $widget;
3504 3523
3505 ++$widget->{frame}; 3524 ++$widget->{frame};
3506 $self->update_face; 3525 $widget->update_face;
3507 $self->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
3508 }, 3529 },
3509 ); 3530 );
3510 3531
3511 $self->update_face; 3532 $self->update_face;
3533 $self->update_timer;
3512 } 3534 }
3513 3535
3514 $self 3536 $self
3537}
3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3515} 3554}
3516 3555
3517sub update_face { 3556sub update_face {
3518 my ($self) = @_; 3557 my ($self) = @_;
3519 3558
… …
3551 return unless $self->{visible}; 3590 return unless $self->{visible};
3552 3591
3553 $self->SUPER::update; 3592 $self->SUPER::update;
3554} 3593}
3555 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3556sub _draw { 3603sub _draw {
3557 my ($self) = @_; 3604 my ($self) = @_;
3558 3605
3559 return unless $::CONN; 3606 return unless $::CONN;
3560 3607
… …
3575} 3622}
3576 3623
3577sub destroy { 3624sub destroy {
3578 my ($self) = @_; 3625 my ($self) = @_;
3579 3626
3580 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3581 if $self->{timer}; 3628 if $self->{timer};
3582 3629
3583 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3584} 3631}
3585 3632
… …
4229 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
4230 $_->() 4277 $_->()
4231 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
4232 } 4279 }
4233 4280
4234
4235 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4237 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
4238 4284
4239 glMatrixMode GL_PROJECTION; 4285 glMatrixMode GL_PROJECTION;

Diff Legend

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