Merge pull request #29 from Hawkbat/v0.4.0

v0.4.0
Hawkbat · Mar 20, 2017 · e3a8572 · e3a8572
2 parents da3a7a7 + 7ad70d1
commit e3a8572
Show file tree

Hide file tree

Showing 20 changed files with 1,627 additions and 667 deletions.
diff --git a/Assets/Editor.unity b/Assets/Editor.unity
diff --git a/Assets/Editor/ImageEffects/ColorCorrectionLookupEditor.cs b/Assets/Editor/ImageEffects/ColorCorrectionLookupEditor.cs
@@ -51,15 +51,15 @@ class ColorCorrectionLookupEditor : Editor
                     if (textureImporter.mipmapEnabled == true) {
                         doImport = true;
                     }
-                    if (textureImporter.textureFormat != TextureImporterFormat.AutomaticTruecolor) {
+                    if (textureImporter.textureCompression != TextureImporterCompression.Uncompressed) {
                         doImport = true;
                     }
 
                     if (doImport)
                     {
                         textureImporter.isReadable = true;
                         textureImporter.mipmapEnabled = false;
-                        textureImporter.textureFormat = TextureImporterFormat.AutomaticTruecolor;
+                        textureImporter.textureCompression = TextureImporterCompression.Uncompressed;
                         AssetDatabase.ImportAsset (path, ImportAssetOptions.ForceUpdate);
                         //tex = AssetDatabase.LoadMainAssetAtPath(path);
                     }

diff --git a/Assets/Editor/ProfilerUtil.cs b/Assets/Editor/ProfilerUtil.cs
@@ -0,0 +1,111 @@
+using System.IO;
+using System.Reflection;
+using UnityEditor;
+using UnityEditorInternal;
+
+public class ProfilerUtil
+{
+    private const string HtmlOutputPath = "profiler.html";
+
+    [MenuItem("Tools/Dump selected profiler frame to HTML")]
+    public static void DumpProfilerFrame()
+    {
+        var property = new ProfilerProperty();
+        property.SetRoot(GetSelectedFrame(), ProfilerColumn.TotalPercent, ProfilerViewType.Hierarchy);
+        property.onlyShowGPUSamples = false;
+
+        if (File.Exists(HtmlOutputPath))
+            File.Delete(HtmlOutputPath);
+        var stream = File.OpenWrite(HtmlOutputPath);
+        var writer = new StreamWriter(stream);
+
+        writer.WriteLine(@"<html>
+<head>
+<title>Unity Profiler Data</title>
+<style type=""text/css"">
+html, body {
+font-family: Helvetica, Arial, sans-serif;
+}
+table {
+width: 100%;
+border-collapse: collapse;
+}
+th:first-child, td:first-child {
+text-align: left;
+}
+th:not(:first-child), td:not(:first-child) {
+text-align: right;
+}
+tbody tr:nth-child(odd) {
+background-color: #EEE;
+}
+th, td {
+margin: 0;
+padding: 5px;
+}
+th {
+padding-bottom: 10px;
+}
+td {
+font-size: 12px;
+}
+</style>
+</head>
+<body>
+<table>
+<thead>
+<tr><th>Path</th><th>Total</th><th>Self</th><th>Calls</th><th>GC Alloc</th><th>Total ms</th><th>Self ms</th></tr>
+</thead>
+<tbody>");
+
+        while (property.Next(true))
+        {
+            writer.Write("<td style=\"padding-left:" + property.depth * 10 + "px\">");
+            writer.Write(property.GetColumn(ProfilerColumn.FunctionName));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.TotalPercent));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.SelfPercent));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.Calls));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.GCMemory));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.TotalTime));
+            writer.Write("</td>");
+
+            writer.Write("<td>");
+            writer.Write(property.GetColumn(ProfilerColumn.SelfTime));
+            writer.Write("</td>");
+
+            writer.WriteLine("</tr>");
+        }
+
+        writer.WriteLine(@"</tbody>
+</table>
+</body>
+</html>");
+
+        writer.Close();
+    }
+
+    private static int GetSelectedFrame()
+    {
+        var editorAssembly = Assembly.GetAssembly(typeof(EditorApplication));
+        var profilerWindowType = editorAssembly.GetType("UnityEditor.ProfilerWindow");
+        var profilerWindowsField = profilerWindowType.GetField("m_ProfilerWindows", BindingFlags.NonPublic | BindingFlags.Static);
+        var firstProfilerWindow = ((System.Collections.IList)profilerWindowsField.GetValue(null))[0];
+        var getFrameMethod = profilerWindowType.GetMethod("GetActiveVisibleFrameIndex");
+        return (int)getFrameMethod.Invoke(firstProfilerWindow, null);
+    }
+}
diff --git a/Assets/Editor/ProfilerUtil.cs.meta b/Assets/Editor/ProfilerUtil.cs.meta
diff --git a/Assets/Scripts/Chunk.cs b/Assets/Scripts/Chunk.cs
@@ -34,21 +34,25 @@ protected virtual void Awake()
         mr = GetComponent<MeshRenderer>();
     }
 
