Cleanup

Sources/arm/App.hx

@@ -33,7 +33,7 @@ import arm.data.ConstData;
 import arm.plugin.Camera;
 import arm.node.MaterialParser;
 import arm.Enums;
-import arm.Project;
+import arm.ProjectFormat;
 import arm.Res;
 
 class App {

Sources/arm/Context.hx

@@ -15,7 +15,7 @@ import arm.ui.UIView2D;
 import arm.ui.UIHeader;
 import arm.node.MaterialParser;
 import arm.Enums;
-import arm.Project;
+import arm.ProjectFormat;
 
 class Context {
 

Sources/arm/Layers.hx

@@ -16,7 +16,7 @@ import arm.node.MaterialParser;
 import arm.render.RenderPathPaint;
 import arm.util.MeshUtil;
 import arm.Enums;
-import arm.Project;
+import arm.ProjectFormat;
 
 class Layers {
 

Sources/arm/Project.hx

@@ -25,6 +25,7 @@ import arm.io.ImportArm;
 import arm.io.ImportBlend;
 import arm.io.ImportMesh;
 import arm.io.ExportArm;
+import arm.ProjectFormat;
 import arm.Enums;
 
 class Project {
@@ -299,38 +300,3 @@ class Project {
 		});
 	}
 }
-
-typedef TProjectFormat = {
-	public var version: String;
-	@:optional public var brush_nodes: Array<TNodeCanvas>;
-	@:optional public var brush_icons: Array<haxe.io.Bytes>;
-	@:optional public var material_nodes: Array<TNodeCanvas>;
-	@:optional public var material_icons: Array<haxe.io.Bytes>;
-	@:optional public var assets: Array<String>; // texture_assets
-	@:optional public var layer_datas: Array<TLayerData>;
-	@:optional public var mesh_datas: Array<TMeshData>;
-	@:optional public var mesh_assets: Array<String>;
-}
-
-typedef TLayerData = {
-	public var res: Int; // Width pixels
-	public var bpp: Int; // Bits per pixel
-	public var texpaint: haxe.io.Bytes;
-	public var texpaint_nor: haxe.io.Bytes;
-	public var texpaint_pack: haxe.io.Bytes;
-	public var texpaint_mask: haxe.io.Bytes;
-	public var uv_scale: Float;
-	public var uv_rot: Float;
-	public var uv_type: Int;
-	public var opacity_mask: Float;
-	public var material_mask: Int;
-	public var object_mask: Int;
-	public var blending: Int;
-	public var parent: Int;
-}
-
-typedef TAsset = {
-	public var id: Int;
-	public var name: String;
-	public var file: String;
-}

Sources/arm/ProjectFormat.hx

@@ -0,0 +1,39 @@
+package arm;
+
+import zui.Nodes;
+import iron.data.SceneFormat;
+
+typedef TProjectFormat = {
+	@:optional public var version: String;
+	@:optional public var brush_nodes: Array<TNodeCanvas>;
+	@:optional public var brush_icons: Array<haxe.io.Bytes>;
+	@:optional public var material_nodes: Array<TNodeCanvas>;
+	@:optional public var material_icons: Array<haxe.io.Bytes>;
+	@:optional public var assets: Array<String>; // texture_assets
+	@:optional public var layer_datas: Array<TLayerData>;
+	@:optional public var mesh_datas: Array<TMeshData>;
+	@:optional public var mesh_assets: Array<String>;
+}
+
+typedef TLayerData = {
+	public var res: Int; // Width pixels
+	public var bpp: Int; // Bits per pixel
+	public var texpaint: haxe.io.Bytes;
+	public var texpaint_nor: haxe.io.Bytes;
+	public var texpaint_pack: haxe.io.Bytes;
+	public var texpaint_mask: haxe.io.Bytes;
+	public var uv_scale: Float;
+	public var uv_rot: Float;
+	public var uv_type: Int;
+	public var opacity_mask: Float;
+	public var material_mask: Int;
+	public var object_mask: Int;
+	public var blending: Int;
+	public var parent: Int;
+}
+
+typedef TAsset = {
+	public var id: Int;
+	public var name: String;
+	public var file: String;
+}

Sources/arm/io/ExportArm.hx

@@ -7,7 +7,7 @@ import iron.system.ArmPack;
 import arm.ui.UISidebar;
 import arm.format.Lz4;
 import arm.sys.Path;
-import arm.Project;
+import arm.ProjectFormat;
 import arm.Enums;
 
 class ExportArm {

Sources/arm/io/ImportArm.hx

@@ -16,7 +16,7 @@ import iron.object.Object;
 import iron.object.MeshObject;
 import iron.Scene;
 import iron.RenderPath;
-import arm.Project;
+import arm.ProjectFormat;
 import arm.ui.UISidebar;
 import arm.ui.UIFiles;
 import arm.sys.Path;

Sources/arm/io/ImportTexture.hx

@@ -4,7 +4,7 @@ import kha.Image;
 import iron.data.Data;
 import arm.ui.UISidebar;
 import arm.sys.Path;
-import arm.Project;
+import arm.ProjectFormat;
 
 class ImportTexture {
 

Sources/arm/ui/UISidebar.hx

@@ -25,7 +25,7 @@ import arm.data.MaterialSlot;
 import arm.io.ImportFont;
 import arm.io.ExportTexture;
 import arm.Enums;
-import arm.Project;
+import arm.ProjectFormat;
 import arm.Res;
 
 @:access(zui.Zui)