UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-05-24 16:37:15 +02:00
commit f26b12821e
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -1202,6 +1202,7 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
data->offsetScaleY = Json_getFloat(constraintMap, "scaleY", 0); data->offsetScaleY = Json_getFloat(constraintMap, "scaleY", 0);
data->offsetShearY = Json_getFloat(constraintMap, "shearY", 0); data->offsetShearY = Json_getFloat(constraintMap, "shearY", 0);
data->mixRotate = Json_getFloat(constraintMap, "mixRotate", 1);
data->mixX = Json_getFloat(constraintMap, "mixX", 1); data->mixX = Json_getFloat(constraintMap, "mixX", 1);
data->mixY = Json_getFloat(constraintMap, "mixY", data->mixX); data->mixY = Json_getFloat(constraintMap, "mixY", data->mixX);
data->mixScaleX = Json_getFloat(constraintMap, "mixScaleX", 1); data->mixScaleX = Json_getFloat(constraintMap, "mixScaleX", 1);

6
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
View File

@ -627,6 +627,8 @@ namespace Spine.Unity.Editor {
material = defaultShader != null ? new Material(defaultShader) : null; material = defaultShader != null ? new Material(defaultShader) : null;
if (material) { if (material) {
ApplyPMAOrStraightAlphaSettings(material, SpineEditorUtilities.Preferences.textureSettingsReference); ApplyPMAOrStraightAlphaSettings(material, SpineEditorUtilities.Preferences.textureSettingsReference);
if (texture != null)
material.mainTexture = texture;
AssetDatabase.CreateAsset(material, materialPath); AssetDatabase.CreateAsset(material, materialPath);
} }
} else { } else {
@ -634,10 +636,8 @@ namespace Spine.Unity.Editor {
} }
if (material != null) { if (material != null) {
if (texture != null) { if (texture != null)
material.mainTexture = texture; material.mainTexture = texture;
}
EditorUtility.SetDirty(material); EditorUtility.SetDirty(material);
// note: don't call AssetDatabase.SaveAssets() since this would trigger OnPostprocessAllAssets() every time unnecessarily. // note: don't call AssetDatabase.SaveAssets() since this would trigger OnPostprocessAllAssets() every time unnecessarily.
populatingMaterials.Add(material); //atlasAsset.materials[i] = mat; populatingMaterials.Add(material); //atlasAsset.materials[i] = mat;

2
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Asset.asset
View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: Demo 2D URP Asset m_Name: Example 2D URP Asset
m_EditorClassIdentifier: m_EditorClassIdentifier:
k_AssetVersion: 5 k_AssetVersion: 5
k_AssetPreviousVersion: 5 k_AssetPreviousVersion: 5

2
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Renderer Data.asset
View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3}
m_Name: Demo 2D URP Renderer Data m_Name: Example 2D URP Renderer Data
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_RendererFeatures: [] m_RendererFeatures: []
m_HDREmulationScale: 1 m_HDREmulationScale: 1

2
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset.asset
View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: Demo URP Asset m_Name: Example URP Asset
m_EditorClassIdentifier: m_EditorClassIdentifier:
k_AssetVersion: 5 k_AssetVersion: 5
k_AssetPreviousVersion: 5 k_AssetPreviousVersion: 5

2
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset_Renderer.asset
View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: Demo URP Asset_Renderer m_Name: Example URP Asset_Renderer
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_RendererFeatures: [] m_RendererFeatures: []
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}