Merge pull request #8 from wotakuro/feature/v1_5

Feature/v1 5

Author: wotakuro

Editor/ProfilerScreenShotWindow.cs

@@ -37,6 +37,7 @@ public static void Create()
         private bool isYFlip = false;
         private OutputMode outputMode;
         private ColorSpaceMode colorSpaceMode;
+        private TagInfo tagInfo;
 
         private Material drawMaterial;
 
@@ -75,7 +76,6 @@ private void Refresh(int frameIdx,bool force = false)
             {
                 return;
             }
-            TagInfo tagInfo;
 
             if (ProfilerScreenShotEditorLogic.TryGetTagInfo(frameIdx, out tagInfo))
             {
@@ -145,6 +145,9 @@ private void OnGUI()
             outputMode = (OutputMode)EditorGUILayout.Popup((int)outputMode, outputModeSelect);
             colorSpaceMode = (ColorSpaceMode)EditorGUILayout.Popup((int)colorSpaceMode, colorSpaceModeSelect);
             EditorGUILayout.EndHorizontal();
+ 
+            EditorGUILayout.LabelField( tagInfo.width +  "x"+ tagInfo.height + 
+                " original:" + tagInfo.originWidth + "x" + tagInfo.originHeight + "::compress " + tagInfo.compress.ToString());
             EditorGUILayout.Space();
             //drawTextureInfo.SetFlip(this.isYFlip);
 

Editor/ProfilerWindowScreenShotModule.cs

@@ -51,6 +51,7 @@ public override ProfilerModuleViewController CreateDetailsViewController()
     public class ScreenShotModuleDetailsViewController : ProfilerModuleViewController
     {
         private ProfilerWindowScreenShotModule screenShotModule;
+        private Label originSize;
         private Toggle yFlipToggle;
         private DropdownField sizeField;
         private DropdownField colorSpaceField;
@@ -115,6 +116,8 @@ private void InitVisualElement(VisualElement ve)
 
             imageBody = ve.Q<IMGUIContainer>("TextureOutIMGUI");
             imageBody.onGUIHandler += OnGUITextureOut;
+
+            originSize = ve.Q<Label>("OriginalSize");
         }
 
         protected override void Dispose(bool disposing)
@@ -129,7 +132,7 @@ protected override void Dispose(bool disposing)
         private void OnGUITextureOut()
         {
             bool yFlip = this.yFlipToggle.value;
-            var rect = new Rect(10, 10, currentTagInfo.width, currentTagInfo.height);
+            var rect = new Rect(0, 0, currentTagInfo.width, currentTagInfo.height);
 
             screenShotModule.yFlip = yFlipToggle.value;
             screenShotModule.sizeIndex = sizeField.index;
@@ -138,7 +141,7 @@ private void OnGUITextureOut()
             if (this.sizeField.index == (int)EOutputMode.FitWindow)
             {
                 rect = FitWindowSize(currentTagInfo,
-                    new Rect(10, 10,
+                    new Rect(0, 0,
                     this.imageBody.contentRect.width,
                     this.imageBody.contentRect.height));
             }
@@ -188,8 +191,12 @@ private void OnSelectedFrameIndexChanged(long selectedFrameIndex) {
                     UnityEngine.Object.DestroyImmediate(screenshotTexture);
                 }
                 screenshotTexture = ProfilerScreenShotEditorLogic.GenerateTagTexture(currentTagInfo, idx);
+                if (originSize!=null)
+                {
+                    originSize.text = currentTagInfo.width + "x" + currentTagInfo.height+" original:"+
+                        currentTagInfo.originWidth +"x"+currentTagInfo.originHeight + "::compress " + currentTagInfo.compress.ToString();
+                }
             }
-
         }
 
 

Editor/UXML/ScreenshotProfilerModule.uxml

@@ -1,11 +1,12 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
     <ui:Label tabindex="-1" text="Screenshot Module" parse-escape-sequences="true" display-tooltip-when-elided="true" />
     <ui:VisualElement style="flex-grow: 1; flex-direction: row; margin-top: 3px; margin-left: 5px;">
-        <ui:DropdownField label="Size" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="SizeMode" style="flex-wrap: nowrap; white-space: nowrap; -unity-text-align: upper-left;" />
+        <ui:DropdownField label="ScaleMode" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="SizeMode" style="flex-wrap: nowrap; white-space: nowrap; -unity-text-align: upper-left;" />
         <ui:Toggle label="Flip Y" name="FlipYToggle" />
         <ui:DropdownField label="ColorSpace" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="ColorSpaceMode" style="flex-wrap: nowrap; white-space: nowrap; -unity-text-align: upper-left;" />
     </ui:VisualElement>
-    <ui:VisualElement name="ImageField" style="flex-wrap: wrap; flex-direction: column; align-items: center; height: 100%; justify-content: flex-start;">
+    <ui:Label tabindex="-1" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" name="OriginalSize" text="size" style="margin-top: 1px; margin-left: 20px; margin-bottom: 2px;" />
+    <ui:VisualElement name="ImageField" style="flex-wrap: wrap; flex-direction: column; align-items: center; height: 100%; justify-content: flex-start; margin-top: 0; margin-left: 20px; margin-bottom: 10px;">
         <ui:IMGUIContainer name="TextureOutIMGUI" style="width: 100%; height: 100%;" />
     </ui:VisualElement>
 </ui:UXML>

README.ja.md

@@ -50,8 +50,36 @@ ScreenShotToProfiler.Instance.captureBehaviour = (target) => {
 ```
 [サンプルC#コード](Sample~/SwitchSample.cs)<br />
 
+## コマンドラインオプション
+実行時にコマンドラインオプションを付けることで、強制的に挙動を変更する事が可能です。(Editor実行時は無効)
+
+### "--profilerSS"による有効・無効
+"--profilerSS=enable"という形でオプションを付ける事で、Screenshotを起動直後から強制的に取るようにします。<br />
+"--profilerSS=disable"という形でオプションを付ける事で、Screenshotを強制的に無効化できます
+
+### "--profilerSS-resolution"での解像度変更
+"--profilerSS-resolution=256x192"のように、Textureの"幅x高さ"を措定できるようになります。<br />
+
+### "--profilerSS-format"でのフォーマット変更 
+"--profilerSS-format=JPG_BUFFERRGB565"のようにすることで、TextureをJpg圧縮する事が可能です。<br />
+
+オプションの値一覧 
+- "NONE" → RGBA 32bit無圧縮設定
+- "RGB_565" → RGB565(16bit) 無圧縮設定
+- "PNG" → RGBA 32Bit PNG圧縮設定
+- "JPG_BUFFERRGBA" → RGBA 32bit JPEG圧縮設定
+- "JPG" / "JPG_BUFFERRGB565" → RGB565 JPEG圧縮設定
+
+### オプション例
+    例：Sample.exe --profilerSS=enable --profilerSS-resolution=640x480 --profilerSS-format=jpg <br />
+    例：adb shell am start -n com.utj.test[パッケージ名]/com.unity3d.player.UnityPlayerActivity[アクティビティ名] -e "unity --profilerSS=disable"<br />
+
 ## 変更履歴
 <pre>
+version 1.5.0
+　コマンドラインオプションを追加
+　解像度の表示
+
 version 1.4.0
   カラースペース変換機能を追加
 

README.md

@@ -53,8 +53,36 @@ ScreenShotToProfiler.Instance.captureBehaviour = (target) => {
 [Whole Sample Code](Sample~/SwitchSample.cs)<br />
 
 
+## command line options
+By adding command line options at runtime, you can forcefully change the behavior. (Disabled when running Editor)
+
+### Enable/disable with "--profilerSS"
+By adding the option "--profilerSS=enable", you can force the screenshot to be taken immediately after startup. <br />
+Screenshot can be forcibly disabled by adding the option "--profilerSS=disable"
+
+### Change resolution with "--profilerSS-resolution"
+You can now set the "width x height" of Texture, like "--profilerSS-resolution=256x192".
+
+### Format change with "--profilerSS-format"
+Texture can be compressed into Jpg by using "--profilerSS-format=JPG_BUFFERRGB565".
+
+Option value list
+- "NONE" → RGBA 32bit uncompressed setting
+- "RGB_565" → RGB565(16bit) uncompressed setting
+- "PNG" → RGBA 32Bit PNG compression setting
+- "JPG_BUFFERRGBA" → RGBA 32bit JPEG compression setting
+- "JPG" / "JPG_BUFFERRGB565" → RGB565 JPEG compression settings
+
+### Option Examples
+    Example: Sample.exe --profilerSS=enable --profilerSS-resolution=640x480 --profilerSS-format=jpg <br />
+    Example: adb shell am start -n com.utj.test[package name]/com.unity3d.player.UnityPlayerActivity[activity name] -e "unity --profilerSS=disable"<br />
+
 ## change
 <pre>
+version 1.5.0
+  Added command line option
+  Display resolution
+
 version 1.4.0
   Add ColorSpace convert.
 

Runtime/ScreenShotToProfiler.cs

@@ -47,7 +47,122 @@ public Action<RenderTexture> captureBehaviour
 
         private CustomSampler captureSampler;
         private CustomSampler updateSampler;
+
+        private bool isInitialize = false;
+
+        const string ArgForceOption = "--profilerSS";
+
+        const string ArgForceResolution = "--profilerSS-resolution";
+        const string ArgForceFormat = "--profilerSS-format";
+
+
+        const int Invalid = -1;
+
+        static int forceLaunchOption = Invalid;
+        static int forceWidth = Invalid;
+        static int forceHeight = Invalid;
+        static int forceFormat = Invalid;
+
 #endif
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+        private static void OnRuntimeInitialize()
+        {
+            var args = System.Environment.GetCommandLineArgs();
+            int length = args.Length;
+
+            for(int i = 0; i < length; ++i)
+            {
+                if ( string.IsNullOrEmpty(args[i] ) )
+                {
+                    continue;
+                }
+                
+                if(args[i].StartsWith( ArgForceResolution) )
+                {
+                    var resolutionVal = GetParameter(args[i]);
+                    GetResolution(resolutionVal, out forceWidth, out forceHeight);
+                }
+                else if (args[i].StartsWith( ArgForceFormat) )
+                {
+                    var formatParam = GetParameter(args[i]);
+                    forceFormat = GetFormat(formatParam);
+                }
+                else if (args[i].StartsWith(ArgForceOption))
+                {
+                    var optionVal = GetParameter(args[i]);
+                    if (optionVal == "enable")
+                    {
+                        forceLaunchOption = 1;
+                    }
+                    else if (optionVal == "disable")
+                    {
+                        forceLaunchOption = 0;
+                    }
+                }
+            }
+            if(forceLaunchOption == 1)
+            {
+                Instance.Initialize();
+            }
+        }
+
+
+        private static int GetFormat(string param)
+        {
+            switch (param)
+            {
+                case "rgb_565":
+                    return (int)TextureCompress.RGB_565;
+                case "png":
+                    return (int)TextureCompress.PNG;
+                case "jpg_bufferrgb565":
+                case "jpg":
+                case "jpeg":
+                    return (int)TextureCompress.JPG_BufferRGB565;
+                case "jpg_Bufferrgba":
+                    return (int)TextureCompress.JPG_BufferRGBA;
+                case "none":
+                    return (int)TextureCompress.None;
+            }
+            return Invalid;
+        }
+
+        private static void GetResolution(string param,out int width,out int height)
+        {
+            int paramIndex = 0;
+            width = 0;
+            height = 0;
+            int length = param.Length;
+            for(int i = 0; i < length; ++i)
+            {
+                if( '0' <= param[i] && param[i] <= '9')
+                {
+                    switch(paramIndex)
+                    {
+                        case 0:
+                            width = width * 10 + (param[i]- '0');
+                            break;
+                        case 1:
+                            height = height * 10 + (param[i] - '0');
+                            break;
+                    }
+                }
+                else if (param[i] == 'x' )
+                {
+                    paramIndex++;
+                }
+            }
+        }
+
+        private static string GetParameter(string arg)
+        {
+            int eqIndex = arg.IndexOf('=');
+            if(eqIndex == -1)
+            {
+                return "";
+            }
+            return arg.Substring(eqIndex+1).ToLower();
+        }
 
         public bool Initialize()
         {
@@ -72,6 +187,25 @@ public bool Initialize(int width , int height,bool allowSync = false)
         public bool Initialize(int width, int height, TextureCompress compress, bool allowSync)
         {
 #if DEBUG
+#if !UNITY_EDITOR
+            if(forceLaunchOption == 0)
+            {
+                return false;
+            }
+            if (forceWidth != Invalid)
+            {
+                width = forceWidth;
+            }
+            if (forceHeight != Invalid)
+            {
+                height = forceHeight;
+            }
+            if(forceFormat != Invalid)
+            {
+                compress = (TextureCompress)forceFormat;
+            }
+#endif
+
             if (!SystemInfo.supportsAsyncGPUReadback)
             {
                 if (!allowSync)
@@ -94,6 +228,13 @@ public bool Initialize(int width, int height, TextureCompress compress, bool all
         private void InitializeLogic(int width,int height,TextureCompress compress)
         {
 #if DEBUG
+            if (isInitialize)
+            {
+                return;
+            }
+            if(width ==0 || height == 0) { 
+                return;
+            }
             renderTextureBuffer = new ScreenShotLogic(width, height, compress);
             renderTextureBuffer.captureBehaviour = this.DefaultCaptureBehaviour;
             this.behaviourGmo = new GameObject();
@@ -105,6 +246,7 @@ private void InitializeLogic(int width,int height,TextureCompress compress)
             this.updateSampler = CustomSampler.Create("ScreenshotToProfiler.Update");
             behaviour.captureFunc += this.Capture;
             behaviour.updateFunc += this.Update;
+            isInitialize = true;
 #endif
         }
 
@@ -117,6 +259,7 @@ public void Destroy()
             }
             if (renderTextureBuffer != null) { renderTextureBuffer.Dispose(); }
             renderTextureBuffer = null;
+            isInitialize = false;
 #endif
         }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.utj.screenshot2profiler",
   "displayName": "Screenshot to Profiler",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "unity": "2019.3",
   "description": "Embedded screenshot to profiler data",
   "keywords": [