From 927d31aba897d1fcffc698943a48b7730385c835 Mon Sep 17 00:00:00 2001 From: Jun Tachikawa Date: Thu, 25 Jun 2020 14:01:48 +0900 Subject: [PATCH 1/6] update to Unity 2019.4 --- Assets/Plugins/Editor.meta | 10 ---------- ProjectSettings/EditorSettings.asset | 20 +++++++++++++++++--- ProjectSettings/ProjectVersion.txt | 3 ++- UnityPackageManager/manifest.json | 4 ---- 4 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 Assets/Plugins/Editor.meta delete mode 100644 UnityPackageManager/manifest.json diff --git a/Assets/Plugins/Editor.meta b/Assets/Plugins/Editor.meta deleted file mode 100644 index b2c048b..0000000 --- a/Assets/Plugins/Editor.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c35658571682a98448f31158e1ad80a7 -folderAsset: yes -timeCreated: 1520013807 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 7b42695..4af553a 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,19 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Hidden Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e6cd1f9..d6e4713 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2017.3.0f3 +m_EditorVersion: 2019.4.0f1 +m_EditorVersionWithRevision: 2019.4.0f1 (0af376155913) diff --git a/UnityPackageManager/manifest.json b/UnityPackageManager/manifest.json deleted file mode 100644 index 526aca6..0000000 --- a/UnityPackageManager/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "dependencies": { - } -} From b0a8d5341284da61558dd56d76a2257418c63309 Mon Sep 17 00:00:00 2001 From: Jun Tachikawa Date: Thu, 25 Jun 2020 14:04:46 +0900 Subject: [PATCH 2/6] added .asmdef --- Assets/Shapes/Shapes.asmdef | 3 +++ Assets/Shapes/Shapes.asmdef.meta | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 Assets/Shapes/Shapes.asmdef create mode 100644 Assets/Shapes/Shapes.asmdef.meta diff --git a/Assets/Shapes/Shapes.asmdef b/Assets/Shapes/Shapes.asmdef new file mode 100644 index 0000000..96d5676 --- /dev/null +++ b/Assets/Shapes/Shapes.asmdef @@ -0,0 +1,3 @@ +{ + "name": "Shapes" +} diff --git a/Assets/Shapes/Shapes.asmdef.meta b/Assets/Shapes/Shapes.asmdef.meta new file mode 100644 index 0000000..7f8bd23 --- /dev/null +++ b/Assets/Shapes/Shapes.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: db3aaf2f24aff4a519dca1eb5602bd39 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From cf962aacab0e6cf6304bc92edb79c3e9e8394fca Mon Sep 17 00:00:00 2001 From: Jun Tachikawa Date: Thu, 25 Jun 2020 14:07:34 +0900 Subject: [PATCH 3/6] added package.json --- Assets/Shapes/package.json | 12 ++++++++++++ Assets/Shapes/package.json.meta | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 Assets/Shapes/package.json create mode 100644 Assets/Shapes/package.json.meta diff --git a/Assets/Shapes/package.json b/Assets/Shapes/package.json new file mode 100644 index 0000000..bafc93b --- /dev/null +++ b/Assets/Shapes/package.json @@ -0,0 +1,12 @@ +{ + "name": "com.jtfrom9.miguel12345.unity-shapes", + "displayName": "Unity Shapes fork", + "version": "1.0.0", + "unity": "2019.4", + "description": "Draw anti-aliased, GPU-instance-supported, 0 allocation shapes (circle,line,arrow) with one line of code in Unity", + "dependencies": { + }, + "author": { + "name": "miguel12345" + } +} diff --git a/Assets/Shapes/package.json.meta b/Assets/Shapes/package.json.meta new file mode 100644 index 0000000..4cc22d4 --- /dev/null +++ b/Assets/Shapes/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 516bb7bd1be3c4095be92660b20744b5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 2c6216222c08d586b5a16ba76308497208b7beb8 Mon Sep 17 00:00:00 2001 From: Jun Tachikawa Date: Thu, 25 Jun 2020 14:20:08 +0900 Subject: [PATCH 4/6] fix for error --- Assets/Shapes/Resources/Shaders/Polygon.shader | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Shapes/Resources/Shaders/Polygon.shader b/Assets/Shapes/Resources/Shaders/Polygon.shader index ea1e3fe..e06431a 100644 --- a/Assets/Shapes/Resources/Shaders/Polygon.shader +++ b/Assets/Shapes/Resources/Shaders/Polygon.shader @@ -50,8 +50,8 @@ { v2f o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_TRANSFER_INSTANCE_ID(v, o); + // UNITY_SETUP_INSTANCE_ID(v); + // UNITY_TRANSFER_INSTANCE_ID(v, o); o.vertex = UnityObjectToClipPos(v.vertex); o.uv = v.uv; @@ -60,7 +60,7 @@ fixed4 frag (v2f i) : SV_Target { - UNITY_SETUP_INSTANCE_ID(i); + // UNITY_SETUP_INSTANCE_ID(i); float aaSmoothing = UNITY_ACCESS_INSTANCED_PROP(CommonProps, _AASmoothing); fixed4 fillColor = UNITY_ACCESS_INSTANCED_PROP(CommonProps, _FillColor); From 1e71dfd57a56151b8015577b89aa25891321308d Mon Sep 17 00:00:00 2001 From: jtfrom9 Date: Tue, 15 Sep 2020 00:09:41 +0900 Subject: [PATCH 5/6] rm Plugins.meta --- Assets/Plugins.meta | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Assets/Plugins.meta diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta deleted file mode 100644 index 5ef30b1..0000000 --- a/Assets/Plugins.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: cad8217af59e2574a9681399cec9f48b -folderAsset: yes -timeCreated: 1520013807 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 488368431347e22b92b70e558332f26ba59b3cbd Mon Sep 17 00:00:00 2001 From: jtfrom9 Date: Tue, 15 Sep 2020 00:14:56 +0900 Subject: [PATCH 6/6] fix package.json --- Assets/Shapes/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Shapes/package.json b/Assets/Shapes/package.json index bafc93b..b75b8a0 100644 --- a/Assets/Shapes/package.json +++ b/Assets/Shapes/package.json @@ -1,6 +1,6 @@ { - "name": "com.jtfrom9.miguel12345.unity-shapes", - "displayName": "Unity Shapes fork", + "name": "com.miguel12345.unity-shapes", + "displayName": "Unity Shapes", "version": "1.0.0", "unity": "2019.4", "description": "Draw anti-aliased, GPU-instance-supported, 0 allocation shapes (circle,line,arrow) with one line of code in Unity",