TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix MovieTexture::get_time()

Browse Source
This commit is contained in:
David Rose 2011-11-28 15:22:48 +00:00
parent 1a8eb0710b
commit a09bb8a154
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/grutil/movieTexture.cxx
View File

@ -68,7 +68,6 @@ CData() :
_clock(0.0),
_playing(false),
_loop_count(1),
_loops_total(1),
_play_rate(1.0)
{
}
@ -87,7 +86,6 @@ CData(const CData &copy) :
_clock(0.0),
_playing(false),
_loop_count(1),
_loops_total(1),
_play_rate(1.0)
{
}
@ -361,7 +359,7 @@ cull_callback(CullTraverser *, const CullTraverserData &) const {
if (cdata->_playing) {
offset += now * cdata->_play_rate;
}
true_loop_count = cdata->_loops_total;
true_loop_count = cdata->_loop_count;
}
for (int i=0; i<((int)(cdata->_pages.size())); i++) {
@ -549,7 +547,6 @@ play() {
double now = ClockObject::get_global_clock()->get_frame_time();
cdata->_clock = 0.0 - (now * cdata->_play_rate);
cdata->_playing = true;
cdata->_loops_total = cdata->_loop_count;
}
////////////////////////////////////////////////////////////////////
@ -587,11 +584,7 @@ get_time() const {
double now = ClockObject::get_global_clock()->get_frame_time();
clock += (now * cdata->_play_rate);
}
if (clock >= cdata->_video_length * cdata->_loops_total) {
return cdata->_video_length;
} else {
return fmod(clock, cdata->_video_length);
}
return clock;
}
////////////////////////////////////////////////////////////////////

1
panda/src/grutil/movieTexture.h
View File

@ -122,7 +122,6 @@ protected:
double _clock;
bool _playing;
int _loop_count;
int _loops_total;
double _play_rate;
PT(AudioSound) _synchronize;
};