Update bundled assets

This commit is contained in:
unknown
2019-06-22 00:24:15 +02:00
parent 0f648bcfca
commit 71dc48ff9b
10 changed files with 54 additions and 7 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

@@ -0,0 +1,8 @@
#version 450
in vec3 color;
out vec4 fragColor;
void main() {
fragColor = vec4(color, 1.0);
}
+12
View File
@@ -0,0 +1,12 @@
#version 450
in vec3 pos;
in vec3 col;
uniform mat4 VP;
out vec3 color;
void main() {
color = col;
gl_Position = VP * vec4(pos, 1.0);
}
@@ -0,0 +1,9 @@
#version 450
in vec3 color;
out vec4 fragColor[2];
void main() {
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0);
fragColor[1] = vec4(color, 1.0);
}
File diff suppressed because one or more lines are too long
+6 -7
View File
@@ -1,7 +1,6 @@
let project = new Project('ArmorPaint');
project.addSources('Sources');
project.addLibrary("armory");
project.addLibrary("iron");
project.addLibrary("zui");
project.addLibrary("iron_format");
@@ -14,11 +13,11 @@ project.addAssets("Bundled/licenses/**", { notinlist: true , destination: "data/
project.addAssets("Bundled/plugins/**", { notinlist: true , destination: "data/plugins/{name}" });
project.addAssets("Bundled/themes/**", { notinlist: true , destination: "data/themes/{name}" });
project.addAssets("Bundled/readme.txt", { notinlist: true , destination: "{name}" });
project.addAssets("Libraries/armory/Assets/brdf.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Libraries/armory/Assets/noise256.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Libraries/armory/Assets/smaa_area.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Libraries/armory/Assets/smaa_search.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Libraries/armory/Assets/font_default.ttf", { notinlist: false , destination: "data/{name}" });
project.addAssets("Bundled/Assets/brdf.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Bundled/Assets/noise256.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Bundled/Assets/smaa_area.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Bundled/Assets/smaa_search.png", { notinlist: true , destination: "data/{name}" });
project.addAssets("Bundled/Assets/font_default.ttf", { notinlist: false , destination: "data/{name}" });
project.addDefine('arm_deferred');
project.addDefine('arm_voxelgi_revox');
project.addDefine('arm_ltc');
@@ -57,7 +56,7 @@ project.addParameter('-dce full');
let debug = false;
if (debug) {
project.addDefine('arm_debug');
project.addShaders("Libraries/armory/Shaders/debug_draw/**");
project.addShaders("Bundled/Shaders/debug_draw/**");
project.addParameter('--times');
}