From 885f40a5ce2e277e5592e6c9d7de93226cfafc79 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Fri, 27 Jan 2023 15:11:36 +0100 Subject: [PATCH] Cleanup --- Assets/licenses/plugins/license_texsynth.md | 25 --------------------- Sources/arm/Enums.hx | 1 - Sources/arm/Strings.hx | 1 - khafile.js | 6 ++--- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 Assets/licenses/plugins/license_texsynth.md diff --git a/Assets/licenses/plugins/license_texsynth.md b/Assets/licenses/plugins/license_texsynth.md deleted file mode 100644 index 0bdad8fb..00000000 --- a/Assets/licenses/plugins/license_texsynth.md +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2019 Embark Studios - -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions -of the Software. - -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 OR COPYRIGHT HOLDERS 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. diff --git a/Sources/arm/Enums.hx b/Sources/arm/Enums.hx index 5b1aca16..a5a77f6b 100644 --- a/Sources/arm/Enums.hx +++ b/Sources/arm/Enums.hx @@ -17,7 +17,6 @@ package arm; @:enum abstract SpaceType(Int) from Int to Int { var SpacePaint = 0; - // var SpaceSculpt = 0; var SpaceMaterial = 1; var SpaceBake = 2; } diff --git a/Sources/arm/Strings.hx b/Sources/arm/Strings.hx index 41e2e98b..4dad86b0 100644 --- a/Sources/arm/Strings.hx +++ b/Sources/arm/Strings.hx @@ -5,7 +5,6 @@ class Strings { public static function error1(): String { return tr("Error: Unknown asset format"); } public static function error2(): String { return tr("Error: Could not locate texture"); } public static function error3(): String { return tr("Error: Failed to read mesh data"); } - // public static function error4(): String { return tr("Error: Mesh has no UVs, generating defaults"); } public static function error5(): String { return tr("Error: Check internet connection to access the cloud"); } public static function info0(): String { return tr("Info: Asset already imported"); } } diff --git a/khafile.js b/khafile.js index c8eaf63b..88d78343 100644 --- a/khafile.js +++ b/khafile.js @@ -17,10 +17,10 @@ project.addSources("Sources"); project.addLibrary("iron"); project.addLibrary("zui"); project.addLibrary("armorbase"); -project.addShaders("Shaders/*.glsl", { embed: snapshot}); -project.addShaders("armorcore/Shaders/*.glsl", { embed: snapshot}); +project.addShaders("Shaders/*.glsl", { embed: snapshot }); +project.addShaders("armorcore/Shaders/*.glsl", { embed: snapshot }); project.addAssets("Assets/*", { destination: "data/{name}", embed: snapshot }); -project.addShaders("Libraries/armorbase/Shaders/common/*.glsl", { embed: snapshot}); +project.addShaders("Libraries/armorbase/Shaders/common/*.glsl", { embed: snapshot }); project.addAssets("Libraries/armorbase/Assets/common/*", { destination: "data/{name}", embed: snapshot }); if (!snapshot) { project.addDefine("arm_noembed");