浏览代码
Fixed planar reflections
Fixed planar reflections
- Planar reflections now work properly across multiple windows - Fixed leaking of render texture - Fixed multiple reflection cameras - Added first pass seaweed - Fixed tessellation shader - Simplified water common to share more between tessellation and vertex displacement - Enabled SRP batcher - Fixed LODLightmaps to work with 4 LODs - Cleared Occlusion data, was messing with planar reflections and also didnt cull anything at large distances -/main
André McGrail
6 年前
当前提交
175825d8
共有 22 个文件被更改,包括 3089 次插入 和 775 次删除
-
5Assets/Data/LightweightAsset.asset
-
2Assets/Objects/boats/Interceptor.mat
-
2Assets/Objects/props/props/Matr_Props_Hue.mat
-
16Assets/Scripts/Boat/BoatController.cs
-
24Assets/Scripts/Effects/LODLightmaps.cs
-
4Assets/Scripts/Effects/WakeGenerator.cs
-
980Assets/scenes/Island.unity
-
980Packages/com.verasl.water-system/Meshes/SeaVertDisp.fbx
-
113Packages/com.verasl.water-system/Scripts/Rendering/PlanerReflections.cs
-
46Packages/com.verasl.water-system/Scripts/Rendering/WaterCausticsPass.cs
-
1Packages/com.verasl.water-system/Sea.mat
-
2Packages/com.verasl.water-system/Shaders/CommonUtilities.hlsl
-
125Packages/com.verasl.water-system/Shaders/WaterCommon.hlsl
-
7Packages/com.verasl.water-system/Shaders/WaterLighting.hlsl
-
18Packages/com.verasl.water-system/Shaders/WaterTessellated.shader
-
38Packages/com.verasl.water-system/Shaders/WaterTessellation.hlsl
-
95Assets/Materials/Seaweed.mat
-
8Assets/Materials/Seaweed.mat.meta
-
1001Assets/Textures/seaweedtemp.png
-
389Assets/Textures/seaweedtemp.png.meta
-
8Assets/scenes/Island/OcclusionCullingData.asset.meta
980
Assets/scenes/Island.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
980
Packages/com.verasl.water-system/Meshes/SeaVertDisp.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Seaweed |
|||
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} |
|||
m_ShaderKeywords: _ALPHATEST_ON |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: 2500 |
|||
stringTagMap: |
|||
RenderType: TransparentCutout |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BaseMap: |
|||
m_Texture: {fileID: 2800000, guid: cc4461962f3156d449f7a6273a2d11a7, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _BumpMap: |
|||
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: 2800000, guid: cc4461962f3156d449f7a6273a2d11a7, type: 3} |
|||
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} |
|||
- _SpecGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _AlphaClip: 1 |
|||
- _Blend: 0 |
|||
- _BumpScale: 1 |
|||
- _Cull: 2 |
|||
- _Cutoff: 0.5 |
|||
- _DstBlend: 0 |
|||
- _EnvironmentReflections: 1 |
|||
- _GlossMapScale: 0 |
|||
- _Glossiness: 0 |
|||
- _GlossinessSource: 0 |
|||
- _GlossyReflections: 0 |
|||
- _Metallic: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _QueueOffset: 0 |
|||
- _ReceiveShadows: 1 |
|||
- _Shininess: 0 |
|||
- _Smoothness: 0.5 |
|||
- _SmoothnessSource: 0 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecSource: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _Surface: 0 |
|||
- _WorkflowMode: 1 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} |
|||
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _SpecColor: {r: 0.19999993, g: 0.19999993, b: 0.19999993, a: 0.5} |
|||
--- !u!114 &743226389367642094 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 11 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_GeneratorAsset: {fileID: 0} |
|||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} |
|||
m_Name: |
|||
m_EditorClassIdentifier: |
|||
version: 1 |
|
|||
fileFormatVersion: 2 |
|||
guid: ad576ac25156b614199c50816aa56dcc |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 2100000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
1001
Assets/Textures/seaweedtemp.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: cc4461962f3156d449f7a6273a2d11a7 |
|||
TextureImporter: |
|||
internalIDToNameTable: |
|||
- first: |
|||
213: 2070579405914638917 |
|||
second: seaweedtemp_0 |
|||
- first: |
|||
213: 6953415236642347197 |
|||
second: seaweedtemp_1 |
|||
- first: |
|||
213: 2011398730452703665 |
|||
second: seaweedtemp_2 |
|||
- first: |
|||
213: -5293604505027546174 |
|||
second: seaweedtemp_3 |
|||
- first: |
|||
213: 3586653459566250728 |
|||
second: seaweedtemp_4 |
|||
- first: |
|||
213: -2203736334888200849 |
|||
second: seaweedtemp_5 |
|||
- first: |
|||
213: 7684757929429416417 |
|||
second: seaweedtemp_6 |
|||
- first: |
|||
213: 7923480362896806873 |
|||
second: seaweedtemp_7 |
|||
- first: |
|||
213: -7357963357551301488 |
|||
second: seaweedtemp_8 |
|||
- first: |
|||
213: -4359772888661098362 |
|||
second: seaweedtemp_9 |
|||
- first: |
|||
213: -4293720270900019543 |
|||
second: seaweedtemp_10 |
|||
- first: |
|||
213: -3568659909592068359 |
|||
second: seaweedtemp_11 |
|||
externalObjects: {} |
|||
serializedVersion: 9 |
|||
mipmaps: |
|||
mipMapMode: 0 |
|||
enableMipMap: 1 |
|||
sRGBTexture: 1 |
|||
linearTexture: 0 |
|||
fadeOut: 0 |
|||
borderMipMap: 1 |
|||
mipMapsPreserveCoverage: 1 |
|||
alphaTestReferenceValue: 0.8 |
|||
mipMapFadeDistanceStart: 1 |
|||
mipMapFadeDistanceEnd: 3 |
|||
bumpmap: |
|||
convertToNormalMap: 0 |
|||
externalNormalMap: 0 |
|||
heightScale: 0.25 |
|||
normalMapFilter: 0 |
|||
isReadable: 0 |
|||
streamingMipmaps: 0 |
|||
streamingMipmapsPriority: 0 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: -1 |
|||
aniso: 4 |
|||
mipBias: -100 |
|||
wrapU: -1 |
|||
wrapV: -1 |
|||
wrapW: -1 |
|||
nPOTScale: 0 |
|||
lightmap: 0 |
|||
compressionQuality: 50 |
|||
spriteMode: 1 |
|||
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: 1 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 0 |
|||
textureShape: 1 |
|||
singleChannelComponent: 0 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
platformSettings: |
|||
- serializedVersion: 2 |
|||
buildTarget: DefaultTexturePlatform |
|||
maxTextureSize: 512 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 1 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
androidETC2FallbackOverride: 0 |
|||
- serializedVersion: 2 |
|||
buildTarget: Standalone |
|||
maxTextureSize: 512 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 1 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
androidETC2FallbackOverride: 0 |
|||
spriteSheet: |
|||
serializedVersion: 2 |
|||
sprites: |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_0 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 42 |
|||
y: 452 |
|||
width: 37 |
|||
height: 287 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: 97a2c42ed98b5734d8f27b5fca2e2e96 |
|||
internalID: 2070579405914638917 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_1 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 106 |
|||
y: 451 |
|||
width: 47 |
|||
height: 255 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: 62c74ced364473340a1c1a16642e6d88 |
|||
internalID: 6953415236642347197 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_2 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 179 |
|||
y: 445 |
|||
width: 52 |
|||
height: 341 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: 887ffb4d096811649a309f668b9a9e6c |
|||
internalID: 2011398730452703665 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_3 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 266 |
|||
y: 450 |
|||
width: 184 |
|||
height: 339 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: d19e1c4c005b9cc4fa01ddf38705e385 |
|||
internalID: -5293604505027546174 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_4 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 503 |
|||
y: 451 |
|||
width: 143 |
|||
height: 334 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: aa624a9f203a59349a2491754c4b9b7c |
|||
internalID: 3586653459566250728 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_5 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 721 |
|||
y: 445 |
|||
width: 121 |
|||
height: 335 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: fef41ef7e9ce26e44b54dc0045a36a96 |
|||
internalID: -2203736334888200849 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_6 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 42 |
|||
y: 133 |
|||
width: 26 |
|||
height: 286 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: d0637000e8812c04f9b16c04e6bea50b |
|||
internalID: 7684757929429416417 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_7 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 76 |
|||
y: 117 |
|||
width: 43 |
|||
height: 300 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: 0db80e8c958eda74ca28b07cd78162dc |
|||
internalID: 7923480362896806873 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_8 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 129 |
|||
y: 88 |
|||
width: 116 |
|||
height: 342 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: f3622b33fc7e6fd478c9953f4c9fe58a |
|||
internalID: -7357963357551301488 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_9 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 264 |
|||
y: 76 |
|||
width: 105 |
|||
height: 339 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: dd407c176671bc248878ab30ab3222c0 |
|||
internalID: -4359772888661098362 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_10 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 400 |
|||
y: 84 |
|||
width: 147 |
|||
height: 329 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: b9e719c5eb7a08b4f9c671b00fd56ea0 |
|||
internalID: -4293720270900019543 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
- serializedVersion: 2 |
|||
name: seaweedtemp_11 |
|||
rect: |
|||
serializedVersion: 2 |
|||
x: 576 |
|||
y: 93 |
|||
width: 286 |
|||
height: 339 |
|||
alignment: 7 |
|||
pivot: {x: 0.5, y: 0} |
|||
border: {x: 0, y: 0, z: 0, w: 0} |
|||
outline: [] |
|||
physicsShape: [] |
|||
tessellationDetail: 0 |
|||
bones: [] |
|||
spriteID: 9efefcdccbb2f4f4fb785209353f1af8 |
|||
internalID: -3568659909592068359 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
bones: [] |
|||
spriteID: f8ee34f0b06540442b4c0022e358630d |
|||
internalID: 0 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
secondaryTextures: [] |
|||
spritePackingTag: |
|||
pSDRemoveMatte: 0 |
|||
pSDShowRemoveMatteOption: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: c50beb49de97543d9986b239981f6b8b |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 36300000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
部分文件因为文件数量过多而无法显示
Reference in new issue
xxxxxxxxxx