Skip to content

fix: vrm export for desktop client #6221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

fix: vrm export for desktop client #6221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
406ef45
Adding debug logs
AlejandroAlvarezMelucciDCL Jun 19, 2024
b81be5c
test removing IO call
AlejandroAlvarezMelucciDCL Jun 19, 2024
693e4fb
Test removing backpack analytic call
AlejandroAlvarezMelucciDCL Jun 20, 2024
21a55c1
Revert IO call
AlejandroAlvarezMelucciDCL Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserFactory/DCLFileBrowserFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ public static IDCLFileBrowserService GetFileBrowserService()
{

#if UNITY_WEBGL && !UNITY_EDITOR
UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService UNITY_WEBGL && !UNITY_EDITOR");
return new DCLFileBrowserServiceWebGL();
#endif

#if FILE_BROWSER_PRESENT
UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService FILE_BROWSER_PRESENT is defined");
return new FileBrowserIntegration.FileBrowserWrapper();
#endif
UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService FILE_BROWSER_PRESENT is NOT defined, returning service mock!");
return new DCLFileBrowserServiceMock();
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...y-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ public void SaveFile(string title, string directory, string defaultName, byte[]

public async UniTask SaveFileAsync(string title, string directory, string defaultName, byte[] content, ExtensionFilter[] extensions)
{
UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync start of method");
UniTaskCompletionSource<string> completionSource = new UniTaskCompletionSource<string>();
FileBrowser.Instance.SaveFileAsync(path => completionSource.TrySetResult(path), title, directory, defaultName, ConvertExtensionFilters(extensions));
var path = await completionSource.Task;
UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync path:{path} before calling System.IO.File.WriteAllBytesAsync");
await System.IO.File.WriteAllBytesAsync(path, content);
}

Expand Down
2 changes: 1 addition & 1 deletion ...cripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ internal async UniTask VrmExport(CancellationToken ct)
view?.SetVRMSuccessToastActive(false);
}

backpackAnalyticsService.SendVRMExportSucceeded();
//backpackAnalyticsService.SendVRMExportSucceeded();
}
}
}
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// </summary>
public class Analytics : IAnalytics
{
private static bool VERBOSE = false;
private static bool VERBOSE = true;

public void SendAnalytic(string eventName, Dictionary<string, string> data)
{
Expand All @@ -21,4 +21,4 @@ public void SendAnalytic(string eventName, Dictionary<string, string> data)
internal void SendToSegment(string eventName, Dictionary<string, string> data) { WebInterface.ReportAnalyticsEvent(eventName, data.Select(x => new WebInterface.AnalyticsPayload.Property(x.Key, x.Value)).ToArray()); }

public void Dispose() { }
}
}