diff --git a/spine-ue4/Content/Maps/example.umap b/spine-ue4/Content/Maps/example.umap index 5387dd347..b3fb3051d 100644 Binary files a/spine-ue4/Content/Maps/example.umap and b/spine-ue4/Content/Maps/example.umap differ diff --git a/spine-ue4/Content/Raptor/Raptor_Blueprint.uasset b/spine-ue4/Content/Raptor/Raptor_Blueprint.uasset new file mode 100644 index 000000000..6fff15b01 Binary files /dev/null and b/spine-ue4/Content/Raptor/Raptor_Blueprint.uasset differ diff --git a/spine-ue4/Content/SpineBoy/Spineboy_Blueprint.uasset b/spine-ue4/Content/SpineBoy/Spineboy_Blueprint.uasset index fd266eb7c..fbf7c5231 100644 Binary files a/spine-ue4/Content/SpineBoy/Spineboy_Blueprint.uasset and b/spine-ue4/Content/SpineBoy/Spineboy_Blueprint.uasset differ diff --git a/spine-ue4/Content/Test/Textures/skeleton.uasset b/spine-ue4/Content/Test/Textures/skeleton.uasset deleted file mode 100644 index d333cef68..000000000 Binary files a/spine-ue4/Content/Test/Textures/skeleton.uasset and /dev/null differ diff --git a/spine-ue4/Content/Test/Textures/skeleton2.uasset b/spine-ue4/Content/Test/Textures/skeleton2.uasset deleted file mode 100644 index 358849494..000000000 Binary files a/spine-ue4/Content/Test/Textures/skeleton2.uasset and /dev/null differ diff --git a/spine-ue4/Content/Test/images/head.png b/spine-ue4/Content/Test/images/head.png deleted file mode 100644 index cfeb4493f..000000000 Binary files a/spine-ue4/Content/Test/images/head.png and /dev/null differ diff --git a/spine-ue4/Content/Test/images/head.uasset b/spine-ue4/Content/Test/images/head.uasset deleted file mode 100644 index 8f2e48dc1..000000000 Binary files a/spine-ue4/Content/Test/images/head.uasset and /dev/null differ diff --git a/spine-ue4/Content/Test/images/hoverboard_board.png b/spine-ue4/Content/Test/images/hoverboard_board.png deleted file mode 100644 index dd80dbdd9..000000000 Binary files a/spine-ue4/Content/Test/images/hoverboard_board.png and /dev/null differ diff --git a/spine-ue4/Content/Test/images/hoverboard_board.uasset b/spine-ue4/Content/Test/images/hoverboard_board.uasset deleted file mode 100644 index fcb157dfb..000000000 Binary files a/spine-ue4/Content/Test/images/hoverboard_board.uasset and /dev/null differ diff --git a/spine-ue4/Content/Test/skeleton.atlas b/spine-ue4/Content/Test/skeleton.atlas deleted file mode 100644 index 0adfd33de..000000000 --- a/spine-ue4/Content/Test/skeleton.atlas +++ /dev/null @@ -1,26 +0,0 @@ - -skeleton.png -size: 275,302 -format: RGBA8888 -filter: Linear,Linear -repeat: none -head - rotate: false - xy: 2, 2 - size: 271, 298 - orig: 271, 298 - offset: 0, 0 - index: -1 - -skeleton2.png -size: 496,156 -format: RGBA8888 -filter: Linear,Linear -repeat: none -hoverboard_board - rotate: false - xy: 2, 2 - size: 492, 152 - orig: 492, 152 - offset: 0, 0 - index: -1 diff --git a/spine-ue4/Content/Test/skeleton.json b/spine-ue4/Content/Test/skeleton.json deleted file mode 100644 index a341a4cad..000000000 --- a/spine-ue4/Content/Test/skeleton.json +++ /dev/null @@ -1,40 +0,0 @@ -{ -"skeleton": { "hash": "MTiZgk2LS7dpxtEZykSk3BMgpHM", "spine": "3.5.43", "width": 821.13, "height": 902.82, "images": "./images/" }, -"bones": [ - { "name": "root" }, - { "name": "bone", "parent": "root", "x": -155.24, "y": 59.79 }, - { "name": "bone2", "parent": "root", "x": 231.1, "y": 40.28 }, - { "name": "bone3", "parent": "root", "x": 243.36, "y": -301.04 }, - { "name": "bone4", "parent": "root", "x": -170.12, "y": -308.37 }, - { "name": "bone5", "parent": "root", "x": -196.27, "y": -618.03 } -], -"slots": [ - { "name": "head", "bone": "bone", "attachment": "head" }, - { "name": "head2", "bone": "bone2", "attachment": "head", "blend": "additive" }, - { "name": "head3", "bone": "bone3", "attachment": "head", "blend": "screen" }, - { "name": "head4", "bone": "bone4", "attachment": "head", "blend": "multiply" }, - { "name": "hoverboard_board", "bone": "bone5", "attachment": "hoverboard_board" } -], -"skins": { - "default": { - "head": { - "head": { "width": 271, "height": 298 } - }, - "head2": { - "head": { "y": 1.27, "width": 271, "height": 298 } - }, - "head3": { - "head": { "width": 271, "height": 298 } - }, - "head4": { - "head": { "y": -0.86, "width": 271, "height": 298 } - }, - "hoverboard_board": { - "hoverboard_board": { "width": 492, "height": 152 } - } - } -}, -"animations": { - "animation": {} -} -} \ No newline at end of file diff --git a/spine-ue4/Content/Test/skeleton.png b/spine-ue4/Content/Test/skeleton.png deleted file mode 100644 index cd2f9feb3..000000000 Binary files a/spine-ue4/Content/Test/skeleton.png and /dev/null differ diff --git a/spine-ue4/Content/Test/skeleton.uasset b/spine-ue4/Content/Test/skeleton.uasset deleted file mode 100644 index 9d856759b..000000000 Binary files a/spine-ue4/Content/Test/skeleton.uasset and /dev/null differ diff --git a/spine-ue4/Content/Test/skeleton2.png b/spine-ue4/Content/Test/skeleton2.png deleted file mode 100644 index 6b58a6b81..000000000 Binary files a/spine-ue4/Content/Test/skeleton2.png and /dev/null differ diff --git a/spine-ue4/Content/Test/test.spine b/spine-ue4/Content/Test/test.spine deleted file mode 100644 index cc587def6..000000000 Binary files a/spine-ue4/Content/Test/test.spine and /dev/null differ diff --git a/spine-ue4/Plugins/SpinePlugin/Content/SpineUnlitMultiplyMaterial.uasset b/spine-ue4/Plugins/SpinePlugin/Content/SpineUnlitMultiplyMaterial.uasset index e09c6631b..0c7650adc 100644 Binary files a/spine-ue4/Plugins/SpinePlugin/Content/SpineUnlitMultiplyMaterial.uasset and b/spine-ue4/Plugins/SpinePlugin/Content/SpineUnlitMultiplyMaterial.uasset differ diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp index 7527bbf3e..e5b584bf6 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp @@ -118,7 +118,7 @@ void USpineSkeletonRendererComponent::TickComponent (float DeltaTime, ELevelTick UTexture* oldTexture = nullptr; UMaterialInstanceDynamic* current = atlasNormalBlendMaterials[i]; - if(!current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { + if(!current || !current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { UMaterialInstanceDynamic* material = UMaterialInstanceDynamic::Create(NormalBlendMaterial, owner); material->SetTextureParameterValue(TextureParameterName, texture); atlasNormalBlendMaterials[i] = material; @@ -126,7 +126,7 @@ void USpineSkeletonRendererComponent::TickComponent (float DeltaTime, ELevelTick pageToNormalBlendMaterial.Add(currPage, atlasNormalBlendMaterials[i]); current = atlasAdditiveBlendMaterials[i]; - if(!current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { + if(!current || !current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { UMaterialInstanceDynamic* material = UMaterialInstanceDynamic::Create(AdditiveBlendMaterial, owner); material->SetTextureParameterValue(TextureParameterName, texture); atlasAdditiveBlendMaterials[i] = material; @@ -134,7 +134,7 @@ void USpineSkeletonRendererComponent::TickComponent (float DeltaTime, ELevelTick pageToAdditiveBlendMaterial.Add(currPage, atlasAdditiveBlendMaterials[i]); current = atlasMultiplyBlendMaterials[i]; - if(!current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { + if(!current || !current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { UMaterialInstanceDynamic* material = UMaterialInstanceDynamic::Create(MultiplyBlendMaterial, owner); material->SetTextureParameterValue(TextureParameterName, texture); atlasMultiplyBlendMaterials[i] = material; @@ -142,7 +142,7 @@ void USpineSkeletonRendererComponent::TickComponent (float DeltaTime, ELevelTick pageToMultiplyBlendMaterial.Add(currPage, atlasMultiplyBlendMaterials[i]); current = atlasScreenBlendMaterials[i]; - if(!current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { + if(!current || !current->GetTextureParameterValue(TextureParameterName, oldTexture) || oldTexture != texture) { UMaterialInstanceDynamic* material = UMaterialInstanceDynamic::Create(ScreenBlendMaterial, owner); material->SetTextureParameterValue(TextureParameterName, texture); atlasScreenBlendMaterials[i] = material;