com.beamable 5.0.0-PREVIEW.RC11 → 5.0.0-PREVIEW.RC13

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
  1. package/.attestation.p7m +0 -0
  2. package/Editor/Toolbar/BeamableToolbarExtender.cs +1 -1
  3. package/Editor/UI/BeamGUI/BeamGUI_Icons.cs +277 -228
  4. package/Runtime/Environment/Resources/env-default.json +1 -1
  5. package/package.json +1 -1
package/.attestation.p7m CHANGED
Binary file
package/Editor/Toolbar/BeamableToolbarExtender.cs CHANGED
@@ -35,7 +35,7 @@ namespace Beamable.Editor.ToolbarExtender
35
35
  BeamableToolbarCallbacks.m_toolbarType.GetMethod("RepaintToolbar", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static).Invoke(null, null);
36
36
  };
37
37
 
38
- BeamGUI.LoadAllIcons();
38
+ BeamGUI.LoadNonConfigurableIcons(silentError: true);
39
39
 
40
40
  BeamableToolbarCallbacks.OnToolbarGUI = OnGUI;
41
41
 
package/Editor/UI/BeamGUI/BeamGUI_Icons.cs CHANGED
@@ -1,3 +1,4 @@
1
+ using System;
1
2
  using System.Linq;
2
3
  using Beamable.Common.Content;
3
4
  using Beamable.Content;
@@ -65,266 +66,314 @@ namespace Beamable.Editor.Util
65
66
  return unitySpinnerTextures[spinnerIndex];
66
67
  }
67
68
 
