diff --git a/SSLR/.gitattributes b/SSLR/.gitattributes index 5b91bfa..513003d 100644 --- a/SSLR/.gitattributes +++ b/SSLR/.gitattributes @@ -130,6 +130,5 @@ Assets/Plugins/** linguist-vendored *.dat filter=lfs diff=lfs merge=lfs -text *.DAT filter=lfs diff=lfs merge=lfs -text - -# hot fix for terrain -*Assets\WorldCreatorTerrains\WC_Terrain\WC_Terrain_0_0.asset eol=lf -text \ No newline at end of file +# worldcreator terrain asset files +Assets/WorldCreatorTerrains/*.asset -text \ No newline at end of file diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain.meta b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain.meta deleted file mode 100644 index c394948..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45cc2487a34e5c348b1caef6d3f1ccf9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/Assets.meta b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/Assets.meta deleted file mode 100644 index 5270963..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7297d4578f5afa14cb3862d392370e9b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset deleted file mode 100644 index 18c6c77..0000000 Binary files a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset and /dev/null differ diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset.meta b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset.meta deleted file mode 100644 index 80bfbd1..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd3e04c1f07416449b4c4ad09424acf5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat deleted file mode 100644 index 689b97d..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat +++ /dev/null @@ -1,110 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: WC_Terrain_0_0 - m_Shader: {fileID: 4800000, guid: d374c4542c1921144adb0733e3d9d996, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _TERRAIN_INSTANCED_PERPIXEL_NORMAL - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorMap: - m_Texture: {fileID: 2800000, guid: 947314cc820f80449a4dc5039d5f97bb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TerrainHolesTexture: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _CullMode: 2 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnableHeightBlend: 0 - - _EnableInstancedPerPixelNormal: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HeightTransition: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ReceivesSSR: 1 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefGBuffer: 2 - - _StencilWriteMask: 3 - - _StencilWriteMaskDepth: 48 - - _StencilWriteMaskGBuffer: 51 - - _SupportDecals: 1 - - _UVSec: 0 - - _ZTestDepthEqualForOpaque: 3 - - _ZTestGBuffer: 4 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _OffsetSize: {r: 0, g: 0, b: 1, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_BuildTextureStacks: [] diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat.meta b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat.meta deleted file mode 100644 index 9dbc990..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/WC_Terrain_0_0.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be43fdf7e28db3c40b2af4af401f6822 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png deleted file mode 100644 index f15c0dc..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c0f21b488a6baf8a0a00a43102e78dfc57172dc10c3ceb4a30b9b81600943a3 -size 6393 diff --git a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png.meta b/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png.meta deleted file mode 100644 index 9fbb116..0000000 --- a/SSLR/Assets/WorldCreatorTerrains/WC_Terrain/colormap_0_0.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 947314cc820f80449a4dc5039d5f97bb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - 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: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: