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

Fix build

Browse Source
This commit is contained in:
luboslenco
2023-02-08 16:42:15 +01:00
parent 578c36f4f0
commit a7dd51c694
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorpaint/Shaders/Material2_mesh.frag.glsl
+1 -1
View File
@@ -1,5 +1,5 @@
#version 450
#include "../Libraries/armorbase/Shaders/std/gbuffer.glsl"
#include "../../base/Shaders/std/gbuffer.glsl"
in vec3 wnormal;
in vec4 wvpposition;
in vec4 prevwvpposition;
armorpaint/Shaders/Material_mesh.frag.glsl
+1 -1
View File
@@ -1,5 +1,5 @@
#version 450
#include "../Libraries/armorbase/Shaders/std/gbuffer.glsl"
#include "../../base/Shaders/std/gbuffer.glsl"
in vec2 texCoord;
in vec3 wnormal;
in vec4 wvpposition;
armorpaint/Shaders/armdefault_mesh.frag.glsl
+1 -1
View File
@@ -1,5 +1,5 @@
#version 450
#include "../Libraries/armorbase/Shaders/std/gbuffer.glsl"
#include "../../base/Shaders/std/gbuffer.glsl"
in vec3 wnormal;
in vec4 wvpposition;
in vec4 prevwvpposition;
armorpaint/khafile.js
+14 -14
View File
@@ -14,17 +14,17 @@ let physics = !ios;
let project = new Project("ArmorPaint");
project.addSources("Sources");
project.addLibrary("iron");
project.addLibrary("zui");
project.addLibrary("armorbase");
project.addShaders("Shaders/*.glsl", { embed: snapshot });
project.addShaders("armorcore/Shaders/*.glsl", { embed: snapshot });
project.addAssets("Assets/*", { destination: "data/{name}", embed: snapshot });
project.addShaders("Libraries/armorbase/Shaders/common/*.glsl", { embed: snapshot });
project.addAssets("Libraries/armorbase/Assets/common/*", { destination: "data/{name}", embed: snapshot });
project.addLibrary("../../Libraries/iron");
project.addLibrary("../../Libraries/zui");
project.addLibrary("../../base");
project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot });
project.addShaders("../base/Shaders/common/*.glsl", { embed: snapshot });
project.addAssets("../base/Assets/common/*", { destination: "data/{name}", embed: snapshot });
if (!snapshot) {
project.addDefine("arm_noembed");
project.addAssets("Libraries/armorbase/Assets/common/extra/*", { destination: "data/{name}" });
project.addAssets("../base/Assets/common/extra/*", { destination: "data/{name}" });
}
project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" });
project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" });
@@ -38,8 +38,8 @@ else {
project.addAssets("Assets/plugins/wasm/*", { destination: "data/plugins/{name}" });
}
project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" });
project.addAssets("Libraries/armorbase/Assets/licenses/**", { destination: "data/licenses/{name}" });
project.addAssets("Libraries/armorbase/Assets/themes/*.json", { destination: "data/themes/{name}" });
project.addAssets("../base/Assets/licenses/**", { destination: "data/licenses/{name}" });
project.addAssets("../base/Assets/themes/*.json", { destination: "data/themes/{name}" });
project.addDefine("js-es=6");
project.addParameter("--macro include('arm.node.brush')");
project.addDefine("kha_no_ogg");
@@ -106,13 +106,13 @@ if (snapshot) {
project.addAssets("Assets/readme/readme.txt", { destination: "{name}" });
if (raytrace) {
project.addAssets("Libraries/armorbase/Assets/raytrace/*", { destination: "data/{name}", embed: snapshot });
project.addAssets("../base/Assets/raytrace/*", { destination: "data/{name}", embed: snapshot });
if (d3d12) {
project.addAssets("Libraries/armorbase/Shaders/raytrace/*.cso", { destination: "data/{name}", embed: snapshot });
project.addAssets("../base/Shaders/raytrace/*.cso", { destination: "data/{name}", embed: snapshot });
project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" });
}
else if (vulkan) {
project.addAssets("Libraries/armorbase/Shaders/raytrace/*.spirv", { destination: "data/{name}", embed: snapshot });
project.addAssets("../base/Shaders/raytrace/*.spirv", { destination: "data/{name}", embed: snapshot });
project.addAssets("Assets/readme/readme_vkrt.txt", { destination: "{name}" });
}
}
@@ -129,10 +129,10 @@ if (process.platform !== "darwin" && !raytrace && !android && !ios) {
project.addDefine("arm_voxelgi_revox");
if (process.platform === "win32" && win_hlsl) {
project.addShaders("Libraries/armorbase/Shaders/voxel_hlsl/*.glsl", { embed: snapshot, noprocessing: true });
project.addShaders("../base/Shaders/voxel_hlsl/*.glsl", { embed: snapshot, noprocessing: true });
}
else {
project.addShaders("Libraries/armorbase/Shaders/voxel_glsl/*.glsl", { embed: snapshot });
project.addShaders("../base/Shaders/voxel_glsl/*.glsl", { embed: snapshot });
}
}