Skip to content

Commit

Permalink
Updated to VS2019. Added a simple gui to delete snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martinii89
Martinii89 committed Jul 24, 2019
1 parent 03610c3 commit f9ac8d3
Show file tree
Hide file tree
Showing 33 changed files with 30,209 additions and 22,890 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "DollyCamPlugin2/imguifilebrowser"]
path = DollyCamPlugin2/imguifilebrowser
url = https://github.com/bakkesmodorg/imgui-filebrowser
[submodule "DollyCamPlugin2/json"]
path = DollyCamPlugin2/json
url = https://github.com/nlohmann/json.git
7 changes: 5 additions & 2 deletions DollyCamPlugin2.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio Version 16
VisualStudioVersion = 16.0.29111.141
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DollyCamPlugin2", "DollyCamPlugin2\DollyCamPlugin2.vcxproj", "{5FCE42A6-EC92-4C5F-A0B2-94FF138187A1}"
EndProject
Expand All @@ -25,4 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BA353E68-24AC-4372-94CE-CBB3C8044290}
EndGlobalSection
EndGlobal
46 changes: 37 additions & 9 deletions DollyCamPlugin2/DollyCamPlugin2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{5FCE42A6-EC92-4C5F-A0B2-94FF138187A1}</ProjectGuid>
<RootNamespace>DollyCamPlugin2</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand All @@ -72,18 +72,25 @@
<Import Project="customPaths.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\.intermediates\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\.intermediates\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\Projects\BakkesMod\json\include;C:\Program Files %28x86%29\Steam\steamapps\common\rocketleague\Binaries\Win32\bakkesmod\bakkesmodsdk\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(BAKKESMOD)\bakkesmodsdk\include</AdditionalIncludeDirectories>
<LanguageStandard>
</LanguageStandard>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>C:\Program Files %28x86%29\Steam\steamapps\common\rocketleague\Binaries\Win32\bakkesmod\bakkesmodsdk\lib</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(BAKKESMOD)\bakkesmodsdk\lib</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand Down Expand Up @@ -127,13 +134,26 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="imguifilebrowser\imfilebrowser.h" />
<ClInclude Include="imgui\CustomImguiModifications.h" />
<ClInclude Include="imgui\imconfig.h" />
<ClInclude Include="imgui\imgui.h" />
<ClInclude Include="imgui\imguivariouscontrols.h" />
<ClInclude Include="imgui\imgui_additions.h" />
<ClInclude Include="imgui\imgui_impl_dx9.h" />
<ClInclude Include="imgui\imgui_internal.h" />
<ClInclude Include="imgui\imgui_rangeslider.h" />
<ClInclude Include="imgui\imgui_tabs.h" />
<ClInclude Include="imgui\imgui_timeline.h" />
<ClInclude Include="imgui\stb_rect_pack.h" />
<ClInclude Include="imgui\stb_textedit.h" />
<ClInclude Include="imgui\stb_truetype.h" />
<ClInclude Include="interpstrategies\catmullrominterp.h" />
<ClInclude Include="dollycam.h" />
<ClInclude Include="dollycamplugin.h" />
<ClInclude Include="gameapplier.h" />
<ClInclude Include="interpstrategies\interpstrategy.h" />
<ClInclude Include="interpstrategies\linearinterp.h" />
<ClInclude Include="interpstrategies\Quaternions\quaternions.h" />
<ClInclude Include="interpstrategies\supportedstrategies.h" />
<ClInclude Include="interpstrategies\tinyspline\tinyspline.h" />
<ClInclude Include="interpstrategies\tinyspline\tinysplinecpp.h" />
Expand All @@ -145,6 +165,14 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="dollycamplugin_gui.cpp" />
<ClCompile Include="imgui\imgui.cpp" />
<ClCompile Include="imgui\imguivariouscontrols.cpp" />
<ClCompile Include="imgui\imgui_additions.cpp" />
<ClCompile Include="imgui\imgui_draw.cpp" />
<ClCompile Include="imgui\imgui_impl_dx9.cpp" />
<ClCompile Include="imgui\imgui_rangeslider.cpp" />
<ClCompile Include="imgui\imgui_tabs.cpp" />
<ClCompile Include="imgui\imgui_timeline.cpp" />
<ClCompile Include="interpstrategies\catmullrominterp.cpp" />
<ClCompile Include="dollycam.cpp" />
<ClCompile Include="dollycamplugin.cpp" />
Expand Down
163 changes: 127 additions & 36 deletions DollyCamPlugin2/DollyCamPlugin2.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,35 @@
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
<Filter Include="InterpolationStrategies">
<UniqueIdentifier>{a8c0340c-7fff-40c5-96bb-efefbc55ebe0}</UniqueIdentifier>
</Filter>
<Filter Include="InterpolationStrategies\Bezier">
<UniqueIdentifier>{fba5f218-c4dc-4b21-906e-1cbedc0217e4}</UniqueIdentifier>
</Filter>
<Filter Include="InterpolationStrategies\Linear">
<UniqueIdentifier>{59abff23-ba54-48c8-8952-fc951928a091}</UniqueIdentifier>
</Filter>
<Filter Include="InterpolationStrategies\CatMull">
<UniqueIdentifier>{03ced2a0-aa8e-487e-b40c-9a096a90d3f4}</UniqueIdentifier>
</Filter>
<Filter Include="InterpolationStrategies\Spline">
<UniqueIdentifier>{6da9d689-b1b1-4ac0-b237-e14834b5cf1a}</UniqueIdentifier>
</Filter>
<Filter Include="InterpolationStrategies\Spline\TinySpline">
<UniqueIdentifier>{7a7175c8-1722-4828-98bd-2515024526e0}</UniqueIdentifier>
</Filter>
<Filter Include="Serialization">
<UniqueIdentifier>{c3ccd069-a373-4ca0-8bb2-78a8adafa3ce}</UniqueIdentifier>
</Filter>
<Filter Include="Serialization\json">
<UniqueIdentifier>{69d788ea-46e4-4818-ac5b-7a6e87790e96}</UniqueIdentifier>
</Filter>
<Filter Include="imgui">
<UniqueIdentifier>{c9a14db7-8bd5-4893-a227-c0c223cee53b}</UniqueIdentifier>
</Filter>
<Filter Include="imgui\headers">
<UniqueIdentifier>{9fc89af7-9494-4546-ad6f-de25fcc463e6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand All @@ -27,38 +53,77 @@
<ClInclude Include="models.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="serialization.h">
<ClInclude Include="interpstrategies\supportedstrategies.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\interpstrategy.h">
<Filter>Header Files</Filter>
<ClInclude Include="interpstrategies\splineinterp.h">
<Filter>InterpolationStrategies\Spline</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\linearinterp.h">
<Filter>Header Files</Filter>
<ClInclude Include="interpstrategies\tinyspline\tinyspline.h">
<Filter>InterpolationStrategies\Spline\TinySpline</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\tinyspline\tinysplinecpp.h">
<Filter>InterpolationStrategies\Spline\TinySpline</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\nbezierinterp.h">
<Filter>Header Files</Filter>
<Filter>InterpolationStrategies\Bezier</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\supportedstrategies.h">
<Filter>Header Files</Filter>
<ClInclude Include="interpstrategies\linearinterp.h">
<Filter>InterpolationStrategies\Linear</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\interpstrategy.h">
<Filter>InterpolationStrategies</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\catmullrominterp.h">
<Filter>Header Files</Filter>
<Filter>InterpolationStrategies\CatMull</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\splineinterp.h">
<Filter>Header Files</Filter>
<ClInclude Include="serialization.h">
<Filter>Serialization</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\tinyspline\tinysplinecpp.h">
<Filter>Header Files</Filter>
<ClInclude Include="nlohmann\json.hpp">
<Filter>Serialization\json</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\tinyspline\tinyspline.h">
<Filter>Header Files</Filter>
<ClInclude Include="imguifilebrowser\imfilebrowser.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="interpstrategies\Quaternions\quaternions.h">
<Filter>Header Files</Filter>
<ClInclude Include="imgui\stb_rect_pack.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="nlohmann\json.hpp">
<Filter>Header Files</Filter>
<ClInclude Include="imgui\stb_textedit.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\stb_truetype.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\CustomImguiModifications.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imconfig.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_additions.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_impl_dx9.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_internal.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_rangeslider.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_tabs.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_timeline.h">
<Filter>imgui\headers</Filter>
</ClInclude>
<ClInclude Include="imgui\imguivariouscontrols.h">
<Filter>imgui\headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
Expand All @@ -74,35 +139,61 @@
<ClCompile Include="models.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="serialization.cpp">
<ClCompile Include="dollycamplugin_gui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\catmullrominterp.cpp">
<Filter>InterpolationStrategies\CatMull</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\interpstrategy.cpp">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\linearinterp.cpp">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies\Linear</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\nbezierinterp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\catmullrominterp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="dollycamplugin_gui.cpp">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies\Bezier</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\splineinterp.cpp">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies\Spline</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\tinyspline\tinyspline.c">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies\Spline\TinySpline</Filter>
</ClCompile>
<ClCompile Include="interpstrategies\tinyspline\tinysplinecpp.cpp">
<Filter>Source Files</Filter>
<Filter>InterpolationStrategies\Spline\TinySpline</Filter>
</ClCompile>
<ClCompile Include="serialization.cpp">
<Filter>Serialization</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_additions.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_draw.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_impl_dx9.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_rangeslider.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_tabs.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_timeline.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imguivariouscontrols.cpp">
<Filter>imgui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="interpstrategies\tinyspline\tinyspline.i" />
<None Include="interpstrategies\tinyspline\tinyspline.i">
<Filter>InterpolationStrategies\Spline\TinySpline</Filter>
</None>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions DollyCamPlugin2/dollycam.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class DollyCam
bool renderFrames = false;
void UpdateRenderPath();
void CheckIfSameInterp();

public:
DollyCam(std::shared_ptr<GameWrapper> _gameWrapper, std::shared_ptr<CVarManagerWrapper> _cvarManager, std::shared_ptr<IGameApplier> _gameApplier);
~DollyCam();
Expand Down
18 changes: 12 additions & 6 deletions DollyCamPlugin2/dollycamplugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
#include "bakkesmod\plugin\pluginwindow.h"
#include "dollycam.h"

class DollyCamPlugin : public BakkesMod::Plugin::BakkesModPlugin
#ifdef PLUGIN_GUI
, public BakkesMod::Plugin::PluginWindow
#endif
class DollyCamPlugin : public BakkesMod::Plugin::BakkesModPlugin, public BakkesMod::Plugin::PluginWindow
{
private:
std::shared_ptr<DollyCam> dollyCam;
std::shared_ptr<bool> renderCameraPath;
CameraSnapshot selectedSnapshot;
bool IsApplicable();

//gui stuff
bool isWindowOpen = true;
bool isMinimized = false;

public:
virtual void onLoad();
virtual void onUnload();
Expand Down Expand Up @@ -44,10 +46,14 @@ class DollyCamPlugin : public BakkesMod::Plugin::BakkesModPlugin

//Interp config methods
void OnBezierCommand(vector<string> params);
#ifdef PLUGIN_GUI
virtual void Render();
virtual std::string GetMenuName();
virtual std::string GetMenuTitle();
virtual void SetImGuiContext(uintptr_t ctx);
#endif

// Inherited via PluginWindow
virtual bool ShouldBlockInput() override;
virtual bool IsActiveOverlay() override;
virtual void OnOpen() override;
virtual void OnClose() override;
};
Loading

0 comments on commit f9ac8d3

Please sign in to comment.