Skip to content

Fix bug when Adding Sample to the Scene and Playing quickly #4630

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

Open
VitorBeamable wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix bug when Adding Sample to the Scene and Playing quickly #4630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 6 additions & 55 deletions client/Packages/com.beamable/Editor/LibraryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public class LightbeamSampleInfo

#region COMPUTED PROPERTIES

public LightbeamSampleType SampleType { get; set; }
public Object ExistingPrefabInstance { get; set; }
public Object PrefabObject { get; set; }
public bool HasDocsUrl { get; set; }
Expand Down Expand Up @@ -108,55 +107,28 @@ public void OpenDocumentation(LightbeamSampleInfo lb)

public void OpenSample(LightbeamSampleInfo lb)
{
var needsRefresh = false;
try
{
AssetDatabase.DisallowAutoRefresh();
if (!lb.isLocal)
{
needsRefresh = true;
CopySampleIntoProject(lb);
}
}
finally
{
AssetDatabase.AllowAutoRefresh();
if (needsRefresh)
{
AssetDatabase.Refresh();
}
AssetDatabase.Refresh();

// if the scene has changes, we don't want to just SWITCH.

switch (lb.SampleType)
if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
{
case LightbeamSampleType.SCENE:
if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
{
EditorSceneManager.OpenScene(lb.localCandidateAssetPath, OpenSceneMode.Single);
EditorWindow.GetWindow<SceneView>();
ShowInProject(lb);

if (needsRefresh)
{
EditorUtility.RequestScriptReload();
}
}
EditorSceneManager.OpenScene(lb.localCandidateAssetPath, OpenSceneMode.Single);
EditorWindow.GetWindow<SceneView>();
ShowInProject(lb);
EditorUtility.RequestScriptReload();

break;
case LightbeamSampleType.PREFAB:
if (lb.ExistingPrefabInstance == null)
{
GameObject existing = AssetDatabase.LoadAssetAtPath<GameObject>(lb.localCandidateAssetPath);
lb.PrefabObject = existing;
lb.ExistingPrefabInstance = PrefabUtility.InstantiatePrefab(lb.PrefabObject);
}
EditorGUIUtility.PingObject(lb.ExistingPrefabInstance);

break;
}


}

}
Expand Down Expand Up @@ -282,27 +254,6 @@ void ResetSamples()
lightbeam.localCandidateFolderMetafile = lightbeam.localCandidateFolder + ".meta";

lightbeam.HasDocsUrl = !string.IsNullOrEmpty(lightbeam.docsUrl);

if (lightbeam.relativeMainAssetPath.EndsWith(".unity"))
{
lightbeam.SampleType = LightbeamSampleType.SCENE;
} else if (lightbeam.relativeMainAssetPath.EndsWith(".prefab"))
{
lightbeam.SampleType = LightbeamSampleType.PREFAB;

if (lightbeam.isLocal)
{
GameObject existing = AssetDatabase.LoadAssetAtPath<GameObject>(lightbeam.localCandidateAssetPath);
lightbeam.PrefabObject = existing;
lightbeam.ExistingPrefabInstance =
PrefabUtility.FindAllInstancesOfPrefab(existing)?.FirstOrDefault();

}
}
else
{
Debug.LogError($"Unknown sample type. name=[{lightbeam.name}] assetPath=[{lightbeam.relativeMainAssetPath}]");
}

lightbeams.Add(lightbeam);
}
Expand Down
17 changes: 2 additions & 15 deletions client/Packages/com.beamable/Editor/UI/LibraryWindow/BeamLibraryWindow_Samples.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,21 +266,8 @@ void DrawSample(Rect bounds, LightbeamSampleInfo lightBeam)
{ // draw button

string text = "";
if (lightBeam.SampleType == LightbeamSampleType.SCENE)
{
text = lightBeam.isLocal ? "Open Scene" : "Add Scene";
} else if (lightBeam.SampleType == LightbeamSampleType.PREFAB)
{
// if the prefab is already in the current scene; then the button should say, "Show Prefab"
if (lightBeam.ExistingPrefabInstance == null)
{
text = "Add Prefab";
}
else
{
text = "Select Prefab";
}
}
text = lightBeam.isLocal ? "Open Scene" : "Add Scene";

// var text = "Open Sample";
// if (!lightBeam.isLocal)
// {
Expand Down
Loading