[v1.2.9] UE4: Preparing plugin for submission

bombomby · Sep 22, 2019 · 48b237e · 48b237e
1 parent 685e20b
commit 48b237e
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 12 deletions.
diff --git a/gui/Controls/Settings.cs b/gui/Controls/Settings.cs
@@ -57,7 +57,7 @@ public enum ExpandMode
 
 		public int CollapsedMaxThreadDepth { get; set; } = 2;
 		public int ExpandedMaxThreadDepth { get; set; } = 12;
-		public ExpandMode ThreadExpandMode { get; set; } = ExpandMode.ExpandMain;
+		public ExpandMode ThreadExpandMode { get; set; } = ExpandMode.ExpandAll;
 
         public string TempDirectoryPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Optick\\Temp\\");
 

diff --git a/gui/Properties/AssemblyInfo.cs b/gui/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.8.0")]
-[assembly: AssemblyFileVersion("1.2.8.0")]
+[assembly: AssemblyVersion("1.2.9.0")]
+[assembly: AssemblyFileVersion("1.2.9.0")]
diff --git a/samples/UnrealEnginePlugin/OptickPlugin.uplugin b/samples/UnrealEnginePlugin/OptickPlugin.uplugin
@@ -7,7 +7,7 @@
 	"Category": "Performance",
 	"CreatedBy": "Vadim Slyusarev",
 	"CreatedByURL": "https://github.com/bombomby/optick",
-	"DocsURL": "https://github.com/bombomby/optick",
+	"DocsURL": "https://github.com/bombomby/optick/wiki/UE4-Optick-Plugin",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/95c078f6fa924b2b82fd8f281e04850f",
 	"SupportURL": "https://github.com/bombomby/optick/issues",
 	"CanContainContent": false,

diff --git a/samples/UnrealEnginePlugin/Source/OptickPlugin.Build.cs b/samples/UnrealEnginePlugin/Source/OptickPlugin.Build.cs
@@ -15,7 +15,7 @@ public OptickPlugin(ReadOnlyTargetRules Target) : base(Target)
 			PrivateIncludePaths.AddRange(
 				new string[] {
 					"Private",
-					"Private/OptickCore",
+					"ThirdParty/Optick/src",
 					// ... add other private include paths required here ...
 				}
 				);

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickCore b/samples/UnrealEnginePlugin/Source/Private/OptickCore
diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickPlugin.cpp b/samples/UnrealEnginePlugin/Source/Private/OptickPlugin.cpp
@@ -29,7 +29,7 @@
 #include "OptickCommands.h"
 #endif
 
-#include <OptickCore/Optick.h>
+#include <optick.h>
 
 DEFINE_LOG_CATEGORY(OptickLog);
 

diff --git a/samples/UnrealEnginePlugin/Source/ThirdParty/Optick/README.txt b/samples/UnrealEnginePlugin/Source/ThirdParty/Optick/README.txt
@@ -0,0 +1,5 @@
+Optick is a super-lightweight C++ profiler for Games.
+It provides access for all the necessary tools required for efficient performance analysis and optimization:
+instrumentation, switch-contexts, sampling, GPU counters.
+
+https://github.com/bombomby/optick
diff --git a/samples/UnrealEnginePlugin/Source/ThirdParty/Optick/src b/samples/UnrealEnginePlugin/Source/ThirdParty/Optick/src
@@ -0,0 +1 @@
+../../../../../src
diff --git a/src/optick_miniz.h b/src/optick_miniz.h
@@ -1,3 +1,29 @@
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
 /* miniz.c 2.1.0 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing
    See "unlicense" statement at the end of this file.
    Rich Geldreich <richgel99@gmail.com>, last updated Oct. 13, 2013

diff --git a/tools/Publish_UE4.bat b/tools/Publish_UE4.bat
@@ -19,13 +19,13 @@ xcopy /Y Bin\Release\x64\Optick.exe samples\UnrealEnginePlugin\GUI\*
 call "C:\Program Files\Epic Games\UE_%UNREAL_VERSION%\Engine\Build\BatchFiles\RunUAT.bat" BuildPlugin -Plugin="%CD%\samples\UnrealEnginePlugin\OptickPlugin.uplugin" -Package="%CD%\publish\Optick_%VERSION_NAME%\OptickPlugin" -Rocket
 
 rem Process Copyright
-cd %CD%\publish\Optick_%VERSION_NAME%\OptickPlugin\Source\Private\OptickCore\
+cd %CD%\publish\Optick_%VERSION_NAME%\OptickPlugin\Source\ThirdParty\Optick\src\
 
 if not exist "tmp" mkdir tmp
 
 for %%f in (*.cpp *.h) do (
-   (Echo "%%f" | FIND /I "miniz" 1>NUL) || (
-	   echo // Copyright(c^) 2019 Vadim Slyusarev > "tmp\%%f"
+	(Echo "%%f" | FIND /I "miniz" 1>NUL) || (
+		echo // Copyright(c^) 2019 Vadim Slyusarev > "tmp\%%f"
        more +21 "%%f" >> "tmp\%%f"
    )
 )
@@ -35,9 +35,12 @@ xcopy /Y tmp\*.* *
 del /Q tmp\*.*
 rmdir tmp
 
-cd ..\..\..\..\..\..
+cd ..\..\..\..\..\..\..
+
+rd /s /q %CD%\publish\Optick_%VERSION_NAME%\OptickPlugin\Intermediate
+rem rd /s /q %CD%\publish\Optick_%VERSION_NAME%\OptickPlugin\Binaries
 
 rem Compress Archive
-powershell "Compress-Archive -Path \"%CD%\publish\Optick_%VERSION_NAME%\*\" -DestinationPath \"%CD%\publish\Optick_%VERSION_NAME%.zip\""
+powershell "Compress-Archive -Path \"%CD%\publish\Optick_%VERSION_NAME%\*\" -DestinationPath \"%CD%\publish\Optick_%VERSION_NAME%.zip\" -Force"
 
 cd tools