diff --git a/Documentation/ScriptingAPI-Documentation.md b/Documentation/ScriptingAPI-Documentation.md index b213963f3..48ee6aa69 100644 --- a/Documentation/ScriptingAPI-Documentation.md +++ b/Documentation/ScriptingAPI-Documentation.md @@ -644,6 +644,7 @@ It inherits functions from RenderPath2D, so it can render a 2D overlay. - SetReflectionsEnabled(bool value) - SetFXAAEnabled(bool value) - SetBloomEnabled(bool value) +- SetBloomThreshold(bool value) - SetColorGradingEnabled(bool value) - SetColorGradingTexture(Texture value) - SetVolumeLightsEnabled(bool value) @@ -652,6 +653,7 @@ It inherits functions from RenderPath2D, so it can render a 2D overlay. - SetMotionBlurEnabled(bool value) - SetMotionBlurStrength(float value) - SetSSSEnabled(bool value) +- SetDitherEnabled(bool value) - SetDepthOfFieldEnabled(bool value) - SetDepthOfFieldFocus(float value) - SetDepthOfFieldStrength(float value) diff --git a/WickedEngine/RenderPath3D_BindLua.cpp b/WickedEngine/RenderPath3D_BindLua.cpp index 0cc488c53..d9aa3c1b7 100644 --- a/WickedEngine/RenderPath3D_BindLua.cpp +++ b/WickedEngine/RenderPath3D_BindLua.cpp @@ -28,12 +28,14 @@ Luna::FunctionType RenderPath3D_BindLua::methods[] = { lunamethod(RenderPath3D_BindLua, SetReflectionsEnabled), lunamethod(RenderPath3D_BindLua, SetFXAAEnabled), lunamethod(RenderPath3D_BindLua, SetBloomEnabled), + lunamethod(RenderPath3D_BindLua, SetBloomThreshold), lunamethod(RenderPath3D_BindLua, SetColorGradingEnabled), lunamethod(RenderPath3D_BindLua, SetVolumeLightsEnabled), lunamethod(RenderPath3D_BindLua, SetLightShaftsEnabled), lunamethod(RenderPath3D_BindLua, SetLensFlareEnabled), lunamethod(RenderPath3D_BindLua, SetMotionBlurEnabled), lunamethod(RenderPath3D_BindLua, SetSSSEnabled), + lunamethod(RenderPath3D_BindLua, SetDitherEnabled), lunamethod(RenderPath3D_BindLua, SetDepthOfFieldEnabled), lunamethod(RenderPath3D_BindLua, SetEyeAdaptionEnabled), lunamethod(RenderPath3D_BindLua, SetMSAASampleCount), @@ -133,6 +135,21 @@ int RenderPath3D_BindLua::SetBloomEnabled(lua_State* L) wiLua::SError(L, "SetBloomEnabled(bool value) not enough arguments!"); return 0; } +int RenderPath3D_BindLua::SetBloomThreshold(lua_State* L) +{ + if (component == nullptr) + { + wiLua::SError(L, "SetBloomThreshold(float value) component is null!"); + return 0; + } + if (wiLua::SGetArgCount(L) > 0) + { + ((RenderPath3D*)component)->setBloomThreshold(wiLua::SGetFloat(L, 1)); + } + else + wiLua::SError(L, "SetBloomThreshold(float value) not enough arguments!"); + return 0; +} int RenderPath3D_BindLua::SetColorGradingEnabled(lua_State* L) { if (component == nullptr) @@ -211,6 +228,19 @@ int RenderPath3D_BindLua::SetSSSEnabled(lua_State* L) wiLua::SError(L, "SetSSSEnabled(bool value) not enough arguments!"); return 0; } +int RenderPath3D_BindLua::SetDitherEnabled(lua_State* L) +{ + if (component == nullptr) + { + wiLua::SError(L, "SetDitherEnabled(bool value) component is null!"); + return 0; + } + if (wiLua::SGetArgCount(L) > 0) + ((RenderPath3D*)component)->setDitherEnabled(wiLua::SGetBool(L, 1)); + else + wiLua::SError(L, "SetDitherEnabled(bool value) not enough arguments!"); + return 0; +} int RenderPath3D_BindLua::SetDepthOfFieldEnabled(lua_State* L) { if (component == nullptr) diff --git a/WickedEngine/RenderPath3D_BindLua.h b/WickedEngine/RenderPath3D_BindLua.h index c869e4b4d..4eb69050c 100644 --- a/WickedEngine/RenderPath3D_BindLua.h +++ b/WickedEngine/RenderPath3D_BindLua.h @@ -24,12 +24,14 @@ public: int SetReflectionsEnabled(lua_State* L); int SetFXAAEnabled(lua_State* L); int SetBloomEnabled(lua_State* L); + int SetBloomThreshold(lua_State* L); int SetColorGradingEnabled(lua_State* L); int SetVolumeLightsEnabled(lua_State* L); int SetLightShaftsEnabled(lua_State* L); int SetLensFlareEnabled(lua_State* L); int SetMotionBlurEnabled(lua_State* L); int SetSSSEnabled(lua_State* L); + int SetDitherEnabled(lua_State* L); int SetDepthOfFieldEnabled(lua_State* L); int SetEyeAdaptionEnabled(lua_State* L); int SetMSAASampleCount(lua_State* L); diff --git a/WickedEngine/RenderPath3D_Deferred_BindLua.cpp b/WickedEngine/RenderPath3D_Deferred_BindLua.cpp index a8d208838..678fc0695 100644 --- a/WickedEngine/RenderPath3D_Deferred_BindLua.cpp +++ b/WickedEngine/RenderPath3D_Deferred_BindLua.cpp @@ -27,12 +27,14 @@ Luna::FunctionType RenderPath3D_Deferred_BindLua: lunamethod(RenderPath3D_BindLua, SetReflectionsEnabled), lunamethod(RenderPath3D_BindLua, SetFXAAEnabled), lunamethod(RenderPath3D_BindLua, SetBloomEnabled), + lunamethod(RenderPath3D_BindLua, SetBloomThreshold), lunamethod(RenderPath3D_BindLua, SetColorGradingEnabled), lunamethod(RenderPath3D_BindLua, SetVolumeLightsEnabled), lunamethod(RenderPath3D_BindLua, SetLightShaftsEnabled), lunamethod(RenderPath3D_BindLua, SetLensFlareEnabled), lunamethod(RenderPath3D_BindLua, SetMotionBlurEnabled), lunamethod(RenderPath3D_BindLua, SetSSSEnabled), + lunamethod(RenderPath3D_BindLua, SetDitherEnabled), lunamethod(RenderPath3D_BindLua, SetDepthOfFieldEnabled), lunamethod(RenderPath3D_BindLua, SetEyeAdaptionEnabled), lunamethod(RenderPath3D_BindLua, SetSharpenFilterEnabled), diff --git a/WickedEngine/RenderPath3D_Forward_BindLua.cpp b/WickedEngine/RenderPath3D_Forward_BindLua.cpp index e8ea6e4e1..f9369362a 100644 --- a/WickedEngine/RenderPath3D_Forward_BindLua.cpp +++ b/WickedEngine/RenderPath3D_Forward_BindLua.cpp @@ -27,12 +27,14 @@ Luna::FunctionType RenderPath3D_Forward_BindLua::m lunamethod(RenderPath3D_BindLua, SetReflectionsEnabled), lunamethod(RenderPath3D_BindLua, SetFXAAEnabled), lunamethod(RenderPath3D_BindLua, SetBloomEnabled), + lunamethod(RenderPath3D_BindLua, SetBloomThreshold), lunamethod(RenderPath3D_BindLua, SetColorGradingEnabled), lunamethod(RenderPath3D_BindLua, SetVolumeLightsEnabled), lunamethod(RenderPath3D_BindLua, SetLightShaftsEnabled), lunamethod(RenderPath3D_BindLua, SetLensFlareEnabled), lunamethod(RenderPath3D_BindLua, SetMotionBlurEnabled), lunamethod(RenderPath3D_BindLua, SetSSSEnabled), + lunamethod(RenderPath3D_BindLua, SetDitherEnabled), lunamethod(RenderPath3D_BindLua, SetDepthOfFieldEnabled), lunamethod(RenderPath3D_BindLua, SetEyeAdaptionEnabled), lunamethod(RenderPath3D_BindLua, SetMSAASampleCount), diff --git a/WickedEngine/RenderPath3D_TiledDeferred_BindLua.cpp b/WickedEngine/RenderPath3D_TiledDeferred_BindLua.cpp index 5e6430c55..d99f3776a 100644 --- a/WickedEngine/RenderPath3D_TiledDeferred_BindLua.cpp +++ b/WickedEngine/RenderPath3D_TiledDeferred_BindLua.cpp @@ -27,12 +27,14 @@ Luna::FunctionType RenderPath3D_TiledDeferre lunamethod(RenderPath3D_BindLua, SetReflectionsEnabled), lunamethod(RenderPath3D_BindLua, SetFXAAEnabled), lunamethod(RenderPath3D_BindLua, SetBloomEnabled), + lunamethod(RenderPath3D_BindLua, SetBloomThreshold), lunamethod(RenderPath3D_BindLua, SetColorGradingEnabled), lunamethod(RenderPath3D_BindLua, SetVolumeLightsEnabled), lunamethod(RenderPath3D_BindLua, SetLightShaftsEnabled), lunamethod(RenderPath3D_BindLua, SetLensFlareEnabled), lunamethod(RenderPath3D_BindLua, SetMotionBlurEnabled), lunamethod(RenderPath3D_BindLua, SetSSSEnabled), + lunamethod(RenderPath3D_BindLua, SetDitherEnabled), lunamethod(RenderPath3D_BindLua, SetDepthOfFieldEnabled), lunamethod(RenderPath3D_BindLua, SetEyeAdaptionEnabled), lunamethod(RenderPath3D_BindLua, SetSharpenFilterEnabled), diff --git a/WickedEngine/RenderPath3D_TiledForward_BindLua.cpp b/WickedEngine/RenderPath3D_TiledForward_BindLua.cpp index 10c852e39..0e134f596 100644 --- a/WickedEngine/RenderPath3D_TiledForward_BindLua.cpp +++ b/WickedEngine/RenderPath3D_TiledForward_BindLua.cpp @@ -27,12 +27,14 @@ Luna::FunctionType RenderPath3D_TiledForward_ lunamethod(RenderPath3D_BindLua, SetReflectionsEnabled), lunamethod(RenderPath3D_BindLua, SetFXAAEnabled), lunamethod(RenderPath3D_BindLua, SetBloomEnabled), + lunamethod(RenderPath3D_BindLua, SetBloomThreshold), lunamethod(RenderPath3D_BindLua, SetColorGradingEnabled), lunamethod(RenderPath3D_BindLua, SetVolumeLightsEnabled), lunamethod(RenderPath3D_BindLua, SetLightShaftsEnabled), lunamethod(RenderPath3D_BindLua, SetLensFlareEnabled), lunamethod(RenderPath3D_BindLua, SetMotionBlurEnabled), lunamethod(RenderPath3D_BindLua, SetSSSEnabled), + lunamethod(RenderPath3D_BindLua, SetDitherEnabled), lunamethod(RenderPath3D_BindLua, SetDepthOfFieldEnabled), lunamethod(RenderPath3D_BindLua, SetEyeAdaptionEnabled), lunamethod(RenderPath3D_BindLua, SetMSAASampleCount), diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 4f66d2c33..1f7122270 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates, breaking API changes const int minor = 47; // minor bug fixes, alterations, refactors, updates - const int revision = 22; + const int revision = 23; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);