UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0-beta' of https://github.com/esotericsoftware/spine-runtimes into 4.0-beta

Browse Source
This commit is contained in:
badlogic 2021-04-02 21:36:04 +02:00
commit 525c8e1837
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-csharp/src/IkConstraint.cs
View File

@ -288,8 +288,7 @@ namespace Spine {
if (cos < -1) { if (cos < -1) {
cos = -1; cos = -1;
a2 = MathUtils.PI * bendDir; a2 = MathUtils.PI * bendDir;
} } else if (cos > 1) {
else if (cos > 1) {
cos = 1; cos = 1;
a2 = 0; a2 = 0;
if (stretch) { if (stretch) {

2
spine-monogame/example/ExampleGame.cs
View File

@ -294,7 +294,7 @@ namespace Spine {
} }
protected override void Draw(GameTime gameTime) { protected override void Draw(GameTime gameTime) {
currentScreen.Render(gameTime.ElapsedGameTime.Milliseconds / 1000.0f); currentScreen.Render((float)(gameTime.ElapsedGameTime.TotalMilliseconds / 1000.0));
} }
} }
} }

11
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs
View File

@ -167,11 +167,14 @@ namespace Spine.Unity {
} }
public static bool IsJsonFile (TextAsset file) { public static bool IsJsonFile (TextAsset file) {
string fileText = file.text; byte[] content = file.bytes;
const int maxCharsToCheck = 256; const int maxCharsToCheck = 256;
int numCharsToCheck = Math.Min(fileText.Length, maxCharsToCheck); int numCharsToCheck = Math.Min(content.Length, maxCharsToCheck);
for (int i = 0; i < numCharsToCheck; ++i) { int i = 0;
char c = fileText[i]; if (content.Length >= 3 && content[0] == 0xEF && content[1] == 0xBB && content[2] == 0xBF) // skip potential BOM
i = 3;
for (; i < numCharsToCheck; ++i) {
char c = (char)content[i];
if (char.IsWhiteSpace(c)) if (char.IsWhiteSpace(c))
continue; continue;
return c == '{'; return c == '{';

2
spine-xna/example/src/ExampleGame.cs
View File

@ -192,7 +192,7 @@ namespace Spine {
protected override void Draw (GameTime gameTime) { protected override void Draw (GameTime gameTime) {
GraphicsDevice.Clear(Color.Black); GraphicsDevice.Clear(Color.Black);
state.Update(gameTime.ElapsedGameTime.Milliseconds / 1000f); state.Update((float)(gameTime.ElapsedGameTime.TotalMilliseconds / 1000.0));
state.Apply(skeleton); state.Apply(skeleton);
skeleton.UpdateWorldTransform(); skeleton.UpdateWorldTransform();
if (skeletonRenderer.Effect is BasicEffect) { if (skeletonRenderer.Effect is BasicEffect) {