godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Homogeinize resource formats loaders/savers"

Browse Source 
The text format definition needs to stay in `scene/` as it relies
on other scene components, and `core/` must stay self-contained.

This reverts commits a5e27503fd
and 1492fd8460.
This commit is contained in:
Rémi Verschelde 2016-07-19 18:10:27 +02:00
parent c83aa5f863
commit 525fb01fd2
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/register_core_types.cpp
View File

@ -42,7 +42,6 @@
#include "translation.h"
#include "compressed_translation.h"
#include "io/translation_loader_po.h"
#include "io/resource_format_text.h"
#include "io/resource_format_xml.h"
#include "io/resource_format_binary.h"
#include "io/stream_peer_ssl.h"
@ -54,9 +53,6 @@
#include "input_map.h"
#include "undo_redo.h"
static ResourceFormatSaverText *resource_saver_text=NULL;
static ResourceFormatLoaderText *resource_loader_text=NULL;
#ifdef XML_ENABLED
static ResourceFormatSaverXML *resource_saver_xml=NULL;
static ResourceFormatLoaderXML *resource_loader_xml=NULL;
@ -100,11 +96,6 @@ void register_core_types() {
resource_format_po = memnew( TranslationLoaderPO );
ResourceLoader::add_resource_format_loader( resource_format_po );
// Register text formats before to give them precedence on saving
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);
resource_saver_binary = memnew( ResourceFormatSaverBinary );
ResourceSaver::add_resource_format_saver(resource_saver_binary);
@ -211,11 +202,6 @@ void unregister_core_types() {
if (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 );

18
scene/register_scene_types.cpp
View File

@ -222,6 +222,8 @@
#include "scene/3d/collision_polygon.h"
#endif
#include "scene/resources/scene_format_text.h"
static ResourceFormatLoaderImage *resource_loader_image=NULL;
static ResourceFormatLoaderWAV *resource_loader_wav=NULL;
@ -233,6 +235,9 @@ static ResourceFormatLoaderWAV *resource_loader_wav=NULL;
static ResourceFormatLoaderTheme *resource_loader_theme=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 SceneStringNames *string_names;
@ -630,6 +635,13 @@ void register_scene_types() {
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() {
@ -649,5 +661,11 @@ void unregister_scene_types() {
memdelete( resource_loader_theme );
memdelete( resource_loader_shader );
if (resource_saver_text) {
memdelete(resource_saver_text);
}
if (resource_loader_text) {
memdelete(resource_loader_text);
}
SceneStringNames::free();
}

2
core/io/resource_format_text.cpp → scene/resources/scene_format_text.cpp
View File

@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "resource_format_text.h"
#include "scene_format_text.h"
#include "globals.h"
#include "version.h"

0
core/io/resource_format_text.h → scene/resources/scene_format_text.h
View File