Skip to content

Commit

Permalink
Cleaned up output files
Browse files Browse the repository at this point in the history
  • Loading branch information
munkybutt committed Sep 16, 2023
1 parent 82cdd79 commit 2779170
Show file tree
Hide file tree
Showing 27 changed files with 174 additions and 53 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyd binary
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -446,5 +446,6 @@ PyProjects/venv37/
PyProjects/venv39/
PyProjects/.venvs/
temp.cpp
*.exp
*.max
*.mb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file modified PYProjects/skin_plus_plus/py/37/skin_plus_plus_py.pyd
Binary file not shown.
Binary file not shown.
Binary file modified PYProjects/skin_plus_plus/py/39/skin_plus_plus_py.pyd
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion PYProjects/skin_plus_plus_test/skin_plus_plus_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,8 @@ def add_bones():
# status = om.MStatus()
mobject = om.MObject()
print(mobject)
fnInfluence = oman.MFnIkJoint(mobject);
fnInfluence = oman.MFnIkJoint(mobject)


if __name__ == "__main__":
pass
Expand Down
10 changes: 5 additions & 5 deletions PYProjects/source/.sln.ps1
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Set dependency variables here:
$Env:THIRD_PARTY_EIGEN = (Resolve-Path -Path "..\3rdParty\eigen-3.4.0")
$Env:THIRD_PARTY_FMT = (Resolve-Path -Path "..\3rdParty\fmt-9.1.0")
$Env:THIRD_PARTY_FMT = (Resolve-Path -Path "..\3rdParty\fmt-10.1.1")

$Env:ADSK_MAYA_SDK_2022 = "C:\Program Files\Autodesk\Maya2022\devkit\devkitBase"
$Env:ADSK_MAYA_SDK_2023 = "C:\Program Files\Autodesk\Maya2023\devkit\devkitBase"

$Env:PYBIND11_37 = (Resolve-Path -Path "..\.venvs\37\.venv\Lib\site-packages\pybind11")
$Env:PYBIND11_39 = (Resolve-Path -Path "..\.venvs\39\.venv\Lib\site-packages\pybind11")
$Env:PYBIND11_37 = (Resolve-Path -Path "..\.venvs\py379\Lib\site-packages\pybind11")
$Env:PYBIND11_39 = (Resolve-Path -Path "..\.venvs\py397\Lib\site-packages\pybind11")

$Env:PYTHON_37 = (Resolve-Path -Path "..\..\..\..\python\libs\.pyenv\pyenv-win\versions\3.7.9")
$Env:PYTHON_39 = (Resolve-Path -Path "..\..\..\..\python\libs\.pyenv\pyenv-win\versions\3.9.13")
$Env:PYTHON_37 = (Resolve-Path -Path "C:\Users\Sheaky\.pyenv\pyenv-win\versions\3.7.9")
$Env:PYTHON_39 = (Resolve-Path -Path "C:\Users\Sheaky\.pyenv\pyenv-win\versions\3.9.7")

.\skin_plus_plus.sln
1 change: 1 addition & 0 deletions PYProjects/source/open_skin_plus_plus_sln.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
rem This allows the sln to be opened by double clicking, rather than right click -> run with powershell.
@echo off
PowerShell .sln.ps1
pause
7 changes: 3 additions & 4 deletions PYProjects/source/skin_plus_plus.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Global
{7BF5EA8D-2105-425A-967C-590AD47EC6CB}.2023-Debug|x64.Build.0 = 2023-Debug|x64
{7BF5EA8D-2105-425A-967C-590AD47EC6CB}.2023-Release|x64.ActiveCfg = 2023-Release|x64
{7BF5EA8D-2105-425A-967C-590AD47EC6CB}.2023-Release|x64.Build.0 = 2023-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2021-Release|x64.ActiveCfg = 2022-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2021-Release|x64.Build.0 = 2022-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2021-Release|x64.ActiveCfg = 2021-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2021-Release|x64.Build.0 = 2021-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2022-Debug|x64.ActiveCfg = 2022-Debug|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2022-Debug|x64.Build.0 = 2022-Debug|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2022-Release|x64.ActiveCfg = 2022-Release|x64
Expand All @@ -44,8 +44,7 @@ Global
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2023-Debug|x64.Build.0 = 2023-Debug|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2023-Release|x64.ActiveCfg = 2023-Release|x64
{6A977F79-6449-4D2F-8B5F-9363A19F5046}.2023-Release|x64.Build.0 = 2023-Release|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2021-Release|x64.ActiveCfg = 2022-Release|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2021-Release|x64.Build.0 = 2022-Release|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2021-Release|x64.ActiveCfg = 2021-Release|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2022-Debug|x64.ActiveCfg = 2022-Debug|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2022-Debug|x64.Build.0 = 2022-Debug|x64
{1A82B795-46D9-40C8-9AE2-4C4D2D71BBFD}.2022-Release|x64.ActiveCfg = 2022-Release|x64
Expand Down
35 changes: 27 additions & 8 deletions PYProjects/source/skin_plus_plus_py/headers/skin_plus_plus_py.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ typedef eg::MatrixXd WeightsMatrix;
typedef eg::MatrixXd PositionMatrix;
typedef unsigned int UINT;


