nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

water ripple placement updated

Browse Source
This commit is contained in:
turanszkij
2016-10-17 22:10:30 +02:00
parent b0d0439a67
commit 366a6bb9f1
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/Editor.cpp
+1 -1
View File
@@ -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
WickedEngine/wiRenderer.cpp
+2 -1
View File
@@ -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;
WickedEngine/wiRenderer.h
+1 -1
View File
@@ -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;};
WickedEngine/wiRenderer_BindLua.cpp
+1 -1
View File
@@ -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!");
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -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()