68
- public static void LoadAllIcons()
69
+ public static void LoadNonConfigurableIcons(bool silentError=false)
69
70
  {
70
- var reflectionCache = Beam.GetReflectionSystem<ContentTypeReflectionCache>();
71
- var allTypes = reflectionCache.GetAll().ToList();
72
- if (ContentConfiguration.Instance.ContentTextureConfiguration == null || ContentConfiguration.Instance.ContentTextureConfiguration?.TextureConfigurations?.Count != allTypes.Count)
73
- {
74
- ContentConfiguration.Instance.ContentTextureConfiguration = new ContentTextureConfiguration(allTypes);
75
- }
76
-
77
-
78
- if (unitySpinnerTextures == null)
79
- {
80
- unitySpinnerTextures = new Texture[]
81
- {
82
- EditorGUIUtility.IconContent("WaitSpin00").image,
83
- EditorGUIUtility.IconContent("WaitSpin01").image,
84
- EditorGUIUtility.IconContent("WaitSpin02").image,
85
- EditorGUIUtility.IconContent("WaitSpin03").image,
86
- EditorGUIUtility.IconContent("WaitSpin04").image,
87
- EditorGUIUtility.IconContent("WaitSpin05").image,
88
- EditorGUIUtility.IconContent("WaitSpin06").image,
89
- EditorGUIUtility.IconContent("WaitSpin07").image,
90
- EditorGUIUtility.IconContent("WaitSpin08").image,
91
- EditorGUIUtility.IconContent("WaitSpin09").image,
92
- EditorGUIUtility.IconContent("WaitSpin10").image,
93
- EditorGUIUtility.IconContent("WaitSpin11").image,
94
- };
95
- }
96
-
97
-
98
- if (artGameServers == null)
99
- {
100
- artGameServers =
101
- EditorResources.Load<Texture>(
102
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_gameservers.png", true);
103
- }
104
- if (artLiveOps == null)
71
+ try
105
72
  {
106
- artLiveOps =
107
- EditorResources.Load<Texture>(
108
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_liveops.png", true);
109
- }
110
- if (artContent == null)
111
- {
112
- artContent =
113
- EditorResources.Load<Texture>(
114
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_game_content.png", true);
115
- }
116
- if (artServerless == null)
117
- {
118
- artServerless =
119
- EditorResources.Load<Texture>(
120
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_serverless.png", true);
121
- }
73
+ if (unitySpinnerTextures == null)
74
+ {
75
+ unitySpinnerTextures = new Texture[]
76
+ {
77
+ EditorGUIUtility.IconContent("WaitSpin00").image,
78
+ EditorGUIUtility.IconContent("WaitSpin01").image,
79
+ EditorGUIUtility.IconContent("WaitSpin02").image,
80
+ EditorGUIUtility.IconContent("WaitSpin03").image,
81
+ EditorGUIUtility.IconContent("WaitSpin04").image,
82
+ EditorGUIUtility.IconContent("WaitSpin05").image,
83
+ EditorGUIUtility.IconContent("WaitSpin06").image,
84
+ EditorGUIUtility.IconContent("WaitSpin07").image,
85
+ EditorGUIUtility.IconContent("WaitSpin08").image,
86
+ EditorGUIUtility.IconContent("WaitSpin09").image,
87
+ EditorGUIUtility.IconContent("WaitSpin10").image,
88
+ EditorGUIUtility.IconContent("WaitSpin11").image,
89
+ };
90
+ }
122
91
 
123
- if (loginArts == null)
124
- {
125
- loginArts = new Texture[] {artLiveOps, artGameServers, artContent, artServerless};
126
- }
127
-
128
-
129
- if (iconShadowSoftA == null)
130
- {
131
- iconShadowSoftA =
132
- EditorResources.Load<Texture>(
133
- "Packages/com.beamable/Editor/UI/Common/Icons/softShadow.png", true);
134
- }
135
-
136
-
137
- if (iconLocked == null)
138
- {
139
- iconLocked = EditorGUIUtility.IconContent("Locked").image;
140
- }
141
92
 
93
+ if (artGameServers == null)
94
+ {
95
+ artGameServers =
96
+ EditorResources.Load<Texture>(
97
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_gameservers.png", true);
98
+ }
142
99
 
143
- if (iconLogoHeader == null)
144
- {
145
- iconLogoHeader =
146
- EditorResources.Load<Texture>(
147
- "Packages/com.beamable/Editor/UI/Login/UI/icon/logo2 L white.png", true);
148
- }
149
- if (iconBeamableSmall == null)
150
- {
151
- iconBeamableSmall =
152
- EditorResources.Load<Texture>(
153
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small.png", true);
154
- }
155
- if (iconBeamableSmallColor == null)
156
- {
157
- iconBeamableSmallColor =
158
- EditorResources.Load<Texture>(
159
- "Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small_color.png"
160
- , true);
161
- }
162
-
163
-
164
- if (iconService == null)
165
- {
166
- iconService =
167
- EditorResources.Load<Texture>(
168
- "Packages/com.beamable/Editor/UI/Common/Icons/microservice.png", true);
169
- }
170
-
171
- if (iconStorage == null)
172
- {
173
- iconStorage =
174
- EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/storage.png", true);
175
- }
100
+ if (artLiveOps == null)
101
+ {
102
+ artLiveOps =
103
+ EditorResources.Load<Texture>(
104
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_liveops.png", true);
105
+ }
176
106
 
177
- if (iconHelp == null)
178
- {
179
- iconHelp = EditorResources.Load<Texture>(
180
- "Packages/com.beamable/Editor/UI/Toolbox/Icons/Info_Light.png");
181
- }
182
-
183
- if (iconRefresh == null)
184
- {
185
- iconRefresh = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Refresh.png");
186
- }
187
-
188
- if (iconSettings == null)
189
- {
190
- iconSettings = EditorGUIUtility.IconContent("Settings").image;
191
- }
107
+ if (artContent == null)
108
+ {
109
+ artContent =
110
+ EditorResources.Load<Texture>(
111
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_game_content.png", true);
112
+ }
192
113
 
193
- if (iconFolder == null)
194
- {
195
- iconFolder = EditorGUIUtility.IconContent("Folder Icon").image;
196
- }
114
+ if (artServerless == null)
115
+ {
116
+ artServerless =
117
+ EditorResources.Load<Texture>(
118
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_art_serverless.png", true);
119
+ }
197
120
 
121
+ if (loginArts == null)
122
+ {
123
+ loginArts = new Texture[] {artLiveOps, artGameServers, artContent, artServerless};
124
+ }
198
125
 
199
- if (iconOpenApi == null)
200
- {
201
- iconOpenApi = EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
202
- }
203
126
 
204
- if (iconOpenMongoExpress == null)
205
- {
206
- iconOpenMongoExpress =
207
- EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Database_light.png", true);
208
- }
127
+ if (iconShadowSoftA == null)
128
+ {
129
+ iconShadowSoftA =
130
+ EditorResources.Load<Texture>(
131
+ "Packages/com.beamable/Editor/UI/Common/Icons/softShadow.png", true);
132
+ }
209
133
 
210
- if (iconOpenProject == null)
211
- {
212
- iconOpenProject = EditorGUIUtility.FindTexture("cs Script Icon");
213
- }
214
- if (iconMoreOptions == null)
215
- {
216
- iconMoreOptions = EditorGUIUtility.IconContent("pane options@2x").image;
217
- }
218
- if (iconPlay == null)
219
- {
220
- iconPlay = EditorGUIUtility.FindTexture("PlayButton");
221
- }
222
134
 
223
- if (iconPlus == null)
224
- {
225
- iconPlus = EditorGUIUtility.IconContent("d_Toolbar Plus@2x").image;
226
- }
135
+ if (iconLocked == null)
136
+ {
137
+ iconLocked = EditorGUIUtility.IconContent("Locked").image;
138
+ }
227
139
 
228
- if (iconCheck == null)
229
- {
230
- // iconCheck = EditorGUIUtility.IconContent("d_FilterSelectedOnly@2x").image;
231
- iconCheck = EditorGUIUtility.IconContent("Toggle Icon").image;
232
- }
233
140
 
234
- if (iconUpload == null)
235
- {
236
- iconUpload = EditorGUIUtility.IconContent("Update-Available@2x").image;
237
- }
238
-
239
- if (iconDownload == null)
240
- {
241
- iconDownload = EditorGUIUtility.IconContent("Download-Available@2x").image;
242
- }
141
+ if (iconLogoHeader == null)
142
+ {
143
+ iconLogoHeader =
144
+ EditorResources.Load<Texture>(
145
+ "Packages/com.beamable/Editor/UI/Login/UI/icon/logo2 L white.png", true);
146
+ }
243
147
 
244
- if (iconMenuOptions == null)
245
- {
246
- iconMenuOptions = EditorGUIUtility.IconContent("d__Menu@2x").image;
247
- }
148
+ if (iconBeamableSmall == null)
149
+ {
150
+ iconBeamableSmall =
151
+ EditorResources.Load<Texture>(
152
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small.png", true);
153
+ }
248
154
 
249
- if (iconTag == null)
250
- {
251
- iconTag = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Tag.png");
252
- }
155
+ if (iconBeamableSmallColor == null)
156
+ {
157
+ iconBeamableSmallColor =
158
+ EditorResources.Load<Texture>(
159
+ "Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small_color.png"
160
+ , true);
161
+ }
253
162
 
254
- if (iconType == null)
255
- {
256
- iconType = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Type.png");
257
- }
258
163
 
259
- if (iconStatus == null)
260
- {
261
- iconStatus = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Statuses.png");
262
- }
164
+ if (iconService == null)
165
+ {
166
+ iconService =
167
+ EditorResources.Load<Texture>(
168
+ "Packages/com.beamable/Editor/UI/Common/Icons/microservice.png", true);
169
+ }
263
170
 
264
- if (iconDelete == null)
265
- {
266
- iconDelete = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Delete.png");
267
- }
171
+ if (iconStorage == null)
172
+ {
173
+ iconStorage =
174
+ EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/storage.png", true);
175
+ }
268
176
 
269
- if (iconStatusModified == null)
270
- {
271
- iconStatusModified = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Modified.png");
272
- }
177
+ if (iconHelp == null)
178
+ {
179
+ iconHelp = EditorResources.Load<Texture>(
180
+ "Packages/com.beamable/Editor/UI/Toolbox/Icons/Info_Light.png");
181
+ }
273
182
 
274
- if (iconStatusAdded == null)
275
- {
276
- iconStatusAdded = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Added.png");
277
- }
183
+ if (iconRefresh == null)
184
+ {
185
+ iconRefresh =
186
+ EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Refresh.png");
187
+ }
278
188
 
279
- if (iconStatusDeleted == null)
280
- {
281
- iconStatusDeleted = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Deleted.png");
282
- }
189
+ if (iconSettings == null)
190
+ {
191
+ iconSettings = EditorGUIUtility.IconContent("Settings").image;
192
+ }
283
193
 
284
- if (iconStatusConflicted == null)
285
- {
286
- iconStatusConflicted = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconLogs_WarningMsg.png");
287
- }
194
+ if (iconFolder == null)
195
+ {
196
+ iconFolder = EditorGUIUtility.IconContent("Folder Icon").image;
197
+ }
288
198
 
289
- if (iconStatusInvalid == null)
290
- {
291
- iconStatusInvalid = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Invalid.png");
292
- }
293
199
 
294
- if (iconRotate == null)
295
- {
296
- iconRotate = EditorGUIUtility.IconContent("RotateTool On@2x").image;
297
- }
298
-
299
- if (iconSync == null)
300
- {
301
- iconSync = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Sync.png");
302
- }
303
-
304
- if (iconPublish == null)
305
- {
306
- iconPublish = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Publish.png");
307
- }
200
+ if (iconOpenApi == null)
201
+ {
202
+ iconOpenApi = EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
203
+ }
308
204
 
309
- if (iconRevertAction == null)
310
- {
311
- iconRevertAction = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconAction_Revert.png");
312
- }
205
+ if (iconOpenMongoExpress == null)
206
+ {
207
+ iconOpenMongoExpress =
208
+ EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Database_light.png",
209
+ true);
210
+ }
313
211
 
314
- if (iconContentEditorIcon == null)
315
- {
316
- iconContentEditorIcon = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ItemFallback.png");
212
+ if (iconOpenProject == null)
213
+ {
214
+ iconOpenProject = EditorGUIUtility.FindTexture("cs Script Icon");
215
+ }
216
+
217
+ if (iconMoreOptions == null)
218
+ {
219
+ iconMoreOptions = EditorGUIUtility.IconContent("pane options@2x").image;
220
+ }
221
+
222
+ if (iconPlay == null)
223
+ {
224
+ iconPlay = EditorGUIUtility.FindTexture("PlayButton");
225
+ }
226
+
227
+ if (iconPlus == null)
228
+ {
229
+ iconPlus = EditorGUIUtility.IconContent("d_Toolbar Plus@2x").image;
230
+ }
231
+
232
+ if (iconCheck == null)
233
+ {
234
+ // iconCheck = EditorGUIUtility.IconContent("d_FilterSelectedOnly@2x").image;
235
+ iconCheck = EditorGUIUtility.IconContent("Toggle Icon").image;
236
+ }
237
+
238
+ if (iconUpload == null)
239
+ {
240
+ iconUpload = EditorGUIUtility.IconContent("Update-Available@2x").image;
241
+ }
242
+
243
+ if (iconDownload == null)
244
+ {
245
+ iconDownload = EditorGUIUtility.IconContent("Download-Available@2x").image;
246
+ }
247
+
248
+ if (iconMenuOptions == null)
249
+ {
250
+ iconMenuOptions = EditorGUIUtility.IconContent("d__Menu@2x").image;
251
+ }
252
+
253
+ if (iconTag == null)
254
+ {
255
+ iconTag = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Tag.png");
256
+ }
257
+
258
+ if (iconType == null)
259
+ {
260
+ iconType = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Type.png");
261
+ }
262
+
263
+ if (iconStatus == null)
264
+ {
265
+ iconStatus =
266
+ EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Statuses.png");
267
+ }
268
+
269
+ if (iconDelete == null)
270
+ {
271
+ iconDelete =
272
+ EditorResources.Load<Texture>(
273
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Delete.png");
274
+ }
275
+
276
+ if (iconStatusModified == null)
277
+ {
278
+ iconStatusModified =
279
+ EditorResources.Load<Texture>(
280
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Modified.png");
281
+ }
282
+
283
+ if (iconStatusAdded == null)
284
+ {
285
+ iconStatusAdded =
286
+ EditorResources.Load<Texture>(
287
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Added.png");
288
+ }
289
+
290
+ if (iconStatusDeleted == null)
291
+ {
292
+ iconStatusDeleted =
293
+ EditorResources.Load<Texture>(
294
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Deleted.png");
295
+ }
296
+
297
+ if (iconStatusConflicted == null)
298
+ {
299
+ iconStatusConflicted =
300
+ EditorResources.Load<Texture>(
301
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconLogs_WarningMsg.png");
302
+ }
303
+
304
+ if (iconStatusInvalid == null)
305
+ {
306
+ iconStatusInvalid =
307
+ EditorResources.Load<Texture>(
308
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Invalid.png");
309
+ }
310
+
311
+ if (iconRotate == null)
312
+ {
313
+ iconRotate = EditorGUIUtility.IconContent("RotateTool On@2x").image;
314
+ }
315
+
316
+ if (iconSync == null)
317
+ {
318
+ iconSync = EditorResources.Load<Texture>(
319
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Sync.png");
320
+ }
321
+
322
+ if (iconPublish == null)
323
+ {
324
+ iconPublish =
325
+ EditorResources.Load<Texture>(
326
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Publish.png");
327
+ }
328
+
329
+ if (iconRevertAction == null)
330
+ {
331
+ iconRevertAction =
332
+ EditorResources.Load<Texture>(
333
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconAction_Revert.png");
334
+ }
335
+
336
+ if (iconContentEditorIcon == null)
337
+ {
338
+ iconContentEditorIcon =
339
+ EditorResources.Load<Texture>(
340
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ItemFallback.png");
341
+ }
342
+
343
+ if (iconContentSnapshotWhite == null)
344
+ {
345
+ iconContentSnapshotWhite =
346
+ EditorResources.Load<Texture>(
347
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconsWhite_ContentSnapshot.png");
348
+ }
349
+
350
+ if (iconContentSnapshotColor == null)
351
+ {
352
+ iconContentSnapshotColor =
353
+ EditorResources.Load<Texture>(
354
+ "Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ContentSnapshot.png");
355
+ }
317
356
  }
318
-
319
- if (iconContentSnapshotWhite == null)
357
+ catch (Exception) when (silentError)
320
358
  {
321
- iconContentSnapshotWhite = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconsWhite_ContentSnapshot.png");
359
+ // let it go.
322
360
  }
323
-
324
- if (iconContentSnapshotColor == null)
361
+ }
362
+
363
+ public static void LoadConfigurableIcons()
364
+ {
365
+ var reflectionCache = Beam.GetReflectionSystem<ContentTypeReflectionCache>();
366
+ var allTypes = reflectionCache.GetAll().ToList();
367
+ if (ContentConfiguration.Instance.ContentTextureConfiguration == null || ContentConfiguration.Instance.ContentTextureConfiguration?.TextureConfigurations?.Count != allTypes.Count)
325
368
  {
326
- iconContentSnapshotColor = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ContentSnapshot.png");
369
+ ContentConfiguration.Instance.ContentTextureConfiguration = new ContentTextureConfiguration(allTypes);
327
370
  }
328
371
  }
372
+
373
+ public static void LoadAllIcons()
374
+ {
375
+ LoadConfigurableIcons();
376
+ LoadNonConfigurableIcons();
377
+ }
329
378
  }
330
379
  }
package/Runtime/Environment/Resources/env-default.json CHANGED
@@ -5,5 +5,5 @@
5
5
  "beamMongoExpressUrl": "https://storage.beamable.com",
6
6
  "dockerRegistryUrl": "https://microservices.beamable.com/v2/",
7
7
  "isUnityVsp": "false",
8
- "sdkVersion": "5.0.0-PREVIEW.RC11"
8
+ "sdkVersion": "5.0.0-PREVIEW.RC13"
9
9
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "com.beamable",
3
- "version": "5.0.0-PREVIEW.RC11",
3
+ "version": "5.0.0-PREVIEW.RC13",
4
4
  "displayName": "Beamable",
5
5
  "description": "A better way to build games in Unity\n",
6
6
  "unity": "2021.3",