Release 7.0.0

.git-branches.toml

@@ -0,0 +1,95 @@
+# Git Town configuration file
+#
+# Run "git town config setup" to add additional entries
+# to this file after updating Git Town.
+#
+# The "push-hook" setting determines whether Git Town
+# permits or prevents Git hooks while pushing branches.
+# Hooks are enabled by default. If your Git hooks are slow,
+# you can disable them to speed up branch syncing.
+#
+# When disabled, Git Town pushes using the "--no-verify" switch.
+# More info at https://www.git-town.com/preferences/push-hook.
+push-hook = true
+
+# Should Git Town push the new branches it creates
+# immediately to origin even if they are empty?
+#
+# When enabled, you can run "git push" right away
+# but creating new branches is slower and
+# it triggers an unnecessary CI run on the empty branch.
+#
+# When disabled, many Git Town commands execute faster
+# and Git Town will create the missing tracking branch
+# on the first run of "git sync".
+push-new-branches = false
+
+# Should "git ship" delete the tracking branch?
+# You want to disable this if your code hosting platform
+# (GitHub, GitLab, etc) deletes head branches when
+# merging pull requests through its UI.
+ship-delete-tracking-branch = true
+
+# Should "git ship" sync branches before shipping them?
+#
+# Guidance: enable when shipping branches locally on your machine
+# and disable when shipping feature branches via the code hosting
+# API or web UI.
+#
+# When enabled, branches are always fully up to date when shipped
+# and you get a chance to resolve merge conflicts
+# between the feature branch to ship and the main development branch
+# on the feature branch. This helps keep the main branch green.
+# But this also triggers another CI run and delays shipping.
+sync-before-ship = true
+
+# Should "git sync" also fetch updates from the upstream remote?
+#
+# If an "upstream" remote exists, and this setting is enabled,
+# "git sync" will also update the local main branch
+# with commits from the main branch at the upstream remote.
+#
+# This is useful if the repository you work on is a fork,
+# and you want to keep it in sync with the repo it was forked from.
+sync-upstream = false
+
+[branches]
+
+# The main branch is the branch from which you cut new feature branches,
+# and into which you ship feature branches when they are done.
+# This branch is often called "main", "master", or "development".
+main = "dev"
+
+# Perennial branches are long-lived branches.
+# They are never shipped and have no ancestors.
+# Typically, perennial branches have names like
+# "development", "staging", "qa", "production", etc.
+perennials = ["main"]
+
+[hosting]
+
+# Knowing the type of code hosting platform allows Git Town
+# to open browser URLs and talk to the code hosting API.
+# Most people can leave this on "auto-detect".
+# Only change this if your code hosting server uses as custom URL.
+platform = "github"
+
+# When using SSH identities, define the hostname
+# of your source code repository. Only change this
+# if the auto-detection does not work for you.
+# origin-hostname = ""
+
+[sync-strategy]
+
+# How should Git Town synchronize feature branches?
+# Feature branches are short-lived branches cut from
+# the main branch and shipped back into the main branch.
+# Typically you develop features and bug fixes on them,
+# hence their name.
+feature-branches = "rebase"
+
+# How should Git Town synchronize perennial branches?
+# Perennial branches have no parent branch.
+# The only updates they receive are additional commits
+# made to their tracking branch somewhere else.
+perennial-branches = "merge"

.github/workflows/build-listing.yml

@@ -28,15 +28,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v3 # check out this repo
-      - uses: actions/checkout@v3 # check out automation repo
+      - uses: actions/checkout@v4 # check out this repo
+      - uses: actions/checkout@v4 # check out automation repo
         with:
           repository: vrchat-community/package-list-action
           path: ${{env.pathToCi}}
           clean: false # otherwise the local repo will no longer be checked out
 
       - name: Restore Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ${{env.pathToCi}}/.nuke/temp
@@ -49,13 +49,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ${{env.listPublishDirectory}}
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.gitignore

@@ -69,6 +69,8 @@ Assets/Develop
 Assets/Develop.meta
 Assets/Bakery
 Assets/Bakery.meta
+Assets/Decalery
+Assets/Decalery.meta
 Assets/BakeryLightmaps
 Assets/BakeryLightmaps.meta
 Assets/Editor.meta
@@ -97,4 +99,39 @@ Packages/sh.orels.shaders.inspector/Editor/MaterialLibraries/Resources/**/*.json
 /Assets/Gizmos
 /Assets/Gizmos.meta
 /Assets/LTCGI-Generated
