npm - com.beamable - Versions diffs - 5.0.0-PREVIEW.RC12 → 5.0.0-PREVIEW.RC14 - Mend

com.beamable 5.0.0-PREVIEW.RC12 → 5.0.0-PREVIEW.RC14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/.attestation.p7m +0 -0
package/Editor/Toolbar/BeamableToolbarExtender.cs +1 -1
package/Editor/UI/BeamGUI/BeamGUI_Icons.cs +270 -225
package/Runtime/Environment/Resources/env-default.json +1 -1
package/package.json +1 -1

package/.attestation.p7m CHANGED Viewed

Binary file

package/Editor/Toolbar/BeamableToolbarExtender.cs CHANGED Viewed

@@ -35,7 +35,7 @@ namespace Beamable.Editor.ToolbarExtender
 				BeamableToolbarCallbacks.m_toolbarType.GetMethod("RepaintToolbar", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static).Invoke(null, null);
 			};
-			BeamGUI.LoadNonConfigurableIcons();
+			BeamGUI.LoadNonConfigurableIcons(silentError: true);
 			BeamableToolbarCallbacks.OnToolbarGUI = OnGUI;

package/Editor/UI/BeamGUI/BeamGUI_Icons.cs CHANGED Viewed

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Beamable.Common.Content;
 using Beamable.Content;
@@ -64,259 +65,303 @@ namespace Beamable.Editor.Util
 			var spinnerIndex = (int)( ((Time.realtimeSinceStartup*12f)+offset) % BeamGUI.unitySpinnerTextures.Length);
 			return unitySpinnerTextures[spinnerIndex];
 		}
