Skip to content

Commit 080d4d4

Browse files
tomoki-suzuki-syntomoki-suzuki-syn
authored
Merge pull request #58 from Synesthesias/dev/v2
release v2.2.1
2 parents 766eb0a + bd42922 commit 080d4d4

File tree

11 files changed

+142
-50
lines changed

11 files changed

+142
-50
lines changed

‎PlateauToolkit.Rendering/Editor/Prefabs/HDRP/Rendering Volume Profile.asset‎

Lines changed: 74 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ MonoBehaviour:
118118
m_Value: 1
119119
m_StepCount:
120120
m_OverrideState: 1
121-
m_Value: 6
121+
m_Value: 16
122122
m_FullResolution:
123123
m_OverrideState: 1
124-
m_Value: 0
124+
m_Value: 1
125125
m_MaximumRadiusInPixels:
126126
m_OverrideState: 1
127-
m_Value: 40
127+
m_Value: 80
128128
m_BilateralUpsample:
129129
m_OverrideState: 1
130130
m_Value: 1
131131
m_DirectionCount:
132132
m_OverrideState: 1
133-
m_Value: 2
133+
m_Value: 4
134134
m_RayLength:
135135
m_OverrideState: 1
136136
m_Value: 20
@@ -176,7 +176,7 @@ MonoBehaviour:
176176
m_Value: 2
177177
limitMax:
178178
m_OverrideState: 1
179-
m_Value: 14
179+
m_Value: 13.3
180180
curveMap:
181181
m_OverrideState: 1
182182
m_Value:
@@ -309,10 +309,10 @@ MonoBehaviour:
309309
active: 1
310310
temperature:
311311
m_OverrideState: 1
312-
m_Value: -6
312+
m_Value: -3
313313
tint:
314-
m_OverrideState: 0
315-
m_Value: 0
314+
m_OverrideState: 1
315+
m_Value: -2
316316
--- !u!114 &-5028308316047275686
317317
MonoBehaviour:
318318
m_ObjectHideFlags: 3
@@ -328,7 +328,7 @@ MonoBehaviour:
328328
active: 1
329329
quality:
330330
m_OverrideState: 1
331-
m_Value: 1
331+
m_Value: 2
332332
focusMode:
333333
m_OverrideState: 1
334334
m_Value: 2
@@ -352,25 +352,28 @@ MonoBehaviour:
352352
m_Value: 300000
353353
m_NearSampleCount:
354354
m_OverrideState: 1
355-
m_Value: 4
355+
m_Value: 8
356356
m_NearMaxBlur:
357357
m_OverrideState: 1
358-
m_Value: 3
358+
m_Value: 7
359359
m_FarSampleCount:
360360
m_OverrideState: 1
361-
m_Value: 5
361+
m_Value: 14
362362
m_FarMaxBlur:
363363
m_OverrideState: 1
364-
m_Value: 6
364+
m_Value: 13
365365
m_Resolution:
366366
m_OverrideState: 1
367-
m_Value: 2
367+
m_Value: 1
368368
m_HighQualityFiltering:
369369
m_OverrideState: 1
370-
m_Value: 0
370+
m_Value: 1
371371
m_PhysicallyBased:
372372
m_OverrideState: 1
373373
m_Value: 0
374+
m_LimitManualRangeNearBlur:
375+
m_OverrideState: 1
376+
m_Value: 0
374377
--- !u!114 &-3323152859500968833
375378
MonoBehaviour:
376379
m_ObjectHideFlags: 3
@@ -442,6 +445,27 @@ MonoBehaviour:
442445
accumulationFactor:
443446
m_OverrideState: 0
444447
m_Value: 0.75
448+
biasFactor:
449+
m_OverrideState: 0
450+
m_Value: 0.5
451+
speedRejectionParam:
452+
m_OverrideState: 0
453+
m_Value: 0.5
454+
speedRejectionScalerFactor:
455+
m_OverrideState: 0
456+
m_Value: 0.2
457+
speedSmoothReject:
458+
m_OverrideState: 0
459+
m_Value: 0
460+
speedSurfaceOnly:
461+
m_OverrideState: 0
462+
m_Value: 1
463+
speedTargetOnly:
464+
m_OverrideState: 0
465+
m_Value: 1
466+
enableWorldSpeedRejection:
467+
m_OverrideState: 0
468+
m_Value: 0
445469
m_RayMaxIterations:
446470
m_OverrideState: 1
447471
m_Value: 64
@@ -609,6 +633,9 @@ MonoBehaviour:
609633
mode:
610634
m_OverrideState: 1
611635
m_Value: 2
636+
useFullACES:
637+
m_OverrideState: 0
638+
m_Value: 0
612639
toeStrength:
613640
m_OverrideState: 0
614641
m_Value: 0
@@ -633,6 +660,33 @@ MonoBehaviour:
633660
lutContribution:
634661
m_OverrideState: 0
635662
m_Value: 1
663+
neutralHDRRangeReductionMode:
664+
m_OverrideState: 0
665+
m_Value: 2
666+
acesPreset:
667+
m_OverrideState: 0
668+
m_Value: 3
669+
fallbackMode:
670+
m_OverrideState: 0
671+
m_Value: 1
672+
hueShiftAmount:
673+
m_OverrideState: 0
674+
m_Value: 0
675+
detectPaperWhite:
676+
m_OverrideState: 0
677+
m_Value: 0
678+
paperWhite:
679+
m_OverrideState: 0
680+
m_Value: 300
681+
detectBrightnessLimits:
682+
m_OverrideState: 0
683+
m_Value: 1
684+
minNits:
685+
m_OverrideState: 0
686+
m_Value: 0.005
687+
maxNits:
688+
m_OverrideState: 0
689+
m_Value: 1000
636690
--- !u!114 &2221381968258264123
637691
MonoBehaviour:
638692
m_ObjectHideFlags: 3
@@ -657,10 +711,10 @@ MonoBehaviour:
657711
m_Value: {r: 0.97547174, g: 1, b: 0.9933615, a: 1}
658712
hueShift:
659713
m_OverrideState: 1
660-
m_Value: -2
714+
m_Value: 0
661715
saturation:
662716
m_OverrideState: 1
663-
m_Value: 0
717+
m_Value: 80
664718
--- !u!114 &5671803632296313252
665719
MonoBehaviour:
666720
m_ObjectHideFlags: 3
@@ -674,6 +728,7 @@ MonoBehaviour:
674728
m_Name: HDShadowSettings
675729
m_EditorClassIdentifier:
676730
active: 1
731+
interCascadeBorders: 1
677732
maxShadowDistance:
678733
m_OverrideState: 1
679734
m_Value: 20000
@@ -694,10 +749,10 @@ MonoBehaviour:
694749
m_Value: 0.3
695750
cascadeShadowBorder0:
696751
m_OverrideState: 1
697-
m_Value: 0.13333334
752+
m_Value: 0.06905067
698753
cascadeShadowBorder1:
699754
m_OverrideState: 1
700-
m_Value: 0.06666666
755+
m_Value: 0.042385235
701756
cascadeShadowBorder2:
702757
m_OverrideState: 0
703758
m_Value: 0

