浏览代码

edits

/lw-hw19-volume-env
André McGrail 6 年前
当前提交
aac85ebe
共有 10 个文件被更改,包括 177 次插入85 次删除
  1. 19
      Assets/Data/BoatDemoRenderer.asset
  2. 32
      Assets/Objects/boats/Prefabs/_Boat.prefab
  3. 97
      Assets/scenes/Island.unity
  4. 45
      Assets/scenes/Island/GlobalFX Profile.asset
  5. 18
      Assets/scenes/Island/MainIsland.asset
  6. 2
      Packages/manifest.json
  7. 4
      ProjectSettings/ProjectSettings.asset
  8. 4
      ProjectSettings/ProjectVersion.txt
  9. 30
      Assets/Scripts/Camera/Postv3Autofocus.cs
  10. 11
      Assets/Scripts/Camera/Postv3Autofocus.cs.meta

19
Assets/Data/BoatDemoRenderer.asset


m_RendererFeatures:
- {fileID: 7749027049794126836}
- {fileID: -5007552800156170450}
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
m_CopyDepthShader: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
m_ScreenSpaceShadowShader: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
type: 3}
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
shaders:
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
type: 3}
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 4294967295

m_DefaultStencilState:
overrideStencilState: 0
stencilReference: 1
stencilCompareFunction: 8
passOperation: 2
failOperation: 2
zFailOperation: 0
--- !u!114 &7749027049794126836
MonoBehaviour:
m_ObjectHideFlags: 0

32
Assets/Objects/boats/Prefabs/_Boat.prefab


maxGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0, a: 0}
key1: {r: 0.49056602, g: 0, b: 0, a: 0}
key2: {r: 0.31910473, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key1: {r: 0.87816983, g: 0, b: 0, a: 0}
key2: {r: 0.49056602, g: 0, b: 0, a: 0}
key3: {r: 0.31910473, g: 0, b: 0, a: 0}
ctime1: 5975
ctime2: 51464
ctime3: 65535
ctime4: 0
ctime1: 4547
ctime2: 5975
ctime3: 51464
ctime4: 65535
ctime5: 0
ctime6: 0
ctime7: 0

atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 4
m_NumColorKeys: 5
m_NumAlphaKeys: 2
minGradient:
serializedVersion: 2

maxGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0, a: 0}
key1: {r: 0.49056602, g: 0, b: 0, a: 0}
key2: {r: 0.31910473, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key1: {r: 0.87816983, g: 0, b: 0, a: 0}
key2: {r: 0.49056602, g: 0, b: 0, a: 0}
key3: {r: 0.31910473, g: 0, b: 0, a: 0}
ctime1: 5975
ctime2: 51464
ctime3: 65535
ctime4: 0
ctime1: 4547
ctime2: 5975
ctime3: 51464
ctime4: 65535
ctime5: 0
ctime6: 0
ctime7: 0

atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 4
m_NumColorKeys: 5
m_NumAlphaKeys: 2
minGradient:
serializedVersion: 2

97
Assets/scenes/Island.unity


m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153441711}
m_LocalRotation: {x: 0.16890061, y: -0.81706506, z: 0.3275648, w: 0.44337186}
m_LocalPosition: {x: -77.74759, y: 8.297212, z: -21.408878}
m_LocalRotation: {x: 0.14146718, y: -0.83498126, z: 0.2754443, w: 0.45488888}
m_LocalPosition: {x: -77.76314, y: 6.347624, z: -21.38484}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 636757618}

