From 8742c8d900e0673418f261cdc7b784de77993c6a Mon Sep 17 00:00:00 2001 From: kungfooman Date: Tue, 31 Oct 2017 08:12:02 +0100 Subject: [PATCH] vs2017 support --- VS2017/.gitignore | 304 +++++++++++++++++ VS2017/GlPortal/GlPortal.sln | 41 +++ VS2017/GlPortal/GlPortal.vcxproj | 169 ++++++++++ VS2017/GlPortal/GlPortal.vcxproj.filters | 36 ++ VS2017/GlPortal/GlPortal.vcxproj.user | 7 + VS2017/RadixEngine/RadixEngine.vcxproj | 236 +++++++++++++ .../RadixEngine/RadixEngine.vcxproj.filters | 313 ++++++++++++++++++ source/WorldHelper.cpp | 9 +- 8 files changed, 1110 insertions(+), 5 deletions(-) create mode 100644 VS2017/.gitignore create mode 100644 VS2017/GlPortal/GlPortal.sln create mode 100644 VS2017/GlPortal/GlPortal.vcxproj create mode 100644 VS2017/GlPortal/GlPortal.vcxproj.filters create mode 100644 VS2017/GlPortal/GlPortal.vcxproj.user create mode 100644 VS2017/RadixEngine/RadixEngine.vcxproj create mode 100644 VS2017/RadixEngine/RadixEngine.vcxproj.filters diff --git a/VS2017/.gitignore b/VS2017/.gitignore new file mode 100644 index 00000000..c7d0d06e --- /dev/null +++ b/VS2017/.gitignore @@ -0,0 +1,304 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ \ No newline at end of file diff --git a/VS2017/GlPortal/GlPortal.sln b/VS2017/GlPortal/GlPortal.sln new file mode 100644 index 00000000..e02d839b --- /dev/null +++ b/VS2017/GlPortal/GlPortal.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlPortal", "GlPortal.vcxproj", "{45125109-5DFB-4F50-A2F2-605D10809969}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RadixEngine", "..\RadixEngine\RadixEngine.vcxproj", "{FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {45125109-5DFB-4F50-A2F2-605D10809969}.Debug|x64.ActiveCfg = Debug|x64 + {45125109-5DFB-4F50-A2F2-605D10809969}.Debug|x64.Build.0 = Debug|x64 + {45125109-5DFB-4F50-A2F2-605D10809969}.Debug|x86.ActiveCfg = Debug|Win32 + {45125109-5DFB-4F50-A2F2-605D10809969}.Debug|x86.Build.0 = Debug|Win32 + {45125109-5DFB-4F50-A2F2-605D10809969}.Release|x64.ActiveCfg = Release|x64 + {45125109-5DFB-4F50-A2F2-605D10809969}.Release|x64.Build.0 = Release|x64 + {45125109-5DFB-4F50-A2F2-605D10809969}.Release|x86.ActiveCfg = Release|Win32 + {45125109-5DFB-4F50-A2F2-605D10809969}.Release|x86.Build.0 = Release|Win32 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Debug|x64.ActiveCfg = Debug|x64 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Debug|x64.Build.0 = Debug|x64 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Debug|x86.ActiveCfg = Debug|Win32 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Debug|x86.Build.0 = Debug|Win32 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Release|x64.ActiveCfg = Release|x64 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Release|x64.Build.0 = Release|x64 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Release|x86.ActiveCfg = Release|Win32 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {368393F4-72EC-4B1B-8474-1ADF6006F40C} + EndGlobalSection +EndGlobal diff --git a/VS2017/GlPortal/GlPortal.vcxproj b/VS2017/GlPortal/GlPortal.vcxproj new file mode 100644 index 00000000..bab521d2 --- /dev/null +++ b/VS2017/GlPortal/GlPortal.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + true + + + + + + + + + + + 15.0 + {45125109-5DFB-4F50-A2F2-605D10809969} + Win32Proj + GlPortal + 10.0.15063.0 + + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + C:\glportal\include;C:\glportal\external\RadixEngine\include;C:\glportal\external\RadixEngine\external\stx\include;C:\glportal\external\RadixEngine\external\RadixEntity\include;C:\glportal\external\RadixEngine\external\easy_profiler\easy_profiler_core\include;C:\glportal\external\RadixEngine\external\linenoise;C:\glportal\external\RadixEngine\external\serine\include;C:\glportal\external\RadixEngine\external;C:\bullet3\src;C:\bullet3;C:\bullet3\bullet;C:\tinyxml2;C:\SDL2-2.0.7\include;$(IncludePath) + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + NotUsing + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions);RADIX_GL_USE_GLAD + true + + + Console + true + C:\glportal\VS2017\GlPortal\x64\Debug\RadixEngine.lib;C:\assimp\build\code\Debug\assimp-vc140-mt.lib;C:\bullet3\build_vs2017_x64\lib\Debug\BulletCollision_Debug.lib;C:\bullet3\build_vs2017_x64\lib\Debug\BulletDynamics_Debug.lib;C:\bullet3\build_vs2017_x64\lib\Debug\LinearMath_Debug.lib;C:\FreeImage\Dist\x64\FreeImaged.lib;C:\tinyxml2\build_vs2017_x64\Debug\tinyxml2d.lib;C:\SDL2-2.0.7\build_vs2017_x64\Debug\SDL2d.lib;C:\SDL2_mixer-2.0.2\VisualC\x64\Debug\SDL2_mixer.lib;%(AdditionalDependencies) + + + + + Use + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/VS2017/GlPortal/GlPortal.vcxproj.filters b/VS2017/GlPortal/GlPortal.vcxproj.filters new file mode 100644 index 00000000..6b4955ed --- /dev/null +++ b/VS2017/GlPortal/GlPortal.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + + + + + + + + + renderer + + + renderer + + + renderer + + + trigger + + + + + + + + {d29e1165-af63-41a5-a8cd-6dcee13e2226} + + + {d866ee7c-0ee0-445e-9416-560704182b0c} + + + \ No newline at end of file diff --git a/VS2017/GlPortal/GlPortal.vcxproj.user b/VS2017/GlPortal/GlPortal.vcxproj.user new file mode 100644 index 00000000..07947a25 --- /dev/null +++ b/VS2017/GlPortal/GlPortal.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(SolutionDir)..\.. + WindowsLocalDebugger + + \ No newline at end of file diff --git a/VS2017/RadixEngine/RadixEngine.vcxproj b/VS2017/RadixEngine/RadixEngine.vcxproj new file mode 100644 index 00000000..53bf8f45 --- /dev/null +++ b/VS2017/RadixEngine/RadixEngine.vcxproj @@ -0,0 +1,236 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15.0 + {FBA286FB-ECEE-4791-ACA9-DF2EF59D2F88} + Win32Proj + RadixEngine + 10.0.15063.0 + + + + Application + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + Application + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + C:\glportal\include;C:\glportal\external\RadixEngine\include;C:\glportal\external\RadixEngine\external\stx\include;C:\glportal\external\RadixEngine\external\RadixEntity\include;C:\glportal\external\RadixEngine\external\easy_profiler\easy_profiler_core\include;C:\glportal\external\RadixEngine\external\linenoise;C:\glportal\external\RadixEngine\external\serine\include;C:\glportal\external\RadixEngine\external;C:\bullet3\src;C:\bullet3;C:\bullet3\bullet;C:\tinyxml2;C:\SDL2-2.0.7\include;C:\SDL2_mixer-2.0.2;C:\getopt;C:\assimp\include;C:\assimp\build\include;C:\FreeImage\Wrapper\FreeImagePlus;C:\FreeImage\Source;$(IncludePath) + + + true + + + false + + + false + + + + NotUsing + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions);RADIX_GL_USE_GLAD;_CRT_SECURE_NO_WARNINGS + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/VS2017/RadixEngine/RadixEngine.vcxproj.filters b/VS2017/RadixEngine/RadixEngine.vcxproj.filters new file mode 100644 index 00000000..e45cec1e --- /dev/null +++ b/VS2017/RadixEngine/RadixEngine.vcxproj.filters @@ -0,0 +1,313 @@ + + + + + {94abd0cc-6d52-4bd9-ae41-dedfb0e2e98e} + + + {6cb4664b-91ca-4bea-a091-2c00426be3f6} + + + {bdd92a38-17b3-446c-9688-305d2f25a1dc} + + + {9782295f-17b7-4fb0-9cf2-700808286962} + + + {360a0ccc-f75a-48ea-8ca9-3cfc2225ad0e} + + + {6312c386-533f-4872-9d05-c56e10cd319d} + + + {812abc31-6321-4e45-ac26-67bd9f775dff} + + + {4a2e1445-38d9-42fa-a2e4-7c80bd98f41e} + + + {f5f54838-bf66-43a1-831d-a0e04fc98faf} + + + {867a38d4-3a7c-4883-8aba-75479036865f} + + + {176947c5-e768-4831-a1f3-ac49c7b5ef46} + + + {b3561d31-4098-4370-9717-27eb58c6ff23} + + + {046ab260-141c-4451-bba0-e83f56048a96} + + + {a56f91a7-732a-40e1-b97e-84189d24688b} + + + {561c2566-fe8c-4b65-b051-30b9322a7f17} + + + {4c89f8bc-18ae-41af-8f7c-37d156ab7714} + + + {669958f1-f0b0-4460-b09c-bf39e0cc8809} + + + {6212073e-97ae-48ee-b6f3-7abbe8c43fd2} + + + {02699d11-f7e0-427c-a41d-7e1add9d1107} + + + {8934d9bb-fc34-4373-ba3e-c26e30579172} + + + {61147ffb-23ff-4851-80b2-3b80604612e7} + + + {f976395f-da6d-4412-96a6-2aaa0428ec38} + + + {0529a74f-4a07-4307-8583-faea5cc3c680} + + + {91f50c60-433e-4cfe-bbc5-6c40fb441c50} + + + {8e8928fc-1328-48b1-9602-2273d55a2825} + + + {efe7023e-984e-42b4-84a1-d42ef7383f20} + + + {e14c2151-9d3a-4483-9385-a5149c398a5e} + + + + + + + + + + + + + + + core\diag + + + core\diag + + + core\diag + + + core\diag + + + core\event + + + core\file + + + core\gl + + + core\gl + + + core\gl + + + core\gl + + + core\math + + + core\math + + + core\math + + + core\math + + + core\math + + + core\math + + + core\math + + + core\state + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\map + + + data\material + + + data\model + + + data\screen + + + data\screen + + + data\screen + + + data\shader + + + data\shader + + + data\text + + + data\texture + + + entities + + + entities + + + entities + + + entities\traits + + + entities\traits + + + entities\traits + + + env + + + env + + + env + + + env + + + env + + + env + + + input + + + physics + + + physics + + + physics + + + physics + + + physics + + + physics + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + simulation + + + simulation + + + util + + + util + + + util\sdl + + + external\json11 + + + external\glad + + + + + external\json11 + + + external\glad + + + \ No newline at end of file diff --git a/source/WorldHelper.cpp b/source/WorldHelper.cpp index 6cf75459..980a88cb 100644 --- a/source/WorldHelper.cpp +++ b/source/WorldHelper.cpp @@ -48,11 +48,10 @@ void WorldHelper::shootPortal(int button, World &world) { portal.trigger->setScale(portal.getScale()); Vector3f modPos = ipos - ((portal.getScale() / 1.15) * portal.getDirection()); portal.trigger->setPosition(modPos); - Destination destination{ - .position = ipos + portal.getDirection(), - .rotation = Vector3f{}, - .orientation = portal.getOrientation() - }; + Destination destination; + destination.position = ipos + portal.getDirection(); + destination.rotation = Vector3f{}; + destination.orientation = portal.getOrientation(); if (button == 1) { world.destinations["portal1"] = destination; PortalTeleport::setAction(*portal.trigger, "portal2");