Blender 3.6.2 support

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.18.0-preview] - 2023-08-01
+
+### Added
+* feat: Blender 3.5 and Blender 3.6.2 support
+* feat: Improved instancing support
+
+### Changed
+* change: instances are now sent in a way that allows the same object to be instanced on multiple parents and keep that hierarchy in Unity
+
+### Fixed
+* fix: various instancing fixes
+
 ## [0.17.1-preview] - 2023-06-13
 
 ### Added

Documentation~/index.md

@@ -56,6 +56,8 @@ This allows devs to immediately see how things will look in-game while modelling
 | Blender 3.2        | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | Blender 3.3        | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | Blender 3.4        | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Blender 3.5        | :white_check_mark: | :x:                | :x:                |
+| Blender 3.6.2      | :white_check_mark: | :x:                | :x:                |
 
 Notes:
 * :white_check_mark: : Supported

MeshSyncDCCPlugins~/Packages/com.unity.meshsync-dcc-plugins/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.18.0-preview] - 2023-08-01
+
+### Added
+* feat: Blender 3.5 and Blender 3.6.2 support
+* feat: Improved instancing support
+
+### Changed
+* change: instances are now sent in a way that allows the same object to be instanced on multiple parents and keep that hierarchy in Unity
+
+### Fixed
+* fix: various instancing fixes
+
 ## [0.17.1-preview] - 2023-06-13
 
 ### Added

MeshSyncDCCPlugins~/Packages/com.unity.meshsync-dcc-plugins/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.meshsync.dcc-plugins",
 	"displayName":"MeshSync DCC Plugins",
-	"version": "0.17.1-preview",
+	"version": "0.18.0-preview",
 	"unity": "2020.3",
 	"description": "This package contains plugin binaries of DCC tools for using MeshSync, which is another package for synchronizing meshes/models editing in DCC tools into Unity in real time.",
 	"dependencies": {

Plugins~/Build/VsDevCmd_2017.bat → Plugins~/Build/VsDevCmd_2022.bat

@@ -1,6 +1,7 @@
-for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" /version [15.0^,16^) /property installationPath`) do (
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" /version 17^ /property installationPath`) do (
   set VSDIR=%%i
   echo %%i
 )
+set VSCMD_DEBUG=True
 call "%VSDIR%\Common7\Tools\VsDevCmd.bat"
 cd %~dp0

Plugins~/Build/make_meshsync_dcc_plugin.bat

@@ -22,7 +22,7 @@ IF %ARG_COUNT% GEQ 2 (
     SET CMAKE_BUILD_ARGS=%*   
 )
 
-SET BUILD_SYSTEM=-G "Visual Studio 15 2017" -A x64
+SET BUILD_SYSTEM=-G "Visual Studio 17 2022" -A x64
 
 ECHO cmake build Arguments: %CMAKE_BUILD_ARGS%
 cmake -UBUILD_*_PLUGIN -UBUILD_*_ALL -DMESHSYNC_VER:STRING=%MESHSYNC_VER% %CMAKE_BUILD_ARGS% %BUILD_SYSTEM% ..

Plugins~/CMakeLists.txt

@@ -146,6 +146,8 @@ list(APPEND BLENDER_VERSIONS
     BLENDER_3.2.0
     BLENDER_3.3.0
     BLENDER_3.4.0
+    BLENDER_3.5.0
+    BLENDER_3.6.2
 ) 
 
 if(BUILD_BLENDER_ALL)

Plugins~/Docs/en/BuildDCCPlugins.md

@@ -15,19 +15,19 @@
    Make sure to choose one of the "Add CMake to the System PATH ..." options as shown below.  
    ![CMakeInstallation](../Images/CMakeInstallation.png)
 
