chore: update coffee.internal

close #248

Packages/manifest.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.coffee.development": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/Development",
+    "com.coffee.minimal-resource": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
     "com.coffee.nano-monitor": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
     "com.unity.ide.rider": "3.0.31",
     "com.unity.test-framework": "1.1.33",

Packages/packages-lock.json

@@ -5,7 +5,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "4e5f735ccf956ee469b5014ae781068c49a2825d"
+      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
+    },
+    "com.coffee.minimal-resource": {
+      "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
     },
     "com.coffee.nano-monitor": {
       "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
@@ -14,7 +21,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "hash": "4e5f735ccf956ee469b5014ae781068c49a2825d"
+      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
     },
     "com.coffee.ui-particle": {
       "version": "file:src",

Packages/src/Runtime/Coffee.UIParticle.R.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 4d73b3825bf044d418ae21bb331d3902
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/src/Runtime/Internal/ProjectSettings/PreloadedProjectSettings.cs

@@ -133,6 +133,8 @@ namespace Coffee.UIParticleInternal
 #if UNITY_EDITOR
         private string _jsonText;
 
+        public static bool hasInstance => s_Instance;
+
         public static T instance
         {
             get

Packages/src/Runtime/Internal/Utilities/MaterialRepository.cs

@@ -15,7 +15,7 @@ namespace Coffee.UIParticleInternal
 
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void Clear()
+        public static void Clear()
         {
             s_Repository.Clear();
         }

Packages/src/Runtime/Internal/Utilities/Misc.cs

@@ -69,6 +69,8 @@ namespace Coffee.UIParticleInternal
 
             return prefabStage.prefabContentsRoot.GetComponentsInChildren<T>(true);
         }
+
+        public static bool isBatchOrBuilding => Application.isBatchMode || BuildPipeline.isBuildingPlayer;
 #endif
     }
 }

Packages/src/Runtime/UIParticle.cs

@@ -577,12 +577,14 @@ namespace Coffee.UIExtensions
             {
                 var ps = particleSystems[i];
                 if (!ps) continue;
-                GetRenderer(j++).Set(this, ps, false);
+
+                var mainEmitter = ps.GetMainEmitter(particleSystems);
+                GetRenderer(j++).Set(this, ps, false, mainEmitter);
 
                 // If the trail is enabled, set it additionally.
                 if (ps.trails.enabled)
                 {
-                    GetRenderer(j++).Set(this, ps, true);
+                    GetRenderer(j++).Set(this, ps, true, mainEmitter);
                 }
             }
         }

Packages/src/Runtime/UIParticleRenderer.cs

@@ -40,6 +40,7 @@ namespace Coffee.UIExtensions
         private Vector2Int _prevScreenSize;
         private bool _preWarm;
         private ParticleSystemRenderer _renderer;
+        private ParticleSystem _mainEmitter;
 
         public override Texture mainTexture => _isTrail ? null : _particleSystem.GetTextureForSprite();
 
@@ -112,6 +113,7 @@ namespace Coffee.UIExtensions
             _parent = null;
             _particleSystem = null;
             _renderer = null;
+            _mainEmitter = null;
             if (0 <= index)
             {
                 _index = index;
@@ -223,7 +225,7 @@ namespace Coffee.UIExtensions
             return _modifiedMaterial;
         }
 
-        public void Set(UIParticle parent, ParticleSystem ps, bool isTrail)
+        public void Set(UIParticle parent, ParticleSystem ps, bool isTrail, ParticleSystem mainEmitter)
         {
             _parent = parent;
             maskable = parent.maskable;
@@ -246,10 +248,7 @@ namespace Coffee.UIExtensions
 
             ps.TryGetComponent(out _renderer);
             _renderer.enabled = false;
-
-            //_emitter = emitter;
             _isTrail = isTrail;
-
             _renderer.GetSharedMaterials(s_Materials);
             material = s_Materials[isTrail ? 1 : 0];
             s_Materials.Clear();
@@ -266,6 +265,7 @@ namespace Coffee.UIExtensions
             _prevScreenSize = new Vector2Int(Screen.width, Screen.height);
             _prevCanvasScale = canvas ? canvas.scaleFactor : 1f;
             _delay = true;
+            _mainEmitter = mainEmitter;
 
             canvasRenderer.SetTexture(null);
 
@@ -303,7 +303,7 @@ namespace Coffee.UIExtensions
 
             // Simulate particles.
             Profiler.BeginSample("[UIParticle] Bake Mesh > Simulate Particles");
-            if (!_isTrail && _parent.canSimulate)
+            if (!_isTrail && _parent.canSimulate && !_mainEmitter)
             {
 #if UNITY_EDITOR
                 if (!Application.isPlaying)
@@ -548,6 +548,24 @@ namespace Coffee.UIExtensions
                                * Matrix4x4.Scale(scale)
                                * Matrix4x4.Translate(-psPos);
                     }
+
+                    if (_mainEmitter)
+                    {
+                        if (_mainEmitter.IsLocalSpace())
+                        {
+                            return Matrix4x4.Translate(psPos)
+                                   * Matrix4x4.Scale(scale)
+                                   * Matrix4x4.Translate(-psPos);
+                        }
+                        else
+                        {
+                            psPos = _particleSystem.transform.position - _mainEmitter.transform.position;
+                            return Matrix4x4.Translate(psPos)
+                                   * Matrix4x4.Scale(scale)
+                                   * Matrix4x4.Translate(-psPos);
+                        }
+                    }
+
                     return Matrix4x4.Scale(scale);
                 case ParticleSystemSimulationSpace.Custom:
                     return Matrix4x4.Translate(_particleSystem.main.customSimulationSpace.position.GetScaled(scale))

Packages/src/Runtime/Utilities/ParticleSystemExtensions.cs

@@ -171,5 +171,30 @@ namespace Coffee.UIParticleInternal
                 action.Invoke(p);
             }
         }
+
+        public static ParticleSystem GetMainEmitter(this ParticleSystem self, List<ParticleSystem> list)
+        {
+            if (!self || list == null || list.Count == 0) return null;
+
+            for (var i = 0; i < list.Count; i++)
+            {
+                var parent = list[i];
+                if (parent != self && IsSubEmitterOf(self, parent)) return parent;
+            }
+
+            return null;
+        }
+
+        public static bool IsSubEmitterOf(this ParticleSystem self, ParticleSystem parent)
+        {
+            var subEmitters = parent.subEmitters;
+            var count = subEmitters.subEmittersCount;
+            for (var i = 0; i < count; i++)
+            {
+                if (subEmitters.GetSubEmitterSystem(i) == self) return true;
+            }
+
+            return false;
+        }
     }
 }

ProjectSettings/MinimalResourceSettings.json

@@ -0,0 +1,11 @@
+{
+    "MonoBehaviour": {
+        "m_Enabled": true,
+        "m_EditorHideFlags": 0,
+        "m_Name": "",
+        "m_EditorClassIdentifier": "",
+        "m_OutputDllPaths": [
+            "Packages/com.coffee.ui-particle/Runtime/Coffee.UIParticle.R.dll"
+        ]
+    }
+}