Merge pull request #38 from TonyHuangYJ/master

Adding Sketchup 2021 support

Author: moethu

API/SketchUpAPI.dll

@@ -79,7 +79,8 @@ enum SUModelVersion {
   SUModelVersion_SU2017,
   SUModelVersion_SU2018,
   SUModelVersion_SU2019,
-  SUModelVersion_SU2020
+  SUModelVersion_SU2020,
+  SUModelVersion_SU2021
 };
 
 /**

API/SketchUpAPI.lib

@@ -42,7 +42,7 @@ public static class SketchUp
         public static bool ReformatModel(string filepath, string version, string newfilepath)
         {
             SketchUpNET.SketchUp skp = new SketchUpNET.SketchUp();
-            SKPVersion v = SKPVersion.V2020;
+            SKPVersion v = SKPVersion.V2021;
             switch (version)
             {
                 case "2014": v = SKPVersion.V2014; break;
@@ -52,6 +52,7 @@ public static bool ReformatModel(string filepath, string version, string newfile
                 case "2018": v = SKPVersion.V2018; break;
                 case "2019": v = SKPVersion.V2019; break;
                 case "2020": v = SKPVersion.V2020; break;
+                case "2021": v = SKPVersion.V2021; break;
             }
             return skp.SaveAs(filepath, v, newfilepath);
         }

API/SketchUpAPI/model/model.h

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2043
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31424.327
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SketchUpForDynamo", "SketchUpForDynamo\SketchUpForDynamo.csproj", "{60201034-7CD1-4217-82BB-1161D8D0BB0A}"
 EndProject
@@ -61,8 +61,8 @@ Global
 		{942583E2-369B-4A00-8E34-F22073A911B2}.Release|x64.ActiveCfg = Release|Any CPU
 		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|ARM.ActiveCfg = Debug|Win32
-		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Mixed Platforms.ActiveCfg = Release|x64
-		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Mixed Platforms.Build.0 = Release|x64
+		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|Win32.Build.0 = Debug|Win32
 		{1C4D4501-EB39-45C8-BED0-609A978E823F}.Debug|x64.ActiveCfg = Debug|x64

API/SketchUpCommonPreferences.dll

@@ -56,7 +56,8 @@ namespace SketchUpNET
 		V2017,
 		V2018,
 		V2019,
-		V2020
+		V2020,
+		V2021
 	};
 
 	/// <summary>
@@ -283,6 +284,9 @@ namespace SketchUpNET
 			case SketchUpNET::SKPVersion::V2020:
 				saveversion = SUModelVersion::SUModelVersion_SU2020;
 				break;
+			case SketchUpNET::SKPVersion::V2021:
+				saveversion = SUModelVersion::SUModelVersion_SU2021;
+				break;
 			default:
 				break;
 			}

API/sketchup.lib

@@ -22,7 +22,7 @@
     <ProjectGuid>{1C4D4501-EB39-45C8-BED0-609A978E823F}</ProjectGuid>
     <RootNamespace>SketchUpNET</RootNamespace>
     <ProjectName>SketchUpNET</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -35,7 +35,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
   </PropertyGroup>
@@ -49,7 +49,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>Safe</CLRSupport>
@@ -100,7 +100,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\API;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>slapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SketchUpAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ProjectReference>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

SketchUpForDynamo/SketchUp.cs

@@ -10,10 +10,10 @@ class Program
     {
         static void Main(string[] args)
         {
-            if (args.Length > 1)
+            if (args.Length > 0)
             {
                 SketchUpNET.SketchUp skp = new SketchUpNET.SketchUp();
-                if (skp.LoadModel(args[1]))
+                if (skp.LoadModel(args[0]))
                 {
                     // do something
                 }