Build fixes

This commit is contained in:
luboslenco
2024-10-16 23:51:15 +02:00
parent 5492639ef4
commit 298c4b3d3e
8 changed files with 15 additions and 20 deletions
-8
View File
@@ -792,7 +792,6 @@ type project_format_t = {
camera_fov?: f32;
swatches?: swatch_color_t[];
///if (is_paint || is_sculpt)
brush_nodes?: ui_node_canvas_t[];
brush_icons?: buffer_t[];
material_nodes?: ui_node_canvas_t[];
@@ -803,12 +802,9 @@ type project_format_t = {
mesh_datas?: mesh_data_t[];
mesh_assets?: string[];
mesh_icons?: buffer_t[];
///end
///if is_paint
atlas_objects?: i32[];
atlas_names?: string[];
///end
///if is_lab
material?: ui_node_canvas_t;
@@ -841,7 +837,6 @@ type swatch_color_t = {
subsurface?: f32;
};
///if (is_paint || is_sculpt)
type layer_data_t = {
name?: string;
res?: i32; // Width pixels
@@ -857,7 +852,6 @@ type layer_data_t = {
blending?: i32;
parent?: i32;
visible?: bool;
///if is_paint
texpaint_nor?: buffer_t;
texpaint_pack?: buffer_t;
paint_base?: bool;
@@ -871,6 +865,4 @@ type layer_data_t = {
paint_height_blend?: bool;
paint_emis?: bool;
paint_subs?: bool;
///end
};
///end
+6 -6
View File
@@ -535,12 +535,12 @@ float ltc_evaluate(vec3 N, vec3 V, float dotnv, vec3 P, mat3 Minv, vec3 points0,
";
let str_get_pos_from_depth: string = " \
vec3 get_pos_from_depth(vec2 uv, mat4 invVP, textureArg(gbufferD)) { \
#if defined(HLSL) || defined(METAL) || defined(SPIRV) \n\
float depth = textureLod(gbufferD, vec2(uv.x, 1.0 - uv.y), 0.0).r; \
#else \n\
float depth = textureLod(gbufferD, uv, 0.0).r; \
#endif \n\
vec3 get_pos_from_depth(vec2 uv, mat4 invVP, textureArg(gbufferD)) { \n\
#ifdef GLSL \n\
float depth = textureLod(gbufferD, uv, 0.0).r; \n\
#else \n\
float depth = textureLod(gbufferD, vec2(uv.x, 1.0 - uv.y), 0.0).r; \n\
#endif \n\
vec4 wpos = vec4(uv * 2.0 - 1.0, depth * 2.0 - 1.0, 1.0); \
wpos = mul(wpos, invVP); \
return wpos.xyz / wpos.w; \