| … | |
… | |
| 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 | } |
| … | |
… | |
| 1100 | } |
1107 | } |
| 1101 | |
1108 | |
| 1102 | sub update_slider { |
1109 | sub update_slider { |
| 1103 | my ($self) = @_; |
1110 | my ($self) = @_; |
| 1104 | |
1111 | |
|
|
1112 | my $child = ($self->{vp} or return)->child; |
|
|
1113 | |
| 1105 | my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w}); |
1114 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
| 1106 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1115 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
| 1107 | #$self->{hslider}->set_visibility ($w1 != $w2); |
1116 | #$self->{hslider}->set_visibility ($w1 != $w2); |
| 1108 | |
1117 | |
| 1109 | my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h}); |
1118 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
| 1110 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1119 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
| 1111 | #$self->{vslider}->set_visibility ($h1 != $h2); |
1120 | #$self->{vslider}->set_visibility ($h1 != $h2); |
| 1112 | } |
1121 | } |
| 1113 | |
1122 | |
| 1114 | sub update { |
1123 | sub update { |
| … | |
… | |
| 3319 | |
3328 | |
| 3320 | sub new { |
3329 | sub new { |
| 3321 | my $class = shift; |
3330 | my $class = shift; |
| 3322 | |
3331 | |
| 3323 | my $self = $class->SUPER::new ( |
3332 | my $self = $class->SUPER::new ( |
|
|
3333 | size_w => 32, |
|
|
3334 | size_h => 8, |
| 3324 | aspect => 1, |
3335 | aspect => 1, |
| 3325 | can_events => 0, |
3336 | can_events => 0, |
| 3326 | @_, |
3337 | @_, |
| 3327 | ); |
3338 | ); |
| 3328 | |
3339 | |
| … | |
… | |
| 3332 | $self->{timer} = Event->timer ( |
3343 | $self->{timer} = Event->timer ( |
| 3333 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
3344 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
| 3334 | hard => 1, |
3345 | hard => 1, |
| 3335 | interval => $self->{animspeed}, |
3346 | interval => $self->{animspeed}, |
| 3336 | cb => sub { |
3347 | cb => sub { |
|
|
3348 | return unless $::CONN; |
|
|
3349 | |
| 3337 | ++$widget->{frame}; |
3350 | ++$widget->{frame}; |
|
|
3351 | $self->update_face; |
| 3338 | $widget->update; |
3352 | $self->update; |
| 3339 | }, |
3353 | }, |
| 3340 | ); |
3354 | ); |
|
|
3355 | |
|
|
3356 | $self->update_face; |
| 3341 | } |
3357 | } |
| 3342 | |
3358 | |
| 3343 | $self |
3359 | $self |
| 3344 | } |
3360 | } |
| 3345 | |
3361 | |
|
|
3362 | sub 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 | |
| 3346 | sub size_request { |
3375 | sub size_request { |
| 3347 | (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) |
| 3348 | } |
3391 | } |
| 3349 | |
3392 | |
| 3350 | sub update { |
3393 | sub update { |
| 3351 | my ($self) = @_; |
3394 | my ($self) = @_; |
| 3352 | |
3395 | |
| … | |
… | |
| 3360 | |
3403 | |
| 3361 | return unless $::CONN; |
3404 | return unless $::CONN; |
| 3362 | |
3405 | |
| 3363 | $self->SUPER::_draw; |
3406 | $self->SUPER::_draw; |
| 3364 | |
3407 | |
| 3365 | my $face; |
|
|
| 3366 | |
|
|
| 3367 | if ($self->{frame}) { |
|
|
| 3368 | my $anim = $::CONN->{anim}[$self->{anim}]; |
3408 | my $faceid = $::CONN->{faceid}[$self->{face}] |
| 3369 | |
3409 | or return; |
| 3370 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
| 3371 | if $anim && @$anim; |
|
|
| 3372 | } |
|
|
| 3373 | |
3410 | |
| 3374 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
3411 | my $tex = $::CONN->{texture}[$faceid]; |
| 3375 | |
3412 | |
| 3376 | if ($tex) { |
3413 | if ($tex) { |
| 3377 | glEnable GL_TEXTURE_2D; |
3414 | glEnable GL_TEXTURE_2D; |
| 3378 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3415 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
| 3379 | glColor 0, 0, 0, 1; |
3416 | glColor 0, 0, 0, 1; |
