omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to visual studio 2019

Browse Source
This commit is contained in:
omigamedev
2019-05-23 21:30:54 +02:00
parent b58e4a94ef
commit c9ef4987d2
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PanoPainter.vcxproj
View File

@@ -42,7 +42,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

2
PanoPainterPackage/PanoPainterPackage.wapproj
View File

@@ -41,7 +41,7 @@
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" /> <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup> <PropertyGroup>
<ProjectGuid>3a716fb6-de62-439f-83b6-3c40915d6678</ProjectGuid> <ProjectGuid>3a716fb6-de62-439f-83b6-3c40915d6678</ProjectGuid>
<TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion> <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion> <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
<PackageCertificateKeyFile>PanoPainterPackage_StoreKey.pfx</PackageCertificateKeyFile> <PackageCertificateKeyFile>PanoPainterPackage_StoreKey.pfx</PackageCertificateKeyFile>

16
src/main.cpp
View File

@@ -441,7 +441,7 @@ void init_vk_map()
} }
else else
{ {
LOG("KEY MAP COLLISION %d and %d maps to", LOG("KEY MAP COLLISION %d and %d maps to %d",
(int)vk, (int)vkey_map[(kKey)k], (int)k); (int)vk, (int)vkey_map[(kKey)k], (int)k);
} }
} }
@@ -513,13 +513,13 @@ bool win32_vr_start()
}; };
const float target_tick_rate = 90; const float target_tick_rate = 90;
auto t0 = GetTickCount(); auto t0 = GetTickCount64();
float one_sec_timer = 0; float one_sec_timer = 0;
int frames = 0; int frames = 0;
while (vr_running && running == 1 && vive->Valid()) while (vr_running && running == 1 && vive->Valid())
{ {
std::unique_lock<std::mutex> lock(hmd_render_mutex); std::unique_lock<std::mutex> lock(hmd_render_mutex);
auto t1 = GetTickCount(); auto t1 = GetTickCount64();
float dt = (float)(t1 - t0) / 1000.0f; float dt = (float)(t1 - t0) / 1000.0f;
one_sec_timer += dt; one_sec_timer += dt;
@@ -896,7 +896,7 @@ int main(int argc, char** argv)
LOG("start render thread"); LOG("start render thread");
const float target_fps = 10; const float target_fps = 10;
const float target_tick_rate = 60; const float target_tick_rate = 60;
unsigned long t0 = GetTickCount(); unsigned long t0 = GetTickCount64();
unsigned long t1; unsigned long t1;
bool first_frame = true; bool first_frame = true;
int frames = 0; int frames = 0;
@@ -905,7 +905,7 @@ int main(int argc, char** argv)
float frame_timer = 0; float frame_timer = 0;
while(running == 1) while(running == 1)
{ {
t1 = GetTickCount(); t1 = GetTickCount64();
float dt = (float)(t1 - t0) / 1000.0f; float dt = (float)(t1 - t0) / 1000.0f;
one_sec += dt; one_sec += dt;
render_timer += dt; render_timer += dt;
@@ -1424,13 +1424,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
{ {
LPWSTR *wargs = nullptr;
char** argv = nullptr;
int argc = 0; int argc = 0;
// convert args from char to wchar // convert args from char to wchar
wargs = CommandLineToArgvW(GetCommandLine(), &argc); auto wargs = CommandLineToArgvW(GetCommandLine(), &argc);
argv = new char*[argc + 1]; auto argv = new char*[argc + 1];
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
{ {
auto len = wcslen(wargs[i]) + 1; auto len = wcslen(wargs[i]) + 1;