fix bug with movie textures in egg files

This commit is contained in:
David Rose 2011-08-08 23:29:32 +00:00
parent 6872488839
commit c3b5e1ec6b
4 changed files with 30 additions and 0 deletions

View File

@ -506,6 +506,20 @@ void FFMpegTexture::
do_get_bam_rawdata() {
}
////////////////////////////////////////////////////////////////////
// Function: FFMpegTexture::do_can_reload
// Access: Protected, Virtual
// Description: Returns true if we can safely call
// do_unlock_and_reload_ram_image() in order to make the
// image available, or false if we shouldn't do this
// (because we know from a priori knowledge that it
// wouldn't work anyway).
////////////////////////////////////////////////////////////////////
bool FFMpegTexture::
do_can_reload() {
return false;
}

View File

@ -62,6 +62,7 @@ protected:
virtual bool do_has_bam_rawdata() const;
virtual void do_get_bam_rawdata();
virtual bool do_can_reload();
private:
class VideoPage;

View File

@ -498,6 +498,20 @@ void MovieTexture::
do_get_bam_rawdata() {
}
////////////////////////////////////////////////////////////////////
// Function: MovieTexture::do_can_reload
// Access: Protected, Virtual
// Description: Returns true if we can safely call
// do_unlock_and_reload_ram_image() in order to make the
// image available, or false if we shouldn't do this
// (because we know from a priori knowledge that it
// wouldn't work anyway).
////////////////////////////////////////////////////////////////////
bool MovieTexture::
do_can_reload() {
return false;
}
////////////////////////////////////////////////////////////////////
// Function: MovieTexture::restart
// Access: Published

View File

@ -73,6 +73,7 @@ protected:
virtual bool get_keep_ram_image() const;
virtual bool do_has_bam_rawdata() const;
virtual void do_get_bam_rawdata();
virtual bool do_can_reload();
virtual bool do_adjust_this_size(int &x_size, int &y_size, const string &name,
bool for_padding);