Skip to content
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.

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

Dev #98

Merged
merged 14 commits into from
Jan 15, 2025
Merged

Dev #98

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Samples.meta is auto created if Samples~ becomes Samples
Samples.meta
193 changes: 193 additions & 0 deletions Editor/Scripts/VisualScripting/VsStubsAllowed.cs

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Runtime/Scripts/Legacy.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Runtime/Scripts/Legacy/WorldCanvas.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class WorldCanvas : MonoBehaviour
{
void Start()
{
var canvas = GetComponent<Canvas>();
if (canvas != null)
{
canvas.renderMode = RenderMode.WorldSpace;
canvas.worldCamera = Camera.main;
}
}

}
11 changes: 11 additions & 0 deletions Runtime/Scripts/Legacy/WorldCanvas.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Runtime/Scripts/Scene/Components/BanterGLTF.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public class BanterGLTF : BanterComponentBase
[See(initial = "false")] public bool legacyRotate;
bool loadStarted;

public bool ModelLoaded { get; private set; }

public override void StartStuff()
{
LogLine.Do("Warning: Using BanterGLTF is not recommended for production use. It is slow and not optimized.");
Expand All @@ -64,6 +66,7 @@ async void SetupGLTF()
return;
}
loadStarted = true;
ModelLoaded = false;
try
{
Importer.ImportGLBAsync(await Get.Bytes(url), new ImportSettings(), (go, animations) =>
Expand Down Expand Up @@ -144,12 +147,14 @@ async void SetupGLTF()
}
}
SetLoadedIfNot();
ModelLoaded = true;
loadStarted = false;
}
catch (Exception e)
{
SetLoadedIfNot(false, e.Message + " - " + url);
Destroy(go);
ModelLoaded = false;
loadStarted = false;
}
});
Expand All @@ -158,6 +163,7 @@ async void SetupGLTF()
{
Debug.LogError(e + " " + url);
SetLoadedIfNot(false, e.Message);
ModelLoaded = false;
loadStarted = false;
}
}
Expand Down
16 changes: 3 additions & 13 deletions Samples~/FlexaWorld/Assets/Ball/TestBall.FBX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugBlack.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugBlue.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugGreen.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugLeft.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugRed.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugRight.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugTRGreen.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugTRPink.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugTRRed.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugWhite.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples~/FlexaWorld/Assets/Debug/DebugYellow.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 46 additions & 4 deletions Samples~/FlexaWorld/Assets/Debug/LocoBall/LocoBall.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading