From 366a6bb9f11636174dcd667b2c0175d97b74759f Mon Sep 17 00:00:00 2001 From: turanszkij Date: Mon, 17 Oct 2016 22:10:30 +0200 Subject: [PATCH] water ripple placement updated --- WickedEngine/Editor.cpp | 2 +- WickedEngine/wiRenderer.cpp | 3 ++- WickedEngine/wiRenderer.h | 2 +- WickedEngine/wiRenderer_BindLua.cpp | 2 +- WickedEngine/wiVersion.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WickedEngine/Editor.cpp b/WickedEngine/Editor.cpp index 3b0a7ce03..d466988ef 100644 --- a/WickedEngine/Editor.cpp +++ b/WickedEngine/Editor.cpp @@ -674,7 +674,7 @@ void EditorComponent::Update() if (wiInputManager::GetInstance()->down(VK_LBUTTON)) { // if water, then put a water ripple onto it: - wiRenderer::PutWaterRipple(wiHelper::GetOriginalWorkingDirectory() + "images/ripple.png", hovered.position, wiRenderer::GetWaterPlane()); + wiRenderer::PutWaterRipple(wiHelper::GetOriginalWorkingDirectory() + "images/ripple.png", hovered.position); } } else diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index 4ecd77ba0..cff7223b3 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -1748,7 +1748,8 @@ void wiRenderer::PutDecal(Decal* decal) { GetScene().GetWorldNode()->decals.push_back(decal); } -void wiRenderer::PutWaterRipple(const string& image, const XMFLOAT3& pos, const wiWaterPlane& waterPlane){ +void wiRenderer::PutWaterRipple(const string& image, const XMFLOAT3& pos) +{ wiSprite* img=new wiSprite("","",image); img->anim.fad=0.01f; img->anim.scaleX=0.2f; diff --git a/WickedEngine/wiRenderer.h b/WickedEngine/wiRenderer.h index 99f278511..8925376fe 100644 --- a/WickedEngine/wiRenderer.h +++ b/WickedEngine/wiRenderer.h @@ -309,7 +309,7 @@ public: static void UpdateImages(); static void ManageImages(); static void PutDecal(Decal* decal); - static void PutWaterRipple(const string& image, const XMFLOAT3& pos, const wiWaterPlane& waterPlane); + static void PutWaterRipple(const string& image, const XMFLOAT3& pos); static void ManageWaterRipples(); static void DrawWaterRipples(GRAPHICSTHREAD threadID); static void SetGameSpeed(float value){GameSpeed=value; if(GameSpeed<0) GameSpeed=0;}; diff --git a/WickedEngine/wiRenderer_BindLua.cpp b/WickedEngine/wiRenderer_BindLua.cpp index 078332170..1df3449fe 100644 --- a/WickedEngine/wiRenderer_BindLua.cpp +++ b/WickedEngine/wiRenderer_BindLua.cpp @@ -527,7 +527,7 @@ namespace wiRenderer_BindLua { XMFLOAT3 pos; XMStoreFloat3(&pos, v->vector); - wiRenderer::PutWaterRipple(name, pos, wiWaterPlane()); + wiRenderer::PutWaterRipple(name, pos); } else wiLua::SError(L, "PutWaterRipple(String imagename, Vector position) argument is not a Vector!"); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index c403d033e..f72ac8059 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -7,7 +7,7 @@ namespace wiVersion // minor features, major updates const int minor = 9; // minor bug fixes, alterations, refactors, updates - const int revision = 17; + const int revision = 18; long GetVersion()