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

Custom default meshes

Browse Source
This commit is contained in:
luboslenco
2020-04-02 11:22:48 +02:00
parent 87517a3abb
commit b18803f00e
6 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/meshes/cube.arm
BIN
View File
Binary file not shown.
Sources/arm/Context.hx
+1 -1
View File
@@ -193,7 +193,7 @@ class Context {
#if arm_creator
public static var projectType = ModelTessellatedPlane;
#else
public static var projectType = ModelCube;
public static var projectType = ModelRoundedCube;
#end
public static var projectObjects: Array<MeshObject>;
Sources/arm/Enums.hx
+2 -1
View File
@@ -201,7 +201,8 @@ package arm;
}
@:enum abstract ProjectModel(Int) from Int to Int {
var ModelCube = 0;
var ModelRoundedCube = 0;
var ModelSphere = 1;
var ModelTessellatedPlane = 2;
var ModelCustom = 3;
}
Sources/arm/Project.hx
+39 -24
View File
@@ -12,6 +12,7 @@ import iron.object.MeshObject;
import iron.Scene;
import arm.util.RenderUtil;
import arm.util.ViewportUtil;
import arm.sys.File;
import arm.sys.Path;
import arm.ui.UISidebar;
import arm.ui.UIFiles;
@@ -45,6 +46,7 @@ class Project {
#if arm_world
public static var waterPass = true;
#end
static var meshList: Array<String> = null;
public static function projectOpen() {
UIFiles.show("arm", false, function(path: String) {
@@ -91,7 +93,15 @@ class Project {
UIBox.showCustom(function(ui: Zui) {
if (ui.tab(Id.handle(), tr("New Project"))) {
ui.row([0.5, 0.5]);
Context.projectType = ui.combo(Id.handle({position: Context.projectType}), ["Cube", "Sphere", "Tessellated Plane"], tr("Template"));
if (meshList == null) {
meshList = File.readDirectory(Path.data() + Path.sep + "meshes");
for (i in 0...meshList.length) meshList[i] = meshList[i].substr(0, meshList[i].length - 4); // Trim .arm
meshList.unshift("tessellated_plane");
meshList.unshift("sphere");
meshList.unshift("rounded_cube");
}
Context.projectType = ui.combo(Id.handle({position: Context.projectType}), meshList, tr("Template"));
if (ui.button(tr("OK")) || ui.isReturnDown) {
Project.projectNew();
ViewportUtil.scaleToBounds();
@@ -137,37 +147,42 @@ class Project {
Data.deleteMesh(handle);
}
if (Context.projectType != ModelCube) {
var mesh: Dynamic = Context.projectType == ModelSphere ?
new arm.format.proc.Sphere(1, 512, 256) :
new arm.format.proc.Plane(1, 1, 512, 512);
var raw = {
name: "Tessellated",
vertex_arrays: [
{ values: mesh.posa, attrib: "pos", data: "short4norm" },
{ values: mesh.nora, attrib: "nor", data: "short2norm" },
{ values: mesh.texa, attrib: "tex", data: "short2norm" }
],
index_arrays: [
{ values: mesh.inda, material: 0 }
],
scale_pos: mesh.scalePos,
scale_tex: mesh.scaleTex
};
if (Context.projectType != ModelRoundedCube) {
var raw: TMeshData = null;
if (Context.projectType == ModelSphere || Context.projectType == ModelTessellatedPlane) {
var mesh: Dynamic = Context.projectType == ModelSphere ?
new arm.format.proc.Sphere(1, 512, 256) :
new arm.format.proc.Plane(1, 1, 512, 512);
raw = {
name: "Tessellated",
vertex_arrays: [
{ values: mesh.posa, attrib: "pos", data: "short4norm" },
{ values: mesh.nora, attrib: "nor", data: "short2norm" },
{ values: mesh.texa, attrib: "tex", data: "short2norm" }
],
index_arrays: [
{ values: mesh.inda, material: 0 }
],
scale_pos: mesh.scalePos,
scale_tex: mesh.scaleTex
};
}
else {
Data.getBlob("meshes/" + meshList[Context.projectType] + ".arm", function(b: kha.Blob) {
raw = iron.system.ArmPack.decode(b.toBytes()).mesh_datas[0];
});
}
var md = new MeshData(raw, function(md: MeshData) {});
Data.cachedMeshes.set("SceneTessellated", md);
if (Context.projectType == ModelSphere) {
ViewportUtil.setView(0, 0, 1, 0, 0, 0); // Top
ViewportUtil.orbit(0, Math.PI / 6); // Orbit down
}
else if (Context.projectType == ModelTessellatedPlane) {
if (Context.projectType == ModelTessellatedPlane) {
ViewportUtil.setView(0, 0, 5, 0, 0, 0); // Top
ViewportUtil.orbit(0, Math.PI / 6); // Orbit down
}
}
var n = Context.projectType == ModelCube ? "Cube" : "Tessellated";
var n = Context.projectType == ModelRoundedCube ? "Cube" : "Tessellated";
Data.getMesh("Scene", n, function(md: MeshData) {
var current = @:privateAccess kha.graphics4.Graphics2.current;
Sources/arm/node/MakePaint.hx
+4 -4
View File
@@ -351,11 +351,11 @@ class MakePaint {
frag.add_uniform('sampler2D texpaint_pack_undo', '_texpaint_pack_undo');
frag.write('vec4 sample_nor_undo = textureLod(texpaint_nor_undo, sample_tc, 0.0);');
frag.write('vec4 sample_pack_undo = textureLod(texpaint_pack_undo, sample_tc, 0.0);');
#if kha_direct3d12
frag.write('fragColor[0] = vec4(' + MaterialBuilder.blendMode(frag, Context.brushBlending, 'sample_undo.rgb', 'basecol', 'str') + ', mat_opacity);');
#else
// #if kha_direct3d12
// frag.write('fragColor[0] = vec4(' + MaterialBuilder.blendMode(frag, Context.brushBlending, 'sample_undo.rgb', 'basecol', 'str') + ', mat_opacity);');
// #else
frag.write('fragColor[0] = vec4(' + MaterialBuilder.blendMode(frag, Context.brushBlending, 'sample_undo.rgb', 'basecol', 'str') + ', max(str, sample_undo.a));');
#end
// #end
frag.write('fragColor[1] = vec4(mix(sample_nor_undo.rgb, nortan, str), matid);');
if (Context.material.paintHeight && MaterialBuilder.heightUsed) {
frag.write('fragColor[2] = mix(sample_pack_undo, vec4(occlusion, roughness, metallic, height), str);');
khafile.js
+1
View File
@@ -17,6 +17,7 @@ project.addAssets("Assets/locale/*", { notinlist: true, destination: "data/local
project.addAssets("Assets/licenses/*", { notinlist: true, destination: "data/licenses/{name}" });
project.addAssets("Assets/plugins/*", { notinlist: true, destination: "data/plugins/{name}" });
project.addAssets("Assets/themes/*", { notinlist: true, destination: "data/themes/{name}" });
project.addAssets("Assets/meshes/*", { notinlist: true, destination: "data/meshes/{name}" });
project.addDefine("arm_taa");
project.addDefine("arm_veloc");