diff --git a/armorforge/project.js b/armorforge/project.js index 4e81a926..8df78c2d 100644 --- a/armorforge/project.js +++ b/armorforge/project.js @@ -1,7 +1,7 @@ let flags = globalThis.flags; -flags.name = 'ArmorForge'; -flags.package = 'org.armorforge'; +flags.name = "ArmorForge"; +flags.package = "org.armorforge"; flags.with_mpeg_write = true; let project = new Project(flags.name); diff --git a/armorlab/project.js b/armorlab/project.js index 8630cfc7..141fca44 100644 --- a/armorlab/project.js +++ b/armorlab/project.js @@ -1,7 +1,7 @@ let flags = globalThis.flags; -flags.name = 'ArmorLab'; -flags.package = 'org.armorlab'; +flags.name = "ArmorLab"; +flags.package = "org.armorlab"; flags.with_onnx = true; let project = new Project(flags.name); diff --git a/armorpaint/project.js b/armorpaint/project.js index f59d2a42..4d29b498 100644 --- a/armorpaint/project.js +++ b/armorpaint/project.js @@ -1,7 +1,7 @@ let flags = globalThis.flags; -flags.name = 'ArmorPaint'; -flags.package = 'org.armorpaint'; +flags.name = "ArmorPaint"; +flags.package = "org.armorpaint"; let project = new Project(flags.name); project.add_define("is_paint"); diff --git a/armorsculpt/project.js b/armorsculpt/project.js index 973340a6..c45eed6a 100644 --- a/armorsculpt/project.js +++ b/armorsculpt/project.js @@ -1,7 +1,7 @@ let flags = globalThis.flags; -flags.name = 'ArmorSculpt'; -flags.package = 'org.armorsculpt'; +flags.name = "ArmorSculpt"; +flags.package = "org.armorsculpt"; let project = new Project(flags.name); project.add_define("is_sculpt"); diff --git a/base/assets/licenses/license_fonts.md b/base/assets/licenses/license_fonts.md index 0a71d7e2..f6269516 100644 --- a/base/assets/licenses/license_fonts.md +++ b/base/assets/licenses/license_fonts.md @@ -201,99 +201,3 @@ Roboto: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - -Noto: - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to -provide a free and open framework in which fonts may be shared and -improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software -components as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, -deleting, or substituting -- in part or in whole -- any of the -components of the Original Version, by changing formats or by porting -the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, -modify, redistribute, and sell modified and unmodified copies of the -Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in -Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the -corresponding Copyright Holder. This restriction only applies to the -primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created using -the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/base/assets/licenses/license_stb.md b/base/assets/licenses/license_stb.md deleted file mode 100644 index e249bf7b..00000000 --- a/base/assets/licenses/license_stb.md +++ /dev/null @@ -1,19 +0,0 @@ -Public Domain (www.unlicense.org) -This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, -commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to -this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -https://github.com/nothings/stb diff --git a/base/assets/licenses/license_tinydir.md b/base/assets/licenses/license_tinydir.md deleted file mode 100644 index 43f1d9d1..00000000 --- a/base/assets/licenses/license_tinydir.md +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2013-2016, tinydir authors: -- Cong Xu -- Lautis Sun -- Baudouin Feildel -- Andargor -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -https://github.com/cxong/tinydir diff --git a/base/assets/licenses/license_zlib.md b/base/assets/licenses/license_zlib.md deleted file mode 100644 index 5f7061ba..00000000 --- a/base/assets/licenses/license_zlib.md +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -Jean-loup Gailly Mark Adler -jloup@gzip.org madler@alumni.caltech.edu - -https://github.com/madler/zlib diff --git a/base/project.js b/base/project.js index 4a691f90..828ff991 100644 --- a/base/project.js +++ b/base/project.js @@ -12,8 +12,7 @@ flags.voxels = !flags.raytrace && !flags.android && !flags.ios; flags.with_d3dcompiler = true; flags.with_nfd = true; -flags.with_tinydir = true; -flags.with_zlib = true; +flags.with_compress = true; flags.with_stb_image_write = true; flags.with_g2 = true; flags.with_iron = true; @@ -54,7 +53,7 @@ let project = new Project("Base"); } } - project.add_define('WITH_PLUGINS'); + project.add_define("WITH_PLUGINS"); project.add_cfiles("sources/plugin_api.c"); project.add_project("../" + dir + "/plugins"); } diff --git a/base/sources/file.ts b/base/sources/file.ts index d4c611be..84bf9a9c 100644 --- a/base/sources/file.ts +++ b/base/sources/file.ts @@ -14,7 +14,7 @@ let file_cloud_sizes: map_t = null; // let let file_internal: map_t = null; // .apk contents // ///end -function file_read_directory(path: string, folders_only: bool = false): string[] { +function file_read_directory(path: string): string[] { if (starts_with(path, "cloud")) { let files: string[] = file_cloud != null ? map_get(file_cloud, string_replace_all(path, "\\", "/")) : null; if (files != null) { @@ -38,7 +38,7 @@ function file_read_directory(path: string, folders_only: bool = false): string[] // } // if (file_internal.exists(path)) return map_get(file_internal, path); // ///end - return string_split(iron_read_directory(path, folders_only), "\n"); + return string_split(iron_read_directory(path), "\n"); } function file_create_directory(path: string) { diff --git a/base/sources/tab_browser.ts b/base/sources/tab_browser.ts index 58dbc064..ce3f14f8 100644 --- a/base/sources/tab_browser.ts +++ b/base/sources/tab_browser.ts @@ -98,7 +98,7 @@ function tab_browser_draw(htab: ui_handle_t) { ui._x = bookmarks_w; ui._w -= bookmarks_w; - ui_files_file_browser(ui, tab_browser_hpath, false, true, tab_browser_hsearch.text, refresh, function (file: string) { + ui_files_file_browser(ui, tab_browser_hpath, true, tab_browser_hsearch.text, refresh, function (file: string) { let file_name: string = substring(file, string_last_index_of(file, path_sep) + 1, file.length); if (file_name == "..") { diff --git a/base/sources/ui_files.ts b/base/sources/ui_files.ts index 62d3e29f..7d4c6caf 100644 --- a/base/sources/ui_files.ts +++ b/base/sources/ui_files.ts @@ -76,7 +76,7 @@ function make_draw_cloud_icon_data(f: string, image: image_t): draw_cloud_icon_d return data; } -function ui_files_file_browser(ui: ui_t, handle: ui_handle_t, folders_only: bool = false, drag_files: bool = false, search: string = "", refresh: bool = false, context_menu: (s: string)=>void = null): string { +function ui_files_file_browser(ui: ui_t, handle: ui_handle_t, drag_files: bool = false, search: string = "", refresh: bool = false, context_menu: (s: string)=>void = null): string { let icons: image_t = resource_get("icons.k"); let folder: rect_t = resource_tile50(icons, 2, 1); @@ -88,7 +88,7 @@ function ui_files_file_browser(ui: ui_t, handle: ui_handle_t, folders_only: bool ui_base_hwnds[tab_area_t.STATUS].redraws = 3; }); } - if (is_cloud && file_read_directory("cloud", false).length == 0) { + if (is_cloud && file_read_directory("cloud").length == 0) { return handle.text; } @@ -119,7 +119,7 @@ function ui_files_file_browser(ui: ui_t, handle: ui_handle_t, folders_only: bool dir_path = document_directory + dir_path; } ///end - let files_all: string[] = file_read_directory(dir_path, folders_only); + let files_all: string[] = file_read_directory(dir_path); for (let i: i32 = 0; i < files_all.length; ++i) { let f: string = files_all[i]; diff --git a/base/tools/pad/project.js b/base/tools/pad/project.js index 37f116cb..e1094324 100644 --- a/base/tools/pad/project.js +++ b/base/tools/pad/project.js @@ -1,9 +1,8 @@ let flags = globalThis.flags; -flags.name = 'ArmorPad'; -flags.package = 'org.armorpad'; +flags.name = "ArmorPad"; +flags.package = "org.armorpad"; flags.with_nfd = true; -flags.with_tinydir = true; flags.with_g2 = true; flags.with_iron = true; flags.with_ui = true; @@ -16,7 +15,7 @@ project.add_shaders(root + "armorcore/shaders/*.glsl",); project.add_assets(root + "base/assets/font_mono.ttf", { destination: "data/{name}" }); project.add_assets(root + "base/assets/text_coloring.json", { destination: "data/{name}" }); -project.add_define('IDLE_SLEEP'); +project.add_define("IDLE_SLEEP"); project.add_project(root + "armorcore"); return project; diff --git a/base/tools/pad/sources/main.ts b/base/tools/pad/sources/main.ts index f60af24a..76f89444 100644 --- a/base/tools/pad/sources/main.ts +++ b/base/tools/pad/sources/main.ts @@ -109,7 +109,7 @@ function armpack_to_string(bytes: buffer_t): string { } function list_folder(path: string) { - let files: string[] = string_split(iron_read_directory(path, false), "\n"); + let files: string[] = string_split(iron_read_directory(path), "\n"); for (let i: i32 = 0; i < files.length; ++i) { let f: string = files[i]; let abs: string = path + "/" + f;