forked from bartvdbraak/blender
06d2ad0185
This patch fixes: - the call of LibFree on a unfinished loaded library; - memory leak created on end of game : the async libraries are loaded but not converted, so not freed with the master scene. Reviewers: campbellbarton, sybren, youle, hg1, moguri, lordloki Reviewed By: moguri, lordloki Differential Revision: https://developer.blender.org/D1571
94 lines
2.6 KiB
C++
94 lines
2.6 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor(s): Mitchell Stokes
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file KX_LibLoadStatus.h
|
|
* \ingroup bgeconv
|
|
*/
|
|
|
|
#ifndef __KX_LIBLOADSTATUS_H__
|
|
#define __KX_LIBLOADSTATUS_H__
|
|
|
|
#include "EXP_PyObjectPlus.h"
|
|
|
|
class KX_LibLoadStatus : public PyObjectPlus
|
|
{
|
|
Py_Header
|
|
private:
|
|
class KX_BlenderSceneConverter* m_converter;
|
|
class KX_KetsjiEngine* m_engine;
|
|
class KX_Scene* m_mergescene;
|
|
void* m_data;
|
|
STR_String m_libname;
|
|
|
|
float m_progress;
|
|
double m_starttime;
|
|
double m_endtime;
|
|
|
|
// The current status of this libload, used by the scene converter.
|
|
bool m_finished;
|
|
|
|
#ifdef WITH_PYTHON
|
|
PyObject* m_finish_cb;
|
|
PyObject* m_progress_cb;
|
|
#endif
|
|
|
|
public:
|
|
KX_LibLoadStatus(class KX_BlenderSceneConverter* kx_converter,
|
|
class KX_KetsjiEngine* kx_engine,
|
|
class KX_Scene* merge_scene,
|
|
const char *path);
|
|
|
|
void Finish(); // Called when the libload is done
|
|
void RunFinishCallback();
|
|
void RunProgressCallback();
|
|
|
|
class KX_BlenderSceneConverter *GetConverter();
|
|
class KX_KetsjiEngine *GetEngine();
|
|
class KX_Scene *GetMergeScene();
|
|
|
|
void SetLibName(const char *name);
|
|
const char *GetLibName();
|
|
|
|
void SetData(void *data);
|
|
void *GetData();
|
|
|
|
inline bool IsFinished() const
|
|
{
|
|
return m_finished;
|
|
}
|
|
|
|
void SetProgress(float progress);
|
|
float GetProgress();
|
|
void AddProgress(float progress);
|
|
|
|
#ifdef WITH_PYTHON
|
|
static PyObject* pyattr_get_onfinish(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
|
static int pyattr_set_onfinish(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
|
|
static PyObject* pyattr_get_onprogress(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
|
static int pyattr_set_onprogress(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
|
|
|
|
static PyObject* pyattr_get_timetaken(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
|
#endif
|
|
};
|
|
|
|
#endif // __KX_LIBLOADSTATUS_H__
|