‎PlateauToolkit.Sandbox/Runtime/PlateauSandboxCameraManager.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,16 @@ void CheckKeyboardCameraSwitch()
168168

169169
void LateUpdate()
170170
{
171-
m_CurrentCameraController?.HandleInput();
171+
try
172+
{
173+
m_CurrentCameraController?.HandleInput();
174+
}
175+
catch (MissingReferenceException)
176+
{
177+
// 追跡車両が消えたらMissingReferenceExceptionが発生
178+
// SandboxCameraの制御を解除
179+
SwitchCamera(PlateauSandboxCameraMode.None);
180+
}
172181
}
173182

174183
void CheckCameraTarget(Vector3 screenPosition)

‎PlateauToolkit.Sandbox/Runtime/RoadNetwork/AWSIM/RandomTraffic/Environments/TrafficIntersection.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ public GroupLightingOrder(int group, TrafficLightData.BulbData bulbData)
107107
[SerializeField] LayerMask colliderMask;
108108
[SerializeField] List<TrafficLightGroup> trafficLightGroups;
109109
[SerializeField] LightingSequence[] lightingSequences;
110+
111+
public List<TrafficLightGroup> TrafficLightGroups => trafficLightGroups;
112+
public LightingSequence[] LightingSequences => lightingSequences;
110113

111114
[Header("RoadNetwork")]
112115
[SerializeField]

