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

Cleanup

Browse Source
This commit is contained in:
luboslenco
2019-12-08 16:59:08 +01:00
parent a7a4d66d67
commit 66bccfe4b5
30 changed files with 420 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/data/BrushSlot.hx
+2 -2
View File
@@ -9,8 +9,8 @@ import iron.data.Data;
class BrushSlot {
public var nodes = new Nodes();
public var canvas:TNodeCanvas;
public var image:Image = null; // 200
public var imageIcon:Image = null; // 50
public var image:Image = null; // 200px
public var imageIcon:Image = null; // 50px
public var previewReady = false;
public var id = 0;
static var defaultCanvas:String = null;
Sources/arm/data/LayerSlot.hx
+9 -6
View File
@@ -6,6 +6,7 @@ import iron.RenderPath;
import iron.object.MeshObject;
import arm.ui.UITrait;
import arm.node.MaterialParser;
import arm.Tool;
class LayerSlot {
public var id = 0;
@@ -27,11 +28,11 @@ class LayerSlot {
static var first = true;
public var blending = 0;
public var blending = BlendMix;
public var objectMask = 0;
public var uvScale = 1.0;
public var uvRot = 0.0;
public var uvType = 0;
public var uvType = UVMap;
public var paintBase = true;
public var paintOpac = true;
public var paintOcc = true;
@@ -74,8 +75,9 @@ class LayerSlot {
}
this.ext = ext;
name = "Layer " + (id + 1);
var format = UITrait.inst.bitsHandle.position == 0 ? 'RGBA32' :
UITrait.inst.bitsHandle.position == 1 ? 'RGBA64' : 'RGBA128';
var format = UITrait.inst.bitsHandle.position == Bits8 ? 'RGBA32' :
UITrait.inst.bitsHandle.position == Bits16 ? 'RGBA64' :
'RGBA128';
{
var t = new RenderTargetRaw();
@@ -287,8 +289,9 @@ class LayerSlot {
}
public function resizeAndSetBits() {
var format = UITrait.inst.bitsHandle.position == 0 ? TextureFormat.RGBA32 :
UITrait.inst.bitsHandle.position == 1 ? TextureFormat.RGBA64 : TextureFormat.RGBA128;
var format = UITrait.inst.bitsHandle.position == Bits8 ? TextureFormat.RGBA32 :
UITrait.inst.bitsHandle.position == Bits16 ? TextureFormat.RGBA64 :
TextureFormat.RGBA128;
var res = Config.getTextureRes();
var rts = RenderPath.active.renderTargets;
Sources/arm/data/MaterialSlot.hx
+2 -2
View File
@@ -11,8 +11,8 @@ import arm.util.RenderUtil;
class MaterialSlot {
public var nodes = new Nodes();
public var canvas:TNodeCanvas;
public var image:Image = null; // 200
public var imageIcon:Image = null; // 50
public var image:Image = null; // 200px
public var imageIcon:Image = null; // 50px
public var previewReady = false;
public var data:MaterialData;
public var id = 0;