m_Script: {fileID: 11500000, guid: 4700f9f03ad19f94baf0367cb7a9c988, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Width: 16
m_Damping: 1
m_Width: 5.39
m_Damping: 2
m_MinFOV: 3
m_MaxFOV: 60
--- !u!1 &198446338

m_Name:
m_EditorClassIdentifier:
m_Path: {fileID: 1210977309}
m_PathPosition: 0.952319
m_PathPosition: 0.9528646
m_PositionUnits: 0
m_PathOffset: {x: 0, y: 0, z: 0}
m_XDamping: 3

m_Modification:
m_TransformParent: {fileID: 305293681}
m_Modifications:
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.x
value: -3

propertyPath: UVModule.flipV
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 23139903168929634, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: m_Materials.Array.data[0]

- component: {fileID: 1017609903}
- component: {fileID: 1017609904}
- component: {fileID: 1017609902}
- component: {fileID: 1017609899}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera

m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_RendererOverrideOption: 1
m_RendererData: {fileID: 0}
m_RendererData: {fileID: 11400000, guid: fa301df1a78cf4a9ebe2a3139dc8be8f, type: 2}
m_Bits: 256
m_Bits: 1
m_Antialiasing: 0
m_Antialiasing: 1
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0

height: 1
near clip plane: 0.1
far clip plane: 500
field of view: 60
field of view: 29.642513
orthographic: 0
orthographic size: 10
m_Depth: -5

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017609894}
m_LocalRotation: {x: 0.16890061, y: -0.81706506, z: 0.3275648, w: 0.44337186}
m_LocalPosition: {x: -77.74759, y: 8.297212, z: -21.408878}
m_LocalRotation: {x: 0.14146718, y: -0.83498126, z: 0.2754443, w: 0.45488888}
m_LocalPosition: {x: -77.76314, y: 6.347624, z: -21.38484}
--- !u!114 &1017609899
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017609894}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dbfa93d7c58bb41259eb3458d3d0838b, type: 3}
m_Name:
m_EditorClassIdentifier:
profile: {fileID: 11400000, guid: ff01fc1485be44df0bc381e53dc3c879, type: 2}
cm: {fileID: 1017609903}
--- !u!114 &1017609902
MonoBehaviour:
m_ObjectHideFlags: 0

m_Name:
m_EditorClassIdentifier:
m_settings:
m_ResolutionMultiplier: 1
m_ResolutionMultiplier: 0
m_ClipPlaneOffset: -0.104
m_ReflectLayers:
serializedVersion: 2

m_Modification:
m_TransformParent: {fileID: 305293681}
m_Modifications:
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.x
value: 3

type: 3}
propertyPath: UVModule.flipV
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143740434}
m_LocalRotation: {x: -0.0027672937, y: 0.9054671, z: -0.005904023, w: -0.42436647}
m_LocalRotation: {x: -0.0027672937, y: 0.9054671, z: -0.0059040235, w: -0.42436647}
m_LocalPosition: {x: 42, y: 2.51, z: 62.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1210977308}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -43.55, y: 2.95, z: -53.1}
m_LocalPosition: {x: -43.55, y: 1, z: -53.1}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 324248881}

m_Modification:
m_TransformParent: {fileID: 305293681}
m_Modifications:
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.x
value: -3

propertyPath: UVModule.flipV
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
--- !u!1 &1358838130

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1376922736}
m_LocalRotation: {x: -0.013267021, y: 0.9827769, z: -0.16695736, w: -0.078094944}
m_LocalRotation: {x: -0.0132670235, y: 0.9827769, z: -0.16695733, w: -0.078094974}
m_LocalPosition: {x: 69.76, y: 3.82, z: 81.16}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

- component: {fileID: 1819032312}
- component: {fileID: 1819032313}
m_Layer: 0
m_Name: ---------------WIP--------------
m_Name: '---------------WIP--------------'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

m_Component:
- component: {fileID: 2041733962}
- component: {fileID: 2041733961}
m_Layer: 8
m_Layer: 0
m_Name: GlobalFX
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: d6e27dc5ad82e7c4e8cddded5872eb77, type: 3}

45
Assets/scenes/Island/GlobalFX Profile.asset


