diff --git a/Assets/MirageSDK/Examples/MirageSDK.Examples.asmdef b/Assets/MirageSDK/Examples/MirageSDK.Examples.asmdef index 61466763..acce7850 100644 --- a/Assets/MirageSDK/Examples/MirageSDK.Examples.asmdef +++ b/Assets/MirageSDK/Examples/MirageSDK.Examples.asmdef @@ -6,7 +6,6 @@ "MirageSDK.Core.Infrastructure", "MirageSDK.Data", "MirageSDK.Examples.WebGlLogin", - "MirageSDK.OpenSea", "MirageSDK.Utils", "MirageSDK.WebGL", "MirageSDK.BlockchainUtils", diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation.meta b/Assets/MirageSDK/Examples/Prefabs.meta old mode 100755 new mode 100644 similarity index 77% rename from Assets/MirageSDK/Examples/TextMesh Pro/Documentation.meta rename to Assets/MirageSDK/Examples/Prefabs.meta index afa527ac..a3b47a8b --- a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation.meta +++ b/Assets/MirageSDK/Examples/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e7e8f5a82a3a134e91c54efd2274ea9 +guid: d18fdea71e62de346944a857ec5ea26e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/MirageSDK/Examples/UIPrefabs.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Back Button.prefab b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Back Button.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Back Button.prefab rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Back Button.prefab diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Back Button.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Back Button.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Back Button.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Back Button.prefab.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Login.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Login.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Login/WalletButton.prefab b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletButton.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Login/WalletButton.prefab rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletButton.prefab diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Login/WalletButton.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletButton.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Login/WalletButton.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletButton.prefab.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Login/WalletSelector.prefab b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletSelector.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Login/WalletSelector.prefab rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletSelector.prefab diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Login/WalletSelector.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletSelector.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Login/WalletSelector.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Login/WalletSelector.prefab.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Logs.prefab b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Logs.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Logs.prefab rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Logs.prefab diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Logs.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Logs.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Logs.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Logs.prefab.meta diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Portrait Canvas - ScreenSpace.prefab b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Portrait Canvas - ScreenSpace.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Portrait Canvas - ScreenSpace.prefab rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Portrait Canvas - ScreenSpace.prefab diff --git a/Assets/MirageSDK/Examples/UIPrefabs/Portrait Canvas - ScreenSpace.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Portrait Canvas - ScreenSpace.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UIPrefabs/Portrait Canvas - ScreenSpace.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UIPrefabs/Portrait Canvas - ScreenSpace.prefab.meta diff --git a/Assets/MirageSDK/Plugins/WalletConnectSharp2.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases.meta similarity index 77% rename from Assets/MirageSDK/Plugins/WalletConnectSharp2.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases.meta index 6e288afd..39ce7e8a 100644 --- a/Assets/MirageSDK/Plugins/WalletConnectSharp2.meta +++ b/Assets/MirageSDK/Examples/Prefabs/UseCases.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5354043fe60b7fe4fa644668ee572941 +guid: 91e79ef44fa1f6a4faa4ffd80164ae6d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/AddSwitchNetwork.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/AddSwitchNetwork.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/AddSwitchNetwork.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/AddSwitchNetwork.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/LinkingAccountWallet.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/LinkingAccountWallet.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/LinkingAccountWallet.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/LinkingAccountWallet.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/LoadNFTs.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/LoadNFTs.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/LoadNFTs.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/LoadNFTs.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/SilentSigning.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/SilentSigning.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/SilentSigning.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/SilentSigning.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/SilentSigning.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/SilentSigning.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/SilentSigning.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/SilentSigning.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/UpdateNFT.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/UpdateNFT.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/UpdateNFT.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/UpdateNFT.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WearableNFTs.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/WearableNFTs.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WearableNFTs.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WearableNFTs.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/WearableNFTs.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/WearableNFTs.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WearableNFTs.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WearableNFTs.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGLLogin.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLLogin.prefab similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGLLogin.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLLogin.prefab diff --git a/Assets/MirageSDK/Examples/UseCases/WebGLLogin.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLLogin.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGLLogin.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLLogin.prefab.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.prefab b/Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLWalletButton.prefab similarity index 99% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.prefab rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLWalletButton.prefab index 2578c3f5..dfb67e4e 100644 --- a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.prefab +++ b/Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLWalletButton.prefab @@ -222,7 +222,7 @@ GameObject: - component: {fileID: 4424874319438181734} - component: {fileID: 4732069687732793963} m_Layer: 5 - m_Name: WalletButton + m_Name: WebGLWalletButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.prefab.meta b/Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLWalletButton.prefab.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.prefab.meta rename to Assets/MirageSDK/Examples/Prefabs/UseCases/WebGLWalletButton.prefab.meta diff --git a/Assets/MirageSDK/Examples/Scenes/UseCaseIndex.unity b/Assets/MirageSDK/Examples/Scenes/UseCaseIndex.unity index e5105a07..1377ce89 100644 --- a/Assets/MirageSDK/Examples/Scenes/UseCaseIndex.unity +++ b/Assets/MirageSDK/Examples/Scenes/UseCaseIndex.unity @@ -167,6 +167,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -198,6 +199,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -293,6 +295,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -327,6 +330,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -359,6 +363,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -390,6 +395,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/Assets/MirageSDK/Examples/Base.meta b/Assets/MirageSDK/Examples/Scripts/Base.meta similarity index 100% rename from Assets/MirageSDK/Examples/Base.meta rename to Assets/MirageSDK/Examples/Scripts/Base.meta diff --git a/Assets/MirageSDK/Examples/Base/IUseCaseUIController.cs b/Assets/MirageSDK/Examples/Scripts/Base/IUseCaseUIController.cs similarity index 100% rename from Assets/MirageSDK/Examples/Base/IUseCaseUIController.cs rename to Assets/MirageSDK/Examples/Scripts/Base/IUseCaseUIController.cs diff --git a/Assets/MirageSDK/Examples/Base/IUseCaseUIController.cs.meta b/Assets/MirageSDK/Examples/Scripts/Base/IUseCaseUIController.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/Base/IUseCaseUIController.cs.meta rename to Assets/MirageSDK/Examples/Scripts/Base/IUseCaseUIController.cs.meta diff --git a/Assets/MirageSDK/Examples/Base/UseCaseBodyUI.cs b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseBodyUI.cs similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseBodyUI.cs rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseBodyUI.cs diff --git a/Assets/MirageSDK/Examples/Base/UseCaseBodyUI.cs.meta b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseBodyUI.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseBodyUI.cs.meta rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseBodyUI.cs.meta diff --git a/Assets/MirageSDK/Examples/Base/UseCaseUI.cs b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseUI.cs similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseUI.cs rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseUI.cs diff --git a/Assets/MirageSDK/Examples/Base/UseCaseUI.cs.meta b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseUI.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseUI.cs.meta rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseUI.cs.meta diff --git a/Assets/MirageSDK/Examples/Base/UseCaseUIHandler.cs b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseUIHandler.cs similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseUIHandler.cs rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseUIHandler.cs diff --git a/Assets/MirageSDK/Examples/Base/UseCaseUIHandler.cs.meta b/Assets/MirageSDK/Examples/Scripts/Base/UseCaseUIHandler.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/Base/UseCaseUIHandler.cs.meta rename to Assets/MirageSDK/Examples/Scripts/Base/UseCaseUIHandler.cs.meta diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/ApprovalForAllDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/ApprovalForAllDTO.cs index 86a57adf..6ac1b86f 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/ApprovalForAllDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/ApprovalForAllDTO.cs @@ -1,15 +1,18 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("ApprovalForAll")] -public class ApprovalForAllEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("address", "account", 1, true)] - public string Account { get; set; } + [Event("ApprovalForAll")] + public class ApprovalForAllEventDTO : EventDTOBase + { + [Parameter("address", "account", 1, true)] + public string Account { get; set; } - [Parameter("address", "operator", 2, true)] - public string Operator { get; set; } + [Parameter("address", "operator", 2, true)] + public string Operator { get; set; } - [Parameter("bool", "approved", 3, false)] - public bool Approved { get; set; } + [Parameter("bool", "approved", 3, false)] + public bool Approved { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/FinishedRentEventDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/FinishedRentEventDTO.cs index bd062f9f..d827fd93 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/FinishedRentEventDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/FinishedRentEventDTO.cs @@ -2,18 +2,21 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("FinishedRent")] -public class FinishedRentEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("uint256", "tokenId", 1, true)] - public BigInteger TokenId { get; set; } + [Event("FinishedRent")] + public class FinishedRentEventDTO : EventDTOBase + { + [Parameter("uint256", "tokenId", 1, true)] + public BigInteger TokenId { get; set; } - [Parameter("address", "lord", 2, true)] - public string Lord { get; set; } + [Parameter("address", "lord", 2, true)] + public string Lord { get; set; } - [Parameter("address", "renter", 3, true)] - public string Renter { get; set; } + [Parameter("address", "renter", 3, true)] + public string Renter { get; set; } - [Parameter("uint256", "expiresAt", 4, false)] - public BigInteger ExpiresAt { get; set; } + [Parameter("uint256", "expiresAt", 4, false)] + public BigInteger ExpiresAt { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/GlassesChangedDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/GlassesChangedDTO.cs index a29bfc11..79fcdbfd 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/GlassesChangedDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/GlassesChangedDTO.cs @@ -2,15 +2,18 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("GlassesChanged")] -public class GlassesChangedEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("uint256", "characterId", 1, true)] - public BigInteger CharacterId { get; set; } + [Event("GlassesChanged")] + public class GlassesChangedEventDTO : EventDTOBase + { + [Parameter("uint256", "characterId", 1, true)] + public BigInteger CharacterId { get; set; } - [Parameter("uint256", "oldGlassesId", 2, false)] - public BigInteger OldGlassesId { get; set; } + [Parameter("uint256", "oldGlassesId", 2, false)] + public BigInteger OldGlassesId { get; set; } - [Parameter("uint256", "newGlassesId", 3, false)] - public BigInteger NewGlassesId { get; set; } + [Parameter("uint256", "newGlassesId", 3, false)] + public BigInteger NewGlassesId { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/HatChangedEventDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/HatChangedEventDTO.cs index 2701e6d0..a8bbeb4a 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/HatChangedEventDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/HatChangedEventDTO.cs @@ -2,15 +2,18 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("HatChanged")] -public class HatChangedEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("uint256", "characterId", 1, true)] - public BigInteger CharacterId { get; set; } + [Event("HatChanged")] + public class HatChangedEventDTO : EventDTOBase + { + [Parameter("uint256", "characterId", 1, true)] + public BigInteger CharacterId { get; set; } - [Parameter("uint256", "oldHatId", 2, false)] - public BigInteger OldHatId { get; set; } + [Parameter("uint256", "oldHatId", 2, false)] + public BigInteger OldHatId { get; set; } - [Parameter("uint256", "newHatId", 3, false)] - public BigInteger NewHatId { get; set; } + [Parameter("uint256", "newHatId", 3, false)] + public BigInteger NewHatId { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/RentedEventDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/RentedEventDTO.cs index 54eee679..26e4976b 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/RentedEventDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/RentedEventDTO.cs @@ -2,18 +2,21 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("Rented")] -public class RentedEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("uint256", "tokenId", 1, true)] - public BigInteger TokenId { get; set; } + [Event("Rented")] + public class RentedEventDTO : EventDTOBase + { + [Parameter("uint256", "tokenId", 1, true)] + public BigInteger TokenId { get; set; } - [Parameter("address", "lord", 2, true)] - public string Lord { get; set; } + [Parameter("address", "lord", 2, true)] + public string Lord { get; set; } - [Parameter("address", "renter", 3, true)] - public string Renter { get; set; } + [Parameter("address", "renter", 3, true)] + public string Renter { get; set; } - [Parameter("uint256", "expiresAt", 4, false)] - public BigInteger ExpiresAt { get; set; } + [Parameter("uint256", "expiresAt", 4, false)] + public BigInteger ExpiresAt { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/SafeMintedEventDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/SafeMintedEventDTO.cs index 50fb7b67..bddd1037 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/SafeMintedEventDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/SafeMintedEventDTO.cs @@ -1,9 +1,12 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("SafeMinted")] -public class SafeMintedEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("address", "to", 1, true)] - public string To { get; set; } + [Event("SafeMinted")] + public class SafeMintedEventDTO : EventDTOBase + { + [Parameter("address", "to", 1, true)] + public string To { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/Scripts/DTO/ShoesChangedDTO.cs b/Assets/MirageSDK/Examples/Scripts/DTO/ShoesChangedDTO.cs index 1a1e99fa..927116b6 100644 --- a/Assets/MirageSDK/Examples/Scripts/DTO/ShoesChangedDTO.cs +++ b/Assets/MirageSDK/Examples/Scripts/DTO/ShoesChangedDTO.cs @@ -2,15 +2,18 @@ using MirageSDK.Data; using Nethereum.ABI.FunctionEncoding.Attributes; -[Event("ShoesChanged")] -public class ShoesChangedEventDTO : EventDTOBase +namespace MirageSDK.DTO { - [Parameter("uint256", "characterId", 1, true)] - public BigInteger CharacterId { get; set; } + [Event("ShoesChanged")] + public class ShoesChangedEventDTO : EventDTOBase + { + [Parameter("uint256", "characterId", 1, true)] + public BigInteger CharacterId { get; set; } - [Parameter("uint256", "oldShoesId", 2, false)] - public BigInteger OldShoesId { get; set; } + [Parameter("uint256", "oldShoesId", 2, false)] + public BigInteger OldShoesId { get; set; } - [Parameter("uint256", "newShoesId", 3, false)] - public BigInteger NewShoesId { get; set; } + [Parameter("uint256", "newShoesId", 3, false)] + public BigInteger NewShoesId { get; set; } + } } \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/UseCases.meta b/Assets/MirageSDK/Examples/Scripts/UseCases.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases.meta diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork.meta diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs similarity index 97% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs index cc9ee1c7..d4a97733 100644 --- a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs +++ b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs @@ -71,7 +71,7 @@ private async void OpenUpdateBsc() private async void OpenUpdateBscTestnet() { - _ethHandler.WalletUpdateEthChain(ChainInfo.BscTestnet.ToEthUpdate()); + await _ethHandler.WalletUpdateEthChain(ChainInfo.BscTestnet.ToEthUpdate()); UpdateUILogs(String.Format(ChainUpdatedMessage, ChainInfo.BscTestnet.chainName)); } diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/AddSwitchNetwork.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/ChainInfo.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/ChainInfo.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/ChainInfo.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/ChainInfo.cs diff --git a/Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/ChainInfo.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/ChainInfo.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/AddSwitchNetwork/ChainInfo.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/AddSwitchNetwork/ChainInfo.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/AccountLinkingExample.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/AccountLinkingExample.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/AccountLinkingExample.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/AccountLinkingExample.cs diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/AccountLinkingExample.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/AccountLinkingExample.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/AccountLinkingExample.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/AccountLinkingExample.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/ReadMe.md b/Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/ReadMe.md similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/ReadMe.md rename to Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/ReadMe.md diff --git a/Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/ReadMe.md.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/ReadMe.md.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LinkingAccountWallet/ReadMe.md.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LinkingAccountWallet/ReadMe.md.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs/LoadNFTExample.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/LoadNFTExample.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs/LoadNFTExample.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/LoadNFTExample.cs diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs/LoadNFTExample.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/LoadNFTExample.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs/LoadNFTExample.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/LoadNFTExample.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs/ReadMe.md b/Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/ReadMe.md similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs/ReadMe.md rename to Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/ReadMe.md diff --git a/Assets/MirageSDK/Examples/UseCases/LoadNFTs/ReadMe.md.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/ReadMe.md.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/LoadNFTs/ReadMe.md.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/LoadNFTs/ReadMe.md.meta diff --git a/Assets/MirageSDK/Examples/UseCases/SilentSigning.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/SilentSigning.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning.meta diff --git a/Assets/MirageSDK/Examples/UseCases/SilentSigning/SilentSigningUseCase.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning/SilentSigningUseCase.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/SilentSigning/SilentSigningUseCase.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning/SilentSigningUseCase.cs diff --git a/Assets/MirageSDK/Examples/UseCases/SilentSigning/SilentSigningUseCase.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning/SilentSigningUseCase.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/SilentSigning/SilentSigningUseCase.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/SilentSigning/SilentSigningUseCase.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT.meta diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT/ReadMe.md b/Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/ReadMe.md similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT/ReadMe.md rename to Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/ReadMe.md diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT/ReadMe.md.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/ReadMe.md.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT/ReadMe.md.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/ReadMe.md.meta diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT/UpdateNftExample.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/UpdateNftExample.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT/UpdateNftExample.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/UpdateNftExample.cs diff --git a/Assets/MirageSDK/Examples/UseCases/UpdateNFT/UpdateNftExample.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/UpdateNftExample.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/UpdateNFT/UpdateNftExample.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/UpdateNFT/UpdateNftExample.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WearableNFTs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WearableNFTs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WearableNFTs/ReadMe.md b/Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs/ReadMe.md similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WearableNFTs/ReadMe.md rename to Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs/ReadMe.md diff --git a/Assets/MirageSDK/Examples/UseCases/WearableNFTs/ReadMe.md.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs/ReadMe.md.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WearableNFTs/ReadMe.md.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WearableNFTs/ReadMe.md.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/MirageSDK.Examples.WebGlLogin.asmdef.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletButton.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletButton.cs diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletButton.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletButton.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletButton.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletItem.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletItem.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletItem.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletItem.cs diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletItem.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletItem.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WalletItem.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WalletItem.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLConnectionController.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLConnectionController.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLConnectionController.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLConnectionController.cs diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLConnectionController.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLConnectionController.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLConnectionController.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLConnectionController.cs.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLLoginPanelController.cs b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLLoginPanelController.cs similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLLoginPanelController.cs rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLLoginPanelController.cs diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLLoginPanelController.cs.meta b/Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLLoginPanelController.cs.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/WebGLLoginPanelController.cs.meta rename to Assets/MirageSDK/Examples/Scripts/UseCases/WebGlLogin/WebGLLoginPanelController.cs.meta diff --git a/Assets/MirageSDK/Examples/ContractInformation.meta b/Assets/MirageSDK/Examples/Settings.meta similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation.meta rename to Assets/MirageSDK/Examples/Settings.meta diff --git a/Assets/MirageSDK/Examples/ContractInformation/ERC20ExampleContract.asset b/Assets/MirageSDK/Examples/Settings/ERC20ExampleContract.asset similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/ERC20ExampleContract.asset rename to Assets/MirageSDK/Examples/Settings/ERC20ExampleContract.asset diff --git a/Assets/MirageSDK/Examples/ContractInformation/ERC20ExampleContract.asset.meta b/Assets/MirageSDK/Examples/Settings/ERC20ExampleContract.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/ERC20ExampleContract.asset.meta rename to Assets/MirageSDK/Examples/Settings/ERC20ExampleContract.asset.meta diff --git a/Assets/MirageSDK/Examples/ContractInformation/ExampleProviderInfo.asset b/Assets/MirageSDK/Examples/Settings/ExampleProviderInfo.asset similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/ExampleProviderInfo.asset rename to Assets/MirageSDK/Examples/Settings/ExampleProviderInfo.asset diff --git a/Assets/MirageSDK/Examples/ContractInformation/ExampleProviderInfo.asset.meta b/Assets/MirageSDK/Examples/Settings/ExampleProviderInfo.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/ExampleProviderInfo.asset.meta rename to Assets/MirageSDK/Examples/Settings/ExampleProviderInfo.asset.meta diff --git a/Assets/MirageSDK/Examples/ContractInformation/GameCharacter.asset b/Assets/MirageSDK/Examples/Settings/GameCharacter.asset similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/GameCharacter.asset rename to Assets/MirageSDK/Examples/Settings/GameCharacter.asset diff --git a/Assets/MirageSDK/Examples/ContractInformation/GameCharacter.asset.meta b/Assets/MirageSDK/Examples/Settings/GameCharacter.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/GameCharacter.asset.meta rename to Assets/MirageSDK/Examples/Settings/GameCharacter.asset.meta diff --git a/Assets/MirageSDK/Examples/ContractInformation/GameItem.asset b/Assets/MirageSDK/Examples/Settings/GameItem.asset similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/GameItem.asset rename to Assets/MirageSDK/Examples/Settings/GameItem.asset diff --git a/Assets/MirageSDK/Examples/ContractInformation/GameItem.asset.meta b/Assets/MirageSDK/Examples/Settings/GameItem.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/ContractInformation/GameItem.asset.meta rename to Assets/MirageSDK/Examples/Settings/GameItem.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta b/Assets/MirageSDK/Examples/Settings/WalletItems.meta old mode 100755 new mode 100644 similarity index 67% rename from Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta rename to Assets/MirageSDK/Examples/Settings/WalletItems.meta index e4afeef8..0caa7e48 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta +++ b/Assets/MirageSDK/Examples/Settings/WalletItems.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 1b8d251f9af63b746bf2f7ffe00ebb9b +guid: fa01967e92c3c654e8f4ad62bc3a83e1 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Metamask.asset b/Assets/MirageSDK/Examples/Settings/WalletItems/Metamask.asset similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Metamask.asset rename to Assets/MirageSDK/Examples/Settings/WalletItems/Metamask.asset diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Metamask.asset.meta b/Assets/MirageSDK/Examples/Settings/WalletItems/Metamask.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Metamask.asset.meta rename to Assets/MirageSDK/Examples/Settings/WalletItems/Metamask.asset.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Torus.asset b/Assets/MirageSDK/Examples/Settings/WalletItems/Torus.asset similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Torus.asset rename to Assets/MirageSDK/Examples/Settings/WalletItems/Torus.asset diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Torus.asset.meta b/Assets/MirageSDK/Examples/Settings/WalletItems/Torus.asset.meta similarity index 100% rename from Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets/Torus.asset.meta rename to Assets/MirageSDK/Examples/Settings/WalletItems/Torus.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf b/Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf deleted file mode 100755 index c2ea2d27..00000000 Binary files a/Assets/MirageSDK/Examples/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf and /dev/null differ diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader deleted file mode 100755 index bab2b2c6..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader +++ /dev/null @@ -1,143 +0,0 @@ -Shader "TextMeshPro/Bitmap Custom Atlas" { - -Properties { - _MainTex ("Font Atlas", 2D) = "white" {} - _FaceTex ("Font Texture", 2D) = "white" {} - [HDR]_FaceColor ("Text Color", Color) = (1,1,1,1) - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _Padding ("Padding", float) = 0 - - _StencilComp("Stencil Comparison", Float) = 8 - _Stencil("Stencil ID", Float) = 0 - _StencilOp("Stencil Operation", Float) = 0 - _StencilWriteMask("Stencil Write Mask", Float) = 255 - _StencilReadMask("Stencil Read Mask", Float) = 255 - - _CullMode("Cull Mode", Float) = 0 - _ColorMask("Color Mask", Float) = 15 -} - -SubShader{ - - Tags { "Queue" = "Transparent" "IgnoreProjector" = "True" "RenderType" = "Transparent" } - - Stencil - { - Ref[_Stencil] - Comp[_StencilComp] - Pass[_StencilOp] - ReadMask[_StencilReadMask] - WriteMask[_StencilWriteMask] - } - - - Lighting Off - Cull [_CullMode] - ZTest [unity_GUIZTestMode] - ZWrite Off - Fog { Mode Off } - Blend SrcAlpha OneMinusSrcAlpha - ColorMask[_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - float4 mask : TEXCOORD2; - }; - - uniform sampler2D _MainTex; - uniform sampler2D _FaceTex; - uniform float4 _FaceTex_ST; - uniform fixed4 _FaceColor; - - uniform float _VertexOffsetX; - uniform float _VertexOffsetY; - uniform float4 _ClipRect; - uniform float _MaskSoftnessX; - uniform float _MaskSoftnessY; - - float2 UnpackUV(float uv) - { - float2 output; - output.x = floor(uv / 4096); - output.y = uv - 4096 * output.x; - - return output * 0.001953125; - } - - v2f vert (appdata_t v) - { - float4 vert = v.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - vert.xy += (vert.w * 0.5) / _ScreenParams.xy; - - float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert)); - - fixed4 faceColor = v.color; - faceColor *= _FaceColor; - - v2f OUT; - OUT.vertex = vPosition; - OUT.color = faceColor; - OUT.texcoord0 = v.texcoord0; - OUT.texcoord1 = TRANSFORM_TEX(UnpackUV(v.texcoord1), _FaceTex); - float2 pixelSize = vPosition.w; - pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1])); - - // Clamp _ClipRect to 16bit. - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - - return OUT; - } - - fixed4 frag (v2f IN) : SV_Target - { - fixed4 color = tex2D(_MainTex, IN.texcoord0) * tex2D(_FaceTex, IN.texcoord1) * IN.color; - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color; - } - ENDCG - } -} - - CustomEditor "TMPro.EditorUtilities.TMP_BitmapShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta deleted file mode 100755 index 0a416c85..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 48bb5f55d8670e349b6e614913f9d910 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader deleted file mode 100755 index 006a271e..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader +++ /dev/null @@ -1,145 +0,0 @@ -Shader "TextMeshPro/Mobile/Bitmap" { - -Properties { - _MainTex ("Font Atlas", 2D) = "white" {} - [HDR]_Color ("Text Color", Color) = (1,1,1,1) - _DiffusePower ("Diffuse Power", Range(1.0,4.0)) = 1.0 - - _VertexOffsetX("Vertex OffsetX", float) = 0 - _VertexOffsetY("Vertex OffsetY", float) = 0 - _MaskSoftnessX("Mask SoftnessX", float) = 0 - _MaskSoftnessY("Mask SoftnessY", float) = 0 - - _ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - _StencilComp("Stencil Comparison", Float) = 8 - _Stencil("Stencil ID", Float) = 0 - _StencilOp("Stencil Operation", Float) = 0 - _StencilWriteMask("Stencil Write Mask", Float) = 255 - _StencilReadMask("Stencil Read Mask", Float) = 255 - - _CullMode("Cull Mode", Float) = 0 - _ColorMask("Color Mask", Float) = 15 -} - -SubShader { - - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - - Stencil - { - Ref[_Stencil] - Comp[_StencilComp] - Pass[_StencilOp] - ReadMask[_StencilReadMask] - WriteMask[_StencilWriteMask] - } - - - Lighting Off - Cull [_CullMode] - ZTest [unity_GUIZTestMode] - ZWrite Off - Fog { Mode Off } - Blend SrcAlpha OneMinusSrcAlpha - ColorMask[_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma fragmentoption ARB_precision_hint_fastest - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct v2f { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float4 mask : TEXCOORD2; - }; - - sampler2D _MainTex; - fixed4 _Color; - float _DiffusePower; - - uniform float _VertexOffsetX; - uniform float _VertexOffsetY; - uniform float4 _ClipRect; - uniform float _MaskSoftnessX; - uniform float _MaskSoftnessY; - - v2f vert (appdata_t v) - { - v2f OUT; - float4 vert = v.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - vert.xy += (vert.w * 0.5) / _ScreenParams.xy; - - OUT.vertex = UnityPixelSnap(UnityObjectToClipPos(vert)); - OUT.color = v.color; - OUT.color *= _Color; - OUT.color.rgb *= _DiffusePower; - OUT.texcoord0 = v.texcoord0; - - float2 pixelSize = OUT.vertex.w; - //pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1])); - - // Clamp _ClipRect to 16bit. - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - - return OUT; - } - - fixed4 frag (v2f IN) : COLOR - { - fixed4 color = fixed4(IN.color.rgb, IN.color.a * tex2D(_MainTex, IN.texcoord0).a); - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color; - } - ENDCG - } -} - -SubShader { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Lighting Off Cull Off ZTest Always ZWrite Off Fog { Mode Off } - Blend SrcAlpha OneMinusSrcAlpha - BindChannels { - Bind "Color", color - Bind "Vertex", vertex - Bind "TexCoord", texcoord0 - } - Pass { - SetTexture [_MainTex] { - constantColor [_Color] combine constant * primary, constant * texture - } - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_BitmapShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta deleted file mode 100755 index d5fb125e..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1e3b057af24249748ff873be7fafee47 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader deleted file mode 100755 index 8ce4937a..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader +++ /dev/null @@ -1,143 +0,0 @@ -Shader "TextMeshPro/Bitmap" { - -Properties { - _MainTex ("Font Atlas", 2D) = "white" {} - _FaceTex ("Font Texture", 2D) = "white" {} - [HDR]_FaceColor ("Text Color", Color) = (1,1,1,1) - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - _StencilComp("Stencil Comparison", Float) = 8 - _Stencil("Stencil ID", Float) = 0 - _StencilOp("Stencil Operation", Float) = 0 - _StencilWriteMask("Stencil Write Mask", Float) = 255 - _StencilReadMask("Stencil Read Mask", Float) = 255 - - _CullMode("Cull Mode", Float) = 0 - _ColorMask("Color Mask", Float) = 15 -} - -SubShader{ - - Tags { "Queue" = "Transparent" "IgnoreProjector" = "True" "RenderType" = "Transparent" } - - Stencil - { - Ref[_Stencil] - Comp[_StencilComp] - Pass[_StencilOp] - ReadMask[_StencilReadMask] - WriteMask[_StencilWriteMask] - } - - - Lighting Off - Cull [_CullMode] - ZTest [unity_GUIZTestMode] - ZWrite Off - Fog { Mode Off } - Blend SrcAlpha OneMinusSrcAlpha - ColorMask[_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - float4 mask : TEXCOORD2; - }; - - uniform sampler2D _MainTex; - uniform sampler2D _FaceTex; - uniform float4 _FaceTex_ST; - uniform fixed4 _FaceColor; - - uniform float _VertexOffsetX; - uniform float _VertexOffsetY; - uniform float4 _ClipRect; - uniform float _MaskSoftnessX; - uniform float _MaskSoftnessY; - - float2 UnpackUV(float uv) - { - float2 output; - output.x = floor(uv / 4096); - output.y = uv - 4096 * output.x; - - return output * 0.001953125; - } - - v2f vert (appdata_t v) - { - float4 vert = v.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - vert.xy += (vert.w * 0.5) / _ScreenParams.xy; - - float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert)); - - fixed4 faceColor = v.color; - faceColor *= _FaceColor; - - v2f OUT; - OUT.vertex = vPosition; - OUT.color = faceColor; - OUT.texcoord0 = v.texcoord0; - OUT.texcoord1 = TRANSFORM_TEX(UnpackUV(v.texcoord1), _FaceTex); - float2 pixelSize = vPosition.w; - pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1])); - - // Clamp _ClipRect to 16bit. - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - - return OUT; - } - - fixed4 frag (v2f IN) : SV_Target - { - fixed4 color = tex2D(_MainTex, IN.texcoord0); - color = fixed4 (tex2D(_FaceTex, IN.texcoord1).rgb * IN.color.rgb, IN.color.a * color.a); - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - return color; - } - ENDCG - } -} - - CustomEditor "TMPro.EditorUtilities.TMP_BitmapShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta deleted file mode 100755 index 7eb1870f..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 128e987d567d4e2c824d754223b3f3b0 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader deleted file mode 100755 index c50c5930..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader +++ /dev/null @@ -1,317 +0,0 @@ -Shader "TextMeshPro/Distance Field Overlay" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - [HDR]_SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - - Tags - { - "Queue"="Overlay" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest Always - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - #include "TMPro.cginc" - - struct vertex_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - UNITY_VERTEX_OUTPUT_STEREO - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) - { - pixel_t output; - - UNITY_INITIALIZE_OUTPUT(pixel_t, output); - UNITY_SETUP_INSTANCE_ID(input); - UNITY_TRANSFER_INSTANCE_ID(input,output); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1); - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - - output.position = vPosition; - output.color = input.color; - output.atlas = input.texcoord0; - output.param = float4(alphaClip, scale, bias, weight); - output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz); - #if (UNDERLAY_ON || UNDERLAY_INNER) - output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias); - output.underlayColor = underlayColor; - #endif - output.textures = float4(faceUV, outlineUV); - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - UNITY_SETUP_INSTANCE_ID(input); - - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, weight, dxy); - - float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz; - bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - faceColor.rgb += glowColor.rgb * glowColor.a; - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - faceColor *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); - #endif - - return faceColor * input.color.a; - } - - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field" -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta deleted file mode 100755 index 56284e9f..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: dd89cf5b9246416f84610a006f916af7 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader deleted file mode 100755 index ed48574d..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader +++ /dev/null @@ -1,310 +0,0 @@ -Shader "TextMeshPro/Distance Field SSD" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - [HDR]_SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - Tags - { - "Queue" = "Transparent" - "IgnoreProjector" = "True" - "RenderType" = "Transparent" - } - - Stencil - { - Ref[_Stencil] - Comp[_StencilComp] - Pass[_StencilOp] - ReadMask[_StencilReadMask] - WriteMask[_StencilWriteMask] - } - - Cull[_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest[unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask[_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - #pragma shader_feature __ FORCE_LINEAR - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - #include "TMPro.cginc" - - struct vertex_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - float4 position : POSITION; - float3 normal : NORMAL; - float4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - UNITY_VERTEX_OUTPUT_STEREO - float4 position : SV_POSITION; - float4 color : COLOR; - float2 atlas : TEXCOORD0; - float weight : TEXCOORD1; - float2 mask : TEXCOORD2; // Position in object space(xy) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float2 texcoord2 : TEXCOORD4; - float4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - float4 SRGBToLinear(float4 rgba) { - return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a); - } - - pixel_t VertShader(vertex_t input) - { - pixel_t output; - - UNITY_INITIALIZE_OUTPUT(pixel_t, output); - UNITY_SETUP_INSTANCE_ID(input); - UNITY_TRANSFER_INSTANCE_ID(input,output); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - float4 color = input.color; - #if (FORCE_LINEAR && !UNITY_COLORSPACE_GAMMA) - color = SRGBToLinear(input.color); - #endif - - output.position = vPosition; - output.color = color; - output.atlas = input.texcoord0; - output.weight = weight; - output.mask = half2(vert.xy * 2 - clampedRect.xy - clampedRect.zw); - output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz); - #if (UNDERLAY_ON || UNDERLAY_INNER) - output.texcoord2 = input.texcoord0 + bOffset; - output.underlayColor = underlayColor; - #endif - output.textures = float4(faceUV, outlineUV); - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - UNITY_SETUP_INSTANCE_ID(input); - - float c = tex2D(_MainTex, input.atlas).a; - - float2 pixelSize = float2(ddx(input.atlas.y), ddy(input.atlas.y)); - pixelSize *= _TextureWidth * .75; - float scale = rsqrt(dot(pixelSize, pixelSize)) * _GradientScale * (_Sharpness + 1); - - float weight = input.weight; - float bias = (.5 - weight) + (.5 / scale); - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, weight, dxy); - - float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz; - bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5)); - n = normalize(n - bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col * faceColor.a; - faceColor.rgb *= 1 - (dot(n, light) * _Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z * n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale; - faceColor += input.underlayColor * saturate(d - bBias) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale; - faceColor += input.underlayColor * (1 - saturate(d - bBias)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - faceColor.rgb += glowColor.rgb * glowColor.a; - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - float2 maskZW = 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + (1 / scale)); - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW); - faceColor *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); - #endif - - return faceColor * input.color.a; - } - - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field" -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta deleted file mode 100755 index 08cd8ae5..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 14eb328de4b8eb245bb7cea29e4ac00b -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader deleted file mode 100755 index 7019aaf4..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader +++ /dev/null @@ -1,247 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field - Masking" { - -Properties { - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - _MaskTex ("Mask Texture", 2D) = "white" {} - _MaskInverse ("Inverse", float) = 0 - _MaskEdgeColor ("Edge Color", Color) = (1,1,1,1) - _MaskEdgeSoftness ("Edge Softness", Range(0, 1)) = 0.01 - _MaskWipeControl ("Wipe Position", Range(0, 1)) = 0.5 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - }; - - float _MaskWipeControl; - float _MaskEdgeSoftness; - fixed4 _MaskEdgeColor; - bool _MaskInverse; - - pixel_t VertShader(vertex_t input) - { - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1); - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a); - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness. - //#if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - c *= m.x * m.y; - //#endif - - float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a); - float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl; - a = saturate(t / _MaskEdgeSoftness); - c.rgb = lerp(_MaskEdgeColor.rgb*c.a, c.rgb, a); - c *= a; - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); - #endif - - return c; - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta deleted file mode 100755 index 3cbdbbb4..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: bc1ede39bf3643ee8e493720e4259791 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader deleted file mode 100755 index ce82bed5..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader +++ /dev/null @@ -1,240 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field Overlay" { - -Properties { - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - Tags - { - "Queue"="Overlay" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest Always - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - - struct vertex_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - UNITY_VERTEX_OUTPUT_STEREO - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - }; - - - pixel_t VertShader(vertex_t input) - { - pixel_t output; - - UNITY_INITIALIZE_OUTPUT(pixel_t, output); - UNITY_SETUP_INSTANCE_ID(input); - UNITY_TRANSFER_INSTANCE_ID(input, output); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1); - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Populate structure for pixel shader - output.vertex = vPosition; - output.faceColor = faceColor; - output.outlineColor = outlineColor; - output.texcoord0 = float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y); - output.param = half4(scale, bias - outline, bias + outline, bias); - output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - #if (UNDERLAY_ON || UNDERLAY_INNER) - output.texcoord1 = float4(input.texcoord0 + layerOffset, input.color.a, 0); - output.underlayParam = half2(layerScale, layerBias); - #endif - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - UNITY_SETUP_INSTANCE_ID(input); - - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a); - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); - #endif - - return c; - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta deleted file mode 100755 index e6b149e0..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a02a7d8c237544f1962732b55a9aebf1 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader deleted file mode 100755 index df4d5b0b..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader +++ /dev/null @@ -1,106 +0,0 @@ -// Simplified SDF shader: -// - No Shading Option (bevel / bump / env map) -// - No Glow Option -// - Softness is applied on both side of the outline - -Shader "TextMeshPro/Mobile/Distance Field SSD" { - -Properties { - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = .5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5 - _ScaleX ("Scale X", float) = 1 - _ScaleY ("Scale Y", float) = 1 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - _MaskTex ("Mask Texture", 2D) = "white" {} - _MaskInverse ("Inverse", float) = 0 - _MaskEdgeColor ("Edge Color", Color) = (1,1,1,1) - _MaskEdgeSoftness ("Edge Softness", Range(0, 1)) = 0.01 - _MaskWipeControl ("Wipe Position", Range(0, 1)) = 0.5 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - Tags { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ OUTLINE_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - - #include "TMPro_Mobile.cginc" - - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta deleted file mode 100755 index 9b84c13d..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c8d12adcee749c344b8117cf7c7eb912 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader deleted file mode 100755 index be764aeb..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader +++ /dev/null @@ -1,138 +0,0 @@ -// Simplified version of the SDF Surface shader : -// - No support for Bevel, Bump or envmap -// - Diffuse only lighting -// - Fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. - -Shader "TextMeshPro/Mobile/Distance Field (Surface)" { - -Properties { - _FaceTex ("Fill Texture", 2D) = "white" {} - [HDR]_FaceColor ("Fill Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - // Should not be directly exposed to the user - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _CullMode ("Cull Mode", Float) = 0 - //_MaskCoord ("Mask Coords", vector) = (0,0,0,0) - //_MaskSoftness ("Mask Softness", float) = 0 -} - -SubShader { - - Tags { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - LOD 300 - Cull [_CullMode] - - CGPROGRAM - #pragma surface PixShader Lambert alpha:blend vertex:VertShader noforwardadd nolightmap nodirlightmap - #pragma target 3.0 - #pragma shader_feature __ GLOW_ON - - #include "TMPro_Properties.cginc" - #include "TMPro.cginc" - - half _FaceShininess; - half _OutlineShininess; - - struct Input - { - fixed4 color : COLOR; - float2 uv_MainTex; - float2 uv2_FaceTex; - float2 uv2_OutlineTex; - float2 param; // Weight, Scale - float3 viewDirEnv; - }; - - #include "TMPro_Surface.cginc" - - ENDCG - - // Pass to render object as a shadow caster - Pass - { - Name "Caster" - Tags { "LightMode" = "ShadowCaster" } - Offset 1, 1 - - Fog {Mode Off} - ZWrite On ZTest LEqual Cull Off - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile_shadowcaster - #include "UnityCG.cginc" - - struct v2f { - V2F_SHADOW_CASTER; - float2 uv : TEXCOORD1; - float2 uv2 : TEXCOORD3; - float alphaClip : TEXCOORD2; - }; - - uniform float4 _MainTex_ST; - uniform float4 _OutlineTex_ST; - float _OutlineWidth; - float _FaceDilate; - float _ScaleRatioA; - - v2f vert( appdata_base v ) - { - v2f o; - TRANSFER_SHADOW_CASTER(o) - o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv2 = TRANSFORM_TEX(v.texcoord, _OutlineTex); - o.alphaClip = o.alphaClip = (1.0 - _OutlineWidth * _ScaleRatioA - _FaceDilate * _ScaleRatioA) / 2; - return o; - } - - uniform sampler2D _MainTex; - - float4 frag(v2f i) : COLOR - { - fixed4 texcol = tex2D(_MainTex, i.uv).a; - clip(texcol.a - i.alphaClip); - SHADOW_CASTER_FRAGMENT(i) - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta deleted file mode 100755 index bff8b7aa..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 85187c2149c549c5b33f0cdb02836b17 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader deleted file mode 100755 index bcb2bb27..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader +++ /dev/null @@ -1,158 +0,0 @@ -Shader "TextMeshPro/Distance Field (Surface)" { - -Properties { - _FaceTex ("Fill Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - [HDR]_FaceColor ("Fill Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _BumpMap ("Normalmap", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0.5 - _BumpFace ("Bump Face", Range(0,1)) = 0.5 - - _ReflectFaceColor ("Face Color", Color) = (0,0,0,1) - _ReflectOutlineColor ("Outline Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - [HDR]_SpecColor ("Specular Color", Color) = (0,0,0,1) - - _FaceShininess ("Face Shininess", Range(0,1)) = 0 - _OutlineShininess ("Outline Shininess", Range(0,1)) = 0 - - [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - // Should not be directly exposed to the user - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _CullMode ("Cull Mode", Float) = 0 - //_MaskCoord ("Mask Coords", vector) = (0,0,0,0) - //_MaskSoftness ("Mask Softness", float) = 0 -} - -SubShader { - - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - - LOD 300 - Cull [_CullMode] - - CGPROGRAM - #pragma surface PixShader BlinnPhong alpha:blend vertex:VertShader nolightmap nodirlightmap - #pragma target 3.0 - #pragma shader_feature __ GLOW_ON - #pragma glsl - - #include "TMPro_Properties.cginc" - #include "TMPro.cginc" - - half _FaceShininess; - half _OutlineShininess; - - struct Input - { - fixed4 color : COLOR; - float2 uv_MainTex; - float2 uv2_FaceTex; - float2 uv2_OutlineTex; - float2 param; // Weight, Scale - float3 viewDirEnv; - }; - - - #define BEVEL_ON 1 - #include "TMPro_Surface.cginc" - - ENDCG - - // Pass to render object as a shadow caster - Pass - { - Name "Caster" - Tags { "LightMode" = "ShadowCaster" } - Offset 1, 1 - - Fog {Mode Off} - ZWrite On - ZTest LEqual - Cull Off - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile_shadowcaster - #include "UnityCG.cginc" - - struct v2f { - V2F_SHADOW_CASTER; - float2 uv : TEXCOORD1; - float2 uv2 : TEXCOORD3; - float alphaClip : TEXCOORD2; - }; - - uniform float4 _MainTex_ST; - uniform float4 _OutlineTex_ST; - float _OutlineWidth; - float _FaceDilate; - float _ScaleRatioA; - - v2f vert( appdata_base v ) - { - v2f o; - TRANSFER_SHADOW_CASTER(o) - o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv2 = TRANSFORM_TEX(v.texcoord, _OutlineTex); - o.alphaClip = (1.0 - _OutlineWidth * _ScaleRatioA - _FaceDilate * _ScaleRatioA) / 2; - return o; - } - - uniform sampler2D _MainTex; - - float4 frag(v2f i) : COLOR - { - fixed4 texcol = tex2D(_MainTex, i.uv).a; - clip(texcol.a - i.alphaClip); - SHADOW_CASTER_FRAGMENT(i) - } - ENDCG - } -} - -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} - diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta deleted file mode 100755 index 26e814c2..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f7ada0af4f174f0694ca6a487b8f543d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader deleted file mode 100755 index 011ee199..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader +++ /dev/null @@ -1,317 +0,0 @@ -Shader "TextMeshPro/Distance Field" { - -Properties { - _FaceTex ("Face Texture", 2D) = "white" {} - _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 - _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) - _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - - [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) - _OutlineTex ("Outline Texture", 2D) = "white" {} - _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 - _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 - _OutlineWidth ("Outline Thickness", Range(0, 1)) = 0 - _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - - _Bevel ("Bevel", Range(0,1)) = 0.5 - _BevelOffset ("Bevel Offset", Range(-0.5,0.5)) = 0 - _BevelWidth ("Bevel Width", Range(-.5,0.5)) = 0 - _BevelClamp ("Bevel Clamp", Range(0,1)) = 0 - _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 - - _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - [HDR]_SpecularColor ("Specular", Color) = (1,1,1,1) - _SpecularPower ("Specular", Range(0,4)) = 2.0 - _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 - _Diffuse ("Diffuse", Range(0,1)) = 0.5 - _Ambient ("Ambient", Range(1,0)) = 0.5 - - _BumpMap ("Normal map", 2D) = "bump" {} - _BumpOutline ("Bump Outline", Range(0,1)) = 0 - _BumpFace ("Bump Face", Range(0,1)) = 0 - - _ReflectFaceColor ("Reflection Color", Color) = (0,0,0,1) - _ReflectOutlineColor("Reflection Color", Color) = (0,0,0,1) - _Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ } - _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - - - [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) - _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 - _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 - _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 - _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - - [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) - _GlowOffset ("Offset", Range(-1,1)) = 0 - _GlowInner ("Inner", Range(0,1)) = 0.05 - _GlowOuter ("Outer", Range(0,1)) = 0.05 - _GlowPower ("Falloff", Range(1, 0)) = 0.75 - - _WeightNormal ("Weight Normal", float) = 0 - _WeightBold ("Weight Bold", float) = 0.5 - - _ShaderFlags ("Flags", float) = 0 - _ScaleRatioA ("Scale RatioA", float) = 1 - _ScaleRatioB ("Scale RatioB", float) = 1 - _ScaleRatioC ("Scale RatioC", float) = 1 - - _MainTex ("Font Atlas", 2D) = "white" {} - _TextureWidth ("Texture Width", float) = 512 - _TextureHeight ("Texture Height", float) = 512 - _GradientScale ("Gradient Scale", float) = 5.0 - _ScaleX ("Scale X", float) = 1.0 - _ScaleY ("Scale Y", float) = 1.0 - _PerspectiveFilter ("Perspective Correction", Range(0, 1)) = 0.875 - _Sharpness ("Sharpness", Range(-1,1)) = 0 - - _VertexOffsetX ("Vertex OffsetX", float) = 0 - _VertexOffsetY ("Vertex OffsetY", float) = 0 - - _MaskCoord ("Mask Coordinates", vector) = (0, 0, 32767, 32767) - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - _MaskSoftnessX ("Mask SoftnessX", float) = 0 - _MaskSoftnessY ("Mask SoftnessY", float) = 0 - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 -} - -SubShader { - - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - ZWrite Off - Lighting Off - Fog { Mode Off } - ZTest [unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass { - CGPROGRAM - #pragma target 3.0 - #pragma vertex VertShader - #pragma fragment PixShader - #pragma shader_feature __ BEVEL_ON - #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER - #pragma shader_feature __ GLOW_ON - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - #include "TMPro_Properties.cginc" - #include "TMPro.cginc" - - struct vertex_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - UNITY_VERTEX_OUTPUT_STEREO - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) - { - pixel_t output; - - UNITY_INITIALIZE_OUTPUT(pixel_t, output); - UNITY_SETUP_INSTANCE_ID(input); - UNITY_TRANSFER_INSTANCE_ID(input,output); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1); - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth * _ScaleRatioA - _OutlineSoftness * _ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - - output.position = vPosition; - output.color = input.color; - output.atlas = input.texcoord0; - output.param = float4(alphaClip, scale, bias, weight); - output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)); - output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz); - #if (UNDERLAY_ON || UNDERLAY_INNER) - output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias); - output.underlayColor = underlayColor; - #endif - output.textures = float4(faceUV, outlineUV); - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - UNITY_SETUP_INSTANCE_ID(input); - - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, weight, dxy); - - float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz; - bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - faceColor.rgb += glowColor.rgb * glowColor.a; - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness. - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw); - faceColor *= m.x * m.y; - #endif - - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); - #endif - - return faceColor * input.color.a; - } - - ENDCG - } -} - -Fallback "TextMeshPro/Mobile/Distance Field" -CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI" -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader.meta deleted file mode 100755 index e1cf3f38..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 68e6db2ebdc24f95958faec2be5558d6 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc deleted file mode 100755 index 58981304..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc +++ /dev/null @@ -1,84 +0,0 @@ -float2 UnpackUV(float uv) -{ - float2 output; - output.x = floor(uv / 4096); - output.y = uv - 4096 * output.x; - - return output * 0.001953125; -} - -fixed4 GetColor(half d, fixed4 faceColor, fixed4 outlineColor, half outline, half softness) -{ - half faceAlpha = 1-saturate((d - outline * 0.5 + softness * 0.5) / (1.0 + softness)); - half outlineAlpha = saturate((d + outline * 0.5)) * sqrt(min(1.0, outline)); - - faceColor.rgb *= faceColor.a; - outlineColor.rgb *= outlineColor.a; - - faceColor = lerp(faceColor, outlineColor, outlineAlpha); - - faceColor *= faceAlpha; - - return faceColor; -} - -float3 GetSurfaceNormal(float4 h, float bias) -{ - bool raisedBevel = step(1, fmod(_ShaderFlags, 2)); - - h += bias+_BevelOffset; - - float bevelWidth = max(.01, _OutlineWidth+_BevelWidth); - - // Track outline - h -= .5; - h /= bevelWidth; - h = saturate(h+.5); - - if(raisedBevel) h = 1 - abs(h*2.0 - 1.0); - h = lerp(h, sin(h*3.141592/2.0), _BevelRoundness); - h = min(h, 1.0-_BevelClamp); - h *= _Bevel * bevelWidth * _GradientScale * -2.0; - - float3 va = normalize(float3(1.0, 0.0, h.y - h.x)); - float3 vb = normalize(float3(0.0, -1.0, h.w - h.z)); - - return cross(va, vb); -} - -float3 GetSurfaceNormal(float2 uv, float bias, float3 delta) -{ - // Read "height field" - float4 h = {tex2D(_MainTex, uv - delta.xz).a, - tex2D(_MainTex, uv + delta.xz).a, - tex2D(_MainTex, uv - delta.zy).a, - tex2D(_MainTex, uv + delta.zy).a}; - - return GetSurfaceNormal(h, bias); -} - -float3 GetSpecular(float3 n, float3 l) -{ - float spec = pow(max(0.0, dot(n, l)), _Reflectivity); - return _SpecularColor.rgb * spec * _SpecularPower; -} - -float4 GetGlowColor(float d, float scale) -{ - float glow = d - (_GlowOffset*_ScaleRatioB) * 0.5 * scale; - float t = lerp(_GlowInner, (_GlowOuter * _ScaleRatioB), step(0.0, glow)) * 0.5 * scale; - glow = saturate(abs(glow/(1.0 + t))); - glow = 1.0-pow(glow, _GlowPower); - glow *= sqrt(min(1.0, t)); // Fade off glow thinner than 1 screen pixel - return float4(_GlowColor.rgb, saturate(_GlowColor.a * glow * 2)); -} - -float4 BlendARGB(float4 overlying, float4 underlying) -{ - overlying.rgb *= overlying.a; - underlying.rgb *= underlying.a; - float3 blended = overlying.rgb + ((1-overlying.a)*underlying.rgb); - float alpha = underlying.a + (1-underlying.a)*overlying.a; - return float4(blended, alpha); -} - diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc.meta deleted file mode 100755 index 0d6eb56c..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro.cginc.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 407bc68d299748449bbf7f48ee690f8d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc deleted file mode 100755 index 5969fec1..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc +++ /dev/null @@ -1,157 +0,0 @@ -struct vertex_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - float4 position : POSITION; - float3 normal : NORMAL; - float4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; -}; - -struct pixel_t { - UNITY_VERTEX_INPUT_INSTANCE_ID - UNITY_VERTEX_OUTPUT_STEREO - float4 position : SV_POSITION; - float4 faceColor : COLOR; - float4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; - float4 param : TEXCOORD1; // weight, scaleRatio - float2 mask : TEXCOORD2; - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD3; - float4 underlayColor : COLOR2; - #endif -}; - -float4 SRGBToLinear(float4 rgba) { - return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a); -} - -pixel_t VertShader(vertex_t input) -{ - pixel_t output; - - UNITY_INITIALIZE_OUTPUT(pixel_t, output); - UNITY_SETUP_INSTANCE_ID(input); - UNITY_TRANSFER_INSTANCE_ID(input, output); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - float4 color = input.color; - #if (FORCE_LINEAR && !UNITY_COLORSPACE_GAMMA) - color = SRGBToLinear(input.color); - #endif - - float opacity = color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - float4 faceColor = float4(color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - float4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - - output.position = vPosition; - output.faceColor = faceColor; - output.outlineColor = outlineColor; - output.texcoord0 = float4(input.texcoord0.xy, maskUV.xy); - output.param = float4(0.5 - weight, 1.3333 * _GradientScale * (_Sharpness + 1) / _TextureWidth, _OutlineWidth * _ScaleRatioA * 0.5, 0); - - float2 mask = float2(0, 0); - #if UNITY_UI_CLIP_RECT - mask = vert.xy * 2 - clampedRect.xy - clampedRect.zw; - #endif - output.mask = mask; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - - output.texcoord2 = float4(input.texcoord0 + float2(x, y), input.color.a, 0); - output.underlayColor = underlayColor; - #endif - - return output; -} - -float4 PixShader(pixel_t input) : SV_Target -{ - UNITY_SETUP_INSTANCE_ID(input); - - float d = tex2D(_MainTex, input.texcoord0.xy).a; - - float2 UV = input.texcoord0.xy; - float scale = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y))) * input.param.y; - - #if (UNDERLAY_ON | UNDERLAY_INNER) - float layerScale = scale; - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = input.param.x * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - #endif - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - - float4 faceColor = input.faceColor * saturate((d - input.param.x) * scale + 0.5); - - #ifdef OUTLINE_ON - float4 outlineColor = lerp(input.faceColor, input.outlineColor, sqrt(min(1.0, input.param.z * scale * 2))); - faceColor = lerp(outlineColor, input.faceColor, saturate((d - input.param.x - input.param.z) * scale + 0.5)); - faceColor *= saturate((d - input.param.x + input.param.z) * scale + 0.5); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord2.xy).a * layerScale; - faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - layerBias) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float bias = input.param.x * scale - 0.5; - float sd = saturate(d * scale - bias - input.param.z); - d = tex2D(_MainTex, input.texcoord2.xy).a * layerScale; - faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - layerBias)) * sd * (1 - faceColor.a); - #endif - - #ifdef MASKING - float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a); - float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl; - a = saturate(t / _MaskEdgeSoftness); - faceColor.rgb = lerp(_MaskEdgeColor.rgb * faceColor.a, faceColor.rgb, a); - faceColor *= a; - #endif - - // Alternative implementation to UnityGet2DClipping with support for softness - #if UNITY_UI_CLIP_RECT - float2 maskZW = 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + (1 / scale)); - float2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW); - faceColor *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - faceColor *= input.texcoord2.z; - #endif - - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); - #endif - - return faceColor; -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta deleted file mode 100755 index 4415e507..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c334973cef89a9840b0b0c507e0377ab -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc deleted file mode 100755 index 622ae875..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc +++ /dev/null @@ -1,101 +0,0 @@ -void VertShader(inout appdata_full v, out Input data) -{ - v.vertex.x += _VertexOffsetX; - v.vertex.y += _VertexOffsetY; - - UNITY_INITIALIZE_OUTPUT(Input, data); - - float bold = step(v.texcoord1.y, 0); - - // Generate normal for backface - float3 view = ObjSpaceViewDir(v.vertex); - v.normal *= sign(dot(v.normal, view)); - -#if USE_DERIVATIVE - data.param.y = 1; -#else - float4 vert = v.vertex; - float4 vPosition = UnityObjectToClipPos(vert); - float2 pixelSize = vPosition.w; - - pixelSize /= float2(_ScaleX, _ScaleY) * mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(v.texcoord1.y) * _GradientScale * (_Sharpness + 1); - scale = lerp(scale * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(v.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - data.param.y = scale; -#endif - - data.param.x = (lerp(_WeightNormal, _WeightBold, bold) / 4.0 + _FaceDilate) * _ScaleRatioA * 0.5; // - - v.texcoord1.xy = UnpackUV(v.texcoord1.x); - data.viewDirEnv = mul((float3x3)_EnvMatrix, WorldSpaceViewDir(v.vertex)); -} - -void PixShader(Input input, inout SurfaceOutput o) -{ - -#if USE_DERIVATIVE - float2 pixelSize = float2(ddx(input.uv_MainTex.y), ddy(input.uv_MainTex.y)); - pixelSize *= _TextureWidth * .75; - float scale = rsqrt(dot(pixelSize, pixelSize)) * _GradientScale * (_Sharpness + 1); -#else - float scale = input.param.y; -#endif - - // Signed distance - float c = tex2D(_MainTex, input.uv_MainTex).a; - float sd = (.5 - c - input.param.x) * scale + .5; - float outline = _OutlineWidth*_ScaleRatioA * scale; - float softness = _OutlineSoftness*_ScaleRatioA * scale; - - // Color & Alpha - float4 faceColor = _FaceColor; - float4 outlineColor = _OutlineColor; - faceColor *= input.color; - outlineColor.a *= input.color.a; - faceColor *= tex2D(_FaceTex, float2(input.uv2_FaceTex.x + _FaceUVSpeedX * _Time.y, input.uv2_FaceTex.y + _FaceUVSpeedY * _Time.y)); - outlineColor *= tex2D(_OutlineTex, float2(input.uv2_OutlineTex.x + _OutlineUVSpeedX * _Time.y, input.uv2_OutlineTex.y + _OutlineUVSpeedY * _Time.y)); - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - faceColor.rgb /= max(faceColor.a, 0.0001); - -#if BEVEL_ON - float3 delta = float3(1.0 / _TextureWidth, 1.0 / _TextureHeight, 0.0); - - float4 smp4x = {tex2D(_MainTex, input.uv_MainTex - delta.xz).a, - tex2D(_MainTex, input.uv_MainTex + delta.xz).a, - tex2D(_MainTex, input.uv_MainTex - delta.zy).a, - tex2D(_MainTex, input.uv_MainTex + delta.zy).a }; - - // Face Normal - float3 n = GetSurfaceNormal(smp4x, input.param.x); - - // Bumpmap - float3 bump = UnpackNormal(tex2D(_BumpMap, input.uv2_FaceTex.xy)).xyz; - bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5)); - bump = lerp(float3(0, 0, 1), bump, faceColor.a); - n = normalize(n - bump); - - // Cubemap reflection - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDirEnv, mul((float3x3)unity_ObjectToWorld, n))); - float3 emission = reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; -#else - float3 n = float3(0, 0, -1); - float3 emission = float3(0, 0, 0); -#endif - -#if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - glowColor.a *= input.color.a; - emission += glowColor.rgb*glowColor.a; - faceColor = BlendARGB(glowColor, faceColor); - faceColor.rgb /= max(faceColor.a, 0.0001); -#endif - - // Set Standard output structure - o.Albedo = faceColor.rgb; - o.Normal = -n; - o.Emission = emission; - o.Specular = lerp(_FaceShininess, _OutlineShininess, saturate(sd + outline * 0.5)); - o.Gloss = 1; - o.Alpha = faceColor.a; -} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta b/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta deleted file mode 100755 index 41ef4b10..00000000 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: d930090c0cd643c7b55f19a38538c162 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MirageSDK/Examples/TextMesh Pro.meta b/Assets/MirageSDK/Examples/TextMeshProAssets.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Fonts.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Fonts.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Fonts.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Fonts.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans - OFL.txt b/Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans - OFL.txt old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans - OFL.txt rename to Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans - OFL.txt diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans - OFL.txt.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans - OFL.txt.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans.ttf b/Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans.ttf old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans.ttf rename to Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans.ttf diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans.ttf.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans.ttf.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Fonts/LiberationSans.ttf.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Fonts/LiberationSans.ttf.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF.asset similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF.asset diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF.asset.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Fonts & Materials/LiberationSans SDF.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Following Characters.txt b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Following Characters.txt old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Following Characters.txt rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Following Characters.txt diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Following Characters.txt.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Following Characters.txt.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Leading Characters.txt old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Leading Characters.txt diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Leading Characters.txt.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/LineBreaking Leading Characters.txt.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets/EmojiOne.asset old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets/EmojiOne.asset diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets/EmojiOne.asset.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Sprite Assets/EmojiOne.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets/Default Style Sheet.asset old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets/Default Style Sheet.asset diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets/Default Style Sheet.asset.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/Style Sheets/Default Style Sheet.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/TMP Settings.asset b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/TMP Settings.asset old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/TMP Settings.asset rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/TMP Settings.asset diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Resources/TMP Settings.asset.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Resources/TMP Settings.asset.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Resources/TMP Settings.asset.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Resources/TMP Settings.asset.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_SDF-Mobile.shader old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_SDF-Mobile.shader diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_SDF-Mobile.shader.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_SDF-Mobile.shader.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Sprite.shader b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_Sprite.shader old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Sprite.shader rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_Sprite.shader diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Sprite.shader.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_Sprite.shader.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMP_Sprite.shader.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMP_Sprite.shader.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Properties.cginc b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMPro_Properties.cginc old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Properties.cginc rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMPro_Properties.cginc diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMPro_Properties.cginc.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Shaders/TMPro_Properties.cginc.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne Attribution.txt b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne Attribution.txt old mode 100755 new mode 100644 similarity index 98% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne Attribution.txt rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne Attribution.txt index 10c4be3a..384180a9 --- a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne Attribution.txt +++ b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne Attribution.txt @@ -1,3 +1,3 @@ -This sample of beautiful emojis are provided by EmojiOne https://www.emojione.com/ - +This sample of beautiful emojis are provided by EmojiOne https://www.emojione.com/ + Please visit their website to view the complete set of their emojis and review their licensing terms. \ No newline at end of file diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne Attribution.txt.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne Attribution.txt.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.json b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.json old mode 100755 new mode 100644 similarity index 96% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.json rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.json index 16c800d5..6c4e50bc --- a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.json +++ b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.json @@ -1,156 +1,156 @@ -{"frames": [ - -{ - "filename": "1f60a.png", - "frame": {"x":0,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f60b.png", - "frame": {"x":128,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f60d.png", - "frame": {"x":256,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f60e.png", - "frame": {"x":384,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f600.png", - "frame": {"x":0,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f601.png", - "frame": {"x":128,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f602.png", - "frame": {"x":256,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f603.png", - "frame": {"x":384,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f604.png", - "frame": {"x":0,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f605.png", - "frame": {"x":128,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f606.png", - "frame": {"x":256,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f609.png", - "frame": {"x":384,"y":256,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f618.png", - "frame": {"x":0,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "1f923.png", - "frame": {"x":128,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "263a.png", - "frame": {"x":256,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}, -{ - "filename": "2639.png", - "frame": {"x":384,"y":384,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128}, - "pivot": {"x":0.5,"y":0.5} -}], -"meta": { - "app": "http://www.codeandweb.com/texturepacker", - "version": "1.0", - "image": "EmojiOne.png", - "format": "RGBA8888", - "size": {"w":512,"h":512}, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:196a26a2e149d875b91ffc8fa3581e76:fc928c7e275404b7e0649307410475cb:424723c3774975ddb2053fd5c4b85f6e$" -} -} +{"frames": [ + +{ + "filename": "1f60a.png", + "frame": {"x":0,"y":0,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f60b.png", + "frame": {"x":128,"y":0,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f60d.png", + "frame": {"x":256,"y":0,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f60e.png", + "frame": {"x":384,"y":0,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f600.png", + "frame": {"x":0,"y":128,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f601.png", + "frame": {"x":128,"y":128,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f602.png", + "frame": {"x":256,"y":128,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f603.png", + "frame": {"x":384,"y":128,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f604.png", + "frame": {"x":0,"y":256,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f605.png", + "frame": {"x":128,"y":256,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f606.png", + "frame": {"x":256,"y":256,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f609.png", + "frame": {"x":384,"y":256,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f618.png", + "frame": {"x":0,"y":384,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "1f923.png", + "frame": {"x":128,"y":384,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "263a.png", + "frame": {"x":256,"y":384,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}, +{ + "filename": "2639.png", + "frame": {"x":384,"y":384,"w":128,"h":128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, + "sourceSize": {"w":128,"h":128}, + "pivot": {"x":0.5,"y":0.5} +}], +"meta": { + "app": "http://www.codeandweb.com/texturepacker", + "version": "1.0", + "image": "EmojiOne.png", + "format": "RGBA8888", + "size": {"w":512,"h":512}, + "scale": "1", + "smartupdate": "$TexturePacker:SmartUpdate:196a26a2e149d875b91ffc8fa3581e76:fc928c7e275404b7e0649307410475cb:424723c3774975ddb2053fd5c4b85f6e$" +} +} diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.json.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.json.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.json.meta diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.png b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.png old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.png rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.png diff --git a/Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.png.meta b/Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.png.meta old mode 100755 new mode 100644 similarity index 100% rename from Assets/MirageSDK/Examples/TextMesh Pro/Sprites/EmojiOne.png.meta rename to Assets/MirageSDK/Examples/TextMeshProAssets/Sprites/EmojiOne.png.meta diff --git a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets.meta b/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets.meta deleted file mode 100644 index 2172ee25..00000000 --- a/Assets/MirageSDK/Examples/UseCases/WebGlLogin/Wallets.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b9d772a6459a4e30a01cdf81b6b8dd06 -timeCreated: 1656408473 \ No newline at end of file diff --git a/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/Models/ClientMeta.cs b/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/Models/ClientMeta.cs index 93c719ad..0c641665 100644 --- a/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/Models/ClientMeta.cs +++ b/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/Models/ClientMeta.cs @@ -34,5 +34,26 @@ public override bool Equals(object obj) return base.Equals(obj); } + + public override int GetHashCode() + { + const int prime1 = 17; + const int prime2 = 31; + + int hash = prime1; + hash = hash * prime2 + Description?.GetHashCode() ?? 0; + hash = hash * prime2 + Url?.GetHashCode() ?? 0; + hash = hash * prime2 + Name?.GetHashCode() ?? 0; + + if (Icons != null) + { + foreach (var icon in Icons) + { + hash = hash * prime2 + icon?.GetHashCode() ?? 0; + } + } + + return hash; + } } } \ No newline at end of file diff --git a/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/WalletConnectSession.cs b/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/WalletConnectSession.cs index db9645a2..659c837d 100644 --- a/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/WalletConnectSession.cs +++ b/Assets/MirageSDK/Plugins/WalletConnectSharp.Core/WalletConnectSession.cs @@ -274,9 +274,9 @@ public async UniTask EthSign(string address, string message) return response.Result; } - public async UniTask EthChainId() + public UniTask EthChainId() { - return new BigInteger(ChainId); + return UniTask.FromResult(new BigInteger(ChainId)); } public async UniTask EthPersonalSign(string address, string message) diff --git a/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/Models/NFTTokenData.cs b/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/Models/NFTTokenData.cs index 22b8d0d8..8183e891 100644 --- a/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/Models/NFTTokenData.cs +++ b/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/Models/NFTTokenData.cs @@ -32,7 +32,7 @@ public IEnumerator DownloadImageSprite() yield return www.SendWebRequest(); - if (www.isNetworkError) + if (www.result == UnityWebRequest.Result.ConnectionError) { throw new IOException(www.error); } diff --git a/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/WalletConnect.cs b/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/WalletConnect.cs index 50457bf0..ca008c7f 100644 --- a/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/WalletConnect.cs +++ b/Assets/MirageSDK/Plugins/WalletConnectSharp.Unity/WalletConnect.cs @@ -417,12 +417,11 @@ public async UniTask CloseSession(bool connectNewSession = true) private void TryLoadOwnVersionKnowledge() { var ownVersionKnowledgeTextAsset = Resources.Load("own-version-knowledge"); - _ownVersionKnowledge = JsonUtility.FromJson(ownVersionKnowledgeTextAsset.text.Trim()); + _ownVersionKnowledge = Newtonsoft.Json.JsonConvert.DeserializeObject(ownVersionKnowledgeTextAsset.text.Trim()); } private void LogVersion() { - const string versionKey = "version"; if (_ownVersionKnowledge != null && !string.IsNullOrWhiteSpace(_ownVersionKnowledge.version)) { Logger.AddLog(_ownVersionKnowledge.version); diff --git a/Assets/MirageSDK/Runtime/Utils/EthereumNetworks.cs b/Assets/MirageSDK/Runtime/Utils/EthereumNetworks.cs index 0ec5bb1f..62cfde26 100644 --- a/Assets/MirageSDK/Runtime/Utils/EthereumNetworks.cs +++ b/Assets/MirageSDK/Runtime/Utils/EthereumNetworks.cs @@ -7,8 +7,6 @@ namespace MirageSDK.Utils { public static class EthereumNetworks { - private static readonly string _ethereumMainnetName = "Mainnet"; - private static readonly Dictionary Dictionary = new Dictionary(); diff --git a/Assets/MirageSDK/Runtime/Utils/MirageSDKNetworkUtils.cs b/Assets/MirageSDK/Runtime/Utils/MirageSDKNetworkUtils.cs index fd928886..2bc41f91 100644 --- a/Assets/MirageSDK/Runtime/Utils/MirageSDKNetworkUtils.cs +++ b/Assets/MirageSDK/Runtime/Utils/MirageSDKNetworkUtils.cs @@ -77,7 +77,7 @@ public static string[] GetAnkrRPCsForSelectedNetwork(NetworkName networkName) rpcUrl }; } - catch (NotSupportedException e) + catch (NotSupportedException) { return null; } diff --git a/Assets/MirageSDK/Runtime/WebGL/WebGLConnect.cs b/Assets/MirageSDK/Runtime/WebGL/WebGLConnect.cs index 8c8b13c4..cf27021d 100644 --- a/Assets/MirageSDK/Runtime/WebGL/WebGLConnect.cs +++ b/Assets/MirageSDK/Runtime/WebGL/WebGLConnect.cs @@ -17,7 +17,6 @@ public class WebGLConnect : IWalletConnectable private UniTaskCompletionSource _walletCompletionSource; private WebGLConnectSettingsSO _settings; private NetworkName _network; - private bool _initialized; public string SettingsFilename => SettingsFilenameStr; @@ -32,7 +31,6 @@ public void Initialize(ScriptableObject settings) _settings = settings as WebGLConnectSettingsSO; if (_settings != null) { - _initialized = true; _network = _settings.DefaultNetwork; } else diff --git a/Assets/MirageSDK/Runtime/WebGL/WebGLTemplates.meta b/Assets/MirageSDK/Runtime/WebGL/WebGLTemplates.meta deleted file mode 100644 index 38a27632..00000000 --- a/Assets/MirageSDK/Runtime/WebGL/WebGLTemplates.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 005da749f15f4d3db06e0d54da930593 -timeCreated: 1679672258 \ No newline at end of file diff --git a/Assets/MirageSDK/Third-Party Notices.md b/Assets/MirageSDK/Third-Party Notices.md new file mode 100644 index 00000000..8af07627 --- /dev/null +++ b/Assets/MirageSDK/Third-Party Notices.md @@ -0,0 +1,116 @@ +# Third Party Software Notices + +This package contains third-party software components governed by the license(s) indicated below: + + +-------------------------------- +## Component Name: TextMesh Pro + +### License Type: Unity Companion License + +Copyright © 2017-2019 Unity Technologies ApS + +Licensed under the Unity Companion License for Unity-dependent projects - see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). + +Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions. + +## Component Name: Nethereum + +### License Type: The MIT License (MIT) + +Copyright © 2015-2023 Nethereum.com (Juan Blanco) , Logo by Cass (https://github.com/c055) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or ANY portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +## Component Name: Bouncy Castle Crypto APIs + +### License Type: The MIT License (MIT) + +Copyright © 2000 - 2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or ANY portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +## Component Name: QRCoder + +### License Type: The MIT License (MIT) + +Copyright © 2013-2018 Raffael Herrmann + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +## Component name: WalletConnectSharp + +### License Type: Apache License 2.0 + +Copyright © 2023 WalletConnect, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +## Component Name: UniTask + +### License Type: The MIT License (MIT) + +Copyright © 2019 Yoshifumi Kawai / Cysharp, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +## Component Name: Newtonsoft.Json + +### License Type: The MIT License (MIT) + +Copyright © 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Assets/MirageSDK/Third-Party Notices.md.meta b/Assets/MirageSDK/Third-Party Notices.md.meta new file mode 100644 index 00000000..57400a15 --- /dev/null +++ b/Assets/MirageSDK/Third-Party Notices.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 110cc08cb3adf4445bf36dd26a7edad9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index d716489e..064cae3e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,21 +6,7 @@ "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.test-framework": "1.3.2", "com.unity.textmeshpro": "3.0.6", - "com.unity.ugui": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0" + "com.unity.modules.unitywebrequesttexture": "1.0.0" }, "scopedRegistries": [ { diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a9b5775f..ddf12720 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -59,121 +59,43 @@ }, "com.unity.ugui": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0" } }, - "com.unity.modules.androidjni": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.animation": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.assetbundle": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.audio": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.director": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.animation": "1.0.0" - } - }, "com.unity.modules.imageconversion": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": {} }, "com.unity.modules.imgui": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": {} }, "com.unity.modules.jsonserialize": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": {} }, "com.unity.modules.ui": { "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.modules.uielements": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.modules.umbra": { - "version": "1.0.0", - "depth": 0, + "depth": 2, "source": "builtin", "dependencies": {} }, "com.unity.modules.unitywebrequest": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": {} }, - "com.unity.modules.unitywebrequestassetbundle": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0" - } - }, - "com.unity.modules.unitywebrequestaudio": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.audio": "1.0.0" - } - }, "com.unity.modules.unitywebrequesttexture": { "version": "1.0.0", "depth": 0, @@ -182,19 +104,6 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.imageconversion": "1.0.0" } - }, - "com.unity.modules.unitywebrequestwww": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0" - } } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 016fb33d..03aaae11 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.4.11 + bundleVersion: 0.6.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/PythonScripts/prepare_for_asset_store.py b/PythonScripts/prepare_for_asset_store.py new file mode 100644 index 00000000..bd54b5db --- /dev/null +++ b/PythonScripts/prepare_for_asset_store.py @@ -0,0 +1,89 @@ +import os +import shutil +import json + + +def remove_dir(path): + """ + Recursively remove directory and its contents. + """ + if os.path.exists(path): + shutil.rmtree(path) + + +def remove_file(path): + """ + Remove a file at the given path. + """ + if os.path.exists(path): + os.remove(path) + + +def remove_assets_and_folders(project_path): + """ + Remove all folders in the Assets folder except MirageSDK folder. + """ + + assets_dir = os.path.join(project_path, "Assets") + for root, dirs, files in os.walk(assets_dir): + for name in dirs: + if root == assets_dir and name != "MirageSDK": + print("removing folder " + name + " in the Assets folder...") + remove_dir(os.path.join(root, name)) + remove_file(os.path.join(root, name + ".meta")) + + # Remove MirageSDK/package.json and MirageSDK/Resources/own-version-knowledge.json + package_file = os.path.join(assets_dir, "MirageSDK", "package.json") + own_version_file = os.path.join(assets_dir, "MirageSDK", "Resources", "own-version-knowledge.json") + remove_file(package_file) + remove_file(own_version_file) + remove_file(package_file + ".meta") + remove_file(own_version_file + ".meta") + + # Remove Resources folder if it is empty + resources_dir = os.path.join(assets_dir, "MirageSDK", "Resources") + if os.path.exists(resources_dir) and not os.listdir(resources_dir): + print("removing dir " + resources_dir) + remove_dir(resources_dir) + remove_file(resources_dir + ".meta") + else: + print("failed to remove " + resources_dir) + + +def put_sdk_folder_to_mirage_folder(project_path): + mirage_sdk_dir = os.path.join(project_path, "Assets", "MirageSDK") + + if os.path.exists(mirage_sdk_dir): + mirage_dir = os.path.join(project_path, "Assets", "Mirage") + remove_dir(mirage_dir) + os.mkdir(mirage_dir) + shutil.move(mirage_sdk_dir, mirage_dir) + remove_file(mirage_sdk_dir + ".meta") + + +def remove_packages(project_path): + remove_packages = ["com.unity.mobile.android-logcat", "com.unity.test-framework", "com.unity.ide.rider"] + + # Remove package references from manifest.json and packages-lock.json files + for file_name in ["manifest.json", "packages-lock.json"]: + file_path = os.path.join(project_path, "Packages", file_name) + with open(file_path, "r") as file: + data = json.load(file) + + for package in remove_packages: + if package in data["dependencies"]: + print(f"Removing package from {file_name}:", package) + data[f"dependencies"].pop(package, None) + + with open(file_path, "w") as file: + json.dump(data, file, indent=4) + + +if __name__ == "__main__": + file_path = os.path.abspath(__file__) + dir_path = os.path.dirname(file_path) + parent_dir_path = os.path.abspath(os.path.join(dir_path, os.pardir)) + + remove_assets_and_folders(parent_dir_path) + put_sdk_folder_to_mirage_folder(parent_dir_path) + remove_packages(parent_dir_path)