From e0ff256f40ffaf724969432122f787d4319c9abd Mon Sep 17 00:00:00 2001 From: QuantumCoderQC Date: Sat, 10 Jul 2021 19:20:56 +0200 Subject: [PATCH 1/2] make boolean objects nullable for static targets --- Sources/armory/logicnode/SetMaterialImageParamNode.hx | 4 +++- Sources/armory/logicnode/SetMaterialRgbParamNode.hx | 4 +++- Sources/armory/logicnode/SetMaterialValueParamNode.hx | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Sources/armory/logicnode/SetMaterialImageParamNode.hx b/Sources/armory/logicnode/SetMaterialImageParamNode.hx index 6b0c0ed8..c74e4553 100644 --- a/Sources/armory/logicnode/SetMaterialImageParamNode.hx +++ b/Sources/armory/logicnode/SetMaterialImageParamNode.hx @@ -13,10 +13,12 @@ class SetMaterialImageParamNode extends LogicNode { } override function run(from: Int) { + var perObject: Null; + var object = inputs[1].get(); if(object == null) return; - var perObject = inputs[2].get(); + perObject = inputs[2].get(); if(perObject == null) perObject = false; var mat = inputs[3].get(); diff --git a/Sources/armory/logicnode/SetMaterialRgbParamNode.hx b/Sources/armory/logicnode/SetMaterialRgbParamNode.hx index f0be3552..a5289b06 100644 --- a/Sources/armory/logicnode/SetMaterialRgbParamNode.hx +++ b/Sources/armory/logicnode/SetMaterialRgbParamNode.hx @@ -13,10 +13,12 @@ class SetMaterialRgbParamNode extends LogicNode { } override function run(from: Int) { + var perObject: Null; + var object = inputs[1].get(); if(object == null) return; - var perObject = inputs[2].get(); + perObject = inputs[2].get(); if(perObject == null) perObject = false; var mat = inputs[3].get(); diff --git a/Sources/armory/logicnode/SetMaterialValueParamNode.hx b/Sources/armory/logicnode/SetMaterialValueParamNode.hx index 8523bb8c..737365cf 100644 --- a/Sources/armory/logicnode/SetMaterialValueParamNode.hx +++ b/Sources/armory/logicnode/SetMaterialValueParamNode.hx @@ -12,10 +12,12 @@ class SetMaterialValueParamNode extends LogicNode { } override function run(from: Int) { + var perObject: Null; + var object = inputs[1].get(); if(object == null) return; - var perObject = inputs[2].get(); + perObject = inputs[2].get(); if(perObject == null) perObject = false; var mat = inputs[3].get(); From c0333db44fc8d59868417a8744d0fdf9032da7ca Mon Sep 17 00:00:00 2001 From: QuantumCoderQC Date: Sat, 10 Jul 2021 19:22:26 +0200 Subject: [PATCH 2/2] Fix typos. Fix fast float --- .../armory/trait/internal/UniformsManager.hx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/armory/trait/internal/UniformsManager.hx b/Sources/armory/trait/internal/UniformsManager.hx index ed1ba2d5..b33624d9 100644 --- a/Sources/armory/trait/internal/UniformsManager.hx +++ b/Sources/armory/trait/internal/UniformsManager.hx @@ -23,7 +23,7 @@ class UniformsManager extends Trait{ static var sceneRemoveInitalized = false; - public var unifromExists = false; + public var uniformExists = false; public function new(){ super(); @@ -45,7 +45,7 @@ class UniformsManager extends Trait{ var exists = registerShaderUniforms(material); if(exists) { - unifromExists = true; + uniformExists = true; } } } @@ -90,7 +90,7 @@ class UniformsManager extends Trait{ // Register and map shader uniforms if it is an armory shader parameter public static function registerShaderUniforms(material: MaterialData) : Bool { - var unifromExist = false; + var uniformExist = false; if(! floatsMap.exists(Scene.active.root)) floatsMap.set(Scene.active.root, null); if(! vectorsMap.exists(Scene.active.root)) vectorsMap.set(Scene.active.root, null); @@ -98,15 +98,15 @@ class UniformsManager extends Trait{ for(context in material.shader.raw.contexts){ // For each context in shader for (constant in context.constants){ // For each constant in the context - if(constant.is_arm_parameter){ // Chack if armory parameter + if(constant.is_arm_parameter){ // Check if armory parameter - unifromExist = true; + uniformExist = true; var object = Scene.active.root; // Map default uniforms to scene root switch (constant.type){ case "float":{ var link = constant.link; - var value:Float = constant.float; + var value = constant.float; setFloatValue(material, object, link, value); register(Float); } @@ -126,9 +126,9 @@ class UniformsManager extends Trait{ } } for (texture in context.texture_units){ - if(texture.is_arm_parameter){ // Chack if armory parameter + if(texture.is_arm_parameter){ // Check if armory parameter - unifromExist = true; + uniformExist = true; var object = Scene.active.root; // Map default texture to scene root iron.data.Data.getImage(texture.default_image_file, function(image: kha.Image) { @@ -142,7 +142,7 @@ class UniformsManager extends Trait{ } } - return unifromExist; + return uniformExist; }