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: 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/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); 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: diff --git a/Assets/Shapes/package.json b/Assets/Shapes/package.json new file mode 100644 index 0000000..b75b8a0 --- /dev/null +++ b/Assets/Shapes/package.json @@ -0,0 +1,12 @@ +{ + "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", + "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: 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": { - } -}