# Conflicts:
#	UnityProject/Assembly-CSharp.csproj
This commit is contained in:
Chikashi Miyama 2019-12-02 17:34:54 +01:00
commit 7f4e06efc7
11 changed files with 16607 additions and 951 deletions

File diff suppressed because it is too large Load diff

View file

@ -21,7 +21,7 @@ namespace cylvester
set
{
var pitchOffset = value * pitchMultiplier;
transform.localPosition = new Vector3(originalPosition.x, originalPosition.y + pitchOffset, originalPosition.z);
transform.localPosition = new Vector3(originalPosition.x, originalPosition.y, originalPosition.z + pitchOffset);
}
}
}

View file

@ -9,13 +9,18 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Floor Material
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords:
m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
- TransparentDepthPrepass
- TransparentDepthPostpass
- TransparentBackface
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -117,7 +122,7 @@ Material:
- _AlphaSrcBlend: 1
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
- _CoatMask: 1
- _CullMode: 2
- _CullModeForward: 2
- _Cutoff: 0.5
@ -132,16 +137,16 @@ Material:
- _DisplacementMode: 0
- _DistortionBlendMode: 0
- _DistortionBlurBlendMode: 0
- _DistortionBlurDstBlend: 0
- _DistortionBlurDstBlend: 1
- _DistortionBlurRemapMax: 1
- _DistortionBlurRemapMin: 0
- _DistortionBlurScale: 1
- _DistortionBlurSrcBlend: 0
- _DistortionBlurSrcBlend: 1
- _DistortionDepthTest: 1
- _DistortionDstBlend: 0
- _DistortionDstBlend: 1
- _DistortionEnable: 0
- _DistortionScale: 1
- _DistortionSrcBlend: 0
- _DistortionSrcBlend: 1
- _DistortionVectorBias: -1
- _DistortionVectorScale: 2
- _DoubleSidedEnable: 0
@ -174,7 +179,7 @@ Material:
- _MaterialID: 1
- _Metallic: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _NormalScale: 0
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
- _PPDMinSamples: 5
@ -183,7 +188,7 @@ Material:
- _ReceivesSSR: 1
- _RefractionModel: 0
- _SSRefractionProjectionModel: 0
- _Smoothness: 0.5
- _Smoothness: 1
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
- _SpecularAAScreenSpaceVariance: 0.1
@ -195,10 +200,10 @@ Material:
- _StencilRefGBuffer: 2
- _StencilRefMV: 128
- _StencilWriteMask: 3
- _StencilWriteMaskDepth: 32
- _StencilWriteMaskDepth: 48
- _StencilWriteMaskDistortionVec: 64
- _StencilWriteMaskGBuffer: 3
- _StencilWriteMaskMV: 128
- _StencilWriteMaskGBuffer: 51
- _StencilWriteMaskMV: 176
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -218,9 +223,9 @@ Material:
- _UVEmissive: 0
- _UseEmissiveIntensity: 0
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 4
- _ZTestDepthEqualForOpaque: 3
- _ZTestGBuffer: 4
- _ZTestModeDistortion: 8
- _ZTestModeDistortion: 4
- _ZTestTransparent: 4
- _ZWrite: 1
m_Colors:

View file

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -597,6 +597,8 @@ GameObject:
- component: {fileID: 372304930}
- component: {fileID: 372304929}
- component: {fileID: 372304933}
- component: {fileID: 372304934}
- component: {fileID: 372304935}
m_Layer: 10
m_Name: Force Sphere
m_TagString: Untagged
@ -634,7 +636,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: c4db94ef0754bc740bd43e2f85df4475, type: 2}
- {fileID: 2100000, guid: da74047e44a241d4f9a358465c908c5c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -662,7 +664,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 372304928}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 4711208715938537054, guid: af6a91beef576fc4ba1253656a48095b, type: 3}
--- !u!4 &372304932
Transform:
m_ObjectHideFlags: 0
@ -671,8 +673,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 372304928}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.974, y: -0.135, z: 0.6}
m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
m_LocalPosition: {x: -3.974, y: -0.135, z: 10.48}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
@ -685,7 +687,7 @@ Animator:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 372304928}
m_Enabled: 1
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
@ -696,6 +698,33 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &372304934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 372304928}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c513f1578a44c27449c0d866ea9134d2, type: 3}
m_Name:
m_EditorClassIdentifier:
spectrogram: {fileID: 850208556}
spectrogramPanel: {fileID: 372304928}
--- !u!114 &372304935
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 372304928}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 37d4113ecd6365143a586866d5a8aa06, type: 3}
m_Name:
m_EditorClassIdentifier:
pitchMultiplier: -0.2
--- !u!1 &682857294
GameObject:
m_ObjectHideFlags: 0
@ -1018,6 +1047,7 @@ GameObject:
- component: {fileID: 850208553}
- component: {fileID: 850208554}
- component: {fileID: 850208555}
- component: {fileID: 850208556}
m_Layer: 0
m_Name: PdBackend
m_TagString: Untagged
@ -1089,6 +1119,20 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
sceneSelection: 0
--- !u!114 &850208556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850208552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a725a1321c35328439b3d1ac5ece95c3, type: 3}
m_Name:
m_EditorClassIdentifier:
pdBackend: {fileID: 850208554}
channel: 1
--- !u!1 &859452785
GameObject:
m_ObjectHideFlags: 0
@ -1799,7 +1843,7 @@ VisualEffect:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1564454366}
m_Enabled: 1
m_Asset: {fileID: 8926484042661614526, guid: 65dd61013dba9684b9c15aa6f7e13895, type: 3}
m_Asset: {fileID: 8926484042661614526, guid: 44a4130ccea228447aac94bbdb4c18da, type: 3}
m_StartSeed: 0
m_ResetSeedOnPlay: 1
m_PropertySheet:
@ -1848,7 +1892,7 @@ VisualEffect:
m_Overridden: 1
m_Vector3f:
m_Array:
- m_Value: {x: -3.974, y: -0.135, z: 0.6}
- m_Value: {x: -3.974, y: -0.135, z: 10.48}
m_Name: Collider Position
m_Overridden: 1
m_Vector4f:
@ -1970,6 +2014,200 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
targetVfx: {fileID: 1564454368}
--- !u!1 &1577943502
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1577943506}
- component: {fileID: 1577943505}
- component: {fileID: 1577943504}
- component: {fileID: 1577943503}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1577943503
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1577943502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
shadowResolution: 512
shadowDimmer: 1
volumetricShadowDimmer: 1
shadowFadeDistance: 10000
contactShadows: 0
shadowTint: {r: 0, g: 0, b: 0, a: 1}
viewBiasMin: 0.2
viewBiasMax: 100
viewBiasScale: 1
normalBiasMin: 0.5
normalBiasMax: 0.5
normalBiasScale: 1
sampleBiasScale: 0
edgeLeakFixup: 0
edgeToleranceNormal: 1
edgeTolerance: 1
shadowCascadeCount: 4
shadowCascadeRatios:
- 0.05
- 0.2
- 0.3
shadowCascadeBorders:
- 0.2
- 0.2
- 0.2
- 0.2
shadowAlgorithm: 0
shadowVariant: 0
shadowPrecision: 0
--- !u!114 &1577943504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1577943502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
m_Version: 5
directionalIntensity: 3.1415927
punctualIntensity: 600
areaIntensity: 200
enableSpotReflector: 0
luxAtDistance: 1
m_InnerSpotPercent: 0
lightDimmer: 1
m_VolumetricDimmer: 1
lightUnit: 2
fadeDistance: 10000
affectDiffuse: 1
affectSpecular: 1
nonLightmappedOnly: 0
lightTypeExtent: 0
m_SpotLightShape: 0
shapeWidth: 0.5
shapeHeight: 0.5
aspectRatio: 1
shapeRadius: 0
maxSmoothness: 0.99
applyRangeAttenuation: 1
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
showAdditionalSettings: 0
displayLightIntensity: 4.2
displayAreaLightEmissiveMesh: 0
areaLightCookie: {fileID: 0}
areaLightShadowCone: 120
useScreenSpaceShadows: 0
evsmExponent: 15
evsmLightLeakBias: 0
evsmVarianceBias: 0.00001
evsmBlurPasses: 0
lightLayers: 1
lightlayersMask: 1
linkShadowLayers: 1
shadowNearPlane: 0.1
shadowSoftness: 0.5
blockerSampleCount: 24
filterSampleCount: 16
minFilterSize: 0.00001
kernelSize: 5
lightAngle: 1
maxDepthBias: 0.001
--- !u!108 &1577943505
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1577943502}
m_Enabled: 1
serializedVersion: 9
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 4.2
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 1
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 2
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 1
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1577943506
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1577943502}
m_LocalRotation: {x: 0.011214157, y: -0.98737055, z: -0.15233216, w: 0.04205361}
m_LocalPosition: {x: -2.423749, y: -5.691804, z: 9.791819}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: -17.45, y: -174.8, z: -2.1}
--- !u!1 &1669078276
GameObject:
m_ObjectHideFlags: 0
@ -2014,9 +2252,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9de1490c361f2bd48b4a81ad0457a4e7, type: 3}
m_Name:
m_EditorClassIdentifier:
attackSmooth: 1
releaseSmooth: 1
ignore0: 0
attackSmooth: 5.6
releaseSmooth: 5.79
ignore0: 1
onSmoothProcessed:
m_PersistentCalls:
m_Calls:
@ -2053,6 +2291,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 372304935}
m_MethodName: set_Position
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1669078279
MonoBehaviour:
m_ObjectHideFlags: 0

View file

@ -1,7 +1,6 @@
fileFormatVersion: 2
guid: 0fba47d1068d2bd4d93d6ca89d0a42c5
folderAsset: yes
DefaultImporter:
guid: 44a4130ccea228447aac94bbdb4c18da
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:

View file

@ -147,9 +147,9 @@ MonoBehaviour:
uiBounds:
serializedVersion: 2
x: -2339
y: -230
y: -231
width: 3713
height: 3100
height: 3103
--- !u!114 &114350483966674976
MonoBehaviour:
m_ObjectHideFlags: 1

View file

@ -116,6 +116,80 @@ MonoBehaviour:
cascadeShadowBorder3:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-3981158851583105287
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: 384c4d03a551c44448145f4093304119, type: 3}
m_Name: ScreenSpaceReflection
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
depthBufferThickness:
m_OverrideState: 1
m_Value: 0.01
min: 0
max: 1
screenFadeDistance:
m_OverrideState: 1
m_Value: 0.1
min: 0
max: 1
minSmoothness:
m_OverrideState: 1
m_Value: 0.9
min: 0
max: 1
smoothnessFadeStart:
m_OverrideState: 1
m_Value: 0.9
min: 0
max: 1
reflectSky:
m_OverrideState: 1
m_Value: 1
rayMaxIterations:
m_OverrideState: 1
m_Value: 32
enableRaytracing:
m_OverrideState: 0
m_Value: 0
rayLength:
m_OverrideState: 0
m_Value: 10
min: 0.001
max: 50
clampValue:
m_OverrideState: 0
m_Value: 1
min: 0.001
max: 10
temporalAccumulationWeight:
m_OverrideState: 0
m_Value: 0.1
min: 0.001
max: 1
spatialFilterRadius:
m_OverrideState: 0
m_Value: 4
numSamples:
m_OverrideState: 0
m_Value: 1
min: 1
max: 32
enableFilter:
m_OverrideState: 0
m_Value: 0
filterRadius:
m_OverrideState: 0
m_Value: 16
min: 1
max: 32
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -131,8 +205,9 @@ MonoBehaviour:
components:
- {fileID: -6543854886712313374}
- {fileID: -5212262289134541047}
- {fileID: 2571966065225955267}
- {fileID: 2665586700123750556}
- {fileID: -7899671507943415206}
- {fileID: -3981158851583105287}
--- !u!114 &1409399634823879722
MonoBehaviour:
m_ObjectHideFlags: 3
@ -175,7 +250,7 @@ MonoBehaviour:
m_Value: 1
min: 0
max: 20
--- !u!114 &2571966065225955267
--- !u!114 &2665586700123750556
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
@ -188,29 +263,29 @@ MonoBehaviour:
m_Name: DepthOfField
m_EditorClassIdentifier:
active: 0
m_AdvancedMode: 1
m_AdvancedMode: 0
focusMode:
m_OverrideState: 1
m_Value: 1
m_Value: 2
focusDistance:
m_OverrideState: 0
m_Value: 10
min: 0.1
nearFocusStart:
m_OverrideState: 1
m_Value: 28.29
m_Value: 0
min: 0
nearFocusEnd:
m_OverrideState: 1
m_Value: 4
m_Value: 2
min: 0
farFocusStart:
m_OverrideState: 1
m_Value: 7.24
m_Value: 15
min: 0
farFocusEnd:
m_OverrideState: 1
m_Value: 68.9
m_Value: 5
min: 0
nearSampleCount:
m_OverrideState: 0
@ -236,8 +311,8 @@ MonoBehaviour:
m_OverrideState: 0
m_Value: 1
resolution:
m_OverrideState: 1
m_Value: 1
m_OverrideState: 0
m_Value: 2
--- !u!114 &5066986204273790376
MonoBehaviour:
m_ObjectHideFlags: 3

View file

@ -5,9 +5,6 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Examples/VisualEffectGraph/Max Fun 1.unity
guid: 327e45240590ab84082fa4266483ca77
- enabled: 1
path: Assets/Scenes/Examples/VisualEffectGraph/VFX Graph Plane.unity
guid: cdf3404fd0b1f6c4ead9fb8bb270f164

View file

@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 16
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{5B580621-09B4-68CB-B5F4-5B9DD210A60F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{3CC9D2C0-C461-07D9-EDF3-4FFB4DE5C299}"