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

ocean updates; editor: ocean parameters moved to weather window;

Browse Source
This commit is contained in:
Turanszki Janos
2020-01-28 23:30:23 +00:00
parent 07081ad27e
commit fd8d734860
12 changed files with 199 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor.cpp
+1 -12
View File
@@ -15,7 +15,6 @@
#include "EmitterWindow.h"
#include "HairParticleWindow.h"
#include "ForceFieldWindow.h"
#include "OceanWindow.h"
#include "SoundWindow.h"
#include "ModelImporter.h"
@@ -146,7 +145,6 @@ void EditorComponent::ChangeRenderPath(RENDERPATH path)
emitterWnd.reset(new EmitterWindow(&GetGUI()));
hairWnd.reset(new HairParticleWindow(&GetGUI()));
forceFieldWnd.reset(new ForceFieldWindow(&GetGUI()));
oceanWnd.reset(new OceanWindow(&GetGUI()));
ResizeBuffers();
}
@@ -346,7 +344,7 @@ void EditorComponent::Load()
GetGUI().AddWidget(emitterWnd_Toggle);
wiButton* hairWnd_Toggle = new wiButton("HairParticle");
hairWnd_Toggle->SetTooltip("Emitter Particle System properties");
hairWnd_Toggle->SetTooltip("Hair Particle System properties");
hairWnd_Toggle->SetPos(XMFLOAT2(x, y += step));
hairWnd_Toggle->SetSize(option_size);
hairWnd_Toggle->OnClick([=](wiEventArgs args) {
@@ -363,15 +361,6 @@ void EditorComponent::Load()
});
GetGUI().AddWidget(forceFieldWnd_Toggle);
wiButton* oceanWnd_Toggle = new wiButton("Ocean");
oceanWnd_Toggle->SetTooltip("Ocean Simulator properties");
oceanWnd_Toggle->SetPos(XMFLOAT2(x, y += step));
oceanWnd_Toggle->SetSize(option_size);
oceanWnd_Toggle->OnClick([=](wiEventArgs args) {
oceanWnd->oceanWindow->SetVisible(!oceanWnd->oceanWindow->IsVisible());
});
GetGUI().AddWidget(oceanWnd_Toggle);
////////////////////////////////////////////////////////////////////////////////////