From 099546ac005d2ddbb5fb806c7ed678484ff02442 Mon Sep 17 00:00:00 2001 From: BastiaanOlij Date: Fri, 8 Sep 2017 11:39:32 +1000 Subject: Fixed loading package from resource folder, exporting textures to bundle and added a bit of feedback for a debug compile --- platform/osx/export/export.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'platform/osx/export/export.cpp') diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 7f749030e..2ec76fe0d 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -88,8 +88,15 @@ public: }; void EditorExportPlatformOSX::get_preset_features(const Ref &p_preset, List *r_features) { - - // what does this need to do? + if (p_preset->get("texture_format/s3tc")) { + r_features->push_back("s3tc"); + } + if (p_preset->get("texture_format/etc")) { + r_features->push_back("etc"); + } + if (p_preset->get("texture_format/etc2")) { + r_features->push_back("etc2"); + } } void EditorExportPlatformOSX::get_export_options(List *r_options) { @@ -112,6 +119,10 @@ void EditorExportPlatformOSX::get_export_options(List *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/entitlements"), "")); #endif + + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false)); } void EditorExportPlatformOSX::_make_icon(const Ref &p_icon, Vector &p_data) { -- cgit v1.2.3-70-g09d2