Skip to content

Commit

Permalink
Minor code/solution updates
Browse files Browse the repository at this point in the history
  • Loading branch information
KimihikoAkayasaki committed Oct 2, 2022
1 parent ba96ade commit 03eb00d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Amethyst/Amethyst.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ xcopy /y /d /s /i "$(ProjectDir)Assets\Strings\*" "$(OutDir)Assets\Strings\"</Co
<ClInclude Include="MainWindow.xaml.h">
<DependentUpon>MainWindow.xaml</DependentUpon>
</ClInclude>
<ClInclude Include="PluginEntryView.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="SettingsPage.xaml.h">
<DependentUpon>SettingsPage.xaml</DependentUpon>
Expand Down Expand Up @@ -238,6 +239,7 @@ xcopy /y /d /s /i "$(ProjectDir)Assets\Strings\*" "$(OutDir)Assets\Strings\"</Co
<DependentUpon>MainWindow.xaml</DependentUpon>
</ClCompile>
<ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
<ClCompile Include="PluginEntryView.cpp" />
<ClCompile Include="SettingsPage.xaml.cpp">
<DependentUpon>SettingsPage.xaml</DependentUpon>
<SubType>Code</SubType>
Expand Down Expand Up @@ -270,6 +272,7 @@ xcopy /y /d /s /i "$(ProjectDir)Assets\Strings\*" "$(OutDir)Assets\Strings\"</Co
<SubType>Code</SubType>
<DependentUpon>MainWindow.xaml</DependentUpon>
</Midl>
<Midl Include="PluginEntryView.idl" />
<Midl Include="SettingsPage.idl">
<DependentUpon>SettingsPage.xaml</DependentUpon>
<SubType>Code</SubType>
Expand Down
9 changes: 9 additions & 0 deletions Amethyst/Amethyst.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
<Midl Include="CalibrationDeviceEntryView.idl">
<Filter>MVVM\Calibration</Filter>
</Midl>
<Midl Include="PluginEntryView.idl">
<Filter>MVVM\Devices %28Manager%29</Filter>
</Midl>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
Expand All @@ -40,6 +43,9 @@
<ClCompile Include="CalibrationDeviceEntryView.cpp">
<Filter>MVVM\Calibration</Filter>
</ClCompile>
<ClCompile Include="PluginEntryView.cpp">
<Filter>MVVM\Devices %28Manager%29</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
Expand Down Expand Up @@ -104,6 +110,9 @@
<ClInclude Include="CalibrationDeviceEntryView.h">
<Filter>MVVM\Calibration</Filter>
</ClInclude>
<ClInclude Include="PluginEntryView.h">
<Filter>MVVM\Devices %28Manager%29</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Wide310x150Logo.scale-200.png">
Expand Down
12 changes: 7 additions & 5 deletions Amethyst/K2Main.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once
#include <ranges>

#include "K2DeviceMath.h"
Expand Down Expand Up @@ -266,8 +266,9 @@ namespace k2app::main
pDevice->update(); // Update the device

if (K2Settings.K2TrackersVector[0].selectedTrackedJointID < pDevice->getTrackedJoints().size())
interfacing::deviceRelativeTransformOrigin[pDevice->getDeviceGUID()] = pDevice->getTrackedJoints().at(
K2Settings.K2TrackersVector[0].selectedTrackedJointID).getJointPosition();
interfacing::deviceRelativeTransformOrigin[pDevice->getDeviceGUID()] = pDevice->getTrackedJoints().
at(
K2Settings.K2TrackersVector[0].selectedTrackedJointID).getJointPosition();
}
break;
}
Expand Down Expand Up @@ -299,8 +300,9 @@ namespace k2app::main
pDevice->update(); // Update the device

if (K2Settings.K2TrackersVector[0].selectedTrackedJointID < pDevice->getTrackedJoints().size())
interfacing::deviceRelativeTransformOrigin[pDevice->getDeviceGUID()] = pDevice->getTrackedJoints().at(
K2Settings.K2TrackersVector[0].selectedTrackedJointID).getJointPosition();
interfacing::deviceRelativeTransformOrigin[pDevice->getDeviceGUID()] = pDevice->
getTrackedJoints().at(
K2Settings.K2TrackersVector[0].selectedTrackedJointID).getJointPosition();
}
break;
}
Expand Down

0 comments on commit 03eb00d

Please sign in to comment.