LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Mikulas Florek 2019-07-17 23:59:36 +02:00
parent ccc9904da2
commit 3e42e61057
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/editor/gizmo.cpp
View file

@ -151,7 +151,6 @@ struct GizmoImpl final : public Gizmo
void update(const Viewport& vp) override
{
RenderInterface* ri = m_editor.getRenderInterface();
ri->addText2D(50, 50, 0xffFFffFF, "test");
for (int i = 0; i < m_count; ++i) {
const RigidTransform gizmo_tr = getTransform(m_entities[i]);
const Vec2 p = m_editor.getViewport().worldToScreenPixels(gizmo_tr.pos);

16
src/engine/win/os.cpp
View file

@ -729,7 +729,19 @@ void getCurrentDirectory(char* buffer, int buffer_size)
bool getSaveFilename(char* out, int max_size, const char* filter, const char* default_extension)
{
WCharStr<MAX_PATH_LENGTH> wtmp("");
WCharStr<MAX_PATH_LENGTH> wfilter(filter ? filter : "");
WCHAR wfilter[MAX_PATH_LENGTH];
const char* c = filter;
WCHAR* cout = wfilter;
while ((*c || *(c + 1)) && (c - filter) < MAX_PATH_LENGTH - 2) {
*cout = *c;
++cout;
++c;
}
*cout = 0;
++cout;
*cout = 0;
WCharStr<MAX_PATH_LENGTH> wdefault_extension(default_extension ? default_extension : "");
OPENFILENAME ofn;
ZeroMemory(&ofn, sizeof(ofn));
@ -738,7 +750,7 @@ bool getSaveFilename(char* out, int max_size, const char* filter, const char* de
ofn.lpstrFile = wtmp.data;
ofn.lpstrFile[0] = '\0';
ofn.nMaxFile = lengthOf(wtmp.data);
ofn.lpstrFilter = wfilter.data;
ofn.lpstrFilter = wfilter;
ofn.nFilterIndex = 1;
ofn.lpstrDefExt = default_extension ? wdefault_extension.data : nullptr;
ofn.lpstrFileTitle = NULL;