diff --git a/Assets/Scene.unity b/Assets/Scene.unity index ca70a72..9b89be0 100644 --- a/Assets/Scene.unity +++ b/Assets/Scene.unity @@ -96,8 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightingDataAsset: {fileID: 112000000, guid: 186267080dddf4607b7d526cccf2d517, - type: 2} + m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: diff --git a/Assets/Scene/LightingData.asset b/Assets/Scene/LightingData.asset deleted file mode 100644 index dcbaf3f..0000000 Binary files a/Assets/Scene/LightingData.asset and /dev/null differ diff --git a/Assets/Scene/LightingData.asset.meta b/Assets/Scene/LightingData.asset.meta deleted file mode 100644 index 93d2828..0000000 --- a/Assets/Scene/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 186267080dddf4607b7d526cccf2d517 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scene/ReflectionProbe-0.exr b/Assets/Scene/ReflectionProbe-0.exr deleted file mode 100644 index 83e7638..0000000 Binary files a/Assets/Scene/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/Scene/ReflectionProbe-0.exr.meta b/Assets/Scene/ReflectionProbe-0.exr.meta deleted file mode 100644 index 6407c16..0000000 --- a/Assets/Scene/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,91 +0,0 @@ -fileFormatVersion: 2 -guid: ae4aa8b9affb847cab0f40d1d7d4c2b7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toon Standard Material.mat b/Assets/Toon Standard Material.mat index 674d845..ee74f6e 100644 --- a/Assets/Toon Standard Material.mat +++ b/Assets/Toon Standard Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Toon Test + m_Name: Toon Standard Material m_Shader: {fileID: 4800000, guid: afd4e5df5a9cf4406a8e772d4ea69d78, type: 3} m_ShaderKeywords: DAB_COORDS_TRIPLANAR m_LightmapFlags: 4 @@ -72,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 0.73 + - _BumpScale: 0.91 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Assets/Toon Standard Shader/ToonLighting.cginc b/Assets/Toon Standard Shader/ToonLighting.cginc index d764780..390e871 100644 --- a/Assets/Toon Standard Shader/ToonLighting.cginc +++ b/Assets/Toon Standard Shader/ToonLighting.cginc @@ -248,7 +248,7 @@ void ComputeVertexLightColor (v2f i) { unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0, unity_LightColor[0].rgb, unity_LightColor[1].rgb, unity_LightColor[2].rgb, unity_LightColor[3].rgb, - unity_4LightAtten0, i.worldPos, i.worldNormal + unity_4LightAtten0, i.worldPos, i.normal ); #endif }