m_Value: 2
gaussianStart:
m_OverrideState: 1
m_Value: 10
m_Value: 50
m_Value: 30
m_Value: 500
min: 0
gaussianMaxRadius:
m_OverrideState: 1

m_Value: 0
focusDistance:
m_OverrideState: 1
m_Value: 20
m_Value: 10.599796
m_Value: 2.4
m_Value: 1.2
m_Value: 150
m_Value: 120
m_Value: 5
m_Value: 3
m_Value: 0
m_Value: 1
min: 0
max: 1
bladeRotation:

min: 0
intensity:
m_OverrideState: 1
m_Value: 0.5
m_Value: 1
min: 0
scatter:
m_OverrideState: 1

m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3}
m_Name: MotionBlur
m_EditorClassIdentifier:
active: 0
active: 1
m_AdvancedMode: 0
mode:
m_OverrideState: 1

m_Value: 2
intensity:
m_OverrideState: 1
m_Value: 1
m_Value: 0.5
min: 0
max: 1
clamp:

- {fileID: -4356414026959411784}
- {fileID: -477900410362853418}
- {fileID: -5880084817896221590}
- {fileID: 2179960825523627355}
--- !u!114 &1950431032137305519
MonoBehaviour:
m_ObjectHideFlags: 3

m_Value: 0
min: -180
max: 180
--- !u!114 &2179960825523627355
MonoBehaviour:
m_ObjectHideFlags: 3
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: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3}
m_Name: PaniniProjection
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
distance:
m_OverrideState: 1
m_Value: 0.5
min: 0
max: 1
cropToFit:
m_OverrideState: 1
m_Value: 1
min: 0
max: 1
--- !u!114 &4034598536361921627
MonoBehaviour:
m_ObjectHideFlags: 3

18
Assets/scenes/Island/MainIsland.asset
文件差异内容过多而无法显示
查看文件

2
Packages/manifest.json


"dependencies": {
"com.unity.burst": "1.0.4",
"com.unity.cinemachine": "2.3.4",
"com.unity.ide.rider": "1.0.8",
"com.unity.recorder": "2.0.2-preview.1",
"com.unity.render-pipelines.core": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.render-pipelines.core",
"com.unity.render-pipelines.lightweight": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.render-pipelines.lightweight",
"com.unity.shadergraph": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.shadergraph",

4
ProjectSettings/ProjectSettings.asset


usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1
resizableWindow: 0
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games

m_Automatic: 0
- m_BuildTarget: MacStandaloneSupport
m_APIs: 10000000
m_Automatic: 0
m_Automatic: 1
- m_BuildTarget: WebGLSupport
m_APIs: 0b000000
m_Automatic: 0

XboxOneAllowedProductIds: []
XboxOnePersistentLocalStorageSize: 0
XboxOneXTitleMemory: 8
xboxOneScriptCompiler: 1
XboxOneOverrideIdentityName:
vrEditorSettings:
daydream:

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.0a4
m_EditorVersionWithRevision: 2019.3.0a4 (7368acd360f4)
m_EditorVersion: 2019.2.0b4
m_EditorVersionWithRevision: 2019.2.0b4 (243498937c5d)

30
Assets/Scripts/Camera/Postv3Autofocus.cs


using System.Collections;
using System.Collections.Generic;
using Cinemachine;
using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Rendering;
using UnityEngine.Rendering.LWRP;
public class Postv3Autofocus : MonoBehaviour
{
public VolumeProfile profile;
private DepthOfField dof;
public CinemachineBrain cm;
// Update is called once per frame
void Update()
{
if (profile && cm)
{
profile.TryGet(out dof);
CameraState state = cm.CurrentCameraState;
if (dof)
dof.focusDistance.value = (state.FinalPosition - state.ReferenceLookAt).magnitude;
}
}
}

11
Assets/Scripts/Camera/Postv3Autofocus.cs.meta


fileFormatVersion: 2
guid: dbfa93d7c58bb41259eb3458d3d0838b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存