Skip to content

Commit 0ca36ab

Browse files
committed
More proper volume linearization
1 parent 7ce5948 commit 0ca36ab

File tree

5 files changed

+168
-156
lines changed

5 files changed

+168
-156
lines changed

Assets/USharpVideo/Scenes/VideoPlayerExampleScene.unity

Lines changed: 150 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,43 @@ MeshFilter:
391391
m_PrefabAsset: {fileID: 0}
392392
m_GameObject: {fileID: 40421412}
393393
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
394+
--- !u!114 &87374302
395+
MonoBehaviour:
396+
m_ObjectHideFlags: 0
397+
m_CorrespondingSourceObject: {fileID: 0}
398+
m_PrefabInstance: {fileID: 0}
399+
m_PrefabAsset: {fileID: 0}
400+
m_GameObject: {fileID: 0}
401+
m_Enabled: 1
402+
m_EditorHideFlags: 0
403+
m_Script: {fileID: 11500000, guid: ec0b4dd729a12d046982652f834580a2, type: 3}
404+
m_Name: probes
405+
m_EditorClassIdentifier:
406+
resolution: 2048
407+
bitmask: 1
408+
id: 1
409+
sortingID: 0
410+
isImplicit: 1
411+
area: 0
412+
totalVertexCount: 2261
413+
vertexCounter: 0
414+
sceneLodLevel: -1
415+
sceneName:
416+
containsTerrains: 0
417+
probes: 1
418+
mode: 2
419+
renderMode: 1000
420+
renderDirMode: 5
421+
atlasPacker: 1000
422+
computeSSS: 0
423+
sssSamples: 16
424+
sssDensity: 10
425+
sssColor: {r: 1, g: 1, b: 1, a: 1}
426+
fakeShadowBias: 0
427+
transparentSelfShadow: 0
428+
flipNormal: 0
429+
parentName:
430+
overridePath:
394431
--- !u!1 &94867900
395432
GameObject:
396433
m_ObjectHideFlags: 0
@@ -4499,42 +4536,42 @@ PrefabInstance:
44994536
type: 3}
45004537
propertyPath: DynamicMaterials.Array.data[0]
45014538
value:
4502-
objectReference: {fileID: 2100000, guid: dd37924cea904bc408bb5659e140ed22, type: 2}
4539+
objectReference: {fileID: 2100000, guid: dfa3df02074a4a244bdae8f939beccbe, type: 2}
45034540
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45044541
type: 3}
45054542
propertyPath: DynamicMaterials.Array.data[1]
45064543
value:
4507-
objectReference: {fileID: 2100000, guid: dc056341635f19c43912574c1c0bf2be, type: 2}
4544+
objectReference: {fileID: 2100000, guid: 4e42f7c9c766b1b4b9a1678c9934d795, type: 2}
45084545
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45094546
type: 3}
45104547
propertyPath: DynamicMaterials.Array.data[2]
45114548
value:
4512-
objectReference: {fileID: 2100000, guid: dfa3df02074a4a244bdae8f939beccbe, type: 2}
4549+
objectReference: {fileID: 2100000, guid: dd37924cea904bc408bb5659e140ed22, type: 2}
45134550
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45144551
type: 3}
45154552
propertyPath: DynamicMaterials.Array.data[3]
45164553
value:
4517-
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
4554+
objectReference: {fileID: 2100000, guid: dc056341635f19c43912574c1c0bf2be, type: 2}
45184555
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45194556
type: 3}
45204557
propertyPath: DynamicMaterials.Array.data[4]
45214558
value:
4522-
objectReference: {fileID: 2100000, guid: a882e10351f5d0c46be0a0e6853422fe, type: 2}
4559+
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
45234560
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45244561
type: 3}
45254562
propertyPath: DynamicMaterials.Array.data[5]
45264563
value:
4527-
objectReference: {fileID: 2100000, guid: 0ca000f61841d694caa625c0652a50a9, type: 2}
4564+
objectReference: {fileID: 2100000, guid: a882e10351f5d0c46be0a0e6853422fe, type: 2}
45284565
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45294566
type: 3}
45304567
propertyPath: DynamicMaterials.Array.data[6]
45314568
value:
4532-
objectReference: {fileID: 2100000, guid: bc5bf9e5a224a6b4695639fbeed28616, type: 2}
4569+
objectReference: {fileID: 2100000, guid: 0ca000f61841d694caa625c0652a50a9, type: 2}
45334570
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45344571
type: 3}
45354572
propertyPath: DynamicMaterials.Array.data[7]
45364573
value:
4537-
objectReference: {fileID: 2100000, guid: 4e42f7c9c766b1b4b9a1678c9934d795, type: 2}
4574+
objectReference: {fileID: 2100000, guid: bc5bf9e5a224a6b4695639fbeed28616, type: 2}
45384575
- target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d,
45394576
type: 3}
45404577
propertyPath: DynamicMaterials.Array.data[8]
@@ -6437,6 +6474,43 @@ Transform:
64376474
m_Father: {fileID: 0}
64386475
m_RootOrder: 3
64396476
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6477+
--- !u!114 &1185382590
6478+
MonoBehaviour:
6479+
m_ObjectHideFlags: 0
6480+
m_CorrespondingSourceObject: {fileID: 0}
6481+
m_PrefabInstance: {fileID: 0}
6482+
m_PrefabAsset: {fileID: 0}
6483+
m_GameObject: {fileID: 0}
6484+
m_Enabled: 1
6485+
m_EditorHideFlags: 0
6486+
m_Script: {fileID: 11500000, guid: ec0b4dd729a12d046982652f834580a2, type: 3}
6487+
m_Name: VideoPlayerExampleScene_LM0
6488+
m_EditorClassIdentifier:
6489+
resolution: 2048
6490+
bitmask: 1
6491+
id: 0
6492+
sortingID: 1
6493+
isImplicit: 1
6494+
area: 2499.858
6495+
totalVertexCount: 0
6496+
vertexCounter: 0
6497+
sceneLodLevel: -1
6498+
sceneName: VideoPlayerExampleScene
6499+
containsTerrains: 0
6500+
probes: 0
6501+
mode: 1
6502+
renderMode: 1000
6503+
renderDirMode: 1000
6504+
atlasPacker: 1000
6505+
computeSSS: 0
6506+
sssSamples: 16
6507+
sssDensity: 10
6508+
sssColor: {r: 1, g: 1, b: 1, a: 1}
6509+
fakeShadowBias: 0
6510+
transparentSelfShadow: 0
6511+
flipNormal: 0
6512+
parentName:
6513+
overridePath:
64406514
--- !u!1 &1257652286
64416515
GameObject:
64426516
m_ObjectHideFlags: 0
@@ -6787,7 +6861,7 @@ MonoBehaviour:
67876861
renderSettingsRTPVSceneView: 0
67886862
renderSettingsRTPVWidth: 640
67896863
renderSettingsRTPVHeight: 360
6790-
lastBakeTime: 588
6864+
lastBakeTime: 671
67916865
enlightenWarningShown: 0
67926866
enlightenWarningShown2: 0
67936867
lightUIDs: 19199ff2
@@ -6823,65 +6897,65 @@ MonoBehaviour:
68236897
cookie: {fileID: 8900000, guid: 32fbe1db0f0c5834aae44f62b2e7c56a, type: 3}
68246898
angle: 30
68256899
implicitGroups:
6826-
- {fileID: 1435097274}
6827-
- {fileID: 1512868440}
6828-
- {fileID: 1512868440}
6829-
- {fileID: 1512868440}
6830-
- {fileID: 1512868440}
6831-
- {fileID: 1512868440}
6832-
- {fileID: 1512868440}
6833-
- {fileID: 1512868440}
6834-
- {fileID: 1512868440}
6835-
- {fileID: 1512868440}
6836-
- {fileID: 1512868440}
6837-
- {fileID: 1512868440}
6838-
- {fileID: 1512868440}
6839-
- {fileID: 1512868440}
6840-
- {fileID: 1512868440}
6841-
- {fileID: 1512868440}
6842-
- {fileID: 1512868440}
6843-
- {fileID: 1512868440}
6844-
- {fileID: 1512868440}
6845-
- {fileID: 1512868440}
6846-
- {fileID: 1512868440}
6847-
- {fileID: 1512868440}
6848-
- {fileID: 1512868440}
6849-
- {fileID: 1512868440}
6850-
- {fileID: 1512868440}
6851-
- {fileID: 1512868440}
6852-
- {fileID: 1512868440}
6853-
- {fileID: 1512868440}
6854-
- {fileID: 1512868440}
6855-
- {fileID: 1512868440}
6856-
- {fileID: 1512868440}
6857-
- {fileID: 1512868440}
6858-
- {fileID: 1512868440}
6859-
- {fileID: 1512868440}
6860-
- {fileID: 1512868440}
6861-
- {fileID: 1512868440}
6862-
- {fileID: 1512868440}
6863-
- {fileID: 1512868440}
6864-
- {fileID: 1512868440}
6865-
- {fileID: 1512868440}
6866-
- {fileID: 1512868440}
6867-
- {fileID: 1512868440}
6868-
- {fileID: 1512868440}
6869-
- {fileID: 1512868440}
6870-
- {fileID: 1512868440}
6871-
- {fileID: 1512868440}
6872-
- {fileID: 1512868440}
6873-
- {fileID: 1512868440}
6874-
- {fileID: 1512868440}
6875-
- {fileID: 1512868440}
6876-
- {fileID: 1512868440}
6877-
- {fileID: 1512868440}
6878-
- {fileID: 1512868440}
6879-
- {fileID: 1512868440}
6880-
- {fileID: 1512868440}
6881-
- {fileID: 1512868440}
6882-
- {fileID: 1512868440}
6883-
- {fileID: 1512868440}
6884-
- {fileID: 1512868440}
6900+
- {fileID: 87374302}
6901+
- {fileID: 1185382590}
6902+
- {fileID: 1185382590}
6903+
- {fileID: 1185382590}
6904+
- {fileID: 1185382590}
6905+
- {fileID: 1185382590}
6906+
- {fileID: 1185382590}
6907+
- {fileID: 1185382590}
6908+
- {fileID: 1185382590}
6909+
- {fileID: 1185382590}
6910+
- {fileID: 1185382590}
6911+
- {fileID: 1185382590}
6912+
- {fileID: 1185382590}
6913+
- {fileID: 1185382590}
6914+
- {fileID: 1185382590}
6915+
- {fileID: 1185382590}
6916+
- {fileID: 1185382590}
6917+
- {fileID: 1185382590}
6918+
- {fileID: 1185382590}
6919+
- {fileID: 1185382590}
6920+
- {fileID: 1185382590}
6921+
- {fileID: 1185382590}
6922+
- {fileID: 1185382590}
6923+
- {fileID: 1185382590}
6924+
- {fileID: 1185382590}
6925+
- {fileID: 1185382590}
6926+
- {fileID: 1185382590}
6927+
- {fileID: 1185382590}
6928+
- {fileID: 1185382590}
6929+
- {fileID: 1185382590}
6930+
- {fileID: 1185382590}
6931+
- {fileID: 1185382590}
6932+
- {fileID: 1185382590}
6933+
- {fileID: 1185382590}
6934+
- {fileID: 1185382590}
6935+
- {fileID: 1185382590}
6936+
- {fileID: 1185382590}
6937+
- {fileID: 1185382590}
6938+
- {fileID: 1185382590}
6939+
- {fileID: 1185382590}
6940+
- {fileID: 1185382590}
6941+
- {fileID: 1185382590}
6942+
- {fileID: 1185382590}
6943+
- {fileID: 1185382590}
6944+
- {fileID: 1185382590}
6945+
- {fileID: 1185382590}
6946+
- {fileID: 1185382590}
6947+
- {fileID: 1185382590}
6948+
- {fileID: 1185382590}
6949+
- {fileID: 1185382590}
6950+
- {fileID: 1185382590}
6951+
- {fileID: 1185382590}
6952+
- {fileID: 1185382590}
6953+
- {fileID: 1185382590}
6954+
- {fileID: 1185382590}
6955+
- {fileID: 1185382590}
6956+
- {fileID: 1185382590}
6957+
- {fileID: 1185382590}
6958+
- {fileID: 1185382590}
68856959
implicitGroupedObjects:
68866960
- {fileID: 0}
68876961
- {fileID: 7033732}
@@ -7559,80 +7633,6 @@ MeshFilter:
75597633
m_PrefabAsset: {fileID: 0}
75607634
m_GameObject: {fileID: 1378073218}
75617635
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
7562-
--- !u!114 &1435097274
7563-
MonoBehaviour:
7564-
m_ObjectHideFlags: 0
7565-
m_CorrespondingSourceObject: {fileID: 0}
7566-
m_PrefabInstance: {fileID: 0}
7567-
m_PrefabAsset: {fileID: 0}
7568-
m_GameObject: {fileID: 0}
7569-
m_Enabled: 1
7570-
m_EditorHideFlags: 0
7571-
m_Script: {fileID: 11500000, guid: ec0b4dd729a12d046982652f834580a2, type: 3}
7572-
m_Name: probes
7573-
m_EditorClassIdentifier:
7574-
resolution: 2048
7575-
bitmask: 1
7576-
id: 1
7577-
sortingID: 0
7578-
isImplicit: 1
7579-
area: 0
7580-
totalVertexCount: 2261
7581-
vertexCounter: 0
7582-
sceneLodLevel: -1
7583-
sceneName:
7584-
containsTerrains: 0
7585-
probes: 1
7586-
mode: 2
7587-
renderMode: 1000
7588-
renderDirMode: 5
7589-
atlasPacker: 1000
7590-
computeSSS: 0
7591-
sssSamples: 16
7592-
sssDensity: 10
7593-
sssColor: {r: 1, g: 1, b: 1, a: 1}
7594-
fakeShadowBias: 0
7595-
transparentSelfShadow: 0
7596-
flipNormal: 0
7597-
parentName:
7598-
overridePath:
7599-
--- !u!114 &1512868440
7600-
MonoBehaviour:
7601-
m_ObjectHideFlags: 0
7602-
m_CorrespondingSourceObject: {fileID: 0}
7603-
m_PrefabInstance: {fileID: 0}
7604-
m_PrefabAsset: {fileID: 0}
7605-
m_GameObject: {fileID: 0}
7606-
m_Enabled: 1
7607-
m_EditorHideFlags: 0
7608-
m_Script: {fileID: 11500000, guid: ec0b4dd729a12d046982652f834580a2, type: 3}
7609-
m_Name: VideoPlayerExampleScene_LM0
7610-
m_EditorClassIdentifier:
7611-
resolution: 2048
7612-
bitmask: 1
7613-
id: 0
7614-
sortingID: 1
7615-
isImplicit: 1
7616-
area: 2499.858
7617-
totalVertexCount: 0
7618-
vertexCounter: 0
7619-
sceneLodLevel: -1
7620-
sceneName: VideoPlayerExampleScene
7621-
containsTerrains: 0
7622-
probes: 0
7623-
mode: 1
7624-
renderMode: 1000
7625-
renderDirMode: 1000
7626-
atlasPacker: 1000
7627-
computeSSS: 0
7628-
sssSamples: 16
7629-
sssDensity: 10
7630-
sssColor: {r: 1, g: 1, b: 1, a: 1}
7631-
fakeShadowBias: 0
7632-
transparentSelfShadow: 0
7633-
flipNormal: 0
7634-
parentName:
7635-
overridePath:
76367636
--- !u!1 &1538022068
76377637
GameObject:
76387638
m_ObjectHideFlags: 0
@@ -9091,7 +9091,7 @@ MonoBehaviour:
90919091
- lightmap: {fileID: 2800000, guid: a8fe183aa37436c47bb97ddb0bb6a089, type: 3}
90929092
lightmapDir: {fileID: 0}
90939093
shadowmask: {fileID: 0}
9094-
isSaved: 1
9094+
isSaved: 0
90959095
--- !u!1 &2011320266
90969096
GameObject:
90979097
m_ObjectHideFlags: 0
@@ -9868,6 +9868,11 @@ PrefabInstance:
98689868
m_Modification:
98699869
m_TransformParent: {fileID: 0}
98709870
m_Modifications:
9871+
- target: {fileID: 8514266412789763511, guid: 87d772cf1b1ec7b49839dde29eb427be,
9872+
type: 3}
9873+
propertyPath: m_Materials.Array.data[0]
9874+
value:
9875+
objectReference: {fileID: 2100000, guid: 4e42f7c9c766b1b4b9a1678c9934d795, type: 2}
98719876
- target: {fileID: 8514266413124898393, guid: 87d772cf1b1ec7b49839dde29eb427be,
98729877
type: 3}
98739878
propertyPath: m_AnchorMax.y
@@ -9966,7 +9971,7 @@ PrefabInstance:
99669971
- target: {fileID: 8514266414051447208, guid: 87d772cf1b1ec7b49839dde29eb427be,
99679972
type: 3}
99689973
propertyPath: m_RootOrder
9969-
value: 2
9974+
value: 1
99709975
objectReference: {fileID: 0}
99719976
- target: {fileID: 8514266414233321578, guid: 87d772cf1b1ec7b49839dde29eb427be,
99729977
type: 3}
@@ -9981,7 +9986,7 @@ PrefabInstance:
99819986
- target: {fileID: 8514266414263867943, guid: 87d772cf1b1ec7b49839dde29eb427be,
99829987
type: 3}
99839988
propertyPath: m_RootOrder
9984-
value: 1
9989+
value: 2
99859990
objectReference: {fileID: 0}
99869991
- target: {fileID: 8514266414354153436, guid: 87d772cf1b1ec7b49839dde29eb427be,
99879992
type: 3}
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:06968e262ad40e295100dedd4577bbca7fa1f439f73de357cf83e7279b7d8a03
3-
size 9214016
2+
oid sha256:a8ce15c36d5c26cae8c5e810ad330f013214e7d5fade06c6a767d714f945163c
3+
size 9216727

0 commit comments

Comments
 (0)