gg.easy.airship 0.1.2130 → 0.1.2131

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 (42) hide show
  1. package/Editor/Packages/AirshipPackagesWindow.cs +1 -1
  2. package/Runtime/Code/Bundles/SystemRoot.cs +12 -0
  3. package/Runtime/Code/Luau/LuauCoreCallbacks.cs +2 -0
  4. package/Runtime/Code/Luau/ReflectionList.cs +1 -0
  5. package/Runtime/Code/LuauAPI/WheelFrictionCurveAPI.cs +9 -0
  6. package/Runtime/Code/LuauAPI/WheelFrictionCurveAPI.cs.meta +3 -0
  7. package/Runtime/Code/MainMenu/MainMenuSceneManager.cs +5 -1
  8. package/Runtime/Code/Network/Simulation/AirshipSimulationManager.cs +6 -0
  9. package/Runtime/Code/Network/StateSystem/AirshipNetworkedStateManager.cs +1 -1
  10. package/Runtime/Code/Player/Character/MovementSystems/Character/CharacterMovement.cs +1 -0
  11. package/Runtime/Code/TSCodeGen/TypeGenerator.cs +1 -0
  12. package/Runtime/Code/VoxelWorld/Editor/VoxelBuilderEditorWindow.cs +4 -2
  13. package/Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs +27 -4
  14. package/Runtime/Code/VoxelWorld/Resources/{VoxelWorldURP.shadergraph → VoxelWorldAtlasURP.shadergraph} +129 -141
  15. package/Runtime/Code/VoxelWorld/Resources/{VoxelWorldURP.mat → VoxelWorldMatURP.mat} +2 -2
  16. package/Runtime/Code/VoxelWorld/TexturePacker.cs +14 -18
  17. package/Runtime/Code/VoxelWorld/VoxelBlockDefinition.cs +1 -1
  18. package/Runtime/Code/VoxelWorld/VoxelBlocks.cs +1 -1
  19. package/Runtime/Code/VoxelWorld/VoxelMeshProcessor.cs +8 -2
  20. package/Runtime/Code/VoxelWorld/VoxelWorld.cs +5 -1
  21. package/Runtime/Code/VoxelWorld/VoxelWorldChunk.cs +9 -3
  22. package/ThirdParty/Graphy - Ultimate Stats Monitor/Editor/GraphyManagerEditor.cs +4 -4
  23. package/ThirdParty/Graphy - Ultimate Stats Monitor/Materials/RAM_Reserved_Graph.mat +12 -67
  24. package/{Runtime/Code/VoxelWorld/Resources/WireFrame.mat → ThirdParty/Graphy - Ultimate Stats Monitor/Materials/Resim_Graph.mat } +21 -50
  25. package/{Runtime/Code/VoxelWorld/Resources/WireFrame.mat.meta → ThirdParty/Graphy - Ultimate Stats Monitor/Materials/Resim_Graph.mat.meta } +1 -1
  26. package/ThirdParty/Graphy - Ultimate Stats Monitor/Prefab/[Graphy].prefab +1669 -78
  27. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Fps/G_FpsGraph.cs +52 -73
  28. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/GraphyDebugger.cs +110 -187
  29. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/GraphyManager.cs +448 -328
  30. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimGraph.cs +188 -0
  31. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimGraph.cs.meta +3 -0
  32. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimManager.cs +226 -0
  33. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimManager.cs.meta +3 -0
  34. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimMonitor.cs +141 -0
  35. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim/G_ResimMonitor.cs.meta +3 -0
  36. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Resim.meta +3 -0
  37. package/ThirdParty/Graphy - Ultimate Stats Monitor/Runtime/Tayx.Graphy.asmdef +4 -1
  38. package/ThirdParty/Mirror/Components/NetworkStatistics.cs +49 -49
  39. package/URP/AirshipURPAsset.asset +3 -3
  40. package/package.json +1 -1
  41. /package/Runtime/Code/VoxelWorld/Resources/{VoxelWorldURP.shadergraph.meta → VoxelWorldAtlasURP.shadergraph.meta} +0 -0
  42. /package/Runtime/Code/VoxelWorld/Resources/{VoxelWorldURP.mat.meta → VoxelWorldMatURP.mat.meta} +0 -0
