Check for plugin updates

appleseedhq · Dec 2, 2015 · b8dba19 · b8dba19
1 parent cd19486
commit b8dba19
Show file tree

Hide file tree

Showing 15 changed files with 613 additions and 122 deletions.
diff --git a/src/appleseed-renderer/appleseed-renderer.rc b/src/appleseed-renderer/appleseed-renderer.rc
@@ -50,6 +50,18 @@ END
 // Dialog
 //
 
+IDD_FORMVIEW_RENDERERPARAMS_ABOUT DIALOGEX 0, 0, 200, 56
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Plugin Version:",IDC_STATIC,0,6,78,8
+    LTEXT           "appleseed Version:",IDC_STATIC,0,21,78,8
+    CONTROL         "Custom1",IDC_TEXT_PLUGIN_VERSION,"CustStatus",WS_TABSTOP,78,5,72,10
+    CONTROL         "Custom1",IDC_TEXT_APPLESEED_VERSION,"CustStatus",WS_TABSTOP,78,20,72,10
+    CONTROL         "Download",IDC_BUTTON_DOWNLOAD,"CustButton",WS_TABSTOP,150,41,42,10
+    LTEXT           "Version x.y.z-maturity is available.",IDC_STATIC_NEW_VERSION,0,42,144,8
+END
+
 IDD_FORMVIEW_RENDERERPARAMS_IMAGESAMPLING DIALOGEX 0, 0, 200, 26
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -104,6 +116,11 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO
 BEGIN
+    IDD_FORMVIEW_RENDERERPARAMS_ABOUT, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 44
+    END
+
     IDD_FORMVIEW_RENDERERPARAMS_IMAGESAMPLING, DIALOG
     BEGIN
     END

diff --git a/src/appleseed-renderer/appleseed-renderer.vcxproj b/src/appleseed-renderer/appleseed-renderer.vcxproj
@@ -59,14 +59,14 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_FILESYSTEM_VERSION=3;BOOST_FILESYSTEM_NO_DEPRECATED;APPLESEED_WITH_OIIO;OIIO_STATIC_BUILD;APPLESEED_WITH_OSL;OSL_STATIC_LIBRARY;APPLESEED_WITH_DISNEY_MATERIAL;APPLESEED_WITH_NORMALIZED_DIFFUSION_BSSRDF;XERCES_STATIC_LIBRARY;BOOST_PYTHON_STATIC_LIB;APPLESEED_X86;APPLESEED_USE_SSE;DEBUG;APPLESEED_ENABLE_IMATH_INTEROP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\include;$(SolutionDir)..\..\boost_1_55_0-vc11;$(SolutionDir)..\..\appleseed-dictoon-vc11\src\appleseed;$(SolutionDir)..\..\appleseed-deps-vc11\stage\ilmbase-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\openexr-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\oiio-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\osl-debug\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\;C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\include;$(SolutionDir)..\..\boost_1_55_0-vc11;$(SolutionDir)..\..\appleseed-dictoon-vc11\src\appleseed;$(SolutionDir)..\..\appleseed-deps-vc11\stage\ilmbase-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\openexr-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\oiio-debug\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\osl-debug\include</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalLibraryDirectories>C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\lib\x64\Release;$(SolutionDir)..\..\appleseed-dictoon-vc11\sandbox\lib\$(ConfigurationName);$(SolutionDir)..\..\appleseed-deps-vc11\stage;$(SolutionDir)..\..\boost_1_55_0-vc11\stage\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>bmm.lib;core.lib;geom.lib;maxutil.lib;mesh.lib;Paramblk2.lib;appleseed.lib;ilmbase-debug\lib\Half.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wininet.lib;bmm.lib;core.lib;geom.lib;maxutil.lib;mesh.lib;Paramblk2.lib;appleseed.lib;ilmbase-debug\lib\Half.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
@@ -88,7 +88,7 @@ copy /Y "$(SolutionDir)..\..\appleseed-dictoon-vc11\build\src\appleseed\$(Config
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_FILESYSTEM_VERSION=3;BOOST_FILESYSTEM_NO_DEPRECATED;APPLESEED_WITH_OIIO;OIIO_STATIC_BUILD;APPLESEED_WITH_OSL;OSL_STATIC_LIBRARY;APPLESEED_WITH_DISNEY_MATERIAL;APPLESEED_WITH_NORMALIZED_DIFFUSION_BSSRDF;XERCES_STATIC_LIBRARY;BOOST_PYTHON_STATIC_LIB;APPLESEED_X86;APPLESEED_USE_SSE;APPLESEED_ENABLE_IMATH_INTEROP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\include;$(SolutionDir)..\..\appleseed-dictoon-vc11\src\appleseed;$(SolutionDir)..\..\boost_1_55_0-vc11;$(SolutionDir)..\..\appleseed-deps-vc11\stage\ilmbase-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\openexr-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\oiio-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\osl-release\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\;C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\include;$(SolutionDir)..\..\appleseed-dictoon-vc11\src\appleseed;$(SolutionDir)..\..\boost_1_55_0-vc11;$(SolutionDir)..\..\appleseed-deps-vc11\stage\ilmbase-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\openexr-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\oiio-release\include;$(SolutionDir)..\..\appleseed-deps-vc11\stage\osl-release\include</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
@@ -102,7 +102,7 @@ copy /Y "$(SolutionDir)..\..\appleseed-dictoon-vc11\build\src\appleseed\$(Config
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>C:\Program Files\Autodesk\3ds Max 2015 SDK\maxsdk\lib\x64\Release;$(SolutionDir)..\..\appleseed-dictoon-vc11\sandbox\lib\$(ConfigurationName);$(SolutionDir)..\..\appleseed-deps-vc11\stage;$(SolutionDir)..\..\boost_1_55_0-vc11\stage\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>bmm.lib;core.lib;geom.lib;maxutil.lib;mesh.lib;Paramblk2.lib;appleseed.lib;ilmbase-release\lib\Half.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wininet.lib;bmm.lib;core.lib;geom.lib;maxutil.lib;mesh.lib;Paramblk2.lib;appleseed.lib;ilmbase-release\lib\Half.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(SolutionDir)..\bin\$(Platform)\$(Configuration)" 2&gt;nul
@@ -125,7 +125,9 @@ copy /Y "$(SolutionDir)..\..\appleseed-dictoon-vc11\build\src\appleseed\$(Config
     <ClCompile Include="renderercontroller.cpp" />
     <ClCompile Include="renderersettings.cpp" />
     <ClCompile Include="tilecallback.cpp" />
