update some UI operation, bump into v1.6

yyc12345 · Jul 6, 2021 · 08ae16d · 08ae16d
1 parent 1331d7c
commit 08ae16d
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ It is strongly not recommended that you compile by yourself unless you know Virt
 
 ## Develop plan
 
-Current version is v1.3. The following features will be added in the following version.
+Current version is v1.6. The following features will be added in the following version.
 
 * Support choosing from `g` and `o` to split object.
 * Export alpha channel in tga texture.

diff --git a/README_ZH.md b/README_ZH.md
@@ -92,7 +92,7 @@ Virtools Obj 插件
 
 ## 开发计划
 
-当前版本 v1.3，以下内容将在未来版本中加入。
+当前版本 v1.6，以下内容将在未来版本中加入。
 
 * 支持选择使用`g`（group）还是`o`（object）来构建物体
 * 对于tga贴图透明通道的导出

diff --git a/export_setting.cpp b/export_setting.cpp
@@ -113,8 +113,8 @@ BOOL ExportSetting::OnInitDialog() {
 	m_CustomTextureFormat.SetCheck(res_settings.custom_texture_format);
 	m_TextureFormat.SetWindowTextA(res_settings.texture_format.c_str());
 
-	this->func_RefreshUI();
 	this->func_ChangeExportMode();
+	//this->func_RefreshUI(); // func_ChangeExportMode has called this.
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 				  // 异常: OCX 属性页应返回 FALSE
@@ -245,9 +245,9 @@ void ExportSetting::func_ChangeExportMode() {
 				m_ExportList.AddString(buffer_helper::global_buffer);
 			}
 		}
-	} else return;
-
+	}
 
+	func_RefreshUI();
 }
 
 void ExportSetting::func_RefreshUI() {
@@ -274,6 +274,9 @@ void ExportSetting::func_RefreshUI() {
 		m_Reposition_3dsmax.EnableWindow(FALSE);
 		m_Reposition_Blender.EnableWindow(FALSE);
 	}
+
+	// export mode for combobox
+	m_ExportList.EnableWindow(!m_ExportMode_All.GetCheck());
 }
 
 #pragma endregion
diff --git a/vt_menu.cpp b/vt_menu.cpp
@@ -84,7 +84,7 @@ void PluginMenuCallback(int commandID) {
 	} else if (commandID == 1)
 		ShellExecute(NULL, "open", "https://github.com/yyc12345/vtobjplugin/issues", NULL, NULL, SW_SHOWNORMAL);
 	else if (commandID == 2)
-		AfxMessageBox("vtobjplugin v1.3 - An OBJ export plugin for Virtools.\nUnder GPL v3 License.\nProject homepage: https://github.com/yyc12345/vtobjplugin", MB_ICONINFORMATION + MB_OK);
+		AfxMessageBox("vtobjplugin v1.6 - An OBJ export plugin for Virtools.\nUnder GPL v3 License.\nProject homepage: https://github.com/yyc12345/vtobjplugin", MB_ICONINFORMATION + MB_OK);
 	else;
 
 }
diff --git a/vtobjplugin.sln b/vtobjplugin.sln
@@ -7,26 +7,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtobjplugin", "vtobjplugin.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-		SlnVT35|x64 = SlnVT35|x64
-		SlnVT35|x86 = SlnVT35|x86
-		SlnVT5|x64 = SlnVT5|x64
-		SlnVT5|x86 = SlnVT5|x86
+		SlnVT35_Debug|x64 = SlnVT35_Debug|x64
+		SlnVT35_Debug|x86 = SlnVT35_Debug|x86
+		SlnVT35_Release|x64 = SlnVT35_Release|x64
+		SlnVT35_Release|x86 = SlnVT35_Release|x86
+		SlnVT5_Debug|x64 = SlnVT5_Debug|x64
+		SlnVT5_Debug|x86 = SlnVT5_Debug|x86
+		SlnVT5_Release|x64 = SlnVT5_Release|x64
+		SlnVT5_Release|x86 = SlnVT5_Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.Release|x64.ActiveCfg = VT5|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.Release|x64.Build.0 = VT5|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.Release|x86.ActiveCfg = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.Release|x86.Build.0 = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35|x64.ActiveCfg = VT5|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35|x64.Build.0 = VT5|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35|x86.ActiveCfg = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35|x86.Build.0 = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5|x64.ActiveCfg = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5|x64.Build.0 = VT35|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5|x86.ActiveCfg = VT5|Win32
-		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5|x86.Build.0 = VT5|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Debug|x64.ActiveCfg = VT35_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Debug|x86.ActiveCfg = VT35_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Debug|x86.Build.0 = VT35_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Release|x64.ActiveCfg = VT35_Release|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Release|x86.ActiveCfg = VT35_Release|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT35_Release|x86.Build.0 = VT35_Release|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Debug|x64.ActiveCfg = VT5_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Debug|x86.ActiveCfg = VT5_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Debug|x86.Build.0 = VT5_Debug|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Release|x64.ActiveCfg = VT5_Release|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Release|x86.ActiveCfg = VT5_Release|Win32
+		{BE21E1CE-8A2B-47B4-AD47-D69A021D4AAB}.SlnVT5_Release|x86.Build.0 = VT5_Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vtobjplugin.vcxproj b/vtobjplugin.vcxproj
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="VT35|Win32">
-      <Configuration>VT35</Configuration>
+    <ProjectConfiguration Include="VT35_Release|Win32">
+      <Configuration>VT35_Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="VT5|Win32">
-      <Configuration>VT5</Configuration>
+    <ProjectConfiguration Include="VT35_Debug|Win32">
+      <Configuration>VT35_Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="VT5_Release|Win32">
+      <Configuration>VT5_Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="VT5_Debug|Win32">
+      <Configuration>VT5_Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -17,14 +25,28 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
@@ -36,27 +58,69 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='VT35|Win32'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='VT35_Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='VT5|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Debug|Win32'">
     <OutDir>E:\Virtools\Virtools Dev 3.5\InterfacePlugins\</OutDir>
     <IntDir>Temp\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Release|Win32'">
+    <OutDir>E:\Virtools\Virtools Dev 3.5\InterfacePlugins\</OutDir>
+    <IntDir>Temp\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Debug|Win32'">
     <OutDir>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\</OutDir>
     <IntDir>Temp\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT35|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Release|Win32'">
+    <OutDir>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\</OutDir>
+    <IntDir>Temp\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>
+      </SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <AdditionalIncludeDirectories>E:\Virtools\Virtools Dev 3.5\Sdk\Includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;TARGET_VT35;VX_MEM_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>E:\Virtools\Virtools Dev 3.5\InterfacePlugins\$(ProjectName).dll</OutputFile>
+      <AdditionalLibraryDirectories>E:\Virtools\Virtools Dev 3.5\Sdk\Lib\Win32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>vxmath.lib;DllEditor.lib;ck2.lib;InterfaceControls.lib;CKControls.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ModuleDefinitionFile>vtobjplugin.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT35_Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>
       </SDLCheck>
       <ConformanceMode>false</ConformanceMode>
@@ -75,12 +139,40 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\$(ProjectName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>vtobjplugin.def</ModuleDefinitionFile>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>
+      </SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <AdditionalIncludeDirectories>E:\Virtools\Virtools Dev 5.0\Sdk\Includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;TARGET_VT5;VX_MEM_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <OutputFile>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\$(ProjectName).dll</OutputFile>
+      <AdditionalLibraryDirectories>E:\Virtools\Virtools Dev 5.0\Sdk\Lib\Win32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>vxmath.lib;DllEditor.lib;ck2.lib;InterfaceControls.lib;CKControls.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ModuleDefinitionFile>vtobjplugin.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT5|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VT5_Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>
       </SDLCheck>
       <ConformanceMode>false</ConformanceMode>
@@ -99,6 +191,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>E:\Virtools\Virtools Dev 5.0\InterfacePlugins\$(ProjectName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>vtobjplugin.def</ModuleDefinitionFile>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>