-/Assets/LTCGI-Generated.meta
+/Assets/LTCGI-Generated.meta
+/Assets/csc.rsp
+/Assets/csc.rsp.meta
+/Assets/_PoiyomiShaders
+/Assets/_PoiyomiShaders.meta
+/Thry
+/Exports
+
+/Assets/Samples
+/Assets/Samples.meta
+
+/UserSettings/**/*
+UserSettings/Layouts/default-2022.dwlt
+UserSettings/EditorUserSettings.asset
+UserSettings/Search.settings
+Assets/TextMesh Pro
+Assets/TextMesh Pro.meta
+Assets/XR
+Assets/XR.meta
+Assets/AmplifyShaderEditor
+Assets/AmplifyShaderEditor.meta
+/bakery-*
+Assets/XSToon3
+Assets/XSToon3.meta
+Assets/AreaLit
+Assets/AreaLit.meta
+Assets/VRSL Addons
+Assets/VRSL Addons.meta
+Assets/Umodeler-Hub
+Assets/Umodeler-Hub.meta
+Assets/UniversalRenderPipelineGlobalSettings.asset
+Assets/UniversalRenderPipelineGlobalSettings.asset.meta
+ProjectSettings/UModeler-Hub.json
+
+Assets/Mochie
+Assets/Mochie.meta

Assets/Tools/Editor/ReleaseExporter.cs

@@ -1,7 +1,12 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using VRC.PackageManagement.Core.Types.Packages;
+using Debug = UnityEngine.Debug;
 
 namespace ORL.Tools
 {
@@ -14,46 +19,114 @@ public static class ReleaseExporter
             "Packages/sh.orels.shaders.generator",
         };
 
+        [Serializable]
+        public class PackageInfo
+        {
+            public string name;
+            public string displayName;
+            public string version;
+        }
+
         [MenuItem("Tools/orels1/Export Release")]
