diff --git a/.vs/psx_retroshader/v16/.suo b/.vs/psx_retroshader/v16/.suo new file mode 100644 index 0000000..f89e7ed Binary files /dev/null and b/.vs/psx_retroshader/v16/.suo differ diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Materials/billboard001.mat b/Assets/Materials/billboard001.mat deleted file mode 100644 index babf473..0000000 Binary files a/Assets/Materials/billboard001.mat and /dev/null differ diff --git a/Assets/Materials/cube001.mat b/Assets/Materials/cube001.mat deleted file mode 100644 index 34f5c5b..0000000 Binary files a/Assets/Materials/cube001.mat and /dev/null differ diff --git a/Assets/Materials/cube002.mat b/Assets/Materials/cube002.mat deleted file mode 100644 index d30c7a4..0000000 Binary files a/Assets/Materials/cube002.mat and /dev/null differ diff --git a/Assets/Materials/cube003.mat b/Assets/Materials/cube003.mat deleted file mode 100644 index c225842..0000000 Binary files a/Assets/Materials/cube003.mat and /dev/null differ diff --git a/Assets/Materials/tex001.mat b/Assets/Materials/tex001.mat deleted file mode 100644 index 022eda4..0000000 Binary files a/Assets/Materials/tex001.mat and /dev/null differ diff --git a/Assets/Materials/tex002.mat b/Assets/Materials/tex002.mat deleted file mode 100644 index a174fc5..0000000 Binary files a/Assets/Materials/tex002.mat and /dev/null differ diff --git a/Assets/Materials/tex003.mat b/Assets/Materials/tex003.mat deleted file mode 100644 index e19e464..0000000 Binary files a/Assets/Materials/tex003.mat and /dev/null differ diff --git a/Assets/Materials/tex004.mat b/Assets/Materials/tex004.mat deleted file mode 100644 index f20e669..0000000 Binary files a/Assets/Materials/tex004.mat and /dev/null differ diff --git a/Assets/Materials/tex006.mat b/Assets/Materials/tex006.mat deleted file mode 100644 index 4a503c0..0000000 Binary files a/Assets/Materials/tex006.mat and /dev/null differ diff --git a/Assets/Shaders/Resources.meta b/Assets/PSXRetroShader.meta similarity index 57% rename from Assets/Shaders/Resources.meta rename to Assets/PSXRetroShader.meta index 49e1b95..287b0f8 100644 --- a/Assets/Shaders/Resources.meta +++ b/Assets/PSXRetroShader.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 334a86c87fcdee84ba61a79f57799b61 +guid: 20cebcdd114865c44b6404d14e299bdc folderAsset: yes -timeCreated: 1466069872 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials.meta b/Assets/PSXRetroShader/Materials.meta similarity index 100% rename from Assets/Materials.meta rename to Assets/PSXRetroShader/Materials.meta diff --git a/Assets/PSXRetroShader/Materials/billboard001.mat b/Assets/PSXRetroShader/Materials/billboard001.mat new file mode 100644 index 0000000..15791e8 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/billboard001.mat differ diff --git a/Assets/Materials/billboard001.mat.meta b/Assets/PSXRetroShader/Materials/billboard001.mat.meta similarity index 100% rename from Assets/Materials/billboard001.mat.meta rename to Assets/PSXRetroShader/Materials/billboard001.mat.meta diff --git a/Assets/PSXRetroShader/Materials/cube001.mat b/Assets/PSXRetroShader/Materials/cube001.mat new file mode 100644 index 0000000..2f77680 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/cube001.mat differ diff --git a/Assets/Materials/cube001.mat.meta b/Assets/PSXRetroShader/Materials/cube001.mat.meta similarity index 100% rename from Assets/Materials/cube001.mat.meta rename to Assets/PSXRetroShader/Materials/cube001.mat.meta diff --git a/Assets/PSXRetroShader/Materials/cube002.mat b/Assets/PSXRetroShader/Materials/cube002.mat new file mode 100644 index 0000000..19bb692 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/cube002.mat differ diff --git a/Assets/Materials/cube002.mat.meta b/Assets/PSXRetroShader/Materials/cube002.mat.meta similarity index 100% rename from Assets/Materials/cube002.mat.meta rename to Assets/PSXRetroShader/Materials/cube002.mat.meta diff --git a/Assets/PSXRetroShader/Materials/cube002_instancing.mat b/Assets/PSXRetroShader/Materials/cube002_instancing.mat new file mode 100644 index 0000000..c32e87c Binary files /dev/null and b/Assets/PSXRetroShader/Materials/cube002_instancing.mat differ diff --git a/Assets/PSXRetroShader/Materials/cube002_instancing.mat.meta b/Assets/PSXRetroShader/Materials/cube002_instancing.mat.meta new file mode 100644 index 0000000..42fd529 --- /dev/null +++ b/Assets/PSXRetroShader/Materials/cube002_instancing.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 783b1ca499823f14f8169e47aba74d11 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Materials/cube003.mat b/Assets/PSXRetroShader/Materials/cube003.mat new file mode 100644 index 0000000..48c43a4 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/cube003.mat differ diff --git a/Assets/Materials/cube003.mat.meta b/Assets/PSXRetroShader/Materials/cube003.mat.meta similarity index 100% rename from Assets/Materials/cube003.mat.meta rename to Assets/PSXRetroShader/Materials/cube003.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex001.mat b/Assets/PSXRetroShader/Materials/tex001.mat new file mode 100644 index 0000000..4930c8f Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex001.mat differ diff --git a/Assets/Materials/tex001.mat.meta b/Assets/PSXRetroShader/Materials/tex001.mat.meta similarity index 100% rename from Assets/Materials/tex001.mat.meta rename to Assets/PSXRetroShader/Materials/tex001.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex002.mat b/Assets/PSXRetroShader/Materials/tex002.mat new file mode 100644 index 0000000..8b2e81a Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex002.mat differ diff --git a/Assets/Materials/tex002.mat.meta b/Assets/PSXRetroShader/Materials/tex002.mat.meta similarity index 100% rename from Assets/Materials/tex002.mat.meta rename to Assets/PSXRetroShader/Materials/tex002.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex002_lm.mat b/Assets/PSXRetroShader/Materials/tex002_lm.mat new file mode 100644 index 0000000..4dfd835 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex002_lm.mat differ diff --git a/Assets/PSXRetroShader/Materials/tex002_lm.mat.meta b/Assets/PSXRetroShader/Materials/tex002_lm.mat.meta new file mode 100644 index 0000000..67bfa1f --- /dev/null +++ b/Assets/PSXRetroShader/Materials/tex002_lm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 423403904e0e082439aa42749b869cca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Materials/tex003.mat b/Assets/PSXRetroShader/Materials/tex003.mat new file mode 100644 index 0000000..b0d85a6 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex003.mat differ diff --git a/Assets/Materials/tex003.mat.meta b/Assets/PSXRetroShader/Materials/tex003.mat.meta similarity index 100% rename from Assets/Materials/tex003.mat.meta rename to Assets/PSXRetroShader/Materials/tex003.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex003_lm.mat b/Assets/PSXRetroShader/Materials/tex003_lm.mat new file mode 100644 index 0000000..f3be738 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex003_lm.mat differ diff --git a/Assets/PSXRetroShader/Materials/tex003_lm.mat.meta b/Assets/PSXRetroShader/Materials/tex003_lm.mat.meta new file mode 100644 index 0000000..daa0131 --- /dev/null +++ b/Assets/PSXRetroShader/Materials/tex003_lm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d14a683cdfd8ef448df2f9e1840e3e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Materials/tex004.mat b/Assets/PSXRetroShader/Materials/tex004.mat new file mode 100644 index 0000000..7a62853 Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex004.mat differ diff --git a/Assets/Materials/tex004.mat.meta b/Assets/PSXRetroShader/Materials/tex004.mat.meta similarity index 100% rename from Assets/Materials/tex004.mat.meta rename to Assets/PSXRetroShader/Materials/tex004.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex006.mat b/Assets/PSXRetroShader/Materials/tex006.mat new file mode 100644 index 0000000..87b92ee Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex006.mat differ diff --git a/Assets/Materials/tex006.mat.meta b/Assets/PSXRetroShader/Materials/tex006.mat.meta similarity index 100% rename from Assets/Materials/tex006.mat.meta rename to Assets/PSXRetroShader/Materials/tex006.mat.meta diff --git a/Assets/PSXRetroShader/Materials/tex006_lm.mat b/Assets/PSXRetroShader/Materials/tex006_lm.mat new file mode 100644 index 0000000..e4836eb Binary files /dev/null and b/Assets/PSXRetroShader/Materials/tex006_lm.mat differ diff --git a/Assets/PSXRetroShader/Materials/tex006_lm.mat.meta b/Assets/PSXRetroShader/Materials/tex006_lm.mat.meta new file mode 100644 index 0000000..757a34e --- /dev/null +++ b/Assets/PSXRetroShader/Materials/tex006_lm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a80027eed8354fd4a86ba3ea1b2733f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Trasparent.meta b/Assets/PSXRetroShader/Scenes.meta similarity index 57% rename from Assets/Shaders/Trasparent.meta rename to Assets/PSXRetroShader/Scenes.meta index e021df8..dcdece2 100644 --- a/Assets/Shaders/Trasparent.meta +++ b/Assets/PSXRetroShader/Scenes.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: f3f21d2adbeffc04498067f4a45cfaa9 +guid: 9778399daa1c0b941b226820d210f194 folderAsset: yes -timeCreated: 1431593662 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/PSXRetroShader/Scenes/instancing.unity b/Assets/PSXRetroShader/Scenes/instancing.unity new file mode 100644 index 0000000..b327c88 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/instancing.unity differ diff --git a/Assets/Shaders/Billboard.meta b/Assets/PSXRetroShader/Scenes/instancing.unity.meta similarity index 58% rename from Assets/Shaders/Billboard.meta rename to Assets/PSXRetroShader/Scenes/instancing.unity.meta index fdefecc..53b48fe 100644 --- a/Assets/Shaders/Billboard.meta +++ b/Assets/PSXRetroShader/Scenes/instancing.unity.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: d13d78a5bb5f6a04dac3ff4075fbbf0d -folderAsset: yes -timeCreated: 1467290045 +guid: 971aa1dc81d27a140bcd298e77880a64 +timeCreated: 1439450285 licenseType: Free DefaultImporter: userData: diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest.meta b/Assets/PSXRetroShader/Scenes/lightmaptest.meta new file mode 100644 index 0000000..c9cd801 --- /dev/null +++ b/Assets/PSXRetroShader/Scenes/lightmaptest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58491cded9bf42340959ad59213a6e96 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest.unity b/Assets/PSXRetroShader/Scenes/lightmaptest.unity new file mode 100644 index 0000000..cda1721 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/lightmaptest.unity differ diff --git a/Assets/Shaders/Reflective.meta b/Assets/PSXRetroShader/Scenes/lightmaptest.unity.meta similarity index 58% rename from Assets/Shaders/Reflective.meta rename to Assets/PSXRetroShader/Scenes/lightmaptest.unity.meta index 92902b0..5fc7883 100644 --- a/Assets/Shaders/Reflective.meta +++ b/Assets/PSXRetroShader/Scenes/lightmaptest.unity.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 86356c96ca41eb14f9eb55d7da98a1c5 -folderAsset: yes -timeCreated: 1467193668 +guid: 3f88f5a3bc4d21b4290074f80a41352c +timeCreated: 1439450285 licenseType: Free DefaultImporter: userData: diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset b/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset new file mode 100644 index 0000000..c5e10a9 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset differ diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset.meta b/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset.meta new file mode 100644 index 0000000..4a193b2 --- /dev/null +++ b/Assets/PSXRetroShader/Scenes/lightmaptest/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5064cae03b5f19b4c8aff95f9f6de418 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..2f6a96c Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png differ diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png.meta b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..284e014 --- /dev/null +++ b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8605fc76f27cd5745888b85e1b003900 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..01c5281 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr differ diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr.meta b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000..8f03d0d --- /dev/null +++ b/Assets/PSXRetroShader/Scenes/lightmaptest/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5ee4fea9cbb9de64e8ca7e91ee22dbe1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr b/Assets/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr new file mode 100644 index 0000000..16b71b6 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr differ diff --git a/Assets/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr.meta b/Assets/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..97e8630 --- /dev/null +++ b/Assets/PSXRetroShader/Scenes/lightmaptest/ReflectionProbe-0.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b55ecfb0748441b44be64dea676d70bf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 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/PSXRetroShader/Scenes/testscene.unity b/Assets/PSXRetroShader/Scenes/testscene.unity new file mode 100644 index 0000000..b5c3e72 Binary files /dev/null and b/Assets/PSXRetroShader/Scenes/testscene.unity differ diff --git a/Assets/testscene.unity.meta b/Assets/PSXRetroShader/Scenes/testscene.unity.meta similarity index 100% rename from Assets/testscene.unity.meta rename to Assets/PSXRetroShader/Scenes/testscene.unity.meta diff --git a/Assets/PSXRetroShader/Scripts.meta b/Assets/PSXRetroShader/Scripts.meta new file mode 100644 index 0000000..eac820e --- /dev/null +++ b/Assets/PSXRetroShader/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06b6fbc892bf92048ac5437f91490289 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs b/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs new file mode 100644 index 0000000..2c2bf81 --- /dev/null +++ b/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs @@ -0,0 +1,58 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +/// +/// Sets vertex snapping precision. +/// +[ExecuteInEditMode] +public class PSXVertexPrecision : MonoBehaviour +{ + + [SerializeField, Range(0, 1024)] + private int xPrecision = 480; + public int XPrecision + { + get => xPrecision; + set + { + if (xPrecision == value) + return; + + xPrecision = value; + UpdatePrecision(); + } + } + [SerializeField, Range(0, 1024)] + private int yPrecision = 480; + public int YPrecision + { + get => yPrecision; + set + { + if (yPrecision == value) + return; + + yPrecision = value; + UpdatePrecision(); + } + } + + private void Start() + { + UpdatePrecision(); + } + + private void OnValidate() + { + UpdatePrecision(); + } + + private void UpdatePrecision() + { + Shader.SetGlobalFloat("_XPrecision", xPrecision); + Shader.SetGlobalFloat("_YPrecision", yPrecision); + } + +} \ No newline at end of file diff --git a/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs.meta b/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs.meta new file mode 100644 index 0000000..05f069a --- /dev/null +++ b/Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a7f3bc9876be0db46818fdcfc3da5b28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Billboard/billboard.cs b/Assets/PSXRetroShader/Scripts/billboard.cs similarity index 100% rename from Assets/Shaders/Billboard/billboard.cs rename to Assets/PSXRetroShader/Scripts/billboard.cs diff --git a/Assets/Shaders/Billboard/billboard.cs.meta b/Assets/PSXRetroShader/Scripts/billboard.cs.meta similarity index 100% rename from Assets/Shaders/Billboard/billboard.cs.meta rename to Assets/PSXRetroShader/Scripts/billboard.cs.meta diff --git a/Assets/rotate.cs b/Assets/PSXRetroShader/Scripts/rotate.cs similarity index 100% rename from Assets/rotate.cs rename to Assets/PSXRetroShader/Scripts/rotate.cs diff --git a/Assets/rotate.cs.meta b/Assets/PSXRetroShader/Scripts/rotate.cs.meta similarity index 100% rename from Assets/rotate.cs.meta rename to Assets/PSXRetroShader/Scripts/rotate.cs.meta diff --git a/Assets/Shaders.meta b/Assets/PSXRetroShader/Shaders.meta similarity index 100% rename from Assets/Shaders.meta rename to Assets/PSXRetroShader/Shaders.meta diff --git a/Assets/Shaders/imageEffects.meta b/Assets/PSXRetroShader/Shaders/imageEffects.meta similarity index 100% rename from Assets/Shaders/imageEffects.meta rename to Assets/PSXRetroShader/Shaders/imageEffects.meta diff --git a/Assets/Shaders/imageEffects/cPrecision.cs b/Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.cs similarity index 100% rename from Assets/Shaders/imageEffects/cPrecision.cs rename to Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.cs diff --git a/Assets/Shaders/imageEffects/cPrecision.cs.meta b/Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.cs.meta similarity index 100% rename from Assets/Shaders/imageEffects/cPrecision.cs.meta rename to Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.cs.meta diff --git a/Assets/Shaders/Resources/cPrecision.shader b/Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.shader similarity index 85% rename from Assets/Shaders/Resources/cPrecision.shader rename to Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.shader index e95c348..a06a76c 100644 --- a/Assets/Shaders/Resources/cPrecision.shader +++ b/Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.shader @@ -1,4 +1,6 @@ -Shader "Hidden/cPrecision" +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Hidden/cPrecision" { Properties { @@ -34,7 +36,7 @@ v2f vert (appdata v) { v2f o; - o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.uv = v.uv; return o; } diff --git a/Assets/Shaders/Resources/cPrecision.shader.meta b/Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.shader.meta similarity index 100% rename from Assets/Shaders/Resources/cPrecision.shader.meta rename to Assets/PSXRetroShader/Shaders/imageEffects/cPrecision.shader.meta diff --git a/Assets/Shaders/imageEffects/palette.png b/Assets/PSXRetroShader/Shaders/imageEffects/palette.png similarity index 100% rename from Assets/Shaders/imageEffects/palette.png rename to Assets/PSXRetroShader/Shaders/imageEffects/palette.png diff --git a/Assets/Shaders/imageEffects/palette.png.meta b/Assets/PSXRetroShader/Shaders/imageEffects/palette.png.meta similarity index 100% rename from Assets/Shaders/imageEffects/palette.png.meta rename to Assets/PSXRetroShader/Shaders/imageEffects/palette.png.meta diff --git a/Assets/PSXRetroShader/Shaders/psx.cginc b/Assets/PSXRetroShader/Shaders/psx.cginc new file mode 100644 index 0000000..074a523 --- /dev/null +++ b/Assets/PSXRetroShader/Shaders/psx.cginc @@ -0,0 +1,59 @@ +uniform int _XPrecision = 160; +uniform int _YPrecision = 120; + +struct psx_v2f +{ + fixed4 pos : SV_POSITION; + noperspective float2 uv : TEXCOORD0; + noperspective float2 uv1 : TEXCOORD1; + half3 normal : NORMAL; + half4 color : COLOR; + float3 reflect : COLOR1; + UNITY_FOG_COORDS(2) + UNITY_VERTEX_INPUT_INSTANCE_ID +}; + +struct psx_appdata +{ + float4 vertex : POSITION; + float3 normal : NORMAL; + float4 texcoord : TEXCOORD0; + float2 texcoord1 : TEXCOORD1; + fixed4 color : COLOR; + UNITY_VERTEX_INPUT_INSTANCE_ID +}; + +//returns vertex position snapped to the _XPrecision and _YPrecision +float4 pixelSnapping(float4 pos) +{ + float4 snapToPixel = UnityObjectToClipPos(pos); + float4 vertex = snapToPixel; + vertex.xyz = snapToPixel.xyz / snapToPixel.w; + vertex.x = floor(_XPrecision * vertex.x) / _XPrecision; + vertex.y = floor(_YPrecision * vertex.y) / _YPrecision; + vertex.xyz *= snapToPixel.w; + return vertex; +}; + +//calculates reflection vector +float3 calculateReflection(psx_appdata v) +{ + float3 viewDir = WorldSpaceViewDir(v.vertex); + float3 worldN = UnityObjectToWorldNormal(v.normal); + return reflect(-viewDir, worldN); +} + +half4 unlitLightning(psx_appdata v) +{ + return v.color; +} + +half4 unlitAmbientLightning(psx_appdata v) +{ + return v.color * UNITY_LIGHTMODEL_AMBIENT; +} + +half4 vertexLitLightning(psx_appdata v) +{ + return float4(ShadeVertexLightsFull(v.vertex, v.normal, 4, true), 1.0) * v.color; +} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader.meta b/Assets/PSXRetroShader/Shaders/psx.cginc.meta similarity index 50% rename from Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader.meta rename to Assets/PSXRetroShader/Shaders/psx.cginc.meta index 3a5e82c..10ad794 100644 --- a/Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader.meta +++ b/Assets/PSXRetroShader/Shaders/psx.cginc.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: bb629a7c9fdda8749a65d6f103229dda -timeCreated: 1467221438 -licenseType: Free +guid: 756f08d1239c89f4886f7d5c32b4cdff ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/PSXRetroShader/Shaders/psx.shader b/Assets/PSXRetroShader/Shaders/psx.shader new file mode 100644 index 0000000..f503920 --- /dev/null +++ b/Assets/PSXRetroShader/Shaders/psx.shader @@ -0,0 +1,90 @@ +Shader "psx/psx" { + Properties{ + [KeywordEnum(VertexLit, UnlitAmbient, Unlit)] _Lightning ("Lighting mode", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 2 + [Space] + _Color("Color", Color) = (1, 1, 1, 1) + _MainTex("Base (RGB)", 2D) = "white" {} + [Space] + _Cube("Reflection map", CUBE) = "" {} + _ReflectionPower("Reflection power", Range(0, 1)) = 0 + [KeywordEnum(Add, Mult)] _Reflection ("Reflection mode", Float) = 0 + } + SubShader{ + Tags{ "RenderType" = "Opaque" } + LOD 200 + Cull [_Cull] + + Pass{ + Lighting On + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_fog + #pragma multi_compile_instancing + #pragma shader_feature _LIGHTNING_VERTEXLIT _LIGHTNING_UNLITAMBIENT _LIGHTNING_UNLIT + #pragma shader_feature _REFLECTION_ADD _REFLECTION_MULT + #include "UnityCG.cginc" + #include "psx.cginc" + + float4 _MainTex_ST; + sampler2D _MainTex; + samplerCUBE _Cube; + half _ReflectionPower; + + UNITY_INSTANCING_BUFFER_START(Props) + UNITY_DEFINE_INSTANCED_PROP(half4, _Color) + UNITY_INSTANCING_BUFFER_END(Props) + + psx_v2f vert(psx_appdata v) + { + psx_v2f o; + UNITY_INITIALIZE_OUTPUT(psx_v2f, o); + + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + + //Vertex snapping + o.pos = pixelSnapping(v.vertex); + + //lighting + #if _LIGHTNING_VERTEXLIT + o.color = vertexLitLightning(v); + #elif _LIGHTNING_UNLITAMBIENT + o.color = unlitAmbientLightning(v); + #else + o.color = unlitLightning(v); + #endif + + //Affine texture mapping + o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); + + //Reflection + o.reflect = calculateReflection(v); + + UNITY_TRANSFER_FOG(o, o.pos); + + return o; + } + + float4 frag(psx_v2f IN) : COLOR + { + half4 c = tex2D(_MainTex, IN.uv) * IN.color * UNITY_ACCESS_INSTANCED_PROP(Props, _Color); + + #if _REFLECTION_ADD + c += texCUBE(_Cube, IN.reflect) * _ReflectionPower; + #else + c = lerp(c, c * texCUBE(_Cube, IN.reflect), _ReflectionPower); + #endif + + UNITY_APPLY_FOG(IN.fogCoord, c); + UNITY_SETUP_INSTANCE_ID(IN); + return c; + } + ENDCG + } + } + + Fallback "Diffuse" +} \ No newline at end of file diff --git a/Assets/Shaders/psx-unlit.shader.meta b/Assets/PSXRetroShader/Shaders/psx.shader.meta similarity index 100% rename from Assets/Shaders/psx-unlit.shader.meta rename to Assets/PSXRetroShader/Shaders/psx.shader.meta diff --git a/Assets/PSXRetroShader/Shaders/psx_lightmapped.shader b/Assets/PSXRetroShader/Shaders/psx_lightmapped.shader new file mode 100644 index 0000000..35176ec --- /dev/null +++ b/Assets/PSXRetroShader/Shaders/psx_lightmapped.shader @@ -0,0 +1,99 @@ +Shader "psx/psx-lightmapped" { + Properties{ + [KeywordEnum(VertexLit, UnlitAmbient, Unlit)] _Lightning ("Lighting mode", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 2 + [Space] + _Color("Color", Color) = (1, 1, 1, 1) + _MainTex("Base (RGB)", 2D) = "white" {} + [Space] + _Cube("Reflection map", CUBE) = "" {} + _ReflectionPower("Reflection power", Range(0, 1)) = 0 + [KeywordEnum(Add, Mult)] _Reflection ("Reflection mode", Float) = 0 + } + SubShader{ + Tags{ "RenderType" = "Opaque" } + LOD 200 + Cull [_Cull] + + Pass{ + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_fog + #pragma multi_compile_instancing + #pragma multi_compile __ LIGHTMAP_ON + #pragma shader_feature _LIGHTNING_VERTEXLIT _LIGHTNING_UNLITAMBIENT _LIGHTNING_UNLIT + #pragma shader_feature _REFLECTION_ADD _REFLECTION_MULT + #include "UnityCG.cginc" + #include "psx.cginc" + + float4 _MainTex_ST; + sampler2D _MainTex; + samplerCUBE _Cube; + half _ReflectionPower; + + UNITY_INSTANCING_BUFFER_START(Props) + UNITY_DEFINE_INSTANCED_PROP(half4, _Color) + UNITY_INSTANCING_BUFFER_END(Props) + + psx_v2f vert(psx_appdata v) + { + psx_v2f o; + UNITY_INITIALIZE_OUTPUT(psx_v2f, o); + + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + + //Vertex snapping + o.pos = pixelSnapping(v.vertex); + + //lighting + #if _LIGHTNING_VERTEXLIT + o.color = vertexLitLightning(v); + #elif _LIGHTNING_UNLITAMBIENT + o.color = unlitAmbientLightning(v); + #else + o.color = unlitLightning(v); + #endif + + //Affine texture mapping + o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); + + //Reflection + o.reflect = calculateReflection(v); + + //Lightmapping + #if LIGHTMAP_ON + o.uv1 = v.texcoord1.xy * unity_LightmapST.xy + unity_LightmapST.zw; + #endif + + UNITY_TRANSFER_FOG(o, o.pos); + + return o; + } + + float4 frag(psx_v2f IN) : COLOR + { + half4 c = tex2D(_MainTex, IN.uv) * IN.color * UNITY_ACCESS_INSTANCED_PROP(Props, _Color); + + #if _REFLECTION_ADD + c += texCUBE(_Cube, IN.reflect) * _ReflectionPower; + #else + c = lerp(c, c * texCUBE(_Cube, IN.reflect), _ReflectionPower); + #endif + + #if LIGHTMAP_ON + c.rgb *= DecodeLightmap(UNITY_SAMPLE_TEX2D(unity_Lightmap, IN.uv1)); + #endif + + UNITY_APPLY_FOG(IN.fogCoord, c); + UNITY_SETUP_INSTANCE_ID(IN); + return c; + } + ENDCG + } + } + + Fallback "Diffuse" +} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit_noambient-add.shader.meta b/Assets/PSXRetroShader/Shaders/psx_lightmapped.shader.meta similarity index 67% rename from Assets/Shaders/Reflective/psx-unlit_noambient-add.shader.meta rename to Assets/PSXRetroShader/Shaders/psx_lightmapped.shader.meta index 930b8b4..80b7748 100644 --- a/Assets/Shaders/Reflective/psx-unlit_noambient-add.shader.meta +++ b/Assets/PSXRetroShader/Shaders/psx_lightmapped.shader.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f350dfbe8b73f1f448a2bf7289450f90 -timeCreated: 1467193668 +guid: b85f4b9f69e79e14e84f3f9403849b4f +timeCreated: 1431334434 licenseType: Free ShaderImporter: defaultTextures: [] diff --git a/Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader b/Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader new file mode 100644 index 0000000..40385c5 --- /dev/null +++ b/Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader @@ -0,0 +1,98 @@ +Shader "psx/psx-lightmapped-transparent" { + Properties{ + [KeywordEnum(VertexLit, UnlitAmbient, Unlit)] _Lightning ("Lighting mode", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 2 + [Space] + _Color("Tint Color", Color) = (1, 1, 1, 1) + _MainTex("Base (RGB)", 2D) = "white" {} + [Space] + _Cube("Reflection map", CUBE) = "" {} + _ReflectionPower("Reflection power", Range(0, 1)) = 0 + [KeywordEnum(Add, Mult)] _Reflection ("Reflection mode", Float) = 0 + } + SubShader{ + Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } + LOD 200 + Cull [_Cull] + Blend SrcAlpha OneMinusSrcAlpha + + Pass{ + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_fog + #pragma multi_compile_instancing + #pragma multi_compile __ LIGHTMAP_ON + #pragma shader_feature _LIGHTNING_VERTEXLIT _LIGHTNING_UNLITAMBIENT _LIGHTNING_UNLIT + #pragma shader_feature _REFLECTION_ADD _REFLECTION_MULT + #include "UnityCG.cginc" + #include "psx.cginc" + + float4 _MainTex_ST; + sampler2D _MainTex; + samplerCUBE _Cube; + half _ReflectionPower; + + UNITY_INSTANCING_BUFFER_START(Props) + UNITY_DEFINE_INSTANCED_PROP(half4, _Color) + UNITY_INSTANCING_BUFFER_END(Props) + + psx_v2f vert(psx_appdata v) + { + psx_v2f o; + UNITY_INITIALIZE_OUTPUT(psx_v2f, o); + + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + + //Vertex snapping + o.pos = pixelSnapping(v.vertex); + + //lighting + #if _LIGHTNING_VERTEXLIT + o.color = vertexLitLightning(v); + #elif _LIGHTNING_UNLITAMBIENT + o.color = unlitAmbientLightning(v); + #else + o.color = unlitLightning(v); + #endif + + //Affine texture mapping + o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); + + //Reflection + o.reflect = calculateReflection(v); + + //Lightmapping + #if LIGHTMAP_ON + o.uv1 = v.texcoord1.xy * unity_LightmapST.xy + unity_LightmapST.zw; + #endif + + UNITY_TRANSFER_FOG(o, o.pos); + + return o; + } + + float4 frag(psx_v2f IN) : COLOR + { + half4 c = tex2D(_MainTex, IN.uv) * IN.color * UNITY_ACCESS_INSTANCED_PROP(Props, _Color); + + #if _REFLECTION_ADD + c += texCUBE(_Cube, IN.reflect) * _ReflectionPower; + #else + c = lerp(c, c * texCUBE(_Cube, IN.reflect), _ReflectionPower); + #endif + + #if LIGHTMAP_ON + c.rgb *= DecodeLightmap(UNITY_SAMPLE_TEX2D(unity_Lightmap, IN.uv1)); + #endif + + UNITY_APPLY_FOG(IN.fogCoord, c); + UNITY_SETUP_INSTANCE_ID(IN); + return c; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit-add.shader.meta b/Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader.meta similarity index 50% rename from Assets/Shaders/Reflective/psx-unlit-add.shader.meta rename to Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader.meta index b007938..af36c41 100644 --- a/Assets/Shaders/Reflective/psx-unlit-add.shader.meta +++ b/Assets/PSXRetroShader/Shaders/psx_lightmapped_transparent.shader.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 9a1e13caa1e505646a45745b8563b411 -timeCreated: 1467193668 -licenseType: Free +guid: d7ad99a26b3fd094490730b34f35dab3 ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/PSXRetroShader/Shaders/psx_transparent.shader b/Assets/PSXRetroShader/Shaders/psx_transparent.shader new file mode 100644 index 0000000..cae72c9 --- /dev/null +++ b/Assets/PSXRetroShader/Shaders/psx_transparent.shader @@ -0,0 +1,89 @@ +Shader "psx/psx-transparent" { + Properties{ + [KeywordEnum(VertexLit, UnlitAmbient, Unlit)] _Lightning ("Lighting mode", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 2 + [Space] + _Color("Color", Color) = (1, 1, 1, 1) + _MainTex("Base (RGB)", 2D) = "white" {} + [Space] + _Cube("Reflection map", CUBE) = "" {} + _ReflectionPower("Reflection power", Range(0, 1)) = 0 + [KeywordEnum(Add, Mult)] _Reflection ("Reflection mode", Float) = 0 + } + SubShader{ + Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } + LOD 200 + Cull [_Cull] + Blend SrcAlpha OneMinusSrcAlpha + + Pass{ + Lighting On + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_fog + #pragma multi_compile_instancing + #pragma shader_feature _LIGHTNING_VERTEXLIT _LIGHTNING_UNLITAMBIENT _LIGHTNING_UNLIT + #pragma shader_feature _REFLECTION_ADD _REFLECTION_MULT + #include "UnityCG.cginc" + #include "psx.cginc" + + float4 _MainTex_ST; + sampler2D _MainTex; + samplerCUBE _Cube; + half _ReflectionPower; + + UNITY_INSTANCING_BUFFER_START(Props) + UNITY_DEFINE_INSTANCED_PROP(half4, _Color) + UNITY_INSTANCING_BUFFER_END(Props) + + psx_v2f vert(psx_appdata v) + { + psx_v2f o; + UNITY_INITIALIZE_OUTPUT(psx_v2f, o); + + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + + //Vertex snapping + o.pos = pixelSnapping(v.vertex); + + //lighting + #if _LIGHTNING_VERTEXLIT + o.color = vertexLitLightning(v); + #elif _LIGHTNING_UNLITAMBIENT + o.color = unlitAmbientLightning(v); + #else + o.color = unlitLightning(v); + #endif + + //Affine texture mapping + o.uv = TRANSFORM_TEX(v.texcoord, _MainTex); + + //Reflection + o.reflect = calculateReflection(v); + + UNITY_TRANSFER_FOG(o, o.pos); + + return o; + } + + float4 frag(psx_v2f IN) : COLOR + { + half4 c = tex2D(_MainTex, IN.uv) * IN.color * UNITY_ACCESS_INSTANCED_PROP(Props, _Color); + + #if _REFLECTION_ADD + c += texCUBE(_Cube, IN.reflect) * _ReflectionPower; + #else + c = lerp(c, c * texCUBE(_Cube, IN.reflect), _ReflectionPower); + #endif + + UNITY_APPLY_FOG(IN.fogCoord, c); + UNITY_SETUP_INSTANCE_ID(IN); + return c; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit-mult.shader.meta b/Assets/PSXRetroShader/Shaders/psx_transparent.shader.meta similarity index 50% rename from Assets/Shaders/Reflective/psx-unlit-mult.shader.meta rename to Assets/PSXRetroShader/Shaders/psx_transparent.shader.meta index 095842c..c8cd8c5 100644 --- a/Assets/Shaders/Reflective/psx-unlit-mult.shader.meta +++ b/Assets/PSXRetroShader/Shaders/psx_transparent.shader.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 11dee6746ab7cdd4888a16256887487d -timeCreated: 1467221438 -licenseType: Free +guid: 9625cbd0d6039654bb2e1315da3781c0 ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Textures.meta b/Assets/PSXRetroShader/Textures.meta similarity index 100% rename from Assets/Textures.meta rename to Assets/PSXRetroShader/Textures.meta diff --git a/Assets/Textures/Skyboxes.meta b/Assets/PSXRetroShader/Textures/Skyboxes.meta similarity index 100% rename from Assets/Textures/Skyboxes.meta rename to Assets/PSXRetroShader/Textures/Skyboxes.meta diff --git a/Assets/Textures/Skyboxes/Cubemap.png b/Assets/PSXRetroShader/Textures/Skyboxes/Cubemap.png similarity index 100% rename from Assets/Textures/Skyboxes/Cubemap.png rename to Assets/PSXRetroShader/Textures/Skyboxes/Cubemap.png diff --git a/Assets/Textures/Skyboxes/Cubemap.png.meta b/Assets/PSXRetroShader/Textures/Skyboxes/Cubemap.png.meta similarity index 100% rename from Assets/Textures/Skyboxes/Cubemap.png.meta rename to Assets/PSXRetroShader/Textures/Skyboxes/Cubemap.png.meta diff --git a/Assets/Textures/tex001.jpg b/Assets/PSXRetroShader/Textures/tex001.jpg similarity index 100% rename from Assets/Textures/tex001.jpg rename to Assets/PSXRetroShader/Textures/tex001.jpg diff --git a/Assets/Textures/tex001.jpg.meta b/Assets/PSXRetroShader/Textures/tex001.jpg.meta similarity index 100% rename from Assets/Textures/tex001.jpg.meta rename to Assets/PSXRetroShader/Textures/tex001.jpg.meta diff --git a/Assets/Textures/tex002.jpg b/Assets/PSXRetroShader/Textures/tex002.jpg similarity index 100% rename from Assets/Textures/tex002.jpg rename to Assets/PSXRetroShader/Textures/tex002.jpg diff --git a/Assets/Textures/tex002.jpg.meta b/Assets/PSXRetroShader/Textures/tex002.jpg.meta similarity index 100% rename from Assets/Textures/tex002.jpg.meta rename to Assets/PSXRetroShader/Textures/tex002.jpg.meta diff --git a/Assets/Textures/tex003.jpg b/Assets/PSXRetroShader/Textures/tex003.jpg similarity index 100% rename from Assets/Textures/tex003.jpg rename to Assets/PSXRetroShader/Textures/tex003.jpg diff --git a/Assets/Textures/tex003.jpg.meta b/Assets/PSXRetroShader/Textures/tex003.jpg.meta similarity index 100% rename from Assets/Textures/tex003.jpg.meta rename to Assets/PSXRetroShader/Textures/tex003.jpg.meta diff --git a/Assets/Textures/tex004.png b/Assets/PSXRetroShader/Textures/tex004.png similarity index 100% rename from Assets/Textures/tex004.png rename to Assets/PSXRetroShader/Textures/tex004.png diff --git a/Assets/Textures/tex004.png.meta b/Assets/PSXRetroShader/Textures/tex004.png.meta similarity index 100% rename from Assets/Textures/tex004.png.meta rename to Assets/PSXRetroShader/Textures/tex004.png.meta diff --git a/Assets/Textures/tex005.png b/Assets/PSXRetroShader/Textures/tex005.png similarity index 100% rename from Assets/Textures/tex005.png rename to Assets/PSXRetroShader/Textures/tex005.png diff --git a/Assets/Textures/tex005.png.meta b/Assets/PSXRetroShader/Textures/tex005.png.meta similarity index 100% rename from Assets/Textures/tex005.png.meta rename to Assets/PSXRetroShader/Textures/tex005.png.meta diff --git a/Assets/Textures/tex006.png b/Assets/PSXRetroShader/Textures/tex006.png similarity index 100% rename from Assets/Textures/tex006.png rename to Assets/PSXRetroShader/Textures/tex006.png diff --git a/Assets/Textures/tex006.png.meta b/Assets/PSXRetroShader/Textures/tex006.png.meta similarity index 100% rename from Assets/Textures/tex006.png.meta rename to Assets/PSXRetroShader/Textures/tex006.png.meta diff --git a/Assets/PSXRetroShader/todos.txt b/Assets/PSXRetroShader/todos.txt new file mode 100644 index 0000000..7d644a6 --- /dev/null +++ b/Assets/PSXRetroShader/todos.txt @@ -0,0 +1,10 @@ +[O] Code cleaning, moving repeating code to the .cginc file +[O] Remove the vertex cutout by the fog distance +[O] Remove custom fog calculation and use Unity builtin functions +[O] Customizable vertex precision +[O] More universal shaders with shader features and enums (2 shaders instead of 13) +[-] Shader based billboards - NOT USABLE +[O] Add lightmapping support +[O] More cleanups +[O] Cull selection option +[O] Instancing support \ No newline at end of file diff --git a/Assets/PSXRetroShader/todos.txt.meta b/Assets/PSXRetroShader/todos.txt.meta new file mode 100644 index 0000000..cf60c53 --- /dev/null +++ b/Assets/PSXRetroShader/todos.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 672c5a55a70b6cd43a55714ee48e36bf +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Reflective/psx-unlit-add.shader b/Assets/Shaders/Reflective/psx-unlit-add.shader deleted file mode 100644 index 186edc6..0000000 --- a/Assets/Shaders/Reflective/psx-unlit-add.shader +++ /dev/null @@ -1,98 +0,0 @@ -Shader "psx/reflective/unlit-Add" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(v.vertex); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - o.color = v.color*UNITY_LIGHTMODEL_AMBIENT;; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Affine texturing for cubemap - o.reflect *= o.normal; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c += texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit-mult.shader b/Assets/Shaders/Reflective/psx-unlit-mult.shader deleted file mode 100644 index 5e9f621..0000000 --- a/Assets/Shaders/Reflective/psx-unlit-mult.shader +++ /dev/null @@ -1,98 +0,0 @@ -Shader "psx/reflective/unlit-Mult" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(v.vertex); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - o.color = v.color*UNITY_LIGHTMODEL_AMBIENT;; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Affine texturing for cubemap - o.reflect *= o.normal; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c *= texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit_noambient-add.shader b/Assets/Shaders/Reflective/psx-unlit_noambient-add.shader deleted file mode 100644 index 1390a4a..0000000 --- a/Assets/Shaders/Reflective/psx-unlit_noambient-add.shader +++ /dev/null @@ -1,95 +0,0 @@ -Shader "psx/reflective/unlit_noambient-Add" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting Off - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(o.pos); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - o.color = v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c += texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader b/Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader deleted file mode 100644 index 2a5b38b..0000000 --- a/Assets/Shaders/Reflective/psx-unlit_noambient-mult.shader +++ /dev/null @@ -1,95 +0,0 @@ -Shader "psx/reflective/unlit_noambient-Mult" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting Off - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(o.pos); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - o.color = v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c *= texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-vertexlit-add.shader b/Assets/Shaders/Reflective/psx-vertexlit-add.shader deleted file mode 100644 index fb8bbc5..0000000 --- a/Assets/Shaders/Reflective/psx-vertexlit-add.shader +++ /dev/null @@ -1,99 +0,0 @@ -Shader "psx/reflective/vertexlit-Add" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags { "RenderType" = "Opaque" } - LOD 200 - - Pass { - Lighting On - CGPROGRAM - - #pragma vertex vert - #pragma fragment frag - #include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(v.vertex); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - // o.color = float4(ShadeVertexLights(v.vertex, v.normal), 1.0); - o.color = float4(ShadeVertexLightsFull(v.vertex, v.normal, 4, true), 1.0); - o.color *= v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex; //vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Affine texturing for cubemap - o.reflect *= o.normal; - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c+= texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-vertexlit-add.shader.meta b/Assets/Shaders/Reflective/psx-vertexlit-add.shader.meta deleted file mode 100644 index 6fca0bf..0000000 --- a/Assets/Shaders/Reflective/psx-vertexlit-add.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3766e70f00ccca14197e7ce39478be3a -timeCreated: 1467193668 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/Reflective/psx-vertexlit-mult.shader b/Assets/Shaders/Reflective/psx-vertexlit-mult.shader deleted file mode 100644 index c42fea9..0000000 --- a/Assets/Shaders/Reflective/psx-vertexlit-mult.shader +++ /dev/null @@ -1,99 +0,0 @@ -Shader "psx/reflective/vertexlit-Mult" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - _Cube("Cubemap", CUBE) = "" {} - } - SubShader{ - Tags { "RenderType" = "Opaque" } - LOD 200 - - Pass { - Lighting On - CGPROGRAM - - #pragma vertex vert - #pragma fragment frag - #include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - float3 reflect : COLOR2; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Reflection - float3 viewDir = WorldSpaceViewDir(v.vertex); - float3 worldN = mul((float3x3)_Object2World, v.normal * 1.0); - o.reflect = reflect(-viewDir, worldN); - - //Vertex lighting - // o.color = float4(ShadeVertexLights(v.vertex, v.normal), 1.0); - o.color = float4(ShadeVertexLightsFull(v.vertex, v.normal, 4, true), 1.0); - o.color *= v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex; //vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Affine texturing for cubemap - o.reflect *= o.normal; - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - return o; - } - - sampler2D _MainTex; - samplerCUBE _Cube; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - c*= texCUBE(_Cube, IN.reflect); - half4 color = c*(IN.colorFog.a); - - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Reflective/psx-vertexlit-mult.shader.meta b/Assets/Shaders/Reflective/psx-vertexlit-mult.shader.meta deleted file mode 100644 index ee65a18..0000000 --- a/Assets/Shaders/Reflective/psx-vertexlit-mult.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c5154b6cfffb708458ec72baa67cfd1c -timeCreated: 1467221438 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader b/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader deleted file mode 100644 index a1558cd..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader +++ /dev/null @@ -1,89 +0,0 @@ -Shader "psx/trasparent/unlit_noambient" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } - LOD 200 - Blend SrcAlpha OneMinusSrcAlpha - Zwrite Off - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal: TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Vertex lighting - - o.color = v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - color.a = c.a; - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader.meta b/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader.meta deleted file mode 100644 index 7dd3e28..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-unlit-noambient.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 7510e806f737f5c4f8a6d0c5193d20fc -timeCreated: 1440609586 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader b/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader deleted file mode 100644 index 713635c..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader +++ /dev/null @@ -1,88 +0,0 @@ -Shader "psx/trasparent/unlit" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } - LOD 200 - Blend SrcAlpha OneMinusSrcAlpha - Zwrite Off - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal :TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Vertex lighting - o.color = v.color*UNITY_LIGHTMODEL_AMBIENT; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - color.a = c.a; - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader.meta b/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader.meta deleted file mode 100644 index 0297f95..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-unlit.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 015294d7b7044ba40ba50b0c05df3b50 -timeCreated: 1431593948 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader b/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader deleted file mode 100644 index d9f8f48..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader +++ /dev/null @@ -1,91 +0,0 @@ -Shader "psx/trasparent/vertexlit" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } - LOD 200 - Blend SrcAlpha OneMinusSrcAlpha - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal: TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - - //o.pos = mul(UNITY_MATRIX_MVP, v.vertex); - //Vertex lighting - //o.color = float4(ShadeVertexLights(v.vertex, v.normal), 1.0); - o.color = float4(ShadeVertexLightsFull(v.vertex, v.normal, 4, true), 1.0); - o.color *= v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - color.a = c.a; - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader.meta b/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader.meta deleted file mode 100644 index 2419070..0000000 --- a/Assets/Shaders/Trasparent/psx-trasparent-vertexlit.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2425baef6ef2e294b931a912bb14fd29 -timeCreated: 1431593670 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/psx-unlit.shader b/Assets/Shaders/psx-unlit.shader deleted file mode 100644 index e093721..0000000 --- a/Assets/Shaders/psx-unlit.shader +++ /dev/null @@ -1,86 +0,0 @@ -Shader "psx/unlit" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Vertex lighting - o.color = v.color*UNITY_LIGHTMODEL_AMBIENT;; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/psx-unlit_noambient.shader b/Assets/Shaders/psx-unlit_noambient.shader deleted file mode 100644 index 56534d6..0000000 --- a/Assets/Shaders/psx-unlit_noambient.shader +++ /dev/null @@ -1,86 +0,0 @@ -Shader "psx/unlit_noambient" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags{ "RenderType" = "Opaque" } - LOD 200 - - Pass{ - Lighting On - CGPROGRAM - -#pragma vertex vert -#pragma fragment frag -#include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Vertex lighting - o.color = v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex;//vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/psx-unlit_noambient.shader.meta b/Assets/Shaders/psx-unlit_noambient.shader.meta deleted file mode 100644 index 861f1ef..0000000 --- a/Assets/Shaders/psx-unlit_noambient.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6d0d57d3e1ee64149a8918104b4b01e9 -timeCreated: 1440609653 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/psx-vertexlit.shader b/Assets/Shaders/psx-vertexlit.shader deleted file mode 100644 index 892aea2..0000000 --- a/Assets/Shaders/psx-vertexlit.shader +++ /dev/null @@ -1,87 +0,0 @@ -Shader "psx/vertexlit" { - Properties{ - _MainTex("Base (RGB)", 2D) = "white" {} - } - SubShader{ - Tags { "RenderType" = "Opaque" } - LOD 200 - - Pass { - Lighting On - CGPROGRAM - - #pragma vertex vert - #pragma fragment frag - #include "UnityCG.cginc" - - struct v2f - { - fixed4 pos : SV_POSITION; - half4 color : COLOR0; - half4 colorFog : COLOR1; - float2 uv_MainTex : TEXCOORD0; - half3 normal : TEXCOORD1; - }; - - float4 _MainTex_ST; - uniform half4 unity_FogStart; - uniform half4 unity_FogEnd; - - v2f vert(appdata_full v) - { - v2f o; - - //Vertex snapping - float4 snapToPixel = mul(UNITY_MATRIX_MVP,v.vertex); - float4 vertex = snapToPixel; - vertex.xyz = snapToPixel.xyz / snapToPixel.w; - vertex.x = floor(160 * vertex.x) / 160; - vertex.y = floor(120 * vertex.y) / 120; - vertex.xyz *= snapToPixel.w; - o.pos = vertex; - - //Vertex lighting - // o.color = float4(ShadeVertexLights(v.vertex, v.normal), 1.0); - o.color = float4(ShadeVertexLightsFull(v.vertex, v.normal, 4, true), 1.0); - o.color *= v.color; - - float distance = length(mul(UNITY_MATRIX_MV,v.vertex)); - - //Affine Texture Mapping - float4 affinePos = vertex; //vertex; - o.uv_MainTex = TRANSFORM_TEX(v.texcoord, _MainTex); - o.uv_MainTex *= distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - o.normal = distance + (vertex.w*(UNITY_LIGHTMODEL_AMBIENT.a * 8)) / distance / 2; - - //Fog - float4 fogColor = unity_FogColor; - - float fogDensity = (unity_FogEnd - distance) / (unity_FogEnd - unity_FogStart); - o.normal.g = fogDensity; - o.normal.b = 1; - - o.colorFog = fogColor; - o.colorFog.a = clamp(fogDensity,0,1); - - //Cut out polygons - if (distance > unity_FogStart.z + unity_FogColor.a * 255) - { - o.pos.w = 0; - } - - return o; - } - - sampler2D _MainTex; - - float4 frag(v2f IN) : COLOR - { - half4 c = tex2D(_MainTex, IN.uv_MainTex / IN.normal.r)*IN.color; - half4 color = c*(IN.colorFog.a); - color.rgb += IN.colorFog.rgb*(1 - IN.colorFog.a); - return color; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shaders/psx-vertexlit.shader.meta b/Assets/Shaders/psx-vertexlit.shader.meta deleted file mode 100644 index effb6d7..0000000 --- a/Assets/Shaders/psx-vertexlit.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 447fef9edcd98e346b21881ad3e44014 -timeCreated: 1431502361 -licenseType: Free -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityVS/Editor.meta b/Assets/UnityVS/Editor.meta deleted file mode 100644 index 21f814f..0000000 --- a/Assets/UnityVS/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ef1900d3c75fb094996a6562fbbf39d3 -folderAsset: yes -timeCreated: 1466069872 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll b/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll deleted file mode 100644 index c7cd0a9..0000000 Binary files a/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll and /dev/null differ diff --git a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll deleted file mode 100644 index c758916..0000000 Binary files a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll and /dev/null differ diff --git a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta deleted file mode 100644 index 1cee783..0000000 --- a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta +++ /dev/null @@ -1,20 +0,0 @@ -fileFormatVersion: 2 -guid: 22716428d05535f40a61ed27066e6612 -timeCreated: 1440522583 -licenseType: Free -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/testscene.unity b/Assets/testscene.unity deleted file mode 100644 index 9828964..0000000 Binary files a/Assets/testscene.unity and /dev/null differ diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log new file mode 100644 index 0000000..ae05119 --- /dev/null +++ b/Logs/AssetImportWorker0-prev.log @@ -0,0 +1,451 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.17f1 (a4537701e4ab) revision 10769271'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Pro; OS build 19044.1586; Version 2009; 64bit' Language: 'ru' Physical Memory: 16318 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + +COMMAND LINE ARGUMENTS: +D:\Unity\2019\2020.3.17f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +F:/psx_retroshader/psx_retroshader +-logFile +Logs/AssetImportWorker0.log +-srvPort +63629 +Successfully changed project path to: F:/psx_retroshader/psx_retroshader +F:/psx_retroshader/psx_retroshader +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 23.89 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.17f1 (a4537701e4ab) +[Subsystems] Discovering subsystems at path D:/Unity/2019/2020.3.17f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path F:/psx_retroshader/psx_retroshader/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.1] + Renderer: NVIDIA GeForce RTX 2060 (ID=0x1f08) + Vendor: + VRAM: 5980 MB + Driver: 30.0.14.9676 +Initialize mono +Mono path[0] = 'D:/Unity/2019/2020.3.17f1/Editor/Data/Managed' +Mono path[1] = 'D:/Unity/2019/2020.3.17f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'D:/Unity/2019/2020.3.17f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56132 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.000878 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 23.95 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.433 seconds +Domain Reload Profiling: + ReloadAssembly (1434ms) + BeginReloadAssembly (40ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (0ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (1ms) + EndReloadAssembly (313ms) + LoadAssemblies (40ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (117ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (24ms) + SetupLoadedEditorAssemblies (121ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (24ms) + BeforeProcessingInitializeOnLoad (13ms) + ProcessInitializeOnLoadAttributes (60ms) + ProcessInitializeOnLoadMethodAttributes (21ms) + AfterProcessingInitializeOnLoad (0ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (0ms) +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.002062 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.31 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.818 seconds +Domain Reload Profiling: + ReloadAssembly (819ms) + BeginReloadAssembly (113ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (15ms) + EndReloadAssembly (658ms) + LoadAssemblies (63ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (209ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (33ms) + SetupLoadedEditorAssemblies (280ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (55ms) + ProcessInitializeOnLoadAttributes (216ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.04 seconds +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1406 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 67.3 MB. +System memory in use after: 67.4 MB. + +Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 1846. +Total: 2.619600 ms (FindLiveObjects: 0.155500 ms CreateObjectMapping: 0.030000 ms MarkObjects: 2.370300 ms DeleteObjects: 0.062900 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + path: Assets/PSXRetroShader/Materials/tex003_lm.mat + artifactKey: Guid(1d14a683cdfd8ef448df2f9e1840e3e4) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/tex003_lm.mat using Guid(1d14a683cdfd8ef448df2f9e1840e3e4) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c56eb57d11ce425e31f2b0d29bcdc0be') in 0.097085 seconds + Import took 0.099150 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000164 seconds. + path: Assets/PSXRetroShader/Materials/tex006_lm.mat + artifactKey: Guid(a80027eed8354fd4a86ba3ea1b2733f5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/tex006_lm.mat using Guid(a80027eed8354fd4a86ba3ea1b2733f5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '975b03da8da950bd09f2c71fb7836fc2') in 0.010906 seconds + Import took 0.012812 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000174 seconds. + path: Assets/PSXRetroShader/Materials/tex002_lm.mat + artifactKey: Guid(423403904e0e082439aa42749b869cca) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/tex002_lm.mat using Guid(423403904e0e082439aa42749b869cca) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6f8c20a8007bda8763cf3482f0d6f78a') in 0.009901 seconds + Import took 0.012150 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000145 seconds. + path: Assets/PSXRetroShader/Materials/billboard001.mat + artifactKey: Guid(beae8e544cba2544d9457eaa2ea00a72) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/billboard001.mat using Guid(beae8e544cba2544d9457eaa2ea00a72) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4096fdeecf119909e74e16aac8ec8a11') in 0.014838 seconds + Import took 0.016938 seconds . + +======================================================================== +Received Import Request. + Time since last request: 711.879326 seconds. + path: Assets/PSXRetroShader/Scenes/testscene 1.unity + artifactKey: Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scenes/testscene 1.unity using Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '347c1446381f90132e5b9b17e093028b') in 0.005380 seconds + Import took 0.007730 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000426 seconds. + path: Assets/PSXRetroShader/Scenes/testscene 1.unity + artifactKey: Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scenes/testscene 1.unity using Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '347c1446381f90132e5b9b17e093028b') in 0.001606 seconds + Import took 0.003812 seconds . + +======================================================================== +Received Import Request. + Time since last request: 3.408596 seconds. + path: Assets/PSXRetroShader/Scenes/instancing.unity + artifactKey: Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scenes/instancing.unity using Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '28ee8be62d1b7ebb373e15350b51f232') in 0.004748 seconds + Import took 0.006901 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002069 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.33 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.753 seconds +Domain Reload Profiling: + ReloadAssembly (754ms) + BeginReloadAssembly (82ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (3ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (26ms) + EndReloadAssembly (626ms) + LoadAssemblies (62ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (202ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (29ms) + SetupLoadedEditorAssemblies (259ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (50ms) + ProcessInitializeOnLoadAttributes (200ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.34 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1395 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 69.8 MB. +System memory in use after: 69.9 MB. + +Unloading 13 unused Assets to reduce memory usage. Loaded Objects now: 1888. +Total: 2.620800 ms (FindLiveObjects: 0.173900 ms CreateObjectMapping: 0.030300 ms MarkObjects: 2.396100 ms DeleteObjects: 0.019300 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + Time since last request: 29.931600 seconds. + path: Assets/PSXRetroShader/Materials/cube002_instancing.mat + artifactKey: Guid(783b1ca499823f14f8169e47aba74d11) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/cube002_instancing.mat using Guid(783b1ca499823f14f8169e47aba74d11) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9224a6f7187dde8899c32e3ebb15bb39') in 0.046233 seconds + Import took 0.048487 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002149 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.770 seconds +Domain Reload Profiling: + ReloadAssembly (771ms) + BeginReloadAssembly (94ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (3ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (26ms) + EndReloadAssembly (630ms) + LoadAssemblies (62ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (200ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (30ms) + SetupLoadedEditorAssemblies (265ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (50ms) + ProcessInitializeOnLoadAttributes (205ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1395 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 69.8 MB. +System memory in use after: 70.0 MB. + +Unloading 13 unused Assets to reduce memory usage. Loaded Objects now: 1891. +Total: 2.860000 ms (FindLiveObjects: 0.162300 ms CreateObjectMapping: 0.033700 ms MarkObjects: 2.645300 ms DeleteObjects: 0.018000 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + Time since last request: 233.986548 seconds. + path: Assets/PSXRetroShader/Materials/cube002_instancing.mat + artifactKey: Guid(783b1ca499823f14f8169e47aba74d11) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Materials/cube002_instancing.mat using Guid(783b1ca499823f14f8169e47aba74d11) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '348810059a510fb113fc52007bd8d3e9') in 0.044644 seconds + Import took 0.046802 seconds . + +======================================================================== +Received Import Request. + Time since last request: 182.106947 seconds. + path: Assets/PSXRetroShader/Scenes/instancing.unity + artifactKey: Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scenes/instancing.unity using Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e3f51e606e9d9de745231946f937853b') in 0.002350 seconds + Import took 0.004470 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000359 seconds. + path: Assets/PSXRetroShader/Scenes/instancing.unity + artifactKey: Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scenes/instancing.unity using Guid(971aa1dc81d27a140bcd298e77880a64) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e3f51e606e9d9de745231946f937853b') in 0.001534 seconds + Import took 0.003536 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002082 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.759 seconds +Domain Reload Profiling: + ReloadAssembly (759ms) + BeginReloadAssembly (87ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (3ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (26ms) + EndReloadAssembly (626ms) + LoadAssemblies (62ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (199ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (29ms) + SetupLoadedEditorAssemblies (262ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (52ms) + ProcessInitializeOnLoadAttributes (201ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1395 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 69.9 MB. +System memory in use after: 70.0 MB. + +Unloading 13 unused Assets to reduce memory usage. Loaded Objects now: 1894. +Total: 2.722100 ms (FindLiveObjects: 0.153400 ms CreateObjectMapping: 0.031200 ms MarkObjects: 2.519000 ms DeleteObjects: 0.017800 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + Time since last request: 57.635830 seconds. + path: Assets/PSXRetroShader/todos.txt + artifactKey: Guid(672c5a55a70b6cd43a55714ee48e36bf) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/todos.txt using Guid(672c5a55a70b6cd43a55714ee48e36bf) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '23a72896b758cafc7353a646c22bc61c') in 0.014958 seconds + Import took 0.017169 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.003791 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.756 seconds +Domain Reload Profiling: + ReloadAssembly (757ms) + BeginReloadAssembly (80ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (3ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (24ms) + EndReloadAssembly (626ms) + LoadAssemblies (61ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (198ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (29ms) + SetupLoadedEditorAssemblies (265ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (52ms) + ProcessInitializeOnLoadAttributes (203ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1395 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 69.9 MB. +System memory in use after: 70.0 MB. + +Unloading 13 unused Assets to reduce memory usage. Loaded Objects now: 1896. +Total: 2.634000 ms (FindLiveObjects: 0.149900 ms CreateObjectMapping: 0.029700 ms MarkObjects: 2.436100 ms DeleteObjects: 0.017300 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log new file mode 100644 index 0000000..254bf6f --- /dev/null +++ b/Logs/AssetImportWorker0.log @@ -0,0 +1,211 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.17f1 (a4537701e4ab) revision 10769271'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Pro; OS build 19044.1586; Version 2009; 64bit' Language: 'ru' Physical Memory: 16318 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + +COMMAND LINE ARGUMENTS: +D:\Unity\2019\2020.3.17f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +F:/psx_retroshader/psx_retroshader +-logFile +Logs/AssetImportWorker0.log +-srvPort +57644 +Successfully changed project path to: F:/psx_retroshader/psx_retroshader +F:/psx_retroshader/psx_retroshader +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 24.18 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.17f1 (a4537701e4ab) +[Subsystems] Discovering subsystems at path D:/Unity/2019/2020.3.17f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path F:/psx_retroshader/psx_retroshader/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.1] + Renderer: NVIDIA GeForce RTX 2060 (ID=0x1f08) + Vendor: + VRAM: 5980 MB + Driver: 30.0.14.9676 +Initialize mono +Mono path[0] = 'D:/Unity/2019/2020.3.17f1/Editor/Data/Managed' +Mono path[1] = 'D:/Unity/2019/2020.3.17f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'D:/Unity/2019/2020.3.17f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56120 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.000862 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 24.11 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.420 seconds +Domain Reload Profiling: + ReloadAssembly (1420ms) + BeginReloadAssembly (40ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (0ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (1ms) + EndReloadAssembly (312ms) + LoadAssemblies (39ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (117ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (24ms) + SetupLoadedEditorAssemblies (120ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (24ms) + BeforeProcessingInitializeOnLoad (13ms) + ProcessInitializeOnLoadAttributes (59ms) + ProcessInitializeOnLoadMethodAttributes (21ms) + AfterProcessingInitializeOnLoad (0ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (0ms) +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.002006 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.838 seconds +Domain Reload Profiling: + ReloadAssembly (839ms) + BeginReloadAssembly (114ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (3ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (16ms) + EndReloadAssembly (677ms) + LoadAssemblies (63ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (208ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (33ms) + SetupLoadedEditorAssemblies (299ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (56ms) + ProcessInitializeOnLoadAttributes (233ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.04 seconds +Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1406 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 67.4 MB. +System memory in use after: 67.5 MB. + +Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 1846. +Total: 3.020600 ms (FindLiveObjects: 0.166500 ms CreateObjectMapping: 0.029900 ms MarkObjects: 2.727200 ms DeleteObjects: 0.096000 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +======================================================================== +Received Import Request. + path: Assets/PSXRetroShader/todos.txt + artifactKey: Guid(672c5a55a70b6cd43a55714ee48e36bf) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/todos.txt using Guid(672c5a55a70b6cd43a55714ee48e36bf) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '93fa2eb3db5a9846f18dd1d92bf55878') in 0.029938 seconds + Import took 0.031988 seconds . + +======================================================================== +Received Import Request. + Time since last request: 18.253660 seconds. + path: Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs + artifactKey: Guid(a7f3bc9876be0db46818fdcfc3da5b28) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs using Guid(a7f3bc9876be0db46818fdcfc3da5b28) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6abb830537007b0a75ee4f59b2b693cf') in 0.006569 seconds + Import took 0.008648 seconds . + +======================================================================== +Received Import Request. + Time since last request: 96.024566 seconds. + path: Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs + artifactKey: Guid(a7f3bc9876be0db46818fdcfc3da5b28) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/PSXRetroShader/Scripts/PSXVertexPrecision.cs using Guid(a7f3bc9876be0db46818fdcfc3da5b28) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7553697d6eac6188207d88aa6d08a436') in 0.002533 seconds + Import took 0.004706 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002110 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.31 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.775 seconds +Domain Reload Profiling: + ReloadAssembly (776ms) + BeginReloadAssembly (93ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (27ms) + EndReloadAssembly (633ms) + LoadAssemblies (64ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (206ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (29ms) + SetupLoadedEditorAssemblies (261ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (50ms) + ProcessInitializeOnLoadAttributes (202ms) + ProcessInitializeOnLoadMethodAttributes (3ms) + AfterProcessingInitializeOnLoad (2ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.32 ms, found 2 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1395 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 66.6 MB. +System memory in use after: 66.7 MB. + +Unloading 13 unused Assets to reduce memory usage. Loaded Objects now: 1848. +Total: 2.719200 ms (FindLiveObjects: 0.146700 ms CreateObjectMapping: 0.029800 ms MarkObjects: 2.523800 ms DeleteObjects: 0.017900 ms) + +AssetImportParameters requested are different than current active one (requested -> active): + custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> +AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..8b113e7 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,46 @@ + +=== Mon Apr 4 21:29:51 2022 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.collab-proxy@1.7.1 + com.unity.ide.rider@2.0.7 + com.unity.ide.visualstudio@2.0.11 + com.unity.ide.vscode@1.2.3 + com.unity.modules.ai@1.0.0 + com.unity.modules.androidjni@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@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.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@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.unityanalytics@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.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 + com.unity.test-framework@1.1.27 + com.unity.textmeshpro@3.0.6 + com.unity.timeline@1.4.8 + com.unity.ugui@1.0.0 diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log new file mode 100644 index 0000000..6b4cb3c --- /dev/null +++ b/Logs/shadercompiler-AssetImportWorker0.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4) + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe10.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe10.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe11.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe12.log b/Logs/shadercompiler-UnityShaderCompiler.exe12.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe12.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe13.log b/Logs/shadercompiler-UnityShaderCompiler.exe13.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe13.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe14.log b/Logs/shadercompiler-UnityShaderCompiler.exe14.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe14.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe15.log b/Logs/shadercompiler-UnityShaderCompiler.exe15.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe15.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Logs/shadercompiler-UnityShaderCompiler.exe4.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe4.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Logs/shadercompiler-UnityShaderCompiler.exe5.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Logs/shadercompiler-UnityShaderCompiler.exe6.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe6.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe7.log b/Logs/shadercompiler-UnityShaderCompiler.exe7.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe7.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe8.log b/Logs/shadercompiler-UnityShaderCompiler.exe8.log new file mode 100644 index 0000000..bdbfe1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe8.log @@ -0,0 +1,6 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe9.log b/Logs/shadercompiler-UnityShaderCompiler.exe9.log new file mode 100644 index 0000000..5a345a6 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe9.log @@ -0,0 +1,4 @@ +Base path: 'D:/Unity/2019/2020.3.17f1/Editor/Data', plugins path 'D:/Unity/2019/2020.3.17f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: shutdown diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..269f819 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,43 @@ +{ + "dependencies": { + "com.unity.collab-proxy": "1.7.1", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.3", + "com.unity.test-framework": "1.1.27", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "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.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "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.unityanalytics": "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.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..6f39b82 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,347 @@ +{ + "dependencies": { + "com.unity.collab-proxy": { + "version": "1.7.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.27", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.4.8", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "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.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "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": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "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, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "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, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "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, + "source": "builtin", + "dependencies": { + "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" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 40dbecb..7580103 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..be4a797 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..67a94da --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b44dbbd..ec2d8d6 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c4684cd..2c2c446 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.4f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 2020.3.17f1 +m_EditorVersionWithRevision: 2020.3.17f1 (a4537701e4ab) diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 39abcdf..0000000 Binary files a/ProjectSettings/UnityAdsSettings.asset and /dev/null differ diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..46f38e1 --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 + m_CompiledVersion: 0 + m_RuntimeVersion: 0 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 0000000..bfed8f8 --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 224247031146464f081d183113265115580216233831 + flags: 0 + RecentlyUsedScenePath-1: + value: 224247031146466b3e363e27043150231e161c2f3e67153328271820adf4312bf6f435ece93f7129370bfb25 + flags: 0 + RecentlyUsedScenePath-2: + value: 224247031146466b3e363e27043150231e161c2f3e67153328271820adec3d3feaf33be8f72e3a2f2d4cfa320d2a18 + flags: 0 + RecentlyUsedScenePath-3: + value: 224247031146466b3e363e27043150231e161c2f3e67153328271820ade93a2bf6e638eaee3438722c0ce6281d + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1