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.369 by root, Sun Jul 15 20:25:26 2007 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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}
… …
1100} 1107}
1101 1108
1102sub update_slider { 1109sub 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
1114sub update { 1123sub update {
1115 my ($self) = @_; 1124 my ($self) = @_;
1116 1125
1117 $self->SUPER::update; 1126 $self->SUPER::update;
1118
1119 $self->update_slider; 1127 $self->update_slider;
1120} 1128}
1121 1129
1122sub invoke_size_allocate { 1130sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1124 1132
1125 $self->update_slider; 1133 $self->update_slider;
1126
1127 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1128} 1135}
1129 1136
1130############################################################################# 1137#############################################################################
1131 1138
… …
3334 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3343 hard => 1,
3337 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
3338 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
3339 ++$widget->{frame}; 3347 ++$widget->{frame};
3340 $widget->update; 3348 $widget->update;
3341 }, 3349 },
3342 ); 3350 );
3343 } 3351 }
… …
3370 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3371 3379
3372 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3373 if $anim && @$anim; 3381 if $anim && @$anim;
3374 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3375 3386
3376 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3377 3388
3378 if ($tex) { 3389 if ($tex) {
3379 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3380 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3381 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3383 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3384 } 3399 }
3385} 3400}
3386 3401
3387sub destroy { 3402sub destroy {
3388 my ($self) = @_; 3403 my ($self) = @_;

Diff Legend

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