diff --git a/Sources/armory/logicnode/CameraGetNode.hx b/Sources/armory/logicnode/CameraGetNode.hx index 40bcd3ce..1044b39e 100644 --- a/Sources/armory/logicnode/CameraGetNode.hx +++ b/Sources/armory/logicnode/CameraGetNode.hx @@ -17,7 +17,7 @@ class CameraGetNode extends LogicNode { case 6: armory.renderpath.Postprocess.camera_uniforms[6]; case 7: armory.renderpath.Postprocess.camera_uniforms[7]; case 8: armory.renderpath.Postprocess.camera_uniforms[8]; - default: null; - } + default: 0.0; + } } } diff --git a/Sources/armory/logicnode/ColorgradingGetGlobalNode.hx b/Sources/armory/logicnode/ColorgradingGetGlobalNode.hx index 326704e9..1e0a9183 100644 --- a/Sources/armory/logicnode/ColorgradingGetGlobalNode.hx +++ b/Sources/armory/logicnode/ColorgradingGetGlobalNode.hx @@ -8,13 +8,14 @@ class ColorgradingGetGlobalNode extends LogicNode { override function get(from:Int):Dynamic { return switch (from) { - case 0: armory.renderpath.Postprocess.colorgrading_global_uniforms[0]; + case 0: armory.renderpath.Postprocess.colorgrading_global_uniforms[0][0]; case 1: armory.renderpath.Postprocess.colorgrading_global_uniforms[1]; case 2: armory.renderpath.Postprocess.colorgrading_global_uniforms[2]; case 3: armory.renderpath.Postprocess.colorgrading_global_uniforms[3]; case 4: armory.renderpath.Postprocess.colorgrading_global_uniforms[4]; case 5: armory.renderpath.Postprocess.colorgrading_global_uniforms[5]; case 6: armory.renderpath.Postprocess.colorgrading_global_uniforms[6]; + default: 0.0; } } } diff --git a/Sources/armory/logicnode/ColorgradingGetHighlightNode.hx b/Sources/armory/logicnode/ColorgradingGetHighlightNode.hx index 10b43015..23b1525c 100644 --- a/Sources/armory/logicnode/ColorgradingGetHighlightNode.hx +++ b/Sources/armory/logicnode/ColorgradingGetHighlightNode.hx @@ -8,13 +8,14 @@ class ColorgradingGetHighlightNode extends LogicNode { override function get(from:Int):Dynamic { return switch (from) { - case 0: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[0]; - case 1: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[1]; - case 2: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[2]; - case 3: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[3]; - case 4: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[4]; - case 5: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[5]; - default: null; + case 0: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[0][2]; + case 1: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[0]; + case 2: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[1]; + case 3: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[2]; + case 4: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[3]; + case 5: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[4]; + case 6: armory.renderpath.Postprocess.colorgrading_highlight_uniforms[5]; + default: 0.0; } } diff --git a/Sources/armory/logicnode/ColorgradingGetMidtoneNode.hx b/Sources/armory/logicnode/ColorgradingGetMidtoneNode.hx index 7dd314b4..d05497fd 100644 --- a/Sources/armory/logicnode/ColorgradingGetMidtoneNode.hx +++ b/Sources/armory/logicnode/ColorgradingGetMidtoneNode.hx @@ -14,7 +14,7 @@ class ColorgradingGetMidtoneNode extends LogicNode { case 3: armory.renderpath.Postprocess.colorgrading_midtone_uniforms[3]; case 4: armory.renderpath.Postprocess.colorgrading_midtone_uniforms[4]; case 5: armory.renderpath.Postprocess.colorgrading_midtone_uniforms[5]; - default: null; + default: 0.0; } } diff --git a/Sources/armory/logicnode/ColorgradingGetShadowNode.hx b/Sources/armory/logicnode/ColorgradingGetShadowNode.hx index 02d9516e..6b5876b0 100644 --- a/Sources/armory/logicnode/ColorgradingGetShadowNode.hx +++ b/Sources/armory/logicnode/ColorgradingGetShadowNode.hx @@ -8,13 +8,14 @@ class ColorgradingGetShadowNode extends LogicNode { override function get(from:Int):Dynamic { return switch (from) { - case 0: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[0]; - case 1: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[1]; - case 2: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[2]; - case 3: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[3]; - case 4: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[4]; - case 5: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[5]; - default: null; + case 0: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[0][1]; + case 1: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[0]; + case 2: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[1]; + case 3: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[2]; + case 4: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[3]; + case 5: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[4]; + case 6: armory.renderpath.Postprocess.colorgrading_shadow_uniforms[5]; + default: 0.0; } } } diff --git a/Sources/armory/logicnode/GetSystemName.hx b/Sources/armory/logicnode/GetSystemName.hx index 3461ef0e..a346f01c 100644 --- a/Sources/armory/logicnode/GetSystemName.hx +++ b/Sources/armory/logicnode/GetSystemName.hx @@ -9,15 +9,14 @@ class GetSystemName extends LogicNode { public static function equalsCI(a : String, b : String) return a.toLowerCase() == b.toLowerCase(); override function get(from: Int): Dynamic { - var systemName: String = kha.System.systemId; return switch (from) { case 0: systemName; - case 1: equalsCI(systemName, 'Windows'); - case 2: equalsCI(systemName, 'Linux'); - case 3: equalsCI(systemName, 'Mac'); - case 4: equalsCI(systemName, 'HTML5'); - case 5: equalsCI(systemName, 'Android'); + case 1: equalsCI(kha.System.systemId, 'Windows'); + case 2: equalsCI(kha.System.systemId, 'Linux'); + case 3: equalsCI(kha.System.systemId, 'Mac'); + case 4: equalsCI(kha.System.systemId, 'HTML5'); + case 5: equalsCI(kha.System.systemId, 'Android'); default: null; } diff --git a/Sources/armory/logicnode/GetVelocityNode.hx b/Sources/armory/logicnode/GetVelocityNode.hx index 75c9a5ff..484ce9ad 100644 --- a/Sources/armory/logicnode/GetVelocityNode.hx +++ b/Sources/armory/logicnode/GetVelocityNode.hx @@ -22,6 +22,6 @@ class GetVelocityNode extends LogicNode { default: null; } #end - + return null; } }