@@ -395,7 +395,7 @@ namespace Editor.Packages {
395
395
 
396
396
  // Uncomment to just build iOS
397
397
  if (isCoreMaterials) {
398
- // platforms.Clear();
398
+ platforms.Clear();
399
399
  // platforms.Add(AirshipPlatform.iOS);
400
400
  // platforms.Add(AirshipPlatform.Android);
401
401
  platforms.Add(AirshipPlatform.Windows);
@@ -36,6 +36,7 @@ public class SystemRoot : Singleton<SystemRoot> {
36
36
  public static bool startedLoadingExtraBundle = false;
37
37
  public static bool preWarmedCoreShaders = false;
38
38
  public AssetBundle coreMaterialsAssetBundle;
39
+ private bool loadInProgress = false;
39
40
 
40
41
  private void Awake() {
41
42
  DontDestroyOnLoad(this);
@@ -142,12 +143,21 @@ public class SystemRoot : Singleton<SystemRoot> {
142
143
  /// <param name="forceUnloadAll">If false, we attempt to keep packages that are already loaded in place (instead of unloading and re-loading them)</param>
143
144
  /// <returns></returns>
144
145
  public IEnumerator LoadPackages(List<AirshipPackage> packages, bool useUnityAssetBundles, bool forceUnloadAll = true, bool compileLuaOnClient = false, Action<string> onLoadingScreenStep = null) {
146
+ if (this.loadInProgress) {
147
+ Debug.LogWarning("Tried to load packages when load was already in progress. Waiting...");
148
+ while (this.loadInProgress) {
149
+ yield return null;
150
+ }
151
+ }
152
+ this.loadInProgress = true;
153
+
145
154
  #if AIRSHIP_PLAYER
146
155
  print("Packages to load:");
147
156
  for (int i = 0; i < packages.Count; i++) {
148
157
  print($" {i}. {packages[i].id} (Assets v{packages[i].assetVersion}) (Code v{packages[i].codeVersion})");
149
158
  }
150
159
  #endif
160
+
151
161
  //
152
162
  // print("Already loaded asset bundles:");
153
163
  // {
@@ -201,6 +211,7 @@ public class SystemRoot : Singleton<SystemRoot> {
201
211
  }
202
212
  if (zip == null) {
203
213
  Debug.LogError("Zip was null. This is bad.");
214
+ this.loadInProgress = false;
204
215
  yield break;
205
216
  }
206
217
 
@@ -396,6 +407,7 @@ public class SystemRoot : Singleton<SystemRoot> {
396
407
  }
397
408
  }
398
409
 
410
+ this.loadInProgress = false;
399
411
  #if AIRSHIP_PLAYER
400
412
  Debug.Log("[Airship]: Finished loading asset bundles in " + sw.ElapsedMilliseconds + " ms.");
401
413
  #endif
@@ -780,6 +780,8 @@ public partial class LuauCore : MonoBehaviour {
780
780
  return LuauError(thread, "ERROR - " + propName + " get property not found on class " + staticClassName);
781
781
  }
782
782
  else {
783
+ // Not a static class object:
784
+
783
785
  // Profiler.BeginSample("GetRef");
784
786
  System.Object objectReference = ThreadDataManager.GetObjectReference(thread, instanceId);
785
787
  // Profiler.EndSample();
@@ -148,6 +148,7 @@ namespace Luau {
148
148
  [typeof(ScrollRect)] = LuauContextAll,
149
149
  [typeof(Text)] = LuauContextAll,
150
150
  [typeof(RectMask2D)] = LuauContextAll,
151
+ [typeof(WheelFrictionCurve)] = LuauContextAll,
151
152
 
152
153
  // Particles
153
154
  [typeof(ParticleSystem)] = LuauContextAll,
@@ -0,0 +1,9 @@
1
+ using System;
2
+ using UnityEngine;
3
+
4
+ [LuauAPI]
5
+ public class WheelFrictionCurveAPI : BaseLuaAPIClass {
6
+ public override Type GetAPIType() {
7
+ return typeof(WheelFrictionCurve);
8
+ }
9
+ }
@@ -0,0 +1,3 @@
1
+ fileFormatVersion: 2
2
+ guid: c28f2fd5c31d42279623c6877ebbd9cb
3
+ timeCreated: 1746810245
@@ -244,7 +244,11 @@ public class MainMenuSceneManager : MonoBehaviour {
244
244
  // Delete core packages
245
245
  var path = Path.Combine(Application.persistentDataPath, "Packages", "@Easy");
246
246
  if (Directory.Exists(path)) {
247
- Directory.Delete(path, true);
247
+ try {
248
+ Directory.Delete(path, true);
249
+ } catch (Exception e) {
250
+ Debug.LogError(e);
251
+ }
248
252
  }
249
253
 
250
254
  // yield return SceneManager.UnloadSceneAsync("MainMenu");
@@ -2,6 +2,7 @@ using System;
2
2
  using System.Collections.Generic;
3
3
  using System.Linq;
4
4
  using Mirror;
5
+ using Tayx.Graphy.Resim;
5
6
  using UnityEngine;
6
7
  using UnityEngine.Serialization;
7
8
 
@@ -144,6 +145,10 @@ namespace Code.Network.Simulation
144
145
  // and capturing snapshots of the interpolated state on its own timeline.
145
146
  var time = NetworkServer.active ? NetworkTime.time : Time.unscaledTimeAsDouble;
146
147
 
148
+ // Update debug overlay
149
+ var buffer = NetworkClient.bufferTime / Math.Min(Time.timeScale, 1);
150
+ G_ResimMonitor.FrameObserverBuffer = buffer;
151
+
147
152
  if (!isActive) return;
148
153
  if (Physics.simulationMode != SimulationMode.Script) return;
149
154
 
@@ -268,6 +273,7 @@ namespace Code.Network.Simulation
268
273
  private void PerformResimulation(double baseTime)
269
274
  {
270
275
  Debug.Log($"T:{Time.unscaledTimeAsDouble} Resimulating from {baseTime}");
276
+ G_ResimMonitor.FrameResimValue = 100;
271
277
 
272
278
  if (replaying)
273
279
  {
@@ -179,7 +179,7 @@ namespace Code.Network.StateSystem
179
179
  // in poor network conditions.
180
180
  this.serverCommandBufferTargetSize =
181
181
  Math.Min(this.serverCommandBufferMaxSize,
182
- ((int)Math.Ceiling(NetworkClient.sendInterval / Time.fixedDeltaTime)) * 3);
182
+ ((int)Math.Ceiling(NetworkClient.sendInterval / Time.fixedDeltaTime)) * 2);
183
183
  print("Command buffer max size is " + this.serverCommandBufferMaxSize + ". Target size: " + this.serverCommandBufferTargetSize);
184
184
 
185
185
  this.inputHistory = new((int)Math.Ceiling(1f / Time.fixedDeltaTime));
@@ -1197,6 +1197,7 @@ namespace Code.Player.Character.MovementSystems.Character
1197
1197
  }
1198
1198
 
1199
1199
  public void SetMoveInput(Vector3 moveDir, bool jump, bool sprinting, bool crouch, int moveDirModeInt) {
1200
+ moveDir = moveDir.normalized;
1200
1201
  var moveDirMode = (MoveDirectionMode)moveDirModeInt;
1201
1202
  switch (moveDirMode) {
1202
1203
  case MoveDirectionMode.World:
@@ -221,6 +221,7 @@ public class TypeGenerator : MonoBehaviour
221
221
  typeof(QualitySettings),
222
222
  typeof(GraphicsSettings),
223
223
  typeof(UniversalRenderPipelineAsset),
224
+ typeof(WheelFrictionCurve),
224
225
 
225
226
  // Mirror
226
227
  typeof(NetworkServer),
@@ -131,15 +131,17 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
131
131
  //Select this
132
132
  selection.gameObject.SetActive(true);
133
133
  Selection.activeGameObject = selection.gameObject;
134
+ Debug.Log("select.1");
134
135
  }
135
136
 
136
- if (VoxelWorldEditorToolBase.buttonActive == true) {
137
+ if (VoxelWorldEditorToolBase.buttonActive) {
137
138
  //If we're not in selection mode, disable the selection zone
138
139
  selection = world.GetComponentInChildren<SelectionZone>();
139
140
 
140
141
  if (selection) {
141
142
  //Select the world
142
143
  Selection.activeGameObject = world.gameObject;
144
+ Debug.Log("select.2");
143
145
  //disable it
144
146
  selection.gameObject.SetActive(false);
145
147
 
@@ -150,7 +152,7 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
150
152
 
151
153
  //Show a foldable help box
152
154
  EditorGUILayout.HelpBox(
153
- "Left click to add\nShift+click to delete\nCtrl+click for repeat placement\nA to rotate highlighted block",
155
+ "Left click to add\nShift+click to delete\nCtrl+click for repeat placement\nG to rotate highlighted block",
154
156
  MessageType.Info);
155
157
 
156
158
  //active = EditorGUILayout.Toggle("Active", active);
@@ -233,9 +233,6 @@ public class VoxelWorldEditor : UnityEditor.Editor {
233
233
  //Add selection handler
234
234
  Selection.selectionChanged += OnSelectionChanged;
235
235
 
236
- //Add a handler for the gizmo refresh event
237
- SceneView.duringSceneGui += GizmoRefreshEvent;
238
-
239
236
  EditorApplication.update += OnEditorUpdate;
240
237
 
241
238
  //Save handler
@@ -428,6 +425,9 @@ public class VoxelWorldEditor : UnityEditor.Editor {
428
425
  }
429
426
 
430
427
  AirshipEditorGUI.HorizontalLine();
428
+
429
+ EditorGUILayout.LabelField("Quality", EditorStyles.boldLabel);
430
+ world.useSimplifiedVoxels = GUILayout.Toggle(world.useSimplifiedVoxels, new GUIContent("Simplified Voxels", "If enabled quarter blocks will be rendered as default cube voxels."));
431
431
 
432
432
  EditorGUILayout.LabelField("Editing", EditorStyles.boldLabel);
433
433
 
@@ -509,8 +509,14 @@ public class VoxelWorldEditor : UnityEditor.Editor {
509
509
  world.FullWorldUpdate();
510
510
  }
511
511
  }
512
+
513
+ private void OnEnable() {
514
+ SceneView.duringSceneGui += GizmoRefreshEvent;
515
+ }
512
516
 
513
517
  private void OnDisable() {
518
+ SceneView.duringSceneGui -= GizmoRefreshEvent;
519
+
514
520
  CleanupHandles();
515
521
  }
516
522
 
@@ -830,7 +836,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
830
836
  leftShiftDown = false;
831
837
  }
832
838
 
833
- if (currentEvent.keyCode == KeyCode.A) {
839
+ if (currentEvent.keyCode == KeyCode.G) {
834
840
  //Cycle the bits on the selected block
835
841
  if (world.selectedBlockIndex > 0) {
836
842
  var oldVoxel = world.GetVoxelAt(lastPos); // Assuming you have a method to get the voxel value
@@ -847,6 +853,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
847
853
  //newValue = (ushort)VoxelWorld.SetVoxelFlippedBits(newValue, 0x04 );
848
854
  VoxelEditManager.AddEdit(world, lastPos, oldVoxel, newVoxel, "Flip Voxel " + def.definition.name);
849
855
 
856
+ //Need to use a Key that Unity doesn't use so we don't consume it
850
857
  currentEvent.Use();
851
858
  }
852
859
 
@@ -983,6 +990,10 @@ public class VoxelWorldEditorToolBase : EditorTool {
983
990
  buttonActive = true;
984
991
  }
985
992
 
993
+ private void OnDisable() {
994
+ buttonActive = false;
995
+ }
996
+
986
997
  public override void OnWillBeDeactivated() {
987
998
  buttonActive = false;
988
999
  }
@@ -1011,6 +1022,10 @@ public class VoxelWorldSelectionToolBase : EditorTool {
1011
1022
  buttonActive = true;
1012
1023
  }
1013
1024
 
1025
+ private void OnDisable() {
1026
+ buttonActive = false;
1027
+ }
1028
+
1014
1029
  public override void OnWillBeDeactivated() {
1015
1030
  buttonActive = false;
1016
1031
  }
@@ -1038,6 +1053,10 @@ public class VoxelWorldPaintBucketToolBase : EditorTool {
1038
1053
  buttonActive = true;
1039
1054
  }
1040
1055
 
1056
+ private void OnDisable() {
1057
+ buttonActive = false;
1058
+ }
1059
+
1041
1060
  public override void OnWillBeDeactivated() {
1042
1061
  buttonActive = false;
1043
1062
  }
@@ -1065,6 +1084,10 @@ public class VoxelWorldBrushToolBase : EditorTool {
1065
1084
  buttonActive = true;
1066
1085
  }
1067
1086
 
1087
+ private void OnDisable() {
1088
+ buttonActive = false;
1089
+ }
1090
+
1068
1091
  public override void OnWillBeDeactivated() {
1069
1092
  buttonActive = false;
1070
1093
  }
@@ -79,7 +79,7 @@
79
79
  "m_Id": "59b36fa019b1481a9b1701685cdba094"
80
80
  },
81
81
  {
82
- "m_Id": "f2d3bc0abbad4d0080152426908007da"
82
+ "m_Id": "d114b3ab7125443e8184114fe94423e5"
83
83
  }
84
84
  ],
85
85
  "m_GroupDatas": [],
@@ -186,13 +186,13 @@
186
186
  {
187
187
  "m_OutputSlot": {
188
188
  "m_Node": {
189
- "m_Id": "c26bf768215845d482d2d459224c717c"
189
+ "m_Id": "d114b3ab7125443e8184114fe94423e5"
190
190
  },
191
- "m_SlotId": 1
191
+ "m_SlotId": 0
192
192
  },
193
193
  "m_InputSlot": {
194
194
  "m_Node": {
195
- "m_Id": "36785904f64a4a9ebe81be9fb1816270"
195
+ "m_Id": "f809ec6c4cbd4029b542e1e64bcaf808"
196
196
  },
197
197
  "m_SlotId": 0
198
198
  }
@@ -252,20 +252,6 @@
252
252
  },
253
253
  "m_SlotId": 0
254
254
  }
255
- },
256
- {
257
- "m_OutputSlot": {
258
- "m_Node": {
259
- "m_Id": "e19f81b87b77480585a9ab2ef567dd1b"
260
- },
261
- "m_SlotId": 2
262
- },
263
- "m_InputSlot": {
264
- "m_Node": {
265
- "m_Id": "f809ec6c4cbd4029b542e1e64bcaf808"
266
- },
267
- "m_SlotId": 0
268
- }
269
255
  }
270
256
  ],
271
257
  "m_VertexContext": {
@@ -324,6 +310,7 @@
324
310
  "m_OutputNode": {
325
311
  "m_Id": ""
326
312
  },
313
+ "m_SubDatas": [],
327
314
  "m_ActiveTargets": [
328
315
  {
329
316
  "m_Id": "be6203bfb35c4eb7b3b7d74e3e19ec34"
@@ -415,29 +402,6 @@
415
402
  "m_Labels": []
416
403
  }
417
404
 
418
- {
419
- "m_SGVersion": 0,
420
- "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
421
- "m_ObjectId": "1939a5189044409296d5bdb077b50d0f",
422
- "m_Id": 0,
423
- "m_DisplayName": "Out",
424
- "m_SlotType": 1,
425
- "m_Hidden": false,
426
- "m_ShaderOutputName": "Out",
427
- "m_StageCapability": 3,
428
- "m_Value": {
429
- "x": 0.0,
430
- "y": 0.0,
431
- "z": 0.0
432
- },
433
- "m_DefaultValue": {
434
- "x": 0.0,
435
- "y": 0.0,
436
- "z": 0.0
437
- },
438
- "m_Labels": []
439
- }
440
-
441
405
  {
442
406
  "m_SGVersion": 0,
443
407
  "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
@@ -494,7 +458,7 @@
494
458
  "hlslDeclarationOverride": 0,
495
459
  "m_Hidden": false,
496
460
  "m_Value": {
497
- "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
461
+ "m_SerializedTexture": "",
498
462
  "m_Guid": ""
499
463
  },
500
464
  "isMainTexture": false,
@@ -619,6 +583,23 @@
619
583
  "m_Labels": []
620
584
  }
621
585
 
586
+ {
587
+ "m_SGVersion": 0,
588
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
589
+ "m_ObjectId": "350b43a517cb4697bcd38c379f711294",
590
+ "m_Id": 3,
591
+ "m_DisplayName": "Z",
592
+ "m_SlotType": 0,
593
+ "m_Hidden": false,
594
+ "m_ShaderOutputName": "Z",
595
+ "m_StageCapability": 3,
596
+ "m_Value": 1.0,
597
+ "m_DefaultValue": 0.0,
598
+ "m_Labels": [
599
+ "Z"
600
+ ]
601
+ }
602
+
622
603
  {
623
604
  "m_SGVersion": 0,
624
605
  "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -728,19 +709,25 @@
728
709
 
729
710
  {
730
711
  "m_SGVersion": 0,
731
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
732
- "m_ObjectId": "3f97b58561d8401c81cb9ea5f07a4a24",
733
- "m_Id": 2,
734
- "m_DisplayName": "Y",
735
- "m_SlotType": 0,
712
+ "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
713
+ "m_ObjectId": "3d1f0628738649129dc8c9bb7b9ed0b8",
714
+ "m_Id": 0,
715
+ "m_DisplayName": "Out",
716
+ "m_SlotType": 1,
736
717
  "m_Hidden": false,
737
- "m_ShaderOutputName": "Y",
718
+ "m_ShaderOutputName": "Out",
738
719
  "m_StageCapability": 3,
739
- "m_Value": 0.0,
740
- "m_DefaultValue": 0.0,
741
- "m_Labels": [
742
- "Y"
743
- ]
720
+ "m_Value": {
721
+ "x": 0.0,
722
+ "y": 0.0,
723
+ "z": 0.0
724
+ },
725
+ "m_DefaultValue": {
726
+ "x": 0.0,
727
+ "y": 0.0,
728
+ "z": 0.0
729
+ },
730
+ "m_Labels": []
744
731
  }
745
732
 
746
733
  {
@@ -812,7 +799,7 @@
812
799
  "tex2d"
813
800
  ],
814
801
  "m_Precision": 0,
815
- "m_PreviewExpanded": true,
802
+ "m_PreviewExpanded": false,
816
803
  "m_DismissedVersion": 0,
817
804
  "m_PreviewMode": 0,
818
805
  "m_CustomColors": {
@@ -845,7 +832,7 @@
845
832
  "hlslDeclarationOverride": 0,
846
833
  "m_Hidden": false,
847
834
  "m_Value": {
848
- "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
835
+ "m_SerializedTexture": "",
849
836
  "m_Guid": ""
850
837
  },
851
838
  "isMainTexture": false,
@@ -982,21 +969,6 @@
982
969
  }
983
970
  }
984
971
 
985
- {
986
- "m_SGVersion": 0,
987
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
988
- "m_ObjectId": "5b1794c074054a8a8c1d0f72731192e5",
989
- "m_Id": 1,
990
- "m_DisplayName": "X",
991
- "m_SlotType": 0,
992
- "m_Hidden": false,
993
- "m_ShaderOutputName": "X",
994
- "m_StageCapability": 3,
995
- "m_Value": 0.0,
996
- "m_DefaultValue": 0.0,
997
- "m_Labels": []
998
- }
999
-
1000
972
  {
1001
973
  "m_SGVersion": 0,
1002
974
  "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
@@ -1183,6 +1155,21 @@
1183
1155
  "m_Labels": []
1184
1156
  }
1185
1157
 
1158
+ {
1159
+ "m_SGVersion": 0,
1160
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
1161
+ "m_ObjectId": "8067b69847634a1db2394d3f1b6ec1c6",
1162
+ "m_Id": 1,
1163
+ "m_DisplayName": "X",
1164
+ "m_SlotType": 0,
1165
+ "m_Hidden": false,
1166
+ "m_ShaderOutputName": "X",
1167
+ "m_StageCapability": 3,
1168
+ "m_Value": 0.0,
1169
+ "m_DefaultValue": 0.0,
1170
+ "m_Labels": []
1171
+ }
1172
+
1186
1173
  {
1187
1174
  "m_SGVersion": 0,
1188
1175
  "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1368,7 +1355,7 @@
1368
1355
  "m_StageCapability": 3,
1369
1356
  "m_BareResource": false,
1370
1357
  "m_Texture": {
1371
- "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
1358
+ "m_SerializedTexture": "",
1372
1359
  "m_Guid": ""
1373
1360
  },
1374
1361
  "m_DefaultType": 0
@@ -1588,23 +1575,6 @@
1588
1575
  "m_Labels": []
1589
1576
  }
1590
1577
 
1591
- {
1592
- "m_SGVersion": 0,
1593
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
1594
- "m_ObjectId": "b324e1ca06d943d1a52d09341a4e868f",
1595
- "m_Id": 3,
1596
- "m_DisplayName": "Z",
1597
- "m_SlotType": 0,
1598
- "m_Hidden": false,
1599
- "m_ShaderOutputName": "Z",
1600
- "m_StageCapability": 3,
1601
- "m_Value": 1.0,
1602
- "m_DefaultValue": 0.0,
1603
- "m_Labels": [
1604
- "Z"
1605
- ]
1606
- }
1607
-
1608
1578
  {
1609
1579
  "m_SGVersion": 0,
1610
1580
  "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -1733,7 +1703,7 @@
1733
1703
  "m_StageCapability": 3,
1734
1704
  "m_BareResource": false,
1735
1705
  "m_Texture": {
1736
- "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
1706
+ "m_SerializedTexture": "",
1737
1707
  "m_Guid": ""
1738
1708
  },
1739
1709
  "m_DefaultType": 0
@@ -1780,6 +1750,7 @@
1780
1750
  "m_AlphaClip": false,
1781
1751
  "m_CastShadows": true,
1782
1752
  "m_ReceiveShadows": true,
1753
+ "m_DisableTint": false,
1783
1754
  "m_AdditionalMotionVectorMode": 0,
1784
1755
  "m_AlembicMotionVectors": false,
1785
1756
  "m_SupportsLODCrossFade": false,
@@ -1888,6 +1859,58 @@
1888
1859
  "m_Labels": []
1889
1860
  }
1890
1861
 
1862
+ {
1863
+ "m_SGVersion": 0,
1864
+ "m_Type": "UnityEditor.ShaderGraph.Vector3Node",
1865
+ "m_ObjectId": "d114b3ab7125443e8184114fe94423e5",
1866
+ "m_Group": {
1867
+ "m_Id": ""
1868
+ },
1869
+ "m_Name": "Vector 3",
1870
+ "m_DrawState": {
1871
+ "m_Expanded": true,
1872
+ "m_Position": {
1873
+ "serializedVersion": "2",
1874
+ "x": 171.9697265625,
1875
+ "y": 387.46966552734377,
1876
+ "width": 127.5,
1877
+ "height": 125.0
1878
+ }
1879
+ },
1880
+ "m_Slots": [
1881
+ {
1882
+ "m_Id": "8067b69847634a1db2394d3f1b6ec1c6"
1883
+ },
1884
+ {
1885
+ "m_Id": "ed4e223a27474792925dc5d9250022d5"
1886
+ },
1887
+ {
1888
+ "m_Id": "350b43a517cb4697bcd38c379f711294"
1889
+ },
1890
+ {
1891
+ "m_Id": "3d1f0628738649129dc8c9bb7b9ed0b8"
1892
+ }
1893
+ ],
1894
+ "synonyms": [
1895
+ "3",
1896
+ "v3",
1897
+ "vec3",
1898
+ "float3"
1899
+ ],
1900
+ "m_Precision": 0,
1901
+ "m_PreviewExpanded": true,
1902
+ "m_DismissedVersion": 0,
1903
+ "m_PreviewMode": 0,
1904
+ "m_CustomColors": {
1905
+ "m_SerializableColors": []
1906
+ },
1907
+ "m_Value": {
1908
+ "x": 0.0,
1909
+ "y": 0.0,
1910
+ "z": 0.0
1911
+ }
1912
+ }
1913
+
1891
1914
  {
1892
1915
  "m_SGVersion": 0,
1893
1916
  "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2150,6 +2173,23 @@
2150
2173
  "m_Channel": 0
2151
2174
  }
2152
2175
 
2176
+ {
2177
+ "m_SGVersion": 0,
2178
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
2179
+ "m_ObjectId": "ed4e223a27474792925dc5d9250022d5",
2180
+ "m_Id": 2,
2181
+ "m_DisplayName": "Y",
2182
+ "m_SlotType": 0,
2183
+ "m_Hidden": false,
2184
+ "m_ShaderOutputName": "Y",
2185
+ "m_StageCapability": 3,
2186
+ "m_Value": 0.0,
2187
+ "m_DefaultValue": 0.0,
2188
+ "m_Labels": [
2189
+ "Y"
2190
+ ]
2191
+ }
2192
+
2153
2193
  {
2154
2194
  "m_SGVersion": 0,
2155
2195
  "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
@@ -2212,58 +2252,6 @@
2212
2252
  "m_SerializedDescriptor": "SurfaceDescription.Smoothness"
2213
2253
  }
2214
2254
 
2215
- {
2216
- "m_SGVersion": 0,
2217
- "m_Type": "UnityEditor.ShaderGraph.Vector3Node",
2218
- "m_ObjectId": "f2d3bc0abbad4d0080152426908007da",
2219
- "m_Group": {
2220
- "m_Id": ""
2221
- },
2222
- "m_Name": "Vector 3",
2223
- "m_DrawState": {
2224
- "m_Expanded": true,
2225
- "m_Position": {
2226
- "serializedVersion": "2",
2227
- "x": 348.4999694824219,
2228
- "y": 184.49998474121095,
2229
- "width": 127.5,
2230
- "height": 125.00001525878906
2231
- }
2232
- },
2233
- "m_Slots": [
2234
- {
2235
- "m_Id": "5b1794c074054a8a8c1d0f72731192e5"
2236
- },
2237
- {
2238
- "m_Id": "3f97b58561d8401c81cb9ea5f07a4a24"
2239
- },
2240
- {
2241
- "m_Id": "b324e1ca06d943d1a52d09341a4e868f"
2242
- },
2243
- {
2244
- "m_Id": "1939a5189044409296d5bdb077b50d0f"
2245
- }
2246
- ],
2247
- "synonyms": [
2248
- "3",
2249
- "v3",
2250
- "vec3",
2251
- "float3"
2252
- ],
2253
- "m_Precision": 0,
2254
- "m_PreviewExpanded": true,
2255
- "m_DismissedVersion": 0,
2256
- "m_PreviewMode": 0,
2257
- "m_CustomColors": {
2258
- "m_SerializableColors": []
2259
- },
2260
- "m_Value": {
2261
- "x": 0.0,
2262
- "y": 0.0,
2263
- "z": 0.0
2264
- }
2265
- }
2266
-
2267
2255
  {
2268
2256
  "m_SGVersion": 0,
2269
2257
  "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",