Skip to content

Commit

Permalink
Add wizard to convert/replace references (#403)
Browse files Browse the repository at this point in the history
* Added Convert Body Reference Dialog. Has the ability to 1 click convert a body (ie. CBBE to BHUNP) or replace an existing body (select 'None' for the conversion).
* ConfigDialogUtil::LoadDialogCheckBox now falls back to the default value
* Validate that an outfit is loaded

Co-authored-by: ousnius <ousnius@users.noreply.github.com>
  • Loading branch information
daz001 and ousnius authored Jan 22, 2022
1 parent 8bfdab3 commit 2f3fcd6
Show file tree
Hide file tree
Showing 10 changed files with 834 additions and 64 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ set(OSsources
src/program/OutfitProject.cpp
src/program/OutfitStudio.cpp
src/program/ShapeProperties.cpp
src/program/ConvertBodyReferenceDialog.cpp
)
set(BSsources
${commonsources}
Expand Down
3 changes: 3 additions & 0 deletions OutfitStudio.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@
<None Include="lib\gli\glm\gtx\wrap.inl" />
<None Include="res\xrc\About.xrc" />
<None Include="res\xrc\Actions.xrc" />
<None Include="res\xrc\ConvertBodyReference.xrc" />
<None Include="res\xrc\OutfitStudio.xrc" />
<None Include="res\xrc\Project.xrc" />
<None Include="res\xrc\SavePreset.xrc" />
Expand Down Expand Up @@ -748,6 +749,7 @@
<ClInclude Include="src\files\ObjFile.h" />
<ClInclude Include="src\files\ResourceLoader.h" />
<ClInclude Include="src\files\TriFile.h" />
<ClInclude Include="src\program\ConvertBodyReferenceDialog.h" />
<ClInclude Include="src\program\EditUV.h" />
<ClInclude Include="src\program\FBXImportDialog.h" />
<ClInclude Include="src\program\FBXImportOptions.h" />
Expand Down Expand Up @@ -820,6 +822,7 @@
<ClCompile Include="src\files\ObjFile.cpp" />
<ClCompile Include="src\files\ResourceLoader.cpp" />
<ClCompile Include="src\files\TriFile.cpp" />
<ClCompile Include="src\program\ConvertBodyReferenceDialog.cpp" />
<ClCompile Include="src\program\EditUV.cpp" />
<ClCompile Include="src\program\FBXImportDialog.cpp" />
<ClCompile Include="src\program\GroupManager.cpp" />
Expand Down
9 changes: 9 additions & 0 deletions OutfitStudio.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,9 @@
<None Include="lib\gli\glm\gtx\color_space_YCoCg.inl">
<Filter>Libraries\gli\glm\gtx</Filter>
</None>
<None Include="res\xrc\ConvertBodyReference.xrc">
<Filter>Resources</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
Expand Down Expand Up @@ -1753,6 +1756,9 @@
<ClInclude Include="src\ui\wxSliderPanel.h">
<Filter>UI</Filter>
</ClInclude>
<ClInclude Include="src\program\ConvertBodyReferenceDialog.h">
<Filter>Program</Filter>
</ClInclude>
<ClInclude Include="src\utils\ConfigDialogUtil.h">
<Filter>Utilities</Filter>
</ClInclude>
Expand Down Expand Up @@ -1962,6 +1968,9 @@
<ClCompile Include="src\ui\wxSliderPanel.cpp">
<Filter>UI</Filter>
</ClCompile>
<ClCompile Include="src\program\ConvertBodyReferenceDialog.cpp">
<Filter>Program</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Xml Include="Config.xml">
Expand Down
Loading

0 comments on commit 2f3fcd6

Please sign in to comment.