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

Fix uniforms_f32_links

Browse Source
This commit is contained in:
luboslenco
2024-12-19 23:53:26 +01:00
parent 41c1def0f7
commit 904aed7566
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorcore/sources/ts/uniforms.ts
+4 -4
View File
@@ -526,7 +526,7 @@ function uniforms_set_obj_const(obj: object_t, loc: kinc_const_loc_t, c: shader_
g4_set_float2(loc, v.x, v.y);
}
else if (c.type == "float") {
let f: f32 = 0.0;
let f: f32 = f32_nan();
if (c.link == "_object_info_index") {
f = obj.uid;
@@ -545,11 +545,11 @@ function uniforms_set_obj_const(obj: object_t, loc: kinc_const_loc_t, c: shader_
}
else if (uniforms_f32_links != null) {
f = uniforms_f32_links(obj, current_material(obj), c.link);
if (f == 0.0) {
return; // TODO: return when uniform is not found
}
}
if (f32_isnan(f)) {
return;
}
g4_set_float(loc, f);
}
else if (c.type == "floats") {
base/sources/uniforms_ext.ts
+2 -2
View File
@@ -133,14 +133,14 @@ function uniforms_ext_f32_link(object: object_t, mat: material_data_t, link: str
for (let i: i32 = 0; i < keys.length; ++i) {
let key: string = keys[i];
// let script: string = parser_material_script_links[key]; ////
let result: f32 = 0.0;
let result: f32 = f32_nan();
// if (script != "") {
// result = js_eval(script);
// }
return result;
}
}
return 0.0;
return f32_nan();
}
function uniforms_ext_vec2_link(object: object_t, mat: material_data_t, link: string): vec2_t {