removed AlembicPointsRenderer

Unity-Technologies · Mar 10, 2017 · 6827bd0 · 6827bd0
1 parent 518f06b
commit 6827bd0
Show file tree

Hide file tree

Showing 33 changed files with 13 additions and 1,324 deletions.
diff --git a/AlembicImporter/Assets/Packaging.cs b/AlembicImporter/Assets/Packaging.cs
@@ -10,41 +10,15 @@
 
 public class AlembicImporterPackaging
 {
-    [MenuItem("Assets/UTJ/AlembicImporter/Make Packages")]
+    [MenuItem("Assets/Make AlembicImporter.unitypackage")]
     public static void MakePackage_Alembic()
-    {
-        MakePackage_AlembicImporter();
-        MakePackage_AlembicExporter();
-    }
-
-    public static void MakePackage_AlembicImporter()
     {
         string[] files = new string[]
         {
-"Assets/UTJ/AlembicImporter",
-"Assets/UTJ/TextureWriter",
-"Assets/UTJ/Plugins/x86/AlembicImporter.dll",
-"Assets/UTJ/Plugins/x86_64/AlembicImporter.dll",
-"Assets/UTJ/Plugins/x86/TextureWriter.dll",
-"Assets/UTJ/Plugins/x86_64/TextureWriter.dll",
-"Assets/StreamingAssets/UTJ/AlembicImporter",
-"Assets/StreamingAssets/AlembicData/Example.abc",
+"Assets/UTJ",
+"Assets/StreamingAssets/UTJ",
         };
         AssetDatabase.ExportPackage(files, "AlembicImporter.unitypackage", ExportPackageOptions.Recurse);
     }
-
-    public static void MakePackage_AlembicExporter()
-    {
-        string[] files = new string[]
-        {
-"Assets/UTJ/AlembicExporter",
-"Assets/UTJ/Plugins/x86/AlembicExporter.dll",
-"Assets/UTJ/Plugins/x86_64/AlembicExporter.dll",
-"Assets/UTJ/AlembicExporterExample",
-"Assets/StreamingAssets/UTJ/AlembicImporter",
-        };
-        AssetDatabase.ExportPackage(files, "AlembicExporter.unitypackage", ExportPackageOptions.Recurse);
-    }
-
 }
 #endif // UNITY_EDITOR
diff --git a/AlembicImporter/Assets/UTJ/AlembicExporter/Scripts/AlembicExporter.cs b/AlembicImporter/Assets/UTJ/AlembicExporter/Scripts/AlembicExporter.cs
@@ -273,7 +273,7 @@ public override void Capture()
                 if (m_target == null) { return; }
 
                 // create buffer
-                int count_max = m_target.maxParticles;
+                int count_max = m_target.main.maxParticles;
                 if (m_buf_particles == null)
                 {
                     m_buf_particles = new ParticleSystem.Particle[count_max];

diff --git a/AlembicImporter/Assets/UTJ/AlembicExporterExample/Scripts/ParticleEngine.cs b/AlembicImporter/Assets/UTJ/AlembicExporterExample/Scripts/ParticleEngine.cs
@@ -81,7 +81,7 @@ void InitializeSimulation()
                 m_csparams = new CSParams[1];
             }
             {
-                UnityEngine.Random.seed = 0;
+                UnityEngine.Random.InitState(0);
                 var tmp = new peParticle[m_particle_count];
                 for (int i = 0; i < tmp.Length; ++i)
                 {

diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicMaterialEditor.cs b/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicMaterialEditor.cs
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicMaterialEditor.cs.meta b/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicMaterialEditor.cs.meta
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicPointsRendererEditor.cs b/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicPointsRendererEditor.cs
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicPointsRendererEditor.cs.meta b/AlembicImporter/Assets/UTJ/AlembicImporter/Editor/AlembicPointsRendererEditor.cs.meta
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Materials.meta b/AlembicImporter/Assets/UTJ/AlembicImporter/Materials.meta
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Materials/AlembicPointsDefault.mat b/AlembicImporter/Assets/UTJ/AlembicImporter/Materials/AlembicPointsDefault.mat
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Materials/AlembicPointsDefault.mat.meta b/AlembicImporter/Assets/UTJ/AlembicImporter/Materials/AlembicPointsDefault.mat.meta
diff --git a/AlembicImporter/Assets/UTJ/AlembicImporter/Scripts/AlembicPointsCloud.cs b/AlembicImporter/Assets/UTJ/AlembicImporter/Scripts/AlembicPointsCloud.cs
@@ -4,7 +4,6 @@
 namespace UTJ.Alembic
 {
 	[ExecuteInEditMode]
-	[RequireComponent(typeof(AlembicPointsRenderer))]
 	public class AlembicPointsCloud : MonoBehaviour
 	{
 		// members
@@ -31,13 +30,6 @@ public ulong[] abcIDs
 
 		void Reset()
 		{
-			// add renderer
-			var c = gameObject.GetComponent<AlembicPointsRenderer>();
-			if (c == null)
-			{
-				c = gameObject.AddComponent<AlembicPointsRenderer>();
-			}
-
 		}
 
 	}