godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
editor/io_plugins/editor_export_scene.cpp
View File

@@ -27,64 +27,61 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_export_scene.h"
#include "editor/editor_settings.h"
#include "globals.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "editor/editor_settings.h"
#include "scene/resources/packed_scene.h"
#include "globals.h"
Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
Vector<uint8_t> EditorSceneExportPlugin::custom_export(String &p_path, const Ref<EditorExportPlatform> &p_platform) {
if (!EditorImportExport::get_singleton()->get_convert_text_scenes()) {
return Vector<uint8_t>();
}
String extension = p_path.extension();
//step 1 check if scene
if (extension=="xml" || extension=="xres") {
if (extension == "xml" || extension == "xres") {
String type = ResourceLoader::get_resource_type(p_path);
if (type!="PackedScene")
if (type != "PackedScene")
return Vector<uint8_t>();
} else if (extension!="tscn" && extension!="xscn") {
} else if (extension != "tscn" && extension != "xscn") {
return Vector<uint8_t>();
}
//step 2 check if cached
uint64_t sd=0;
uint64_t sd = 0;
String smd5;
String gp = Globals::get_singleton()->globalize_path(p_path);
String md5=gp.md5_text();
String md5 = gp.md5_text();
String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/");
bool valid=false;
bool valid = false;
{
//if existing, make sure it's valid
FileAccessRef f = FileAccess::open(tmp_path+"scnexp-"+md5+".txt",FileAccess::READ);
FileAccessRef f = FileAccess::open(tmp_path + "scnexp-" + md5 + ".txt", FileAccess::READ);
if (f) {
uint64_t d = f->get_line().strip_edges().to_int64();
sd = FileAccess::get_modified_time(p_path);
if (d==sd) {
valid=true;
if (d == sd) {
valid = true;
} else {
String cmd5 = f->get_line().strip_edges();
smd5 = FileAccess::get_md5(p_path);
if (cmd5==smd5) {
valid=true;
if (cmd5 == smd5) {
valid = true;
}
}
}
}
@@ -92,32 +89,32 @@ Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<
//cache failed, convert
DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
String copy = p_path+".convert."+extension;
String copy = p_path + ".convert." + extension;
// a copy will allow loading the internal resources without conflicting with opened scenes
da->copy(p_path,copy);
da->copy(p_path, copy);
//@todo for tscn use something more efficient
Ref<PackedScene> copyres = ResourceLoader::load(copy,"PackedScene");
Ref<PackedScene> copyres = ResourceLoader::load(copy, "PackedScene");
da->remove(copy);
memdelete(da);
ERR_FAIL_COND_V(!copyres.is_valid(),Vector<uint8_t>());
ERR_FAIL_COND_V(!copyres.is_valid(), Vector<uint8_t>());
Error err = ResourceSaver::save(tmp_path+"scnexp-"+md5+".scn",copyres);
Error err = ResourceSaver::save(tmp_path + "scnexp-" + md5 + ".scn", copyres);
copyres=Ref<PackedScene>();
copyres = Ref<PackedScene>();
ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
ERR_FAIL_COND_V(err != OK, Vector<uint8_t>());
FileAccessRef f = FileAccess::open(tmp_path+"scnexp-"+md5+".txt",FileAccess::WRITE);
FileAccessRef f = FileAccess::open(tmp_path + "scnexp-" + md5 + ".txt", FileAccess::WRITE);
if (sd==0)
if (sd == 0)
sd = FileAccess::get_modified_time(p_path);
if (smd5==String())
if (smd5 == String())
smd5 = FileAccess::get_md5(p_path);
f->store_line(String::num(sd));
@@ -125,16 +122,12 @@ Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<
f->store_line(gp); //source path for reference
}
Vector<uint8_t> ret = FileAccess::get_file_as_array(tmp_path + "scnexp-" + md5 + ".scn");
Vector<uint8_t> ret = FileAccess::get_file_as_array(tmp_path+"scnexp-"+md5+".scn");
p_path+=".converted.scn";
p_path += ".converted.scn";
return ret;
}
EditorSceneExportPlugin::EditorSceneExportPlugin()
{
EditorSceneExportPlugin::EditorSceneExportPlugin() {
}