gg.easy.airship 0.1.2221 → 0.1.2222

package/Editor/TypescriptServices/Compiler/TypescriptCompilationService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -406,7 +407,7 @@ using Object = UnityEngine.Object;
 
                 if (!showProgressBar && (compileFlags & TypeScriptCompileFlags.DisplayProgressBar) != 0) {
                     showProgressBar = true;
-                    UpdateCompilerProgressBar(0f, $"Starting to compile TypeScript code...");
+                    UpdateCompilerProgressBar(0f, $"Starting to compile TypeScript code...", false);
                 }
                 
                 if (!File.Exists(Path.Join(project.Package.Directory, "package.json"))) {
@@ -427,13 +428,14 @@ using Object = UnityEngine.Object;
                     return; // ??
                 }
 
-                try
-                {
+                Process compilerProcess = null;
+                bool cancelled = false;
+                
+                try {
                     if (fullClean) {
                         UpdateCompilerProgressBarText($"Preparing TypeScript project");
                         var success = RunNpmInstall(packageDir);
-                        if (!success)
-                        {
+                        if (!success) {
                             Debug.LogWarning("Failed to install NPM dependencies");
                             return;
                         }
@@ -441,18 +443,42 @@ using Object = UnityEngine.Object;
 
                     compilationState.FilesToCompileCount = 0;
                     compilationState.CompiledFileCount = 0;
-       
-                    var compilerProcess = RunNodeCommand(project.Directory, $"{TypescriptLocationCommandLine} {arguments.GetCommandString(CompilerCommand.BuildOnly)}");
-                    TypescriptLogService.LogInfo($"Executed compiler build instance '{arguments.GetCommandString(CompilerCommand.BuildOnly)}' at pid {compilerProcess.Id}");
+
+                    compilerProcess = RunNodeCommand(project.Directory,
+                        $"{TypescriptLocationCommandLine} {arguments.GetCommandString(CompilerCommand.BuildOnly)}");
+                    TypescriptLogService.LogInfo(
+                        $"Executed compiler build instance '{arguments.GetCommandString(CompilerCommand.BuildOnly)}' at pid {compilerProcess.Id}");
                     AttachBuildOutputToUnityConsole(project, arguments, compilerProcess, packageDir);
-                    
+
                     while (!compilerProcess.HasExited) {
                         if (compilationState.FilesToCompileCount == 0) continue;
-                        UpdateCompilerProgressBar(
-                            compilationState.CompiledFileCount / (float)compilationState.FilesToCompileCount, $"Compiling TypeScript files {compilationState.CompiledFileCount}/{project.CompilationState.FilesToCompileCount}...");
+
+                        cancelled = UpdateCompilerProgressBar(
+                            compilationState.CompiledFileCount / (float)compilationState.FilesToCompileCount,
+                            $"Compiling TypeScript files {compilationState.CompiledFileCount}/{project.CompilationState.FilesToCompileCount}...",
+                            true);
+                        if (cancelled) {
+                            compilerProcess.Kill();
+                        }
                     }
-                    
+
                     // compilerProcess.WaitForExit();
+                } catch (Win32Exception ex) {
+                    if (compilerProcess != null) {
+                        switch (compilerProcess.ExitCode) {
+                            case ExitCodeKill:
+                                if (cancelled) {
+                                    Debug.Log("Typescript compiler build process was killed by user");
+                                } else {
+                                    Debug.LogError("Typescript compiler build process was killed by system");
+                                    Debug.LogException(ex);
+                                }
+                                break;
+                            default:
+                                Debug.LogException(ex);
+                                break;
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -462,10 +488,16 @@ using Object = UnityEngine.Object;
 
             private static bool showProgressBar = false;
             private static float progress = 0;
-            private static void UpdateCompilerProgressBar(float progress, string text) {
+            private static bool UpdateCompilerProgressBar(float progress, string text, bool cancellable) {
                 TypescriptCompilationService.progress = progress;
-                if (!showProgressBar) return;
+                if (!showProgressBar) return false;
+
+                if (cancellable) {
+                    return EditorUtility.DisplayCancelableProgressBar(TsCompilerService, text, progress);
+                }
+                
                 EditorUtility.DisplayProgressBar(TsCompilerService, text, progress);
+                return false;
             }
             
             private static bool UpdateCompilerProgressBarCancellable(float progress, string text) {

package/Runtime/Code/VoxelWorld/WorldSaveFile.cs

@@ -32,7 +32,7 @@ public class WorldSaveFile : ScriptableObject {
         public VoxelData[] data;
         public uint[] color;
         public Dictionary<ushort, BinaryBlob> customData;
-        
+
         public SaveChunk(Vector3Int key, VoxelData[] data, uint[] color, Dictionary<ushort, BinaryBlob> customData) {
             this.key = key;
             this.data = data;
@@ -45,7 +45,7 @@ public class WorldSaveFile : ScriptableObject {
             writer.Write(key.x);
             writer.Write(key.y);
             writer.Write(key.z);
-            
+
             // Write colors:
             writer.Write((uint)color.Length);
             var colorPoolLen = color.Length * sizeof(uint);
@@ -53,7 +53,7 @@ public class WorldSaveFile : ScriptableObject {
             Buffer.BlockCopy(color, 0, colorPool, 0, colorPoolLen);
             writer.Write(colorPool, 0, colorPoolLen);
             ArrayPool<byte>.Shared.Return(colorPool);
-            
+
             // Write voxel data:
             writer.Write((uint)data.Length);
             var dataPoolLen = data.Length * sizeof(ushort);
@@ -113,7 +113,7 @@ public class WorldSaveFile : ScriptableObject {
                 voxelData.Add(c);
             }
             ArrayPool<byte>.Shared.Return(dataBytes);
-            
+
             // Read custom data:
             if (version >= 3) {
                 var numCustomElements = reader.ReadInt32();
@@ -271,21 +271,21 @@ public class WorldSaveFile : ScriptableObject {
             // Don't save empty chunks
             if (!foundVoxel) continue;
 
-            
+
             // Debug.Log("Valid Chunk: " + chunk.Value.chunkKey);
             var chunkData = new SaveChunk(chunk.Key, data, chunk.Value.color, chunk.Value.customDataMap);
             savedChunks.Add(chunkData);
             finalChunkCounter++;
         }
-        
+
         // Serialize:
         using var memStream = new MemoryStream();
         using var writer = new BinaryWriter(memStream);
-        
+
         // Serializer version:
         const ushort version = 2;
         writer.Write(version);
-        
+
         // Serialize chunks:
         writer.Write((uint)savedChunks.Count);
         // Debug.Log("Writing chunk size: " + savedChunks.Count);
@@ -293,13 +293,13 @@ public class WorldSaveFile : ScriptableObject {
             // Debug.Log("Serializing chunk: " + chunk.key);
             chunk.Serialize(writer, version);
         }
-        
+
         // Compress:
         var buffer = memStream.GetBuffer();
         var bufferSpan = new ReadOnlySpan<byte>(buffer, 0, (int)memStream.Length);
         chunksCompressed = VoxelCompressUtil.CompressToByteArrayV2(bufferSpan);
         chunksCompressedV2 = true;
-        
+
 #if UNITY_EDITOR
         if (!Application.isPlaying) {
             Debug.Log($"Saved {finalChunkCounter} chunks to {name} (raw: {FormatDataSize(memStream.Length)}) (compressed: {FormatDataSize(chunksCompressed.Length)})");
@@ -330,7 +330,7 @@ public class WorldSaveFile : ScriptableObject {
         for (int i = 0; i < data.Count; i++) {
             BlockId fileBlockId = VoxelWorld.GetVoxelDataId(data[i]);
             ushort extraBits = VoxelWorld.GetVoxelDataExtraBits(data[i]);
-            
+
             bool found = blockRemapping.TryGetValue(fileBlockId, out var updatedBlockId);
             if (found) {
                 VoxelData vox = (VoxelData)(updatedBlockId | extraBits);
@@ -344,11 +344,11 @@ public class WorldSaveFile : ScriptableObject {
 #endif
 
                 writeChunk.readWriteVoxel[i] = vox;
-                
+
                 // Note: This is a huge GC alloc penalty, but these aren't really used (and are recomputed on first use anyway),
                 // thus, this line has been commented out for now:
                 // writeChunk.keysWithVoxels.Add(i);
-                
+
                 if (writeColor) {
                     writeChunk.color[i] = color[i];
                 }
@@ -372,6 +372,11 @@ public class WorldSaveFile : ScriptableObject {
         Dictionary<BlockId, BlockId> blockRemapping = new();
 
         foreach (var blockIdToScopeName in this.blockIdToScopeName) {
+            // Example code for fixing missing block
+            // if (blockIdToScopeName.name == "@Easy/VoxelWorld:Grass 1") {
+            //     blockRemapping[blockIdToScopeName.id] = this.blockIdToScopeName.Find((s) => s.name == "@Easy/VoxelWorld:Grass").id;
+            //     continue;
+            // }
 
             //see if this block exists in the world blockfiles
             var definition = world.voxelBlocks.GetBlockDefinitionByStringId(blockIdToScopeName.name);
@@ -389,7 +394,7 @@ public class WorldSaveFile : ScriptableObject {
         // If compressed data is available, use that instead:
         if (chunksCompressed != null && chunksCompressed.Length > 0) {
             Profiler.BeginSample("ReadVoxelWorldChunks");
-            
+
             // Decompress and deserialize chunks:
             Profiler.BeginSample("DecompressChunks");
             using var decompressedStream = chunksCompressedV2
@@ -400,7 +405,7 @@ public class WorldSaveFile : ScriptableObject {
             var reader = new BinaryReader(decompressedStream);
             var version = reader.ReadUInt16();
             var numChunks = reader.ReadUInt32();
-            
+
             var data = new List<VoxelData>();
             var color = new List<uint>();
             var customData = new Dictionary<ushort, BinaryBlob>();
@@ -408,13 +413,13 @@ public class WorldSaveFile : ScriptableObject {
             for (uint i = 0; i < numChunks; i++) {
                 data.Clear();
                 color.Clear();
-                
+
                 Profiler.BeginSample("Deserialize");
                 var key = SaveChunk.Deserialize(reader, version, data, color, customData);
                 Profiler.EndSample();
-                
+
                 counter += 1;
-                
+
                 Profiler.BeginSample("LoadChunkIntoVoxelWorld");
                 try {
                     LoadChunkIntoVoxelWorld(world, blockRemapping, key, data, color, customData);
@@ -423,7 +428,7 @@ public class WorldSaveFile : ScriptableObject {
                 }
                 Profiler.EndSample();
             }
-            
+
             Profiler.EndSample();
         } else {
             Debug.Log("Loading non compressed chunk");
@@ -439,7 +444,7 @@ public class WorldSaveFile : ScriptableObject {
             Debug.Log($"[Voxel World]: Loaded {counter} chunks");
         }
 #endif
-        
+
         Profiler.EndSample();
     }
 

package/URP/AirshipMobileURPAsset_Renderer.asset

@@ -303,7 +303,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3}
   m_Name: DecalRendererFeature
   m_EditorClassIdentifier: 
-  m_Active: 1
+  m_Active: 0
   m_Settings:
     technique: 0
     maxDrawDistance: 500

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2221",
+  "version": "0.1.2222",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",