‎PlateauToolkit.Sandbox/Runtime/RoadNetwork/Debug/DebugLaneConverter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void DebugLanes(TrafficLane lane, RoadNetworkDataGetter getter)
2222
if (nextIntersection != null)
2323
{
2424
var linestrings = nextIntersection.Edges.Select(x => x.GetBorder(getter).LineString.ID);
25-
Debug.Log($"Next Intersection Borders {string.Join(",", linestrings)} : nextBorder {nextBorder.LineString.ID} {lane.rnLane.IsReverse} {nextIntersection.IsEmptyIntersection} {lane.name} ");
25+
Debug.Log($"Next Intersection Borders {string.Join(",", linestrings)} : nextBorder {nextBorder.LineString.ID} {lane.rnLane.IsReversed} {nextIntersection.IsEmptyIntersection} {lane.name} ");
2626

2727
if (nextIntersection.IsEmptyIntersection)
2828
{
@@ -52,7 +52,7 @@ public static void DebugLanes(TrafficLane lane, RoadNetworkDataGetter getter)
5252
if (prevIntersection != null)
5353
{
5454
var linestrings = prevIntersection.Edges.Select(x => x.GetBorder(getter).LineString.ID);
55-
Debug.Log($"Prev Intersection Borders {string.Join(",", linestrings)} : prevBorder {prevBorder.LineString.ID} {lane.rnLane.IsReverse} {prevIntersection.IsEmptyIntersection} {lane.name}");
55+
Debug.Log($"Prev Intersection Borders {string.Join(",", linestrings)} : prevBorder {prevBorder.LineString.ID} {lane.rnLane.IsReversed} {prevIntersection.IsEmptyIntersection} {lane.name}");
5656
}
5757
}
5858
else if (lane.rnIntersection != null)

‎PlateauToolkit.Sandbox/Runtime/RoadNetwork/RoadNetworkLaneConverter.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void AssignTrafficLightToStoplines(RoadNetworkDataGetter getter)
173173
List<TrafficLight> trafficLightsInSameArea = trafficLights.FindAll(x => (RnDataIntersection)x.rnTrafficLight.GetParentController(getter).GetParentRoad(getter) == stopline.rnIntersection);
174174
foreach (var trafficLight in trafficLightsInSameArea)
175175
{
176-
RnDataNeighbor edge = stopline.rnIntersection.GetEdgeByBorder(getter, stopline.rnBorder);
176+
RnDataIntersectionEdge edge = stopline.rnIntersection.GetEdgeByBorder(getter, stopline.rnBorder);
177177

178178
if (edge.GetBorder(getter).ContainsSameLine(trafficLight.rnTrafficLight.GetEdges(getter)))
179179
{
@@ -261,7 +261,7 @@ public List<TrafficLane> Create(RoadNetworkDataGetter getter, Transform parent)
261261
continue;
262262
}
263263

264-
if (PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE && lane.IsReverse)
264+
if (PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE && lane.IsReversed)
265265
points.Reverse();
266266

267267
if (PlateauSandboxTrafficManagerConstants.USE_SIMPLE_LINESTRINGS && points.Count > 3)
@@ -279,7 +279,7 @@ public List<TrafficLane> Create(RoadNetworkDataGetter getter, Transform parent)
279279
RnDataIntersection nextIntersection = road.GetNextRoad(getter) as RnDataIntersection;
280280
RnDataIntersection prevIntersection = road.GetPrevRoad(getter) as RnDataIntersection;
281281

282-
if (!PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE && lane.IsReverse) //反転している場合 Prev/Nextを逆に
282+
if (!PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE && lane.IsReversed) //反転している場合 Prev/Nextを逆に
283283
{
284284
(nextIntersection, prevIntersection) = (prevIntersection, nextIntersection);
285285
}
@@ -289,7 +289,7 @@ public List<TrafficLane> Create(RoadNetworkDataGetter getter, Transform parent)
289289
if (!nextIntersection.IsEmptyIntersection)
290290
{
291291
var tracks = nextIntersection.GetFromTracksFromLane(getter, lane);
292-
info.nextTracks = nextIntersection.FilterAvailableToTracks(getter,tracks); //一方通行侵入除外
292+
info.nextTracks = nextIntersection.FilterAvailableToTracks(getter, tracks); //一方通行侵入除外
293293

294294
//Stopline
295295
if (PlateauSandboxTrafficManagerConstants.ADD_TRAFFIC_LIGHTS && nextIntersection.SignalController != null)
@@ -351,7 +351,7 @@ public List<TrafficLane> Create(RoadNetworkDataGetter getter, Transform parent)
351351
info.road = rb;
352352

353353
info.nextLanes = intersection.GetNextLanesFromTrack(getter, track, PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE);
354-
354+
355355
info.prevLanes = intersection.GetPrevLanesFromTrack(getter, track, PlateauSandboxTrafficManagerConstants.IGNORE_REVERSED_LANE);
356356

357357
laneInfo.Add(info);
@@ -367,7 +367,7 @@ public List<TrafficLane> Create(RoadNetworkDataGetter getter, Transform parent)
367367

368368
if (info.prevLanes != null)
369369
{
370-
foreach(var l in info.prevLanes)
370+
foreach (var l in info.prevLanes)
371371
{
372372
if (laneDict.ContainsKey(l))
373373
lane.PrevLanes.Add(laneDict[l]);

0 commit comments

Comments
 (0)