Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add wizard to convert/replace references #403

Merged
merged 18 commits into from
Jan 22, 2022
Merged

Add wizard to convert/replace references #403

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
82f41cf
Added Convert Body Reference Dialog. Has the ability to 1 click conve…
daz001 Jan 17, 2022
cb85b40
Removed unnecessary method define
daz001 Jan 17, 2022
0d21d44
Renamed Keep Zaps option to Merge Zaps and added Merge Sliders also
daz001 Jan 21, 2022
cd27317
Removed example body specific names from the dialog text
daz001 Jan 21, 2022
a8b7a60
Filtered the dialog options for the convert body and new body
daz001 Jan 21, 2022
c1190fa
Merge branch 'dev' into pr/403
ousnius Jan 22, 2022
8a4ee33
Edit ConvertBodyReference labels, convert whitespace to tabs
ousnius Jan 22, 2022
eeada27
Sort ref templates based on the use case in the converter
daz001 Jan 22, 2022
e91925b
Renamed the converter to be include replace
daz001 Jan 22, 2022
80a79e2
ConfigDialogUtil::LoadDialogCheckBox now falls back to the default value
daz001 Jan 22, 2022
0d56182
Improved template sorting / removed magic values
daz001 Jan 22, 2022
3cb5330
changed the converter dialog to now be a wizard
daz001 Jan 22, 2022
7e819c9
Merge branch 'mdev' into convert_body_ref
daz001 Jan 22, 2022
90fd10d
Validate that an outfit is loaded
daz001 Jan 22, 2022
ba3c954
Improved error checking
daz001 Jan 22, 2022
c068a5b
typo
daz001 Jan 22, 2022
434583d
Label tweaks
daz001 Jan 22, 2022
bb7af99
Updated CMakeLists
daz001 Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions OutfitStudio.vcxproj
View file
Open in desktop
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
View file
Open in desktop
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