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

Update iron

Browse Source
This commit is contained in:
luboslenco
2020-03-03 22:56:27 +01:00
parent 3da18b7f4b
commit a57002c0cb
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/creator/Scene.arm
BIN
View File
Binary file not shown.
Assets/painter/Scene.arm
BIN
View File
Binary file not shown.
Sources/arm/Project.hx
+3 -3
View File
@@ -144,9 +144,9 @@ class Project {
var raw = { var raw = {
name: "Tessellated", name: "Tessellated",
vertex_arrays: [ vertex_arrays: [
{ values: mesh.posa, attrib: "pos" }, { values: mesh.posa, attrib: "pos", data: "short4norm" },
{ values: mesh.nora, attrib: "nor" }, { values: mesh.nora, attrib: "nor", data: "short2norm" },
{ values: mesh.texa, attrib: "tex" } { values: mesh.texa, attrib: "tex", data: "short2norm" }
], ],
index_arrays: [ index_arrays: [
{ values: mesh.inda, material: 0 } { values: mesh.inda, material: 0 }
Sources/arm/io/ImportMesh.hx
+6 -6
View File
@@ -94,13 +94,13 @@ class ImportMesh {
var raw: TMeshData = null; var raw: TMeshData = null;
if (UITrait.inst.worktab.position == SpaceScene) { if (UITrait.inst.worktab.position == SpaceScene) {
raw = rawMesh(mesh); raw = rawMesh(mesh);
if (mesh.texa != null) raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" }); if (mesh.texa != null) raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
} }
else { else {
raw = rawMesh(mesh); raw = rawMesh(mesh);
if (mesh.texa == null) equirectUnwrap(mesh); if (mesh.texa == null) equirectUnwrap(mesh);
raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" }); raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
if (mesh.cola != null) raw.vertex_arrays.push({ values: mesh.cola, attrib: "col" }); if (mesh.cola != null) raw.vertex_arrays.push({ values: mesh.cola, attrib: "col", data: "short4norm" });
} }
new MeshData(raw, function(md: MeshData) { new MeshData(raw, function(md: MeshData) {
@@ -175,7 +175,7 @@ class ImportMesh {
equirectUnwrap(mesh); equirectUnwrap(mesh);
} }
var raw = rawMesh(mesh); var raw = rawMesh(mesh);
raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" }); raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
new MeshData(raw, function(md: MeshData) { new MeshData(raw, function(md: MeshData) {
@@ -215,8 +215,8 @@ class ImportMesh {
return { return {
name: mesh.name, name: mesh.name,
vertex_arrays: [ vertex_arrays: [
{ values: mesh.posa, attrib: "pos" }, { values: mesh.posa, attrib: "pos", data: "short4norm" },
{ values: mesh.nora, attrib: "nor" } { values: mesh.nora, attrib: "nor", data: "short2norm" }
], ],
index_arrays: [ index_arrays: [
{ values: mesh.inda, material: 0 } { values: mesh.inda, material: 0 }
Sources/arm/node/MakePaint.hx
+1 -1
View File
@@ -25,7 +25,7 @@ class MakePaint {
con_paint.data.color_writes_green = [true, true, true, true]; con_paint.data.color_writes_green = [true, true, true, true];
con_paint.data.color_writes_blue = [true, true, true, true]; con_paint.data.color_writes_blue = [true, true, true, true];
con_paint.data.color_writes_alpha = [true, true, true, true]; con_paint.data.color_writes_alpha = [true, true, true, true];
con_paint.allow_vcols = Context.paintObject.data.geom.cols != null; con_paint.allow_vcols = Context.paintObject.data.geom.cols;
var vert = con_paint.make_vert(); var vert = con_paint.make_vert();
var frag = con_paint.make_frag(); var frag = con_paint.make_frag();
Sources/arm/util/MeshUtil.hx
+3 -3
View File
@@ -52,9 +52,9 @@ class MeshUtil {
var raw: TMeshData = { var raw: TMeshData = {
name: Context.paintObject.name, name: Context.paintObject.name,
vertex_arrays: [ vertex_arrays: [
{ values: va0, attrib: "pos" }, { values: va0, attrib: "pos", data: "short4norm" },
{ values: va1, attrib: "nor" }, { values: va1, attrib: "nor", data: "short2norm" },
{ values: va2, attrib: "tex" } { values: va2, attrib: "tex", data: "short2norm" }
], ],
index_arrays: [ index_arrays: [
{ values: ia, material: 0 } { values: ia, material: 0 }