-		public static void LoadNonConfigurableIcons()
+		public static void LoadNonConfigurableIcons(bool silentError=false)
 		{
-			if (unitySpinnerTextures == null)
-			{
-				unitySpinnerTextures = new Texture[]
-				{
-					EditorGUIUtility.IconContent("WaitSpin00").image,
-					EditorGUIUtility.IconContent("WaitSpin01").image,
-					EditorGUIUtility.IconContent("WaitSpin02").image,
-					EditorGUIUtility.IconContent("WaitSpin03").image,
-					EditorGUIUtility.IconContent("WaitSpin04").image,
-					EditorGUIUtility.IconContent("WaitSpin05").image,
-					EditorGUIUtility.IconContent("WaitSpin06").image,
-					EditorGUIUtility.IconContent("WaitSpin07").image,
-					EditorGUIUtility.IconContent("WaitSpin08").image,
-					EditorGUIUtility.IconContent("WaitSpin09").image,
-					EditorGUIUtility.IconContent("WaitSpin10").image,
-					EditorGUIUtility.IconContent("WaitSpin11").image,
-				};
-			}
-			if (artGameServers == null)
-			{
-				artGameServers =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_gameservers.png", true);
-			}
-			if (artLiveOps == null)
-			{
-				artLiveOps =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_liveops.png", true);
-			}
-			if (artContent == null)
-			{
-				artContent =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_game_content.png", true);
-			}
-			if (artServerless == null)
-			{
-				artServerless =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_serverless.png", true);
-			}
+			try
+			{
+				// do not attempt to load the icons if the beamable editor is not initialized.
+				//  it is a good proxy for, "is the asset database ready",
+				//  and if it is not, then trying to import these assets will surely fail.
+				if (!BeamEditor.IsInitialized) return;
+				if (unitySpinnerTextures == null)
+				{
+					unitySpinnerTextures = new Texture[]
+					{
+						EditorGUIUtility.IconContent("WaitSpin00").image,
+						EditorGUIUtility.IconContent("WaitSpin01").image,
+						EditorGUIUtility.IconContent("WaitSpin02").image,
+						EditorGUIUtility.IconContent("WaitSpin03").image,
+						EditorGUIUtility.IconContent("WaitSpin04").image,
+						EditorGUIUtility.IconContent("WaitSpin05").image,
+						EditorGUIUtility.IconContent("WaitSpin06").image,
+						EditorGUIUtility.IconContent("WaitSpin07").image,
+						EditorGUIUtility.IconContent("WaitSpin08").image,
+						EditorGUIUtility.IconContent("WaitSpin09").image,
+						EditorGUIUtility.IconContent("WaitSpin10").image,
+						EditorGUIUtility.IconContent("WaitSpin11").image,
+					};
+				}
+				if (artGameServers == null)
+				{
+					artGameServers =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_gameservers.png", true);
+				}
-			if (loginArts == null)
-			{
-				loginArts = new Texture[] {artLiveOps, artGameServers, artContent, artServerless};
-			}
-			if (iconShadowSoftA == null)
-			{
-				iconShadowSoftA =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/softShadow.png", true);
-			}
-			if (iconLocked == null)
-			{
-				iconLocked = EditorGUIUtility.IconContent("Locked").image;
-			}
+				if (artLiveOps == null)
+				{
+					artLiveOps =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_liveops.png", true);
+				}
+				if (artContent == null)
+				{
+					artContent =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_game_content.png", true);
+				}
-			if (iconLogoHeader == null)
-			{
-				iconLogoHeader =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Login/UI/icon/logo2 L white.png", true);
-			}
-			if (iconBeamableSmall == null)
-			{
-				iconBeamableSmall =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small.png", true);
-			}
-			if (iconBeamableSmallColor == null)
-			{
-				iconBeamableSmallColor =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small_color.png"
-					  , true);
-			}
-			if (iconService == null)
-			{
-				iconService =
-					EditorResources.Load<Texture>(
-						"Packages/com.beamable/Editor/UI/Common/Icons/microservice.png", true);
-			}
-			if (iconStorage == null)
-			{
-				iconStorage =
-					EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/storage.png", true);
-			}
+				if (artServerless == null)
+				{
+					artServerless =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_serverless.png", true);
+				}
-			if (iconHelp == null)
-			{
-				iconHelp = EditorResources.Load<Texture>(
-					"Packages/com.beamable/Editor/UI/Toolbox/Icons/Info_Light.png");
-			}
-			if (iconRefresh == null)
-			{
-				iconRefresh = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Refresh.png");
-			}
-			if (iconSettings == null)
-			{
-				iconSettings = EditorGUIUtility.IconContent("Settings").image;
-			}
+				if (loginArts == null)
+				{
+					loginArts = new Texture[] {artLiveOps, artGameServers, artContent, artServerless};
+				}
-			if (iconFolder == null)
-			{
-				iconFolder = EditorGUIUtility.IconContent("Folder Icon").image;
-			}
+				if (iconShadowSoftA == null)
+				{
+					iconShadowSoftA =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/softShadow.png", true);
+				}
-			if (iconOpenApi == null)
-			{
-				iconOpenApi = EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
-			}
-			if (iconOpenMongoExpress == null)
-			{
-				iconOpenMongoExpress =
-					EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Database_light.png", true);
-			}
+				if (iconLocked == null)
+				{
+					iconLocked = EditorGUIUtility.IconContent("Locked").image;
+				}
-			if (iconOpenProject == null)
-			{
-				iconOpenProject = EditorGUIUtility.FindTexture("cs Script Icon");
-			}
-			if (iconMoreOptions == null)
-			{
-				iconMoreOptions = EditorGUIUtility.IconContent("pane options@2x").image;
-			}
-			if (iconPlay == null)
-			{
-				iconPlay = EditorGUIUtility.FindTexture("PlayButton");
-			}
-			if (iconPlus == null)
-			{
-				iconPlus = EditorGUIUtility.IconContent("d_Toolbar Plus@2x").image;
-			}
+				if (iconLogoHeader == null)
+				{
+					iconLogoHeader =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Login/UI/icon/logo2 L white.png", true);
+				}
-			if (iconCheck == null)
-			{
-				// iconCheck = EditorGUIUtility.IconContent("d_FilterSelectedOnly@2x").image;
-				iconCheck = EditorGUIUtility.IconContent("Toggle Icon").image;
-			}
+				if (iconBeamableSmall == null)
+				{
+					iconBeamableSmall =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small.png", true);
+				}
-			if (iconUpload == null)
-			{
-				iconUpload = EditorGUIUtility.IconContent("Update-Available@2x").image;
-			}
-			if (iconDownload == null)
-			{
-				iconDownload = EditorGUIUtility.IconContent("Download-Available@2x").image;
-			}
+				if (iconBeamableSmallColor == null)
+				{
+					iconBeamableSmallColor =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small_color.png"
+						  , true);
+				}
-			if (iconMenuOptions == null)
-			{
-				iconMenuOptions = EditorGUIUtility.IconContent("d__Menu@2x").image;
-			}
-			if (iconTag == null)
-			{
-				iconTag = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Tag.png");
-			}
+				if (iconService == null)
+				{
+					iconService =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/microservice.png", true);
+				}
-			if (iconType == null)
-			{
-				iconType = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Type.png");
-			}
+				if (iconStorage == null)
+				{
+					iconStorage =
+						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/storage.png", true);
+				}
-			if (iconStatus == null)
-			{
-				iconStatus = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Statuses.png");
-			}
+				if (iconHelp == null)
+				{
+					iconHelp = EditorResources.Load<Texture>(
+						"Packages/com.beamable/Editor/UI/Toolbox/Icons/Info_Light.png");
+				}
-			if (iconDelete == null)
-			{
-				iconDelete = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Delete.png");
-			}
+				if (iconRefresh == null)
+				{
+					iconRefresh =
+						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Refresh.png");
+				}
-			if (iconStatusModified == null)
-			{
-				iconStatusModified = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Modified.png");
-			}
+				if (iconSettings == null)
+				{
+					iconSettings = EditorGUIUtility.IconContent("Settings").image;
+				}
-			if (iconStatusAdded == null)
-			{
-				iconStatusAdded = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Added.png");
-			}
+				if (iconFolder == null)
+				{
+					iconFolder = EditorGUIUtility.IconContent("Folder Icon").image;
+				}
-			if (iconStatusDeleted == null)
-			{
-				iconStatusDeleted = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Deleted.png");
-			}
-			if (iconStatusConflicted == null)
-			{
-				iconStatusConflicted = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconLogs_WarningMsg.png");
-			}
+				if (iconOpenApi == null)
+				{
+					iconOpenApi = EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
+				}
-			if (iconStatusInvalid == null)
-			{
-				iconStatusInvalid = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Invalid.png");
-			}
+				if (iconOpenMongoExpress == null)
+				{
+					iconOpenMongoExpress =
+						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Database_light.png",
+						                              true);
+				}
-			if (iconRotate == null)
-			{
-				iconRotate = EditorGUIUtility.IconContent("RotateTool On@2x").image;
-			}
-			if (iconSync == null)
-			{
-				iconSync = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Sync.png");
-			}
-			if (iconPublish == null)
-			{
-				iconPublish = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Publish.png");
-			}
+				if (iconOpenProject == null)
+				{
+					iconOpenProject = EditorGUIUtility.FindTexture("cs Script Icon");
+				}
-			if (iconRevertAction == null)
-			{
-				iconRevertAction = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconAction_Revert.png");
-			}
+				if (iconMoreOptions == null)
+				{
+					iconMoreOptions = EditorGUIUtility.IconContent("pane options@2x").image;
+				}
-			if (iconContentEditorIcon == null)
-			{
-				iconContentEditorIcon = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ItemFallback.png");
-			}
-			if (iconContentSnapshotWhite == null)
-			{
-				iconContentSnapshotWhite = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconsWhite_ContentSnapshot.png");
+				if (iconPlay == null)
+				{
+					iconPlay = EditorGUIUtility.FindTexture("PlayButton");
+				}
+				if (iconPlus == null)
+				{
+					iconPlus = EditorGUIUtility.IconContent("d_Toolbar Plus@2x").image;
+				}
+				if (iconCheck == null)
+				{
+					// iconCheck = EditorGUIUtility.IconContent("d_FilterSelectedOnly@2x").image;
+					iconCheck = EditorGUIUtility.IconContent("Toggle Icon").image;
+				}
+				if (iconUpload == null)
+				{
+					iconUpload = EditorGUIUtility.IconContent("Update-Available@2x").image;
+				}
+				if (iconDownload == null)
+				{
+					iconDownload = EditorGUIUtility.IconContent("Download-Available@2x").image;
+				}
+				if (iconMenuOptions == null)
+				{
+					iconMenuOptions = EditorGUIUtility.IconContent("d__Menu@2x").image;
+				}
+				if (iconTag == null)
+				{
+					iconTag = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Tag.png");
+				}
+				if (iconType == null)
+				{
+					iconType = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Type.png");
+				}
+				if (iconStatus == null)
+				{
+					iconStatus =
+						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Statuses.png");
+				}
+				if (iconDelete == null)
+				{
+					iconDelete =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Delete.png");
+				}
+				if (iconStatusModified == null)
+				{
+					iconStatusModified =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Modified.png");
+				}
+				if (iconStatusAdded == null)
+				{
+					iconStatusAdded =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Added.png");
+				}
+				if (iconStatusDeleted == null)
+				{
+					iconStatusDeleted =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Deleted.png");
+				}
+				if (iconStatusConflicted == null)
+				{
+					iconStatusConflicted =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconLogs_WarningMsg.png");
+				}
+				if (iconStatusInvalid == null)
+				{
+					iconStatusInvalid =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Invalid.png");
+				}
+				if (iconRotate == null)
+				{
+					iconRotate = EditorGUIUtility.IconContent("RotateTool On@2x").image;
+				}
+				if (iconSync == null)
+				{
+					iconSync = EditorResources.Load<Texture>(
+						"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Sync.png");
+				}
+				if (iconPublish == null)
+				{
+					iconPublish =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Publish.png");
+				}
+				if (iconRevertAction == null)
+				{
+					iconRevertAction =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconAction_Revert.png");
+				}
+				if (iconContentEditorIcon == null)
+				{
+					iconContentEditorIcon =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ItemFallback.png");
+				}
+				if (iconContentSnapshotWhite == null)
+				{
+					iconContentSnapshotWhite =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconsWhite_ContentSnapshot.png");
+				}
+				if (iconContentSnapshotColor == null)
+				{
+					iconContentSnapshotColor =
+						EditorResources.Load<Texture>(
+							"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ContentSnapshot.png");
+				}
 			}
-			if (iconContentSnapshotColor == null)
+			catch (Exception) when (silentError)
 			{
-				iconContentSnapshotColor = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ContentSnapshot.png");
+				// let it go.
 			}
 		}

package/Runtime/Environment/Resources/env-default.json CHANGED Viewed

@@ -5,5 +5,5 @@
     "beamMongoExpressUrl": "https://storage.beamable.com",
     "dockerRegistryUrl": "https://microservices.beamable.com/v2/",
     "isUnityVsp": "false",
-    "sdkVersion": "5.0.0-PREVIEW.RC12"
+    "sdkVersion": "5.0.0-PREVIEW.RC14"
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "com.beamable",
-  "version": "5.0.0-PREVIEW.RC12",
+  "version": "5.0.0-PREVIEW.RC14",
   "displayName": "Beamable",
   "description": "A better way to build games in Unity\n",
   "unity": "2021.3",