Compose: Fix file field bugs

Arcthesia · Aug 3, 2024 · d6ed763 · d6ed763
1 parent d4fdd9b
commit d6ed763
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 28 deletions.
diff --git a/Assets/Fonts/NotoSans-Light SDF.asset b/Assets/Fonts/NotoSans-Light SDF.asset
@@ -43,18 +43,72 @@ MonoBehaviour:
     m_StrikethroughOffset: 19.2
     m_StrikethroughThickness: 4.5
     m_TabWidth: 23
-  m_GlyphTable: []
-  m_CharacterTable: []
+  m_GlyphTable:
+  - m_Index: 526
+    m_Metrics:
+      m_Width: 51.75
+      m_Height: 8.90625
+      m_HorizontalBearingX: 7.109375
+      m_HorizontalBearingY: 7.921875
+      m_HorizontalAdvance: 65.796875
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 10
+      m_Width: 52
+      m_Height: 9
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 66
+    m_Metrics:
+      m_Width: 37.984375
+      m_Height: 4.0625
+      m_HorizontalBearingX: -0.1875
+      m_HorizontalBearingY: -8.09375
+      m_HorizontalAdvance: 37.625
+    m_GlyphRect:
+      m_X: 81
+      m_Y: 10
+      m_Width: 39
+      m_Height: 5
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  m_CharacterTable:
+  - m_ElementType: 1
+    m_Unicode: 8230
+    m_GlyphIndex: 526
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 95
+    m_GlyphIndex: 66
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 7434375323867729728}
   m_AtlasTextureIndex: 0
   m_IsMultiAtlasTexturesEnabled: 0
   m_ClearDynamicDataOnBuild: 1
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
+  m_UsedGlyphRects:
   - m_X: 0
     m_Y: 0
+    m_Width: 71
+    m_Height: 28
+  - m_X: 71
+    m_Y: 0
+    m_Width: 58
+    m_Height: 24
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 28
     m_Width: 1023
+    m_Height: 995
+  - m_X: 71
+    m_Y: 24
+    m_Width: 952
+    m_Height: 999
+  - m_X: 129
+    m_Y: 0
+    m_Width: 894
     m_Height: 1023
   m_fontInfo:
     Name: 

diff --git a/Assets/Fonts/NotoSans-Regular SDF.asset b/Assets/Fonts/NotoSans-Regular SDF.asset
diff --git a/Assets/Materials/Compose/Waveform.mat b/Assets/Materials/Compose/Waveform.mat
@@ -74,7 +74,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
-    - _ToSample: 14376600
+    - _ToSample: 9116338
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:

diff --git a/Assets/Scripts/Compose/Components/Fields/FileSelectField.cs b/Assets/Scripts/Compose/Components/Fields/FileSelectField.cs
@@ -210,7 +210,7 @@ private void OnOpenBrowserClick()
                         onSuccess: (string[] paths) => {
                             if (paths.Length >= 1)
                             {
-                                UseFilePathIfValid(Path.GetFileNameWithoutExtension(paths[0]));
+                                UseFilePathIfValid(paths[0]);
                             }
                         },
                         onCancel: () => {},

diff --git a/Assets/Scripts/Compose/Rendering/VideoRenderService.cs b/Assets/Scripts/Compose/Rendering/VideoRenderService.cs
@@ -103,6 +103,7 @@ public async UniTask StartRender(EditorAction editorAction)
                     pickMode: SimpleFileBrowser.FileBrowser.PickMode.Files,
                     allowMultiSelection: false,
                     initialPath: initialPath,
+                    initialFilename: defaultName,
                     title: title);
 
                 while (outputPath == null && !cancelled)

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/Controllers/Scene.cs b/Assets/Scripts/Gameplay/Scenecontrol/Controllers/Scene.cs
@@ -738,7 +738,7 @@ private Controller GetBaseControlerFromTypeName(string def, string arg)
                     string[] imgsplit = arg.Split(',');
                     return CreateImage(imgsplit[0], imgsplit[1], imgsplit[2], new XY(float.Parse(imgsplit[3]), float.Parse(imgsplit[4])));
                 case "canvas":
-                    bool worldSpace = def.ToLower() == "true";
+                    bool worldSpace = arg.ToLower() == "true";
                     return CreateCanvas(worldSpace);
                 case "sprite":
                     string[] spriteSplit = arg.Split(',');