Commit 38efdefa authored by Sarah's avatar Sarah

updated lit spheres

parent 9a2c5b47
......@@ -59,6 +59,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
quality:
m_OverrideState: 0
m_Value: 1
enable:
m_OverrideState: 1
m_Value: 1
......@@ -85,7 +88,7 @@ MonoBehaviour:
m_OverrideState: 0
m_Value: 5
min: 0
sampleCount:
m_SampleCount:
m_OverrideState: 1
m_Value: 12
min: 4
......@@ -143,8 +146,11 @@ MonoBehaviour:
min: 0
upperHemisphereLuxValue:
m_OverrideState: 0
m_Value: 0.46608552
m_Value: 0.46607146
min: 0
upperHemisphereLuxColor:
m_OverrideState: 0
m_Value: {x: 0.18750611, y: 0.29181966, z: 0.5}
desiredLuxValue:
m_OverrideState: 0
m_Value: 20000
......@@ -161,6 +167,55 @@ MonoBehaviour:
hdriSky:
m_OverrideState: 1
m_Value: {fileID: 8900000, guid: 54a3a0570aebe8949bec4966f1376581, type: 3}
enableBackplate:
m_OverrideState: 0
m_Value: 0
backplateType:
m_OverrideState: 0
m_Value: 0
groundLevel:
m_OverrideState: 0
m_Value: 0
scale:
m_OverrideState: 0
m_Value: {x: 32, y: 32}
projectionDistance:
m_OverrideState: 0
m_Value: 16
min: 0.0000001
plateRotation:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
plateTexRotation:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
plateTexOffset:
m_OverrideState: 0
m_Value: {x: 0, y: 0}
blendAmount:
m_OverrideState: 0
m_Value: 0
min: 0
max: 100
shadowTint:
m_OverrideState: 0
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
hdr: 0
showAlpha: 1
showEyeDropper: 1
pointLightShadow:
m_OverrideState: 0
m_Value: 0
dirLightShadow:
m_OverrideState: 0
m_Value: 0
rectLightShadow:
m_OverrideState: 0
m_Value: 0
--- !u!114 &1501199423866068322
MonoBehaviour:
m_ObjectHideFlags: 3
......@@ -180,7 +235,7 @@ MonoBehaviour:
m_Value: 1
intensity:
m_OverrideState: 1
m_Value: 0.2
m_Value: 0.011
min: 0
max: 1
scatter:
......@@ -320,8 +375,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9008a067f4d626c4d8bc4bc48f04bb89, type: 3}
m_Name: AmbientOcclusion
m_EditorClassIdentifier:
active: 1
active: 0
m_AdvancedMode: 0
quality:
m_OverrideState: 0
m_Value: 1
rayTracing:
m_OverrideState: 0
m_Value: 0
......@@ -335,24 +393,11 @@ MonoBehaviour:
m_Value: 0
min: 0
max: 1
stepCount:
m_OverrideState: 0
m_Value: 6
min: 2
max: 32
radius:
m_OverrideState: 1
m_Value: 1.5
min: 0.25
max: 5
fullResolution:
m_OverrideState: 0
m_Value: 0
maximumRadiusInPixels:
m_OverrideState: 0
m_Value: 40
min: 16
max: 256
temporalAccumulation:
m_OverrideState: 0
m_Value: 1
......@@ -361,14 +406,6 @@ MonoBehaviour:
m_Value: 0.5
min: 0
max: 1
bilateralUpsample:
m_OverrideState: 0
m_Value: 1
directionCount:
m_OverrideState: 0
m_Value: 2
min: 1
max: 6
blurSharpness:
m_OverrideState: 0
m_Value: 0.1
......@@ -397,6 +434,27 @@ MonoBehaviour:
m_Value: 0.5
min: 0.001
max: 1
m_StepCount:
m_OverrideState: 0
m_Value: 6
min: 2
max: 32
m_FullResolution:
m_OverrideState: 0
m_Value: 0
m_MaximumRadiusInPixels:
m_OverrideState: 0
m_Value: 40
min: 16
max: 256
m_BilateralUpsample:
m_OverrideState: 0
m_Value: 1
m_DirectionCount:
m_OverrideState: 0
m_Value: 2
min: 1
max: 6
--- !u!114 &7542669330009093999
MonoBehaviour:
m_ObjectHideFlags: 3
......@@ -468,6 +526,11 @@ MonoBehaviour:
m_OverrideState: 1
m_Value: 150
min: 0
directionalTransmissionMultiplier:
m_OverrideState: 0
m_Value: 1
min: 0
max: 1
cascadeShadowSplitCount:
m_OverrideState: 0
m_Value: 4
......
......@@ -921,13 +921,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 171135794}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalRotation: {x: 0, y: -0.258819, z: 0, w: 0.9659259}
m_LocalPosition: {x: 6.9, y: 3.38, z: -9.47}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -30, z: 0}
--- !u!114 &171135797
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1749,7 +1749,7 @@ VisualEffect:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 403605269}
m_Enabled: 1
m_Asset: {fileID: 8926484042661614526, guid: cacfd45ed02642840836b231a69f7e5d, type: 3}
m_Asset: {fileID: 8926484042661614526, guid: 4912f4bae68bc93468f9f5c2885584bb, type: 3}
m_InitialEventName: OnPlay
m_InitialEventNameOverriden: 0
m_StartSeed: 0
......@@ -3031,12 +3031,12 @@ GameObject:
- component: {fileID: 614244007}
- component: {fileID: 614244006}
m_Layer: 5
m_Name: Dropdown_BlendingMode
m_Name: Dropdown_ParticleOutput
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &614244005
RectTransform:
m_ObjectHideFlags: 0
......@@ -3057,7 +3057,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -20.9}
m_AnchoredPosition: {x: 0, y: -228.3}
m_SizeDelta: {x: 250, y: 45.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &614244006
......@@ -3108,15 +3108,28 @@ MonoBehaviour:
m_Value: 0
m_Options:
m_Options:
- m_Text: Option A
- m_Text: LitSpheres
m_Image: {fileID: 0}
- m_Text: Additive
m_Image: {fileID: 0}
- m_Text: Option B
- m_Text: Alpha
m_Image: {fileID: 0}
- m_Text: Option C
- m_Text: Strips
m_Image: {fileID: 0}
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 1247722526}
m_MethodName: ValueChangeCheckParticleOutput
m_Mode: 1
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
m_AlphaFadeSpeed: 0.15
--- !u!114 &614244007
MonoBehaviour:
......@@ -4887,8 +4900,8 @@ MonoBehaviour:
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearColorMode: 1
backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0}
clearDepth: 1
volumeLayerMask:
serializedVersion: 2
......@@ -4910,7 +4923,7 @@ MonoBehaviour:
flipYMode: 0
fullscreenPassthrough: 0
allowDynamicResolution: 0
customRenderingSettings: 0
customRenderingSettings: 1
invertFaceCulling: 0
probeLayerMask:
serializedVersion: 2
......@@ -4918,7 +4931,7 @@ MonoBehaviour:
hasPersistentHistory: 0
m_RenderingPathCustomFrameSettings:
bitDatas:
data1: 70297877217101
data1: 70160304045901
data2: 4539628425463136256
lodBias: 1
lodBiasMode: 0
......@@ -4929,7 +4942,7 @@ MonoBehaviour:
materialQuality: 0
renderingPathCustomFrameSettingsOverrideMask:
mask:
data1: 0
data1: 137573171200
data2: 0
defaultFrameSettings: 0
--- !u!1 &1176592045
......@@ -5178,8 +5191,8 @@ MonoBehaviour:
m_SpawnSlider: {fileID: 2134832564}
m_XScale: {fileID: 524605113}
m_rangeSlider: {fileID: 475985254}
m_BlendModeDropDown: {fileID: 614244006}
m_BlendModeText: {fileID: 1371208683}
m_ParticleOutputDropDown: {fileID: 614244006}
m_ParticleOutputText: {fileID: 1433549233}
m_TextureDropDown: {fileID: 422364664}
m_TextureText: {fileID: 1492615629}
m_ColorDropDown: {fileID: 1080817368}
......@@ -5190,6 +5203,11 @@ MonoBehaviour:
- {fileID: 2800000, guid: d01d8874889eebc4ab0cde7f2b3309de, type: 3}
- {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2800000, guid: 49cb5aa34272b034d8b754c65d9cdbfa, type: 3}
m_VFXArray:
- {fileID: 8926484042661614526, guid: b3dec54105e10eb44b7e3802280d381e, type: 3}
- {fileID: 8926484042661614526, guid: 2624b1b8daa6f6547832dadb0c29012a, type: 3}
- {fileID: 8926484042661614526, guid: 6d05695126b1b4e47911242ce7170070, type: 3}
- {fileID: 8926484042661614526, guid: 4912f4bae68bc93468f9f5c2885584bb, type: 3}
--- !u!1 &1263873844
GameObject:
m_ObjectHideFlags: 0
......@@ -5363,6 +5381,99 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1319781820
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1319781824}
- component: {fileID: 1319781823}
- component: {fileID: 1319781822}
- component: {fileID: 1319781821}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!135 &1319781821
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1319781820}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1319781822
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1319781820}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1319781823
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1319781820}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1319781824
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1319781820}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1334929506
GameObject:
m_ObjectHideFlags: 0
......@@ -5698,7 +5809,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Option A
m_Text: LitSpheres
--- !u!222 &1371208684
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -5798,7 +5909,7 @@ GameObject:
- component: {fileID: 1433549234}
- component: {fileID: 1433549233}
m_Layer: 5
m_Name: Label_BlendMode
m_Name: Label_ParticleOutput
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -5854,9 +5965,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Particle Blend Mode
'
m_Text: Particle Output
--- !u!222 &1433549234
CanvasRenderer:
m_ObjectHideFlags: 0
......
......@@ -13,8 +13,8 @@ public class VFXShader : MonoBehaviour
//[SerializeField] Slider m_MaxSpeed;
[SerializeField] RangeSlider m_rangeSlider;
[SerializeField] Dropdown m_BlendModeDropDown;
[SerializeField] Text m_BlendModeText;
[SerializeField] Dropdown m_ParticleOutputDropDown;
[SerializeField] Text m_ParticleOutputText;
[SerializeField] Dropdown m_TextureDropDown;
[SerializeField] Text m_TextureText;
[SerializeField] Dropdown m_ColorDropDown;
......@@ -22,6 +22,7 @@ public class VFXShader : MonoBehaviour
[SerializeField] GameObject m_vfx;
[SerializeField] Texture2D[] m_TextureArray;
[SerializeField] VisualEffectAsset[] m_VFXArray;
VisualEffect m_vea;
......@@ -32,7 +33,7 @@ public class VFXShader : MonoBehaviour
m_vea = m_vfx.GetComponent<VisualEffect>();
//Initialise the Text to say the first value of the Dropdown
m_BlendModeText.text = "First Value : " + m_BlendModeDropDown.value;
m_ParticleOutputText.text = "First Value : " + m_ParticleOutputDropDown.value;
m_TextureText.text = "First Value :" + m_TextureDropDown.value;
m_ColorText.text = "First Value :" + m_ColorDropDown.value;
......@@ -42,6 +43,7 @@ public class VFXShader : MonoBehaviour
ValueChangeCheckColor();
//ValueChangeCheckMaxSpeed();
ValueChangeCheckRangeSlider();
ValueChangeCheckParticleOutput();
}
// Invoked when the value of the slider changes.
......@@ -50,9 +52,14 @@ public class VFXShader : MonoBehaviour
m_vea.SetFloat("SpawnRate", m_SpawnSlider.value);
}
public void ValueChangeCheckBlendMode()
public void ValueChangeCheckParticleOutput()
{
VisualEffect vfx = m_vfx.GetComponent<VisualEffect>();
vfx.visualEffectAsset = m_VFXArray[m_ParticleOutputDropDown.value];
Debug.Log(m_VFXArray[m_ParticleOutputDropDown.value]);
Debug.Log(vfx);
Debug.Log(vfx.visualEffectAsset);
Debug.Log(m_ParticleOutputDropDown.value);
}
public void ValueChangeCheckTexture()
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 2624b1b8daa6f6547832dadb0c29012a
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 6d05695126b1b4e47911242ce7170070
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
fileFormatVersion: 2
guid: b3dec54105e10eb44b7e3802280d381e
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 4912f4bae68bc93468f9f5c2885584bb
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e48a4fb8821cf4241a9d7dba882ff119
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 70ed7ab9ddb2dc9a2957ad0a45b516ea
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: fcba9cf5611a35f3fb81b15575c40e77
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 8365f8b61211611e49c33e93322e49c3
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: d5b97a12f79c9a34993ebded662dc0c2
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment