edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Init strings

Browse Source
This commit is contained in:
luboslenco
2019-06-17 21:05:15 +02:00
parent 52d6fe2f79
commit 55dfc630f9
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+1 -1
View File
@@ -409,7 +409,7 @@ class App extends iron.Trait {
for (i in 0...s.length) { for (i in 0...s.length) {
if (s.charCodeAt(i) > 127) { if (s.charCodeAt(i) > 127) {
// Bail out for now :( // Bail out for now :(
UITrait.inst.showError("Error: accented / special characters in file path"); UITrait.inst.showError(Strings.error0);
return false; return false;
} }
} }
Sources/arm/Importer.hx
+8 -8
View File
@@ -51,7 +51,7 @@ class Importer {
importFolder(path); importFolder(path);
} }
else { else {
UITrait.inst.showError("Error: Unknown asset format"); UITrait.inst.showError(Strings.error1);
} }
} }
@@ -237,11 +237,11 @@ class Importer {
public static function importTexture(path:String) { public static function importTexture(path:String) {
if (!Format.checkTextureFormat(path)) { if (!Format.checkTextureFormat(path)) {
UITrait.inst.showError("Error: Unknown asset format"); UITrait.inst.showError(Strings.error1);
return; return;
} }
for (a in UITrait.inst.assets) if (a.file == path) { UITrait.inst.showMessage("Info: Asset already imported"); return; } for (a in UITrait.inst.assets) if (a.file == path) { UITrait.inst.showMessage(Strings.info0); return; }
iron.data.Data.getImage(path, function(image:kha.Image) { iron.data.Data.getImage(path, function(image:kha.Image) {
var ar = path.split("/"); var ar = path.split("/");
@@ -367,7 +367,7 @@ class Importer {
public static function importMesh(path:String) { public static function importMesh(path:String) {
if (!Format.checkMeshFormat(path)) { if (!Format.checkMeshFormat(path)) {
UITrait.inst.showError("Error: Unknown mesh format"); UITrait.inst.showError(Strings.error1);
return; return;
} }
@@ -476,7 +476,7 @@ class Importer {
// { test -e file && echo 1 || echo 0 } // { test -e file && echo 1 || echo 0 }
#end #end
if (exists == 0) { if (exists == 0) {
trace("Could not locate texture " + abs); UITrait.inst.showError(Strings.error2 + abs);
var b = haxe.io.Bytes.alloc(4); var b = haxe.io.Bytes.alloc(4);
b.set(0, 255); b.set(0, 255);
b.set(1, 0); b.set(1, 0);
@@ -889,7 +889,7 @@ class Importer {
static function makeMesh(mesh:Dynamic, path:String) { static function makeMesh(mesh:Dynamic, path:String) {
if (mesh == null || mesh.posa == null || mesh.nora == null || mesh.inda == null) { if (mesh == null || mesh.posa == null || mesh.nora == null || mesh.inda == null) {
UITrait.inst.showError("Error: Failed to read mesh data"); UITrait.inst.showError(Strings.error3);
return; return;
} }
@@ -912,7 +912,7 @@ class Importer {
else { else {
if (mesh.texa == null) { if (mesh.texa == null) {
UITrait.inst.showError("Error: Mesh has no UVs, generating defaults"); UITrait.inst.showError(Strings.error4);
var verts = Std.int(mesh.posa.length / 4); var verts = Std.int(mesh.posa.length / 4);
mesh.texa = new kha.arrays.Int16Array(verts * 2); mesh.texa = new kha.arrays.Int16Array(verts * 2);
var n = new iron.math.Vec4(); var n = new iron.math.Vec4();
@@ -1015,7 +1015,7 @@ class Importer {
static function addMesh(mesh:Dynamic) { static function addMesh(mesh:Dynamic) {
if (mesh.texa == null) { if (mesh.texa == null) {
UITrait.inst.showError("Error: Mesh has no UVs, generating defaults"); UITrait.inst.showError(Strings.error4);
var verts = Std.int(mesh.posa.length / 4); var verts = Std.int(mesh.posa.length / 4);
mesh.texa = new kha.arrays.Int16Array(verts * 2); mesh.texa = new kha.arrays.Int16Array(verts * 2);
var n = new iron.math.Vec4(); var n = new iron.math.Vec4();
Sources/arm/Project.hx
+2 -2
View File
@@ -22,7 +22,7 @@ class Project {
UIFiles.filters = "arm"; UIFiles.filters = "arm";
arm.App.filesDone = function(path:String) { arm.App.filesDone = function(path:String) {
if (!StringTools.endsWith(path, ".arm")) { if (!StringTools.endsWith(path, ".arm")) {
UITrait.inst.showError("Error: .arm file expected"); UITrait.inst.showError(Strings.error5);
return; return;
} }
@@ -282,7 +282,7 @@ class Project {
// { test -e file && echo 1 || echo 0 } // { test -e file && echo 1 || echo 0 }
#end #end
if (exists == 0) { if (exists == 0) {
trace("Could not locate texture " + abs); UITrait.inst.showError(Strings.error2 + abs);
var b = haxe.io.Bytes.alloc(4); var b = haxe.io.Bytes.alloc(4);
b.set(0, 255); b.set(0, 255);
b.set(1, 0); b.set(1, 0);
Sources/arm/Strings.hx
+11
View File
@@ -0,0 +1,11 @@
package arm;
class Strings {
public static var error0 = "Error: Accented / special characters in file path";
public static var error1 = "Error: Unknown asset format";
public static var error2 = "Error: Could not locate texture ";
public static var error3 = "Error: Failed to read mesh data";
public static var error4 = "Error: Mesh has no UVs, generating defaults";
public static var error5 = "Error: .arm file expected";
public static var info0 = "Info: Asset already imported";
}