-1. Install Visual Studio 2017, together with the following components:
+1. Install Visual Studio 2022, together with the following components:
    * Windows 8.1 SDK
    * Windows Universal CRT SDK
 
 1. Install git. For example: [SourceTree](https://www.sourcetreeapp.com/)
 1. Build [Poco](https://pocoproject.org) (static libraries).  
    * Download [Poco 1.10.1](https://github.com/pocoproject/poco/archive/poco-1.10.1-release.zip) and extract the file in a folder.
-   * Start "Developer Command Prompt for VS 2017" and go to where Poco was extracted.
+   * Start "Developer Command Prompt for VS 2022" and go to where Poco was extracted.
    * Execute the following in the command prompt:      
     ``` 
     $ mkdir cmake-build
     $ cd cmake-build
-    $ cmake .. -DBUILD_SHARED_LIBS=OFF -G "Visual Studio 15 2017" -A x64
+    $ cmake .. -DBUILD_SHARED_LIBS=OFF -G "Visual Studio 17 2022" -A x64
     $ cmake --build . --config Release && cmake --build . --config Debug
     ```
 
@@ -41,7 +41,7 @@
 ### Build Steps (Win)
 
 
-Start "Developer Command Prompt for VS 2017" and execute the following:
+Start "Developer Command Prompt for VS 2022" and execute the following:
 
 ``` 
 $ git clone https://github.com/Unity-Technologies/MeshSyncDCCPlugins
@@ -57,9 +57,9 @@ $ cmake -DBUILD_TYPE=Release -P cmake_install.cmake
 * `[optional_arguments]`   
   See [MakeOptionalArguments](MakeOptionalArguments.md) for more details.
 
-> For a regular "Command Prompt", there is a script: *VsDevCmd_2017.bat* 
+> For a regular "Command Prompt", there is a script: *VsDevCmd_2022.bat* 
 > under the *Build* folder, which if executed, will turn the prompt into a 
-> "Developer Command Prompt for VS 2017".
+> "Developer Command Prompt for VS 2022".
 
 #### Notes
 

Plugins~/Docs/en/MakeOptionalArguments.md

@@ -46,6 +46,7 @@ with commands described in the following sections.
 * Blender 3.2.0 : `-DBUILD_BLENDER_3.2.0_PLUGIN=ON`
 * Blender 3.3.0 : `-DBUILD_BLENDER_3.3.0_PLUGIN=ON`
 * Blender 3.4.0 : `-DBUILD_BLENDER_3.4.0_PLUGIN=ON`
+* Blender 3.5.0 : `-DBUILD_BLENDER_3.5.0_PLUGIN=ON`
 
 ## Modo
 

Plugins~/Src/MeshSyncClient/Include/MeshSyncClient/msInstancesManager.h

@@ -15,9 +15,10 @@ struct InstancesManagerRecord
 {
     bool dirtyInstances = false;
     bool dirtyMesh = false;
-    InstanceInfoPtr instances = nullptr;
     TransformPtr entity = nullptr;
     bool updated = false;
+    std::map<std::string, bool> updatedParents;
+    std::map<std::string, std::vector<InstanceInfoPtr>> instancesPerParent;
 };
 
 /// <summary>
@@ -74,6 +75,8 @@ class InstancesManager : public TransformManager<InstancesManagerRecord>
     /// </summary>
     void eraseStaleEntities() override;
 
+    bool erase(const std::string& path);
+
     bool needsToApplyMirrorModifier() override { return false; }
 };
 

Plugins~/Src/MeshSyncClient/msInstancesManager.cpp

@@ -15,29 +15,50 @@ namespace ms {
         }
         return ret;
     }
+
     vector<InstanceInfoPtr> InstancesManager::getDirtyInstances()
     {
         vector<InstanceInfoPtr> ret;
         for (auto& p : m_records) {
             InstancesManagerRecord& r = p.second;
             if (r.dirtyInstances) {
-                ret.push_back(r.instances);
+                for (auto& instances : r.instancesPerParent)
+                {
+                    ret.insert(ret.end(), instances.second.begin(), instances.second.end());
+                }
             }
         }
+
+        // Sort by parent to ensure children are grouped correctly by the server:
+        sort(ret.begin(), ret.end(), [](const InstanceInfoPtr& a, const InstanceInfoPtr& b) {
+            return a->parent_path < b->parent_path;
+        });
+
         return ret;
     }
 
     vector<Identifier>& InstancesManager::getDeleted() {
         return m_deleted;
     }
 
+    bool InstancesManager::erase(const std::string& path) {
+        auto it = m_records.find(path);
+        if (it != m_records.end()) {
+            m_records.erase(it);
+            m_deleted.push_back({ path, InvalidID });
+            return true;
+        }
+        return false;
+    }
+
     void InstancesManager::clearDirtyFlags()
     {
         for (auto& p : m_records) {
             InstancesManagerRecord& r = p.second;
             r.dirtyInstances = false;
             r.dirtyMesh = false;
             r.updated = false;
+            r.updatedParents.clear();
         }
 
         m_deleted.clear();
@@ -60,13 +81,25 @@ namespace ms {
     void InstancesManager::add(InstanceInfoPtr info)
     {
         auto& rec = lockAndGet(info->path);
+
+        for (int i = 0; i < rec.instancesPerParent[info->parent_path].size(); ++i)
+        {
+            const auto& instance = rec.instancesPerParent[info->parent_path][i];
 
-        if (m_always_mark_dirty || rec.instances == nullptr) {
-            rec.dirtyInstances = true;
+            if (instance->parent_path == info->parent_path)
+            {
+                // Remove instance from the list, the new one will be added below:
+                rec.instancesPerParent[info->parent_path].erase(rec.instancesPerParent[info->parent_path].begin() + i);
+
+                break;
+            }
         }
 
-        rec.updated = true;
-        rec.instances = info;
+        // instanceInfos need to be sent every update because it's how the server knows which instances are still alive:
+        rec.dirtyInstances = true;
+
+        rec.instancesPerParent[info->parent_path].push_back(info);
+        rec.updatedParents[info->parent_path] = true;
     }
 
     void InstancesManager::clear()
@@ -85,13 +118,34 @@ namespace ms {
     {
         for (auto it = m_records.begin(); it != m_records.end(); ) {
             if (!it->second.updated) {
-                if (it->second.instances) {
-                    m_deleted.push_back(it->second.instances->getIdentifier());
-                }
                 m_records.erase(it++);
             }
             else
+            {
+                // Remove records to parents that were not updated:
+                auto& parentMap = it->second.instancesPerParent;
+                auto& updatedParents = it->second.updatedParents;
+
+                for (auto parentMap_it = parentMap.cbegin(), nextParentMap_it = parentMap_it; 
+                    parentMap_it != parentMap.cend();
+                    parentMap_it = nextParentMap_it)
+                {
+                    ++nextParentMap_it;
+
+                    auto& instances = parentMap_it->second;
+
+                    for (auto& instance : instances)
+                    {
+                        auto& parentPath = instance->parent_path;
+                        if (!updatedParents[parentPath])
+                        {
+                            parentMap.erase(parentPath);
+                        }
+                    }
+                }
+
                 ++it;
+            }
         }
     }
 }

Plugins~/Src/MeshSyncClient/msPropertyManager.cpp

@@ -10,6 +10,7 @@ namespace ms {
 		std::unique_lock<std::mutex> lock(m_mutex);
 
 		vector<PropertyInfoPtr> ret;
+		ret.reserve(m_records.size());
 
 		for (const auto& [key, propertyInfo] : m_records) {
 			ret.push_back(propertyInfo);

Plugins~/Src/MeshSyncClientBlender/BlenderPyObjects/BlenderPyDepsgraphObjectInstance.h

@@ -15,7 +15,7 @@ namespace blender
             void world_matrix(mu::float4x4* world_matrix);
             Object* parent();
             Object* object();
-    private:
+    public:
         PointerRNA& m_instance;
     };