Fixes for VC and new Win32 binary.
This commit is contained in:
parent
5ca1417039
commit
22865e60af
Binary file not shown.
Binary file not shown.
@ -177,11 +177,23 @@
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\Source\ChunkyTriMesh.cpp"
|
||||
RelativePath="..\..\Source\Builder.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\demo.cpp"
|
||||
RelativePath="..\..\Source\BuilderStatMesh.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\BuilderStatMeshSimple.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\BuilderStatMeshTiling.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\ChunkyTriMesh.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -204,6 +216,10 @@
|
||||
RelativePath="..\..\Source\imgui.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\main.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Source\MeshLoaderObj.cpp"
|
||||
>
|
||||
@ -250,6 +266,22 @@
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\Include\Builder.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Include\BuilderStatMesh.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Include\BuilderStatMeshSimple.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Include\BuilderStatMeshTiling.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Include\ChunkyTriMesh.h"
|
||||
>
|
||||
|
@ -18,6 +18,10 @@
|
||||
#include "BuilderStatMeshSimple.h"
|
||||
#include "BuilderStatMeshTiling.h"
|
||||
|
||||
#ifdef WIN32
|
||||
# define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
GLFont g_font;
|
||||
|
||||
void drawText(int x, int y, int dir, const char* text, unsigned int col)
|
||||
@ -437,7 +441,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
mouseOverMenu = false;
|
||||
|
||||
int propDiv = showDebugMode ? height*0.6f : height;
|
||||
int propDiv = showDebugMode ? (int)(height*0.6f) : height;
|
||||
|
||||
if (imguiBeginScrollArea(GENID, "Properties",
|
||||
width-250-10, 10+height-propDiv, 250, propDiv-20, &propScroll))
|
||||
|
Loading…
x
Reference in New Issue
Block a user