-        private static void ExportAsUnityPackage ()
+        private static void ExportAsUnityPackage()
         {
-            var manifestPath = Path.Combine(_exportFolders[0], VRCPackageManifest.Filename);
-            var manifest = VRCPackageManifest.GetManifestAtPath(manifestPath);
+            var manifestPath = Path.Combine(_exportFolders[0], "package.json");
+            var manifest = JsonUtility.FromJson<PackageInfo>(File.ReadAllText(manifestPath));
             if (manifest == null)
             {
                 Debug.LogError("Failed to load main package manifest to extract version, aborting");
                 return;
             }
 
+            // Get a list of new files from git
+            var processInfo = new ProcessStartInfo("git", "status -s")
+            {
+                WorkingDirectory = new FileInfo(".").FullName,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true
+            };
+            var gitProc = Process.Start(processInfo);
+            gitProc.WaitForExit();
+            if (gitProc.ExitCode != 0)
+            {
+                Debug.LogError("Failed to get git status, aborting");
+                return;
+            }
+            var ignored = new List<string>();
+            while (!gitProc.StandardOutput.EndOfStream)
+            {
+                var line = gitProc.StandardOutput.ReadLine();
+                if (line.StartsWith("??"))
+                {
+                    ignored.Add(line.Substring(2).Trim().Replace('/', '\\'));
+                }
+            }
+
+            Debug.Log($"Exporting version {manifest.version}");
+
             var exportDir = Path.Combine(Directory.GetCurrentDirectory(), "Exports");
             Directory.CreateDirectory(exportDir);
-            AssetDatabase.ExportPackage
-            (
-                _exportFolders, 
-                Path.Combine(exportDir, $"orl-shaders-combined-{manifest.Version}.unitypackage"),
-                ExportPackageOptions.Recurse | ExportPackageOptions.Interactive
-            );
-
-            AssetDatabase.ExportPackage
-            (
-                _exportFolders[0], 
-                Path.Combine(exportDir, $"sh.orels.shaders-standalone-{manifest.Version}.unitypackage"),
-                ExportPackageOptions.Recurse | ExportPackageOptions.Interactive
-            );
-
-            AssetDatabase.ExportPackage
-            (
-                _exportFolders[1], 
-                Path.Combine(exportDir, $"sh.orels.shaders.inspector-standalone-{manifest.Version}.unitypackage"),
-                ExportPackageOptions.Recurse | ExportPackageOptions.Interactive
-            );
-
-            AssetDatabase.ExportPackage
-            (
-                _exportFolders[2], 
-                Path.Combine(exportDir, $"sh.orels.shaders.generator-standalone-{manifest.Version}.unitypackage"),
-                ExportPackageOptions.Recurse | ExportPackageOptions.Interactive
-            );
+
+            // Export .unitypackage files
+            ExportAsUnityPackage(_exportFolders, ignored, Path.Combine(exportDir, $"sh.orels.shaders-combined-{manifest.version}.unitypackage"));
+            ExportAsUnityPackage(_exportFolders[0], ignored, Path.Combine(exportDir, $"sh.orels.shaders-standalone-{manifest.version}.unitypackage"));
+            ExportAsUnityPackage(_exportFolders[1], ignored, Path.Combine(exportDir, $"sh.orels.shaders.inspector-standalone-{manifest.version}.unitypackage"));
+            ExportAsUnityPackage(_exportFolders[2], ignored, Path.Combine(exportDir, $"sh.orels.shaders.generator-standalone-{manifest.version}.unitypackage"));
+
+            // Export .zip files
+            ExportAsZip(_exportFolders[0], ignored, Path.Combine(exportDir, $"sh.orels.shaders-{manifest.version}.zip"));
+            ExportAsZip(_exportFolders[1], ignored, Path.Combine(exportDir, $"sh.orels.shaders.inspector-{manifest.version}.zip"));
+            ExportAsZip(_exportFolders[2], ignored, Path.Combine(exportDir, $"sh.orels.shaders.generator-{manifest.version}.zip"));
+
+            // Open the export folder
+            var exportedPath = new FileInfo("Exports").FullName;
+            Process.Start(exportedPath);
+        }
+
+        private static void ExportAsUnityPackage(string[] baseFolders, List<string> ingored, string exportPath)
+        {
+            var list = baseFolders.SelectMany(f => Directory.GetFiles(f, "*", SearchOption.AllDirectories))
+                .Select(f => f.Replace('/', '\\'))
+                .Where(f => !ingored.Any(i => f.Contains(i, StringComparison.InvariantCultureIgnoreCase)))
+                .ToArray();
+
+            Debug.Log("Packages\\sh.orels.shaders\\Editor\\Dependencies\\ORLLayoutToolkit.cs".Contains("Packages\\sh.orels.shaders\\Editor\\Dependencies\\"));
+            AssetDatabase.ExportPackage(list, exportPath, ExportPackageOptions.Recurse);
+        }
+
+        private static void ExportAsUnityPackage(string baseFolder, List<string> ingored, string exportPath)
+        {
+            var list = Directory.GetFiles(baseFolder, "*", SearchOption.AllDirectories)
+                .Select(f => f.Replace('/', '\\'))
+                .Where(f => !ingored.Any(i => f.Contains(i, StringComparison.InvariantCultureIgnoreCase)))
+                .ToArray();
+            AssetDatabase.ExportPackage(list, exportPath, ExportPackageOptions.Recurse);
+        }
+
+        private static void ExportAsZip(string baseFolder, List<string> ingored, string exportPath)
+        {
+            var list = Directory.GetFiles(baseFolder, "*", SearchOption.AllDirectories)
+                .Select(f => f.Replace('/', '\\'))
+                .Where(f => !ingored.Any(i => f.Contains(i, StringComparison.InvariantCultureIgnoreCase)))
+                .ToArray();
+
+            if (File.Exists(exportPath)) File.Delete(exportPath);
+            var basePath = baseFolder.Replace('/', '\\') + '\\';
+            using (var zip = new ZipArchive(File.OpenWrite(exportPath), ZipArchiveMode.Create))
+            {
+                foreach (var file in list)
+                {
+                    var entry = zip.CreateEntry(file.Replace(basePath, "").Replace('\\', '/'));
+                    using (var stream = File.OpenRead(file))
+                    {
+                        using (var entryStream = entry.Open())
+                        {
+                            stream.CopyTo(entryStream);
+                        }
+                    }
+                }
+            }
         }
     }
 }

Packages/.gitignore

@@ -1,6 +1,7 @@
 /*/
-!com.vrchat.core.*
 
+!com.vrchat.core.vpm-resolver
 !sh.orels.shaders.generator
 !sh.orels.shaders.inspector
-!sh.orels.shaders
+!sh.orels.shaders
+!com.vrchat.core.*/