Homogeinize resource formats loaders/savers
This commit is contained in:
parent
83740ab793
commit
a5e27503fd
|
@ -26,7 +26,7 @@
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
#include "scene_format_text.h"
|
#include "resource_format_text.h"
|
||||||
|
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
|
@ -42,6 +42,7 @@
|
||||||
#include "translation.h"
|
#include "translation.h"
|
||||||
#include "compressed_translation.h"
|
#include "compressed_translation.h"
|
||||||
#include "io/translation_loader_po.h"
|
#include "io/translation_loader_po.h"
|
||||||
|
#include "io/resource_format_text.h"
|
||||||
#include "io/resource_format_xml.h"
|
#include "io/resource_format_xml.h"
|
||||||
#include "io/resource_format_binary.h"
|
#include "io/resource_format_binary.h"
|
||||||
#include "io/stream_peer_ssl.h"
|
#include "io/stream_peer_ssl.h"
|
||||||
|
@ -53,6 +54,9 @@
|
||||||
#include "input_map.h"
|
#include "input_map.h"
|
||||||
#include "undo_redo.h"
|
#include "undo_redo.h"
|
||||||
|
|
||||||
|
|
||||||
|
static ResourceFormatSaverText *resource_saver_text=NULL;
|
||||||
|
static ResourceFormatLoaderText *resource_loader_text=NULL;
|
||||||
#ifdef XML_ENABLED
|
#ifdef XML_ENABLED
|
||||||
static ResourceFormatSaverXML *resource_saver_xml=NULL;
|
static ResourceFormatSaverXML *resource_saver_xml=NULL;
|
||||||
static ResourceFormatLoaderXML *resource_loader_xml=NULL;
|
static ResourceFormatLoaderXML *resource_loader_xml=NULL;
|
||||||
|
@ -102,6 +106,11 @@ void register_core_types() {
|
||||||
resource_loader_binary = memnew( ResourceFormatLoaderBinary );
|
resource_loader_binary = memnew( ResourceFormatLoaderBinary );
|
||||||
ResourceLoader::add_resource_format_loader(resource_loader_binary);
|
ResourceLoader::add_resource_format_loader(resource_loader_binary);
|
||||||
|
|
||||||
|
resource_saver_text = memnew( ResourceFormatSaverText );
|
||||||
|
ResourceSaver::add_resource_format_saver(resource_saver_text);
|
||||||
|
resource_loader_text = memnew( ResourceFormatLoaderText );
|
||||||
|
ResourceLoader::add_resource_format_loader(resource_loader_text);
|
||||||
|
|
||||||
#ifdef XML_ENABLED
|
#ifdef XML_ENABLED
|
||||||
resource_saver_xml = memnew( ResourceFormatSaverXML );
|
resource_saver_xml = memnew( ResourceFormatSaverXML );
|
||||||
ResourceSaver::add_resource_format_saver(resource_saver_xml);
|
ResourceSaver::add_resource_format_saver(resource_saver_xml);
|
||||||
|
@ -202,6 +211,11 @@ void unregister_core_types() {
|
||||||
if (resource_loader_binary)
|
if (resource_loader_binary)
|
||||||
memdelete(resource_loader_binary);
|
memdelete(resource_loader_binary);
|
||||||
|
|
||||||
|
if (resource_saver_text)
|
||||||
|
memdelete(resource_saver_text);
|
||||||
|
if (resource_loader_text)
|
||||||
|
memdelete(resource_loader_text);
|
||||||
|
|
||||||
|
|
||||||
memdelete( resource_format_po );
|
memdelete( resource_format_po );
|
||||||
|
|
||||||
|
|
|
@ -222,8 +222,6 @@
|
||||||
#include "scene/3d/collision_polygon.h"
|
#include "scene/3d/collision_polygon.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "scene/resources/scene_format_text.h"
|
|
||||||
|
|
||||||
static ResourceFormatLoaderImage *resource_loader_image=NULL;
|
static ResourceFormatLoaderImage *resource_loader_image=NULL;
|
||||||
static ResourceFormatLoaderWAV *resource_loader_wav=NULL;
|
static ResourceFormatLoaderWAV *resource_loader_wav=NULL;
|
||||||
|
|
||||||
|
@ -235,9 +233,6 @@ static ResourceFormatLoaderWAV *resource_loader_wav=NULL;
|
||||||
static ResourceFormatLoaderTheme *resource_loader_theme=NULL;
|
static ResourceFormatLoaderTheme *resource_loader_theme=NULL;
|
||||||
static ResourceFormatLoaderShader *resource_loader_shader=NULL;
|
static ResourceFormatLoaderShader *resource_loader_shader=NULL;
|
||||||
|
|
||||||
static ResourceFormatSaverText *resource_saver_text=NULL;
|
|
||||||
static ResourceFormatLoaderText *resource_loader_text=NULL;
|
|
||||||
|
|
||||||
static ResourceFormatLoaderDynamicFont *resource_loader_dynamic_font=NULL;
|
static ResourceFormatLoaderDynamicFont *resource_loader_dynamic_font=NULL;
|
||||||
|
|
||||||
//static SceneStringNames *string_names;
|
//static SceneStringNames *string_names;
|
||||||
|
@ -635,13 +630,6 @@ void register_scene_types() {
|
||||||
|
|
||||||
OS::get_singleton()->yield(); //may take time to init
|
OS::get_singleton()->yield(); //may take time to init
|
||||||
|
|
||||||
|
|
||||||
resource_saver_text = memnew( ResourceFormatSaverText );
|
|
||||||
ResourceSaver::add_resource_format_saver(resource_saver_text);
|
|
||||||
|
|
||||||
resource_loader_text = memnew( ResourceFormatLoaderText );
|
|
||||||
ResourceLoader::add_resource_format_loader(resource_loader_text);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void unregister_scene_types() {
|
void unregister_scene_types() {
|
||||||
|
@ -661,11 +649,5 @@ void unregister_scene_types() {
|
||||||
memdelete( resource_loader_theme );
|
memdelete( resource_loader_theme );
|
||||||
memdelete( resource_loader_shader );
|
memdelete( resource_loader_shader );
|
||||||
|
|
||||||
if (resource_saver_text) {
|
|
||||||
memdelete(resource_saver_text);
|
|
||||||
}
|
|
||||||
if (resource_loader_text) {
|
|
||||||
memdelete(resource_loader_text);
|
|
||||||
}
|
|
||||||
SceneStringNames::free();
|
SceneStringNames::free();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue