Browse Source

Merge pull request #400 from Areloch/PostFXEdFix

Fixes logic that checks if a postFX was enabled so the PostFX Editor works properly
Brian Roberts 4 years ago
parent
commit
9be3151cb0

+ 5 - 1
Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.cs

@@ -122,18 +122,22 @@ function SSAOPostFx::onEnabled( %this )
    // from our #ssaoMask texture target. 
    $AL::UseSSAOMask = true;
    
+   $PostFX::SSAOPostFx::Enabled = true;
+   
    return true;
 }
 
 function SSAOPostFx::onDisabled( %this )
 {
   $AL::UseSSAOMask = false;
+  
+  $PostFX::SSAOPostFx::Enabled = false;
 }
 
 function SSAOPostFx::populatePostFXSettings(%this)
 {
    PostEffectEditorInspector.startGroup("SSAO - General");
-   PostEffectEditorInspector.addCallbackField("$PostFX::SSAOPostFx::Enabled", "Enabled", "bool", "", $PostFXManager::PostFX::Enable, "", "toggleSSAOPostFx");
+   PostEffectEditorInspector.addCallbackField("$PostFX::SSAOPostFx::Enabled", "Enabled", "bool", "", $PostFX::SSAOPostFx::Enabled, "", "toggleSSAOPostFx");
    PostEffectEditorInspector.addField("$PostFX::SSAOPostFx::quality", "Quality", "list", "0,1,2", $PostFX::SSAOPostFX::quality, "0,1,2");
    PostEffectEditorInspector.addField("$PostFX::SSAOPostFx::overallStrength", "Overall Strength", "float", "", $PostFX::SSAOPostFX::overallStrength, "");
    PostEffectEditorInspector.addField("$PostFX::SSAOPostFx::blurDepthTol", "Blur (Softness)", "float", "", $PostFX::SSAOPostFX::blurDepthTol, "");

+ 2 - 2
Templates/BaseGame/game/tools/gui/postFxEditor.cs

@@ -52,7 +52,7 @@ function PostFXEditor::refresh(%this)
    {
       %postEffect = PostFXManager.getKey(%i);  
       
-      if(%postEffect.isEnabled)
+      if(%postEffect.isEnabled())
          PostEffectEditorList.addRow( %i, %postEffect.getName() );
    }
 }
@@ -143,7 +143,7 @@ function PostFXEditorNewPFXWindow::showDialog(%this)
    {
       %postEffect = PostFXManager.getKey(%i);  
       
-      if(!%postEffect.isEnabled)
+      if(!%postEffect.isEnabled())
          PostFXEditorNewPFXList.addRow( %i, %postEffect.getName() );
    }
 }