+    <ClCompile Include="updatechecker.cpp" />
     <ClCompile Include="utilities.cpp" />
+    <ClCompile Include="version.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="appleseedrenderer.h" />
@@ -138,6 +140,7 @@ copy /Y "$(SolutionDir)..\..\appleseed-dictoon-vc11\build\src\appleseed\$(Config
     <ClInclude Include="renderersettings.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="tilecallback.h" />
+    <ClInclude Include="updatechecker.h" />
     <ClInclude Include="utilities.h" />
     <ClInclude Include="version.h" />
   </ItemGroup>

diff --git a/src/appleseed-renderer/appleseed-renderer.vcxproj.filters b/src/appleseed-renderer/appleseed-renderer.vcxproj.filters
@@ -11,6 +11,8 @@
     <ClCompile Include="tilecallback.cpp" />
     <ClCompile Include="renderercontroller.cpp" />
     <ClCompile Include="renderersettings.cpp" />
+    <ClCompile Include="version.cpp" />
+    <ClCompile Include="updatechecker.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="appleseedrenderer.h" />
@@ -25,6 +27,7 @@
     <ClInclude Include="renderersettings.h" />
     <ClInclude Include="datachunks.h" />
     <ClInclude Include="version.h" />
+    <ClInclude Include="updatechecker.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="appleseed-renderer.rc" />

diff --git a/src/appleseed-renderer/appleseedrenderer.cpp b/src/appleseed-renderer/appleseedrenderer.cpp
@@ -324,7 +324,7 @@ int AppleseedRenderer::Render(
             progress_cb->SetTitle(_T("Writing Project To Disk..."));
         asr::ProjectFileWriter::write(
             project.ref(),
-            utf8_encode(m_settings.m_project_file_path).c_str());
+            wide_to_utf8(m_settings.m_project_file_path).c_str());
     }
 
     // Render the project.
@@ -373,11 +373,11 @@ IOResult AppleseedRenderer::Save(ISave* isave)
 {
     bool success = true;
 
-    isave->BeginChunk(CHUNK_FILE_FORMAT_VERSION);
-    success &= write(isave, FILE_FORMAT_VERSION);
+    isave->BeginChunk(ChunkFileFormatVersion);
+    success &= write(isave, FileFormatVersion);
     isave->EndChunk();
 
-    isave->BeginChunk(CHUNK_SETTINGS);
+    isave->BeginChunk(ChunkSettings);
     success &= m_settings.save(isave);
     isave->EndChunk();
 
@@ -398,14 +398,14 @@ IOResult AppleseedRenderer::Load(ILoad* iload)
 
         switch (iload->CurChunkID())
         {
-          case CHUNK_FILE_FORMAT_VERSION:
+          case ChunkFileFormatVersion:
             {
                 USHORT version;
                 result = read<USHORT>(iload, &version);
             }
             break;
 
-          case CHUNK_SETTINGS:
+          case ChunkSettings:
             result = m_settings.load(iload);
             break;
         }