template <typename T>
UINT getItemIndex(std::vector<T> vector, T item) {
UINT index = std::distance(vector.begin(), find(vector.begin(), vector.end(), item));
Expand All @@ -36,23 +37,41 @@ UINT getItemIndex(std::vector<T> vector, T item) {
}


//char convertWCharToChar(const wchar_t* text)
//{
// size_t length = std::wcslen(text);
// std::wstring_convert<std::codecvt<wchar_t, char, std::mbstate_t>> conv;
// std::string storeTextBuffer = conv.to_bytes(text, text + length);
//
// return storeTextBuffer[0];
//}


char convertWCharToChar(const wchar_t* text)
{
size_t length = std::wcslen(text);
std::wstring_convert<std::codecvt<wchar_t, char, std::mbstate_t>> conv;
std::string storeTextBuffer = conv.to_bytes(text, text + length);
std::wstring ws(text);
std::string str(ws.begin(), ws.end());

return storeTextBuffer[0];
return str[0];
}


//std::string convertWCharToString(const wchar_t* text)
//{
// size_t length = std::wcslen(text);
// std::wstring_convert<std::codecvt<wchar_t, char, std::mbstate_t>> conv;
// std::string storeTextBuffer = conv.to_bytes(text, text + length);
//
// return storeTextBuffer;
//}


std::string convertWCharToString(const wchar_t* text)
{
size_t length = std::wcslen(text);
std::wstring_convert<std::codecvt<wchar_t, char, std::mbstate_t>> conv;
std::string storeTextBuffer = conv.to_bytes(text, text + length);
std::wstring ws(text);
std::string str(ws.begin(), ws.end());

return storeTextBuffer;
return str;
}


Expand Down
59 changes: 58 additions & 1 deletion PYProjects/source/skin_plus_plus_py/skin_plus_plus_py.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<Configuration>2022-Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="2021-Release|x64">
<Configuration>2021-Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
Expand All @@ -26,6 +30,13 @@
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='2021-Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='2022-Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
Expand All @@ -47,10 +58,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='2023-Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -63,6 +75,9 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='2023-Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='2021-Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='2022-Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
Expand All @@ -75,6 +90,12 @@
<OutDir>$(SolutionDir)..\..\PYProjects\skin_plus_plus\py\debug_37</OutDir>
<IncludePath>$(THIRD_PARTY_EIGEN);$(THIRD_PARTY_FMT)\include;$(ProjectDir)headers;$(PYTHON_37)\include;$(PYBIND11_37)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='2021-Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetExt>.pyd</TargetExt>
<OutDir>$(SolutionDir)..\..\PYProjects\skin_plus_plus\py\37</OutDir>
<IncludePath>$(THIRD_PARTY_EIGEN);$(THIRD_PARTY_FMT)\include;$(WindowsSDK_IncludePath);$(VC_IncludePath);$(ProjectDir)headers;$(PYTHON_37)\include;$(PYBIND11_37)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='2022-Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetExt>.pyd</TargetExt>
Expand Down Expand Up @@ -181,6 +202,42 @@
<AdditionalLibraryDirectories>$(PYTHON_39)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='2021-Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(PYTHON_37)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(OutDir)obj\$(TargetName).pdb</ProgramDatabaseFile>
<ProfileGuidedDatabase>$(OutDir)obj\$(TargetName).pgd</ProfileGuidedDatabase>
<ImportLibrary>$(OutDir)obj\$(TargetName).lib</ImportLibrary>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Xdcmake>
<OutputFile>$(OutDir)obj\$(TargetName).xml</OutputFile>
</Xdcmake>
<Bscmake>
<OutputFile>$(OutDir)obj\$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy compiled files into correct python module structure</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="headers\skin_plus_plus_py.h" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 2779170

Please sign in to comment.