-    protected virtual VTileChunk GetChunk()
+    protected VTileChunk cachedVChunk;
+
+    protected VTileChunk GetChunk()
     {
-        return tile.GetTile().GetChunk(layerIndex, animationIndex, frameIndex);
+        return cachedVChunk;
     }
 
     public int GetIndex(int x, int y, int z)
     {
-        return GetChunk().GetPaletteIndexAt(x, y, z);
+        return cachedVChunk.GetPaletteIndexAt(x, y, z);
     }
 
+    int colorIndexTemp;
+
     public VColor GetColor(int x, int y, int z)
     {
-        int index = GetIndex(x, y, z);
-        if (index >= tile.GetTile().GetPalette().GetCount()) return new VColor(255, 0, 255, 255, 0, 0, 255, 0);
-        return tile.GetTile().GetPalette().GetColor(GetIndex(x, y, z));
+        colorIndexTemp = cachedVChunk.GetPaletteIndexAt(x, y, z);
+        if (colorIndexTemp >= tile.GetTile().GetPalette().GetCount()) return new VColor(255, 0, 255, 255, 0, 0, 255, 0);
+        else return tile.GetTile().GetPalette().GetColor(colorIndexTemp);
     }
 
     void LateUpdate()
@@ -59,6 +63,8 @@ void LateUpdate()
 
         bool active = layerIndex == t.GetLayerIndex() && animationIndex == t.GetAnimationIndex() && frameIndex == t.GetFrameIndex();
 
+        cachedVChunk = t.GetChunk(layerIndex, animationIndex, frameIndex);
+
         if (GetChunk().IsDirty() || t.GetPalette().IsDirty() || l.IsDirty() || a.IsDirty()) Refresh();
         bool visible = l.GetVisible() && animationIndex == t.GetAnimationIndex() && frameIndex == t.GetFrameIndex();
         gameObject.layer = (visible && (active || (!l.GetOutline() && !l.GetTransparent()))) ? 10 : 0;
@@ -68,6 +74,9 @@ void LateUpdate()
 
     public void Refresh()
     {
+        // The preview chunk uses -1 for all indices, so don't try to grab an actual chunk
+        if (layerIndex != -1) cachedVChunk = tile.GetTile().GetChunk(layerIndex, animationIndex, frameIndex);
+
         bool layerTrans = (layerIndex >= 0) ? tile.GetTile().GetLayer(layerIndex).GetTransparent() : false;
         bool layerLine = (layerIndex >= 0) ? tile.GetTile().GetLayer(layerIndex).GetOutline() : false;
 

diff --git a/Assets/Scripts/Edit.cs b/Assets/Scripts/Edit.cs
@@ -36,9 +36,8 @@ public class Edit : MonoBehaviour
     public Binding bindToolPlace;
     public Binding bindToolPaint;
     public Binding bindToolFill;
-    public Binding bindToolMove;
     public Binding bindToolBox;
-    public Binding bindToolWand;
+    public Binding bindToolPicker;
 
     public Binding bindUseTool;
     public Binding bindUseToolAlt;
@@ -58,8 +57,7 @@ public enum Tool
         Paint,
         Fill,
         Box,
-        Move,
-        Wand
+        Picker
     }
 
     public enum Brush
@@ -83,14 +81,14 @@ void Awake()
     void Update()
     {
         tile.SetDirty(false);
+        PreviewChunk.use.chunk.SetDirty(false);
         if (bindUndo.IsPressed() && undos.Count > 0) Do(new UndoAct());
         if (bindRedo.IsPressed() && redos.Count > 0) Do(new RedoAct());
         if (bindToolPlace.IsPressed()) Do(new ChangeToolAct(Tool.Place));
         if (bindToolPaint.IsPressed()) Do(new ChangeToolAct(Tool.Paint));
         if (bindToolFill.IsPressed()) Do(new ChangeToolAct(Tool.Fill));
         if (bindToolBox.IsPressed()) Do(new ChangeToolAct(Tool.Box));
-        if (bindToolMove.IsPressed()) Do(new ChangeToolAct(Tool.Move));
-        if (bindToolWand.IsPressed()) Do(new ChangeToolAct(Tool.Wand));
+        if (bindToolPicker.IsPressed()) Do(new ChangeToolAct(Tool.Picker));
         if (batch.Count > 0 && Time.time > batchTime)
         {
             DoBatch();