From 3d9f3f48b96bce7c7140742b77e1144382e83f65 Mon Sep 17 00:00:00 2001 From: Szymon Lis Date: Wed, 21 Jun 2023 09:40:53 +0200 Subject: [PATCH 1/4] Upgrade to 2021.3.16f1 --- Assets/AWSIM.meta | 16 +- Assets/AWSIM/Externals.meta | 16 +- .../DefaultSettingsVolumeProfile.asset | 160 +-- .../HDRenderPipelineAsset.asset | 369 +++--- .../CameraSensorVisualization_Edge.mat | 11 +- .../CameraSensorVisualization_Fill.mat | 13 +- .../PedestrianTrafficLight/Materials/Body.mat | 13 +- .../PedestrianTrafficLight/Materials/Stop.mat | 14 +- .../PedestrianTrafficLight/Materials/Walk.mat | 14 +- .../Materials/TrafficLightsBodyBlack.mat | 15 +- .../Materials/TrafficLightsDownArrow.mat | 14 +- .../Materials/TrafficLightsLed.mat | 14 +- .../Materials/TrafficLightsLeftArrow.mat | 14 +- .../Materials/TrafficLightsRightArrow.mat | 14 +- .../Materials/TrafficLightsStop.mat | 14 +- .../Materials/TrafficLightsUpArrow.mat | 14 +- .../Materials/TrafficLightsWalk.mat | 14 +- .../Resources/Materials/LightBulbId0.mat | 16 +- .../Resources/Materials/LightBulbId1.mat | 16 +- .../Resources/Materials/LightBulbId2.mat | 16 +- .../Resources/Materials/LightBulbId3.mat | 16 +- .../Resources/Materials/LightBulbId4.mat | 16 +- .../Resources/Materials/LightBulbId5.mat | 16 +- .../SmallCar/Models/Materials/Rims.001.mat | 13 +- .../Materials/SmallCar_Body_Black.001.mat | 13 +- .../Materials/SmallCar_Body_Blue.001.mat | 13 +- .../Materials/SmallCar_Body_Chrome.001.mat | 13 +- .../Materials/SmallCar_Bumper_Lights.001.mat | 13 +- .../Materials/SmallCar_Headlights.001.mat | 13 +- .../Materials/SmallCar_Lights_Glass.001.mat | 16 +- .../Models/Materials/SmallCar_Mirrors.001.mat | 13 +- .../Materials/SmallCar_Rear_Light.001.mat | 13 +- .../Materials/SmallCar_Reverse_Light.001.mat | 13 +- .../Materials/SmallCar_Stop_Light.001.mat | 13 +- .../Materials/SmallCar_Turn_Signal_L.001.mat | 13 +- .../Materials/SmallCar_Turn_Signal_R.001.mat | 13 +- .../Models/Materials/SmallCar_Windows.001.mat | 16 +- .../SmallCar/Models/Materials/Tires.001.mat | 13 +- .../Materials/SensorGlass.mat | 14 +- .../Materials/SensorMetal.mat | 14 +- .../HESAI Pandar 40P/Materials/SensorText.mat | 13 +- .../Materials/SensorGlass.mat | 14 +- .../Materials/SensorMetal.mat | 14 +- .../Materials/SensorText.mat | 13 +- .../Velodyne VLP-16/Materials/SensorGlass.mat | 14 +- .../Velodyne VLP-16/Materials/SensorMetal.mat | 14 +- .../Velodyne VLP-16/Materials/SensorText.mat | 13 +- .../Velodyne VLP-32/Materials/SensorGlass.mat | 14 +- .../Velodyne VLP-32/Materials/SensorMetal.mat | 13 +- .../Velodyne VLP-32/Materials/SensorText.mat | 13 +- .../Materials/SensorGlass.mat | 14 +- .../Materials/SensorMetal.mat | 13 +- .../Materials/SensorText.mat | 13 +- .../Materials/LidarPartGrey.mat | 14 +- .../XX1 Sensor Kit/Materials/WhiteMetal.mat | 18 +- .../Materials/BlackPlastic.mat | 16 +- .../Lexus RX450h 2015/Materials/BlueMetal.mat | 16 +- .../Lexus RX450h 2015/Materials/BreakDisc.mat | 14 +- .../Materials/BreakLight.mat | 13 +- .../Materials/BreakeCaliper.mat | 14 +- .../Lexus RX450h 2015/Materials/FogLight.mat | 13 +- .../Lexus RX450h 2015/Materials/HeadLight.mat | 13 +- .../Lexus RX450h 2015/Materials/Interior.mat | 14 +- .../Materials/LightBackGlass.mat | 18 +- .../Materials/LightBackInside.mat | 14 +- .../Materials/LightFrontGlass.mat | 18 +- .../Materials/LightFrontInside.mat | 13 +- .../Lexus RX450h 2015/Materials/Mirror.mat | 14 +- .../Materials/PlasticSilver.mat | 14 +- .../Materials/ReverseLight.mat | 13 +- .../Lexus RX450h 2015/Materials/Rims.mat | 14 +- .../Lexus RX450h 2015/Materials/Tires.mat | 14 +- .../Materials/TurnSignalL.mat | 13 +- .../Materials/TurnSignalR.mat | 13 +- .../Materials/WhiteMetal.mat | 16 +- .../Lexus RX450h 2015/Materials/Window.mat | 18 +- .../Main/PointCloudMapping/Materials/Way.mat | 13 +- .../SensorConfig/Materials/BaseTex_gray.mat | 15 +- .../CheckerBoard.mat | 12 +- .../CameraFOVVisualizationSample/Element.mat | 15 +- .../GroundTex.mat | 14 +- .../Samples/NPCVehicleSample/BaseTex.mat | 15 +- .../Materials/TrafficLightsBodyBlack.mat | 15 +- .../Materials/TrafficLightsDownArrow.mat | 14 +- .../model/Materials/TrafficLightsLed.mat | 14 +- .../Materials/TrafficLightsLeftArrow.mat | 14 +- .../Materials/TrafficLightsRightArrow.mat | 14 +- .../model/Materials/TrafficLightsStop.mat | 14 +- .../model/Materials/TrafficLightsUpArrow.mat | 14 +- .../model/Materials/TrafficLightsWalk.mat | 14 +- .../Resources/Materials/LightBulbId0.mat | 16 +- .../Resources/Materials/LightBulbId1.mat | 16 +- .../Resources/Materials/LightBulbId2.mat | 16 +- .../Resources/Materials/LightBulbId3.mat | 16 +- .../Resources/Materials/LightBulbId4.mat | 16 +- .../Resources/Materials/LightBulbId5.mat | 16 +- Assets/HDRPDefaultResources.meta | 8 + .../HDRenderPipelineGlobalSettings.asset | 101 ++ .../HDRenderPipelineGlobalSettings.asset.meta | 8 + Packages/manifest.json | 22 +- Packages/packages-lock.json | 107 +- ProjectSettings/GraphicsSettings.asset | 5 +- ProjectSettings/HDRPProjectSettings.asset | 19 +- ProjectSettings/MemorySettings.asset | 35 + ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 16 + ProjectSettings/VFXManager.asset | 5 +- ProjectSettings/boot.config | 0 UserSettings/HDRPUserSettings.asset | 18 + UserSettings/Layouts/default-2021.dwlt | 1007 +++++++++++++++++ 110 files changed, 2549 insertions(+), 675 deletions(-) mode change 100644 => 100755 Assets/AWSIM.meta mode change 100644 => 100755 Assets/AWSIM/Externals.meta create mode 100644 Assets/HDRPDefaultResources.meta create mode 100644 Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset create mode 100644 Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta create mode 100644 ProjectSettings/MemorySettings.asset create mode 100644 ProjectSettings/ShaderGraphSettings.asset create mode 100644 ProjectSettings/boot.config create mode 100644 UserSettings/HDRPUserSettings.asset create mode 100644 UserSettings/Layouts/default-2021.dwlt diff --git a/Assets/AWSIM.meta b/Assets/AWSIM.meta old mode 100644 new mode 100755 index d8f2a7e3d..818e7cd39 --- a/Assets/AWSIM.meta +++ b/Assets/AWSIM.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: bce20113f0ef31a4284721787f07494d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: bce20113f0ef31a4284721787f07494d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Externals.meta b/Assets/AWSIM/Externals.meta old mode 100644 new mode 100755 index c27dc8016..1f07e6637 --- a/Assets/AWSIM/Externals.meta +++ b/Assets/AWSIM/Externals.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: f207955f3459f3848ab17a87587cb489 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f207955f3459f3848ab17a87587cb489 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/AWSIM/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index 1a424d23c..72fdc257c 100644 --- a/Assets/AWSIM/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/AWSIM/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -13,24 +13,18 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 0.5 - min: 0 maximumVelocity: m_OverrideState: 0 m_Value: 200 - min: 0 - max: 1500 minimumVelocity: m_OverrideState: 0 m_Value: 2 - min: 0 - max: 64 cameraMotionBlur: m_OverrideState: 0 m_Value: 1 @@ -40,27 +34,18 @@ MonoBehaviour: cameraVelocityClamp: m_OverrideState: 0 m_Value: 0.05 - min: 0 - max: 0.3 cameraTranslationVelocityClamp: m_OverrideState: 0 m_Value: 0.05 - min: 0 - max: 0.3 cameraRotationVelocityClamp: m_OverrideState: 0 m_Value: 0.03 - min: 0 - max: 0.2 depthComparisonExtent: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 20 m_SampleCount: m_OverrideState: 1 m_Value: 8 - min: 2 --- !u!114 &-1016694868962581565 MonoBehaviour: m_ObjectHideFlags: 3 @@ -74,7 +59,6 @@ MonoBehaviour: m_Name: ContactShadows m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -84,49 +68,33 @@ MonoBehaviour: length: m_OverrideState: 0 m_Value: 0.15 - min: 0 - max: 1 opacity: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 distanceScaleFactor: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 maxDistance: m_OverrideState: 0 m_Value: 50 - min: 0 minDistance: m_OverrideState: 0 m_Value: 0 - min: 0 fadeDistance: m_OverrideState: 0 m_Value: 5 - min: 0 fadeInDistance: m_OverrideState: 0 m_Value: 0 - min: 0 rayBias: m_OverrideState: 0 m_Value: 0.2 - min: 0 - max: 1 thicknessScale: m_OverrideState: 0 m_Value: 0.15 - min: 0.02 - max: 1 m_SampleCount: m_OverrideState: 0 m_Value: 10 - min: 4 - max: 64 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -162,12 +130,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -177,13 +142,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.4660715 - min: 0 upperHemisphereLuxColor: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} desiredLuxValue: m_OverrideState: 0 @@ -194,34 +157,48 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 - hdriSky: - m_OverrideState: 1 - m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + m_SkyVersion: 1 enableDistortion: m_OverrideState: 0 m_Value: 0 procedural: m_OverrideState: 0 m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 + hdriSky: + m_OverrideState: 1 + m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -237,31 +214,21 @@ MonoBehaviour: 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 @@ -284,37 +251,27 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 1 threshold: m_OverrideState: 0 m_Value: 0 - min: 0 intensity: m_OverrideState: 1 m_Value: 0.2 - min: 0 - max: 1 scatter: m_OverrideState: 0 m_Value: 0.7 - min: 0 - max: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 anamorphic: m_OverrideState: 0 m_Value: 1 @@ -340,13 +297,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 1 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -363,7 +328,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 1 @@ -469,19 +433,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -506,7 +466,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &7502528774814404555 MonoBehaviour: m_ObjectHideFlags: 3 @@ -520,7 +479,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -530,79 +488,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 radius: m_OverrideState: 1 m_Value: 1.5 - min: 0.25 - max: 5 spatialBilateralAggressiveness: m_OverrideState: 0 m_Value: 0.15 - min: 0 - max: 1 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + occluderMotionRejection: + m_OverrideState: 0 + m_Value: 1 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 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 m_RayLength: m_OverrideState: 0 m_Value: 3 - min: 0 m_SampleCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 64 m_Denoise: m_OverrideState: 0 m_Value: 1 m_DenoiserRadius: m_OverrideState: 0 m_Value: 0.5 - min: 0.001 - max: 1 --- !u!114 &7542669330009093999 MonoBehaviour: m_ObjectHideFlags: 3 @@ -616,46 +557,33 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 2 toeStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 toeLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 shoulderStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 shoulderLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 shoulderAngle: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 gamma: m_OverrideState: 0 m_Value: 1 - min: 0.001 lutTexture: m_OverrideState: 0 m_Value: {fileID: 0} lutContribution: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 --- !u!114 &7686318427622180703 MonoBehaviour: m_ObjectHideFlags: 3 @@ -669,21 +597,15 @@ MonoBehaviour: m_Name: HDShadowSettings m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: 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 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 0 m_Value: 0.05 diff --git a/Assets/AWSIM/HDRPDefaultResources/HDRenderPipelineAsset.asset b/Assets/AWSIM/HDRPDefaultResources/HDRenderPipelineAsset.asset index 6390c9a2c..ff1fc0295 100644 --- a/Assets/AWSIM/HDRPDefaultResources/HDRenderPipelineAsset.asset +++ b/Assets/AWSIM/HDRPDefaultResources/HDRenderPipelineAsset.asset @@ -12,12 +12,145 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRenderPipelineAsset m_EditorClassIdentifier: - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - m_RenderPipelineRayTracingResources: {fileID: 11400000, guid: ba6e7f30e5cffc249a8bf7ee5756c196, type: 2} - m_DefaultVolumeProfile: {fileID: 11400000, guid: 0523f518e80989b4ab665474feafcb9b, type: 2} - m_LensAttenuation: 0 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 4a2f85f34ec2ef645a6f4ba88ed92929, type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_Version: 21 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteRealtimeReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 0} + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: data1: 72198262773251917 data2: 13763000468760363032 @@ -30,8 +163,9 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 0 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 135310754214733 data2: 4539628428684427288 @@ -44,8 +178,9 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 0 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 139923391782733 data2: 13763000465807638544 @@ -58,7 +193,17 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 0 materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 0} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 0 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: [] m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 0 @@ -71,15 +216,8 @@ MonoBehaviour: m_SchemaId: m_Id: With3Levels supportVolumetrics: 1 + supportVolumetricClouds: 0 supportLightLayers: 0 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -94,26 +232,18 @@ MonoBehaviour: m_Id: With3Levels supportDecals: 1 supportDecalLayers: 0 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 + supportSurfaceGradient: 0 + decalNormalBufferHP: 0 msaaSampleCount: 1 supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 supportRuntimeAOVAPI: 0 supportDitheringCrossFade: 1 supportTerrainHole: 0 supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 supportRayTracing: 1 supportedRayTracingMode: 3 - probeVolumeSettings: - atlasResolution: 128 - atlasOctahedralDepthResolution: 2048 lightLoopSettings: cookieAtlasSize: 2048 cookieFormat: 74 @@ -136,6 +266,8 @@ MonoBehaviour: maxDecalsOnScreen: 512 maxPlanarReflectionOnScreen: 16 maxLightsPerClusterCell: 8 + maxLocalVolumetricFogSize: 32 + maxLocalVolumetricFogOnScreen: 64 hdShadowInitParams: maxShadowRequests: 128 directionalShadowsDepthBits: 32 @@ -179,12 +311,19 @@ MonoBehaviour: bufferFormat: 74 dynamicResolutionSettings: enabled: 0 + useMipBias: 0 + enableDLSS: 0 + DLSSPerfQualitySetting: 0 + DLSSUseOptimalSettings: 1 + DLSSSharpness: 0.5 maxPercentage: 100 minPercentage: 100 dynResType: 1 upsampleFilter: 1 forceResolution: 0 forcedPercentage: 100 + lowResTransparencyMinimumThreshold: 0 + rayTracingHalfResThreshold: 50 lowresTransparentSettings: enabled: 1 checkerboardDepthBuffer: 1 @@ -193,6 +332,7 @@ MonoBehaviour: singlePass: 1 occlusionMesh: 1 cameraJitter: 0 + allowMotionBlur: 1 postProcessQualitySettings: NearBlurSampleCount: 030000000500000008000000 NearBlurMaxRadius: @@ -236,6 +376,14 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIDenoise: 010101 + SSGIHalfResDenoise: 010000 + SSGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.5 + SSGISecondDenoise: 010101 RTAORayLength: - 0.5 - 3 @@ -255,7 +403,7 @@ MonoBehaviour: - 0.5 - 0.8 - 1.5 - RTGIUpScaleRadius: 040000000400000004000000 + RTGIRaySteps: 200000003000000040000000 RTGIDenoise: 010101 RTGIHalfResDenoise: 010000 RTGIDenoiserRadius: @@ -280,6 +428,7 @@ MonoBehaviour: - 1 - 1.2 RTRFullResolution: 000001 + RTRRayMaxIterations: 200000003000000040000000 RTRDenoise: 010101 RTRDenoiserRadius: 080000000c00000010000000 RTRSmoothDenoising: 010000 @@ -292,157 +441,31 @@ MonoBehaviour: - 0.666 - 0.666 - 0.5 + m_ObsoleteLightLayerName0: + m_ObsoleteLightLayerName1: + m_ObsoleteLightLayerName2: + m_ObsoleteLightLayerName3: + m_ObsoleteLightLayerName4: + m_ObsoleteLightLayerName5: + m_ObsoleteLightLayerName6: + m_ObsoleteLightLayerName7: + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + m_ObsoleteSupportRuntimeDebugDisplay: 0 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 0} - diffusionProfileSettingsList: - - {fileID: 11400000, guid: 8f083b2b3b063a04db4c607505cba1d4, type: 2} - - {fileID: 11400000, guid: 5e63b5ed211aa814381ccffe8a0ddbad, type: 2} - beforeTransparentCustomPostProcesses: [] - beforeTAACustomPostProcesses: [] - beforePostProcessCustomPostProcesses: [] - afterPostProcessCustomPostProcesses: [] virtualTexturingSettings: streamingCpuCacheSizeInMegaBytes: 256 streamingGpuCacheSettings: - format: 0 sizeInMegaBytes: 128 - m_Version: 18 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteBakedOrCustomReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteRealtimeReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 + m_UseRenderGraph: 1 diff --git a/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Edge.mat b/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Edge.mat index 5f353fdc3..50384d0fb 100644 --- a/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Edge.mat +++ b/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Edge.mat @@ -12,17 +12,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CameraSensorVisualization_Edge m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT + m_ValidKeywords: [] + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Fill.mat b/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Fill.mat index b2df9f254..0ff12e195 100644 --- a/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Fill.mat +++ b/Assets/AWSIM/Materials/CameraSensorVisualization/CameraSensorVisualization_Fill.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CameraSensorVisualization_Fill m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Body.mat b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Body.mat index 4f39688b4..5dafb1d19 100644 --- a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Body.mat +++ b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Body.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Body m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -148,6 +151,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -256,4 +260,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Stop.mat b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Stop.mat index df0601760..cb538bb40 100644 --- a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Stop.mat +++ b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Stop.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Stop m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -148,6 +152,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -256,4 +261,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Walk.mat b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Walk.mat index 98940a5ca..9b57f4978 100644 --- a/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Walk.mat +++ b/Assets/AWSIM/Models/Miscs/PedestrianTrafficLight/Materials/Walk.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -148,6 +152,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -256,4 +261,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsBodyBlack.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsBodyBlack.mat index a419cda6c..ecdbdfd03 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsBodyBlack.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsBodyBlack.mat @@ -2,14 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsBodyBlack m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -281,6 +286,7 @@ Material: - _DistortionVectorBias: -1 - _DistortionVectorScale: 2 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EMISSION_WEIGHT: 1 @@ -425,4 +431,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsDownArrow.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsDownArrow.mat index 004c1ddc3..e20badba8 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsDownArrow.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsDownArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsDownArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLed.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLed.mat index dfae00083..2575ae0ff 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLed.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLed.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsLed m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSION _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -186,6 +190,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -304,4 +309,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLeftArrow.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLeftArrow.mat index d50bd4312..8ee2d8f1f 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLeftArrow.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsLeftArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsLeftArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsRightArrow.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsRightArrow.mat index a696c5438..a86ed5f82 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsRightArrow.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsRightArrow.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsRightArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -186,6 +190,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -304,4 +309,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsStop.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsStop.mat index 40a4d2e28..c421773c3 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsStop.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsStop.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsStop m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -195,6 +202,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsUpArrow.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsUpArrow.mat index 7fd5bc4bd..46ce3ecdf 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsUpArrow.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsUpArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsUpArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsWalk.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsWalk.mat index 34d70f474..38bf265fe 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsWalk.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Materials/TrafficLightsWalk.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsWalk m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -182,6 +186,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -299,4 +304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId0.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId0.mat index 135f5c1ca..7e8636a9f 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId0.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId0.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId0 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId1.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId1.mat index a13e631e5..832e25563 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId1.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId1.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId1 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId2.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId2.mat index 426177a68..a5d4daeb0 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId2.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId2.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId2 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId3.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId3.mat index dd919dcc0..e058654ef 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId3.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId3.mat @@ -2,15 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId3 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -244,4 +247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId4.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId4.mat index 07caf00fe..230e1830d 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId4.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId4.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId4 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId5.mat b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId5.mat index d39a52519..fb241e8ce 100644 --- a/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId5.mat +++ b/Assets/AWSIM/Models/Miscs/VehicleTrafficLight/Resources/Materials/LightBulbId5.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId5 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Rims.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Rims.001.mat index 4f481f27a..7a2976575 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Rims.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Rims.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Rims.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Black.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Black.001.mat index 892d224dc..2ad4682b0 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Black.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Black.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Body_Black.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Blue.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Blue.001.mat index 9e27f56d7..89d859fbd 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Blue.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Blue.001.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Body_Blue.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Chrome.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Chrome.001.mat index 9bf043e6c..2c36c2f2d 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Chrome.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Body_Chrome.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Body_Chrome.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Bumper_Lights.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Bumper_Lights.001.mat index eb1560859..1b8ae89cb 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Bumper_Lights.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Bumper_Lights.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Bumper_Lights.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Headlights.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Headlights.001.mat index b21d6a1a6..71421c958 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Headlights.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Headlights.001.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Headlights.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Lights_Glass.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Lights_Glass.001.mat index b389c13c2..ed99695d5 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Lights_Glass.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Lights_Glass.001.mat @@ -2,15 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Lights_Glass.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE - _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -152,6 +156,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 - _EmissiveColorMode: 1 @@ -269,4 +274,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Mirrors.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Mirrors.001.mat index 16918a376..9ae45b275 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Mirrors.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Mirrors.001.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Mirrors.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Rear_Light.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Rear_Light.001.mat index 4fc6b46e5..f7007e611 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Rear_Light.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Rear_Light.001.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Rear_Light.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Reverse_Light.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Reverse_Light.001.mat index abbffc1c1..cb692e894 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Reverse_Light.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Reverse_Light.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Reverse_Light.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Stop_Light.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Stop_Light.001.mat index 43c880192..ac886e245 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Stop_Light.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Stop_Light.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Stop_Light.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_L.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_L.001.mat index 7a5e9e849..0bd5d9144 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_L.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_L.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Turn_Signal_L.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_R.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_R.001.mat index 60e78cfb2..3e5edf690 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_R.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Turn_Signal_R.001.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Turn_Signal_R.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Windows.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Windows.001.mat index 259a9a85a..da9499d96 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Windows.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/SmallCar_Windows.001.mat @@ -12,18 +12,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SmallCar_Windows.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE - _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -165,6 +172,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Tires.001.mat b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Tires.001.mat index 894c22329..e5ed1f259 100644 --- a/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Tires.001.mat +++ b/Assets/AWSIM/Models/NPCs/Vehicles/SmallCar/Models/Materials/Tires.001.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Tires.001 m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorGlass.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorGlass.mat index 402ce938d..740766a51 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorGlass.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorGlass.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorMetal.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorMetal.mat index da5b6c43e..79615dd77 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorMetal.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorMetal.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorText.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorText.mat index 665b0229e..37feb7df8 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorText.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar 40P/Materials/SensorText.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorText m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorGlass.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorGlass.mat index 069457868..6064de135 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorGlass.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorGlass.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorMetal.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorMetal.mat index 9e6c3efaf..d991264b5 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorMetal.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorMetal.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorText.mat b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorText.mat index 7dca22521..f7e6610b1 100644 --- a/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorText.mat +++ b/Assets/AWSIM/Models/Sensors/HESAI Pandar QT64/Materials/SensorText.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorText m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorGlass.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorGlass.mat index 28455bd2c..0944fffae 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorGlass.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorGlass.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorMetal.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorMetal.mat index 81b614b81..6319d324c 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorMetal.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorMetal.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorText.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorText.mat index 8a4493d3e..bd68488d4 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorText.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-16/Materials/SensorText.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorText m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorGlass.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorGlass.mat index e9f8a51ab..6c19396e3 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorGlass.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorGlass.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorMetal.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorMetal.mat index 3294d3de5..d2055cbc3 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorMetal.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorMetal.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorText.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorText.mat index 735b78938..1f4c921ee 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorText.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLP-32/Materials/SensorText.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorText m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorGlass.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorGlass.mat index e9f8a51ab..6c19396e3 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorGlass.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorGlass.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorMetal.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorMetal.mat index 3294d3de5..d2055cbc3 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorMetal.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorMetal.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorText.mat b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorText.mat index 735b78938..1f4c921ee 100644 --- a/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorText.mat +++ b/Assets/AWSIM/Models/Sensors/Velodyne VLS-128-AP/Materials/SensorText.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SensorText m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/LidarPartGrey.mat b/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/LidarPartGrey.mat index 74462759a..5cf843eee 100644 --- a/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/LidarPartGrey.mat +++ b/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/LidarPartGrey.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LidarPartGrey m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/WhiteMetal.mat b/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/WhiteMetal.mat index adec0efef..9f8fddfc7 100644 --- a/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/WhiteMetal.mat +++ b/Assets/AWSIM/Models/Sensors/XX1 Sensor Kit/Materials/WhiteMetal.mat @@ -12,18 +12,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: WhiteMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _MATERIAL_FEATURE_ANISOTROPY - _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _MATERIAL_FEATURE_ANISOTROPY + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -164,6 +173,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlackPlastic.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlackPlastic.mat index d9bc35d44..d4f8e8fc4 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlackPlastic.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlackPlastic.mat @@ -12,18 +12,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BlackPlastic m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _MATERIAL_FEATURE_CLEAR_COAT - _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -164,6 +171,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlueMetal.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlueMetal.mat index 0c51248d9..9d1707210 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlueMetal.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BlueMetal.mat @@ -12,18 +12,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BlueMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _MATERIAL_FEATURE_ANISOTROPY - _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _MATERIAL_FEATURE_ANISOTROPY + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -164,6 +171,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakDisc.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakDisc.mat index 96e3c8efe..bd2a7b232 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakDisc.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakDisc.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BreakDisc m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakLight.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakLight.mat index c08c56004..52dc3e728 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakLight.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakLight.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BreakLight m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakeCaliper.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakeCaliper.mat index 8d9a58124..cc66e6c7c 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakeCaliper.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/BreakeCaliper.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BreakeCaliper m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/FogLight.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/FogLight.mat index 7007357c7..e9e10507a 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/FogLight.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/FogLight.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FogLight m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/HeadLight.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/HeadLight.mat index 147d18885..f9650adfe 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/HeadLight.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/HeadLight.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HeadLight m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Interior.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Interior.mat index 502987ff6..45eeec30d 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Interior.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Interior.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Interior m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackGlass.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackGlass.mat index 8aeec7d76..060ec3e46 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackGlass.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackGlass.mat @@ -12,18 +12,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBackGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _MATERIAL_FEATURE_ANISOTROPY - _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT + - _MATERIAL_FEATURE_ANISOTROPY + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -165,6 +174,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackInside.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackInside.mat index e1e1b4b31..16f79ebec 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackInside.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightBackInside.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBackInside m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +154,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontGlass.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontGlass.mat index f60cce9d8..6700442f1 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontGlass.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontGlass.mat @@ -2,15 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightFrontGlass m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _MATERIAL_FEATURE_ANISOTROPY - _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT + - _MATERIAL_FEATURE_ANISOTROPY + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -152,6 +158,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 - _EmissiveColorMode: 1 @@ -269,4 +276,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontInside.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontInside.mat index 8b1ad12de..d4c9571ba 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontInside.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/LightFrontInside.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightFrontInside m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Mirror.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Mirror.mat index 04ef01a6d..bdc507024 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Mirror.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Mirror.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Mirror m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/PlasticSilver.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/PlasticSilver.mat index 1359c2010..59aa11a22 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/PlasticSilver.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/PlasticSilver.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlasticSilver m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/ReverseLight.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/ReverseLight.mat index 6d6fddd50..b702e9e98 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/ReverseLight.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/ReverseLight.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ReverseLight m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Rims.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Rims.mat index 0143bb463..195b30c3c 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Rims.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Rims.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Rims m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_ANISOTROPY _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MATERIAL_FEATURE_ANISOTROPY + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Tires.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Tires.mat index 8955fc9b9..318c90e51 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Tires.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Tires.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Tires m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +170,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalL.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalL.mat index 5a78a4d74..0f7410242 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalL.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalL.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TurnSignalL m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -150,6 +153,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -267,4 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalR.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalR.mat index b68392133..b46594463 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalR.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/TurnSignalR.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TurnSignalR m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -163,6 +169,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/WhiteMetal.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/WhiteMetal.mat index 2283c465f..3e60ca997 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/WhiteMetal.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/WhiteMetal.mat @@ -12,18 +12,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: WhiteMetal m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _MATERIAL_FEATURE_ANISOTROPY - _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _MASKMAP + - _MATERIAL_FEATURE_ANISOTROPY + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -164,6 +171,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Window.mat b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Window.mat index a19da709c..f8294e748 100644 --- a/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Window.mat +++ b/Assets/AWSIM/Models/Vehicles/Lexus RX450h 2015/Materials/Window.mat @@ -12,18 +12,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Window m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _MATERIAL_FEATURE_ANISOTROPY - _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT + - _MATERIAL_FEATURE_ANISOTROPY + - _MATERIAL_FEATURE_CLEAR_COAT + - _NORMALMAP_TANGENT_SPACE + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -165,6 +174,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Main/PointCloudMapping/Materials/Way.mat b/Assets/AWSIM/Scenes/Main/PointCloudMapping/Materials/Way.mat index f69d86e00..089221486 100644 --- a/Assets/AWSIM/Scenes/Main/PointCloudMapping/Materials/Way.mat +++ b/Assets/AWSIM/Scenes/Main/PointCloudMapping/Materials/Way.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Way m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: [] + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _DOUBLESIDED_ON + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 diff --git a/Assets/AWSIM/Scenes/Main/SensorConfig/Materials/BaseTex_gray.mat b/Assets/AWSIM/Scenes/Main/SensorConfig/Materials/BaseTex_gray.mat index 48c5aac3e..1f1158f96 100644 --- a/Assets/AWSIM/Scenes/Main/SensorConfig/Materials/BaseTex_gray.mat +++ b/Assets/AWSIM/Scenes/Main/SensorConfig/Materials/BaseTex_gray.mat @@ -12,17 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BaseTex_gray m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -79,7 +85,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 780be815aee4b384090ab723739f1934, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 1000, y: 1000} m_Offset: {x: 0, y: 0} - _MaskMap: m_Texture: {fileID: 0} @@ -161,6 +167,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/CheckerBoard.mat b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/CheckerBoard.mat index 8c899d1cc..f91ecf006 100644 --- a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/CheckerBoard.mat +++ b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/CheckerBoard.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CheckerBoard m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: [] + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -282,4 +285,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/Element.mat b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/Element.mat index b035239e8..5d6e4bdfb 100644 --- a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/Element.mat +++ b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/Element.mat @@ -2,14 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Element m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -513,6 +518,7 @@ Material: - _DistortionVectorBias: -1 - _DistortionVectorScale: 2 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DrawOrder: 0 - _DstBlend: 0 @@ -813,4 +819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/GroundTex.mat b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/GroundTex.mat index 7d95cc6f5..0fe474271 100644 --- a/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/GroundTex.mat +++ b/Assets/AWSIM/Scenes/Samples/CameraFOVVisualizationSample/GroundTex.mat @@ -2,14 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GroundTex m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: [] + m_InvalidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -282,4 +287,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/NPCVehicleSample/BaseTex.mat b/Assets/AWSIM/Scenes/Samples/NPCVehicleSample/BaseTex.mat index 8f859b86c..89d59d4a7 100644 --- a/Assets/AWSIM/Scenes/Samples/NPCVehicleSample/BaseTex.mat +++ b/Assets/AWSIM/Scenes/Samples/NPCVehicleSample/BaseTex.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: BaseTex m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,7 +69,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 93eb38434bffe9446b33a7e855a8aab6, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 10, y: 10} m_Offset: {x: 0, y: 0} - _MaskMap: m_Texture: {fileID: 0} @@ -148,6 +151,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -256,4 +260,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsBodyBlack.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsBodyBlack.mat index a419cda6c..ecdbdfd03 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsBodyBlack.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsBodyBlack.mat @@ -2,14 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsBodyBlack m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -281,6 +286,7 @@ Material: - _DistortionVectorBias: -1 - _DistortionVectorScale: 2 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EMISSION_WEIGHT: 1 @@ -425,4 +431,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsDownArrow.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsDownArrow.mat index 004c1ddc3..e20badba8 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsDownArrow.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsDownArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsDownArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLed.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLed.mat index dfae00083..2575ae0ff 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLed.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLed.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsLed m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSION _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -186,6 +190,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -304,4 +309,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLeftArrow.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLeftArrow.mat index d50bd4312..8ee2d8f1f 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLeftArrow.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsLeftArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsLeftArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsRightArrow.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsRightArrow.mat index a696c5438..a86ed5f82 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsRightArrow.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsRightArrow.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsRightArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -186,6 +190,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -304,4 +309,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsStop.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsStop.mat index 40a4d2e28..c421773c3 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsStop.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsStop.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsStop m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -195,6 +202,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsUpArrow.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsUpArrow.mat index 7fd5bc4bd..46ce3ecdf 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsUpArrow.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsUpArrow.mat @@ -12,17 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsUpArrow m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -199,6 +206,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsWalk.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsWalk.mat index 34d70f474..38bf265fe 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsWalk.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Materials/TrafficLightsWalk.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TrafficLightsWalk m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _EMISSIVE_COLOR_MAP _NORMALMAP_TANGENT_SPACE + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _EMISSIVE_COLOR_MAP + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -182,6 +186,7 @@ Material: - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 @@ -299,4 +304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId0.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId0.mat index 135f5c1ca..7e8636a9f 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId0.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId0.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId0 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId1.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId1.mat index a13e631e5..832e25563 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId1.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId1.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId1 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId2.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId2.mat index 426177a68..a5d4daeb0 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId2.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId2.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId2 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId3.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId3.mat index dd919dcc0..e058654ef 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId3.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId3.mat @@ -2,15 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId3 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -244,4 +247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId4.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId4.mat index 07caf00fe..230e1830d 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId4.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId4.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId4 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId5.mat b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId5.mat index d39a52519..fb241e8ce 100644 --- a/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId5.mat +++ b/Assets/AWSIM/Scenes/Samples/TrafficLightSample/model/Resources/Materials/LightBulbId5.mat @@ -12,18 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 11 + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LightBulbId5 - m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, - type: 3} - m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR _DISABLE_SSR_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: aefc63699cf4eff49a6bbb7c9ef5d160, type: 3} + m_ValidKeywords: + - _DISABLE_DECALS + - _DISABLE_SSR + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/HDRPDefaultResources.meta b/Assets/HDRPDefaultResources.meta new file mode 100644 index 000000000..e732fd350 --- /dev/null +++ b/Assets/HDRPDefaultResources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e41ca6fa77c099a182152d766120482 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset b/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset new file mode 100644 index 000000000..a00014592 --- /dev/null +++ b/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 781cc897cf8675041a751163b51f97dd, type: 3} + m_Name: HDRenderPipelineGlobalSettings + m_EditorClassIdentifier: + m_Version: 3 + m_DefaultVolumeProfile: {fileID: 11400000, guid: 0523f518e80989b4ab665474feafcb9b, type: 2} + m_LookDevVolumeProfile: {fileID: 11400000, guid: 4a2f85f34ec2ef645a6f4ba88ed92929, type: 2} + m_RenderingPathDefaultCameraFrameSettings: + bitDatas: + data1: 72198262773251917 + data2: 13763000477350297624 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 9 + materialQuality: 0 + m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + bitDatas: + data1: 135310754214733 + data2: 4539628428684427288 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + m_RenderingPathDefaultRealtimeReflectionFrameSettings: + bitDatas: + data1: 139923391782733 + data2: 13763000465807638544 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} + m_RenderPipelineRayTracingResources: {fileID: 11400000, guid: ba6e7f30e5cffc249a8bf7ee5756c196, type: 2} + beforeTransparentCustomPostProcesses: [] + beforePostProcessCustomPostProcesses: [] + afterPostProcessBlursCustomPostProcesses: [] + afterPostProcessCustomPostProcesses: [] + beforeTAACustomPostProcesses: [] + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + decalLayerName0: Decal Layer default + decalLayerName1: Decal Layer 1 + decalLayerName2: Decal Layer 2 + decalLayerName3: Decal Layer 3 + decalLayerName4: Decal Layer 4 + decalLayerName5: Decal Layer 5 + decalLayerName6: Decal Layer 6 + decalLayerName7: Decal Layer 7 + shaderVariantLogLevel: 0 + lensAttenuationMode: 0 + diffusionProfileSettingsList: + - {fileID: 11400000, guid: 8f083b2b3b063a04db4c607505cba1d4, type: 2} + - {fileID: 11400000, guid: 5e63b5ed211aa814381ccffe8a0ddbad, type: 2} + rendererListCulling: 0 + DLSSProjectId: 000000 + useDLSSCustomProjectId: 0 + supportProbeVolumes: 0 + supportRuntimeDebugDisplay: 0 + apvScenesData: + serializedBounds: [] + serializedHasVolumes: [] + serializedProfiles: [] + serializedBakeSettings: [] + serializedBakingSets: [] diff --git a/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta b/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 000000000..c1e967b6f --- /dev/null +++ b/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6368b4ab879be07e59f821ad979804cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 9f01edcb9..901d649cb 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.cinemachine": "2.7.3", - "com.unity.collab-proxy": "1.3.9", - "com.unity.ide.rider": "3.0.6", - "com.unity.ide.visualstudio": "2.0.7", - "com.unity.ide.vscode": "1.2.3", - "com.unity.inputsystem": "1.0.2", - "com.unity.render-pipelines.high-definition": "11.0.0", - "com.unity.test-framework": "1.1.24", - "com.unity.textmeshpro": "3.0.4", - "com.unity.timeline": "1.5.4", + "com.unity.cinemachine": "2.8.9", + "com.unity.collab-proxy": "1.17.7", + "com.unity.ide.rider": "3.0.16", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.4.4", + "com.unity.render-pipelines.high-definition": "12.1.8", + "com.unity.test-framework": "1.1.31", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.4", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.2", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.6.1", + "com.unity.visualscripting": "1.7.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d3e6464b4..93bcd1050 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,17 +1,30 @@ { "dependencies": { + "com.unity.burst": { + "version": "1.8.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.cinemachine": { - "version": "2.7.3", + "version": "2.8.9", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.3.9", + "version": "1.17.7", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -22,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.6", + "version": "3.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -31,7 +44,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.7", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -40,64 +53,95 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.2", + "version": "1.4.4", "depth": 0, "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.2.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 2, + "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "11.0.0", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.high-definition": { - "version": "11.0.0", + "version": "12.1.8", "depth": 0, "source": "builtin", "dependencies": { + "com.unity.mathematics": "1.2.4", + "com.unity.burst": "1.8.2", "com.unity.modules.video": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", - "com.unity.render-pipelines.core": "11.0.0", - "com.unity.shadergraph": "11.0.0", - "com.unity.visualeffectgraph": "11.0.0", - "com.unity.render-pipelines.high-definition-config": "11.0.0" + "com.unity.modules.terrain": "1.0.0", + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.shadergraph": "12.1.8", + "com.unity.visualeffectgraph": "12.1.8", + "com.unity.render-pipelines.high-definition-config": "12.1.8" } }, "com.unity.render-pipelines.high-definition-config": { - "version": "11.0.0", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "11.0.0" + "com.unity.render-pipelines.core": "12.1.8" } }, "com.unity.searcher": { - "version": "4.3.2", + "version": "4.9.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.services.core": { + "version": "1.6.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.shadergraph": { - "version": "11.0.0", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "11.0.0", - "com.unity.searcher": "4.3.1" + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.searcher": "4.9.1" } }, "com.unity.sysroot": { @@ -117,7 +161,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.24", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -128,7 +172,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.4", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -137,7 +181,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.5.4", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { @@ -168,26 +212,21 @@ } }, "com.unity.visualeffectgraph": { - "version": "11.0.0", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.shadergraph": "11.0.0", - "com.unity.render-pipelines.core": "11.0.0" + "com.unity.shadergraph": "12.1.8", + "com.unity.render-pipelines.core": "12.1.8" } }, "com.unity.visualscripting": { - "version": "1.6.1", + "version": "1.7.8", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 07f5b83a8..97bd78abf 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -37,6 +37,7 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: dd0e5180d6f6e0340b822c69074777b0, type: 2} m_TransparencySortMode: 0 @@ -61,3 +62,5 @@ GraphicsSettings: m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 257 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: 6368b4ab879be07e59f821ad979804cd, type: 2} diff --git a/ProjectSettings/HDRPProjectSettings.asset b/ProjectSettings/HDRPProjectSettings.asset index bfc6f887d..26b34c0d8 100644 --- a/ProjectSettings/HDRPProjectSettings.asset +++ b/ProjectSettings/HDRPProjectSettings.asset @@ -12,11 +12,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 63a2978a97e4fc04cb9d905947216f3d, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 m_ProjectSettingFolderPath: HDRPDefaultResources m_WizardPopupAtStart: 1 - m_WizardPopupAlreadyShownOnce: 0 - m_WizardActiveTab: 2 - m_WizardNeedRestartAfterChangingToDX12: 0 - m_WizardNeedToRunFixAllAgainAfterDomainReload: 0 - m_LastMaterialVersion: 11 + m_LastMaterialVersion: 12 + m_HDShaderGraphLastSeenVersion: 0 + m_PluginMaterialVersions: + m_Keys: [] + m_Values: + m_PluginSubTargetVersions: + m_Keys: [] + m_Values: + m_Version: 2 + m_ObsoleteWizardPopupAlreadyShownOnce: 1 + m_ObsoleteWizardActiveTab: 2 + m_ObsoleteWizardNeedRestartAfterChangingToDX12: 0 + m_ObsoleteWizardNeedToRunFixAllAgainAfterDomainReload: 0 diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 000000000..5b5faceca --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 69d23f717..3643b0227 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.7f1 -m_EditorVersionWithRevision: 2021.1.7f1 (d91830b65d9b) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 000000000..9b28428b9 --- /dev/null +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index c258b1ce1..b004c5edb 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -10,5 +10,6 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 - m_CompiledVersion: 2 - m_RuntimeVersion: 16 + m_CompiledVersion: 4 + m_RuntimeVersion: 22 + m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 000000000..e69de29bb diff --git a/UserSettings/HDRPUserSettings.asset b/UserSettings/HDRPUserSettings.asset new file mode 100644 index 000000000..06ef5cd32 --- /dev/null +++ b/UserSettings/HDRPUserSettings.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: ef3b9f3ac26b8524bab7722d06b49724, type: 3} + m_Name: + m_EditorClassIdentifier: + m_WizardPopupAlreadyShownOnce: 0 + m_WizardActiveTab: 2 + m_WizardNeedRestartAfterChangingToDX12: 0 + m_WizardNeedToRunFixAllAgainAfterDomainReload: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt new file mode 100644 index 000000000..d2d866f09 --- /dev/null +++ b/UserSettings/Layouts/default-2021.dwlt @@ -0,0 +1,1007 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 1920 + y: 37 + width: 1920 + height: 1018 + m_ShowMode: 4 + m_Title: Hierarchy + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 968 + m_MinSize: {x: 679, y: 492} + m_MaxSize: {x: 14002, y: 14042} + vertical: 0 + controlID: 81 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1466 + y: 0 + width: 454 + height: 968 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 363 + height: 574 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 574 + width: 1466 + height: 394 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1018 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 998 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1466 + height: 968 + m_MinSize: {x: 403, y: 492} + m_MaxSize: {x: 10001, y: 14042} + vertical: 1 + controlID: 82 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1466 + height: 574 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} + vertical: 0 + controlID: 83 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 363 + y: 0 + width: 1103 + height: 574 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 666 + width: 1465 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/szymon/UnityProjects/Production/ContractB/WP8/DotsPhysicsDeterminism/AWSIM + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 5a390200 + m_LastClickedID: 145754 + m_ExpandedIDs: 000000005a39020000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3386 + y: 92 + width: 453 + height: 947 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 92 + width: 362 + height: 553 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: d0a9feff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2283 + y: 92 + width: 1101 + height: 553 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect Model + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect Event Tester + index: 13 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + speed: 2 + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 507 + y: 94 + width: 1532 + height: 790 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1532, y: 769} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -384.5 + m_VBaseRangeMax: 384.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1532 + height: 769 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 384.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -384.5 + width: 1532 + height: 769 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1532, y: 790} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] From e21d18bb33bfb408a346e121801f94b6bcbeac41 Mon Sep 17 00:00:00 2001 From: Szymon Lis Date: Wed, 21 Jun 2023 10:14:23 +0200 Subject: [PATCH 2/4] Changed Fixed Timestep --- ProjectSettings/TimeManager.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 58b5dc21a..71eb08ca1 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -3,7 +3,7 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: 0.01 + Fixed Timestep: 0.01666667 Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 Maximum Particle Timestep: 0.03 From 9103572a82655ca4923d39207202f8b8752dbf9f Mon Sep 17 00:00:00 2001 From: Szymon Lis Date: Wed, 21 Jun 2023 10:25:24 +0200 Subject: [PATCH 3/4] Add DOTS Packages --- Packages/manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Packages/manifest.json b/Packages/manifest.json index 901d649cb..78fcdc07b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,14 +2,18 @@ "dependencies": { "com.unity.cinemachine": "2.8.9", "com.unity.collab-proxy": "1.17.7", + "com.unity.entities": "0.51.1-preview.21", "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.4.4", + "com.unity.physics": "0.51.1-preview.21", "com.unity.render-pipelines.high-definition": "12.1.8", + "com.unity.rendering.hybrid": "0.51.1-preview.21", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", + "com.unity.toolchain.linux-x86_64": "2.0.5", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.2", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", From 15df98197c53e85f67e9e6be5abd6b603b0b763a Mon Sep 17 00:00:00 2001 From: Szymon Lis Date: Wed, 21 Jun 2023 10:48:32 +0200 Subject: [PATCH 4/4] Added Sample Scene for Physics Determinism Test in DOTS approach. --- .../DeterminismPhysicsTestDOTSSample.meta | 8 + .../DeterminismPhysicsTestDOTSSample.unity | 869 ++++++++ ...eterminismPhysicsTestDOTSSample.unity.meta | 7 + .../Materials.meta | 8 + .../Materials/CheckerDOTS.mat | 266 +++ .../Materials/CheckerDOTS.mat.meta | 8 + ...nismPhysicsTestMaterialDOTS.physicMaterial | 14 + ...hysicsTestMaterialDOTS.physicMaterial.meta | 8 + .../Materials/GroundDOTS.mat | 266 +++ .../Materials/GroundDOTS.mat.meta | 8 + .../Materials/Textures.meta | 8 + .../Materials/Textures/CheckerBoardDOTS.png | Bin 0 -> 11854 bytes .../Textures/CheckerBoardDOTS.png.meta | 123 ++ .../Materials/Textures/GroundTexDOTS.png | Bin 0 -> 48355 bytes .../Materials/Textures/GroundTexDOTS.png.meta | 96 + .../Materials/YellowDOTS.mat | 266 +++ .../Materials/YellowDOTS.mat.meta | 8 + .../Prefabs.meta | 8 + .../Prefabs/Ball_DOTS.prefab | 175 ++ .../Prefabs/Ball_DOTS.prefab.meta | 7 + .../Prefabs/Environment_DOTS.prefab | 1788 +++++++++++++++++ .../Prefabs/Environment_DOTS.prefab.meta | 7 + .../Prefabs/Wheel_DOTS.prefab | 263 +++ .../Prefabs/Wheel_DOTS.prefab.meta | 7 + .../Scripts.meta | 8 + .../Scripts/BallDataSaveSystem.cs | 83 + .../Scripts/BallDataSaveSystem.cs.meta | 11 + .../Scripts/BallMovementSystem.cs | 57 + .../Scripts/BallMovementSystem.cs.meta | 11 + .../Scripts/BallTag.cs | 10 + .../Scripts/BallTag.cs.meta | 11 + .../Scripts/WheelDataSaveSystem.cs | 83 + .../Scripts/WheelDataSaveSystem.cs.meta | 11 + .../Scripts/WheelIdData.cs | 10 + .../Scripts/WheelIdData.cs.meta | 11 + .../Scripts/WheelMovementSystem.cs | 58 + .../Scripts/WheelMovementSystem.cs.meta | 11 + 37 files changed, 4593 insertions(+) create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/CheckerBoardDOTS.png create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/CheckerBoardDOTS.png.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/GroundTexDOTS.png create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/GroundTexDOTS.png.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/YellowDOTS.mat create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/YellowDOTS.mat.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Ball_DOTS.prefab create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Ball_DOTS.prefab.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Environment_DOTS.prefab create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Environment_DOTS.prefab.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Wheel_DOTS.prefab create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Prefabs/Wheel_DOTS.prefab.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallDataSaveSystem.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallDataSaveSystem.cs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs.meta create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs create mode 100644 Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs.meta diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.meta new file mode 100644 index 000000000..c6b639ba0 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 430cc5cf17463a327a880545e0ad0175 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity new file mode 100644 index 000000000..a404294cd --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity @@ -0,0 +1,869 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 3297.8438, g: 4086.1875, b: 5408.304, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &279686307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 279686308} + m_Layer: 0 + m_Name: -------- GAMEPLAY --------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &279686308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279686307} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 216.4744, y: -0.23781097, z: -279.6713} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &484174926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484174927} + m_Layer: 0 + m_Name: ------ ENVIRONMENT -------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &484174927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484174926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 216.4744, y: -0.23781097, z: -279.6713} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1367895533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1367895534} + m_Layer: 0 + m_Name: ---------- LIGHTS ----------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1367895534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367895533} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 216.4744, y: -0.23781097, z: -279.6713} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1475636821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1475636822} + - component: {fileID: 1475636824} + - component: {fileID: 1475636823} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1475636822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475636821} + m_LocalRotation: {x: 0.64758235, y: -0.19203752, z: 0.17351921, w: 0.7166937} + m_LocalPosition: {x: 152.22025, y: 3.6157556, z: -241.32684} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 84.2, y: -120, z: 0} +--- !u!114 &1475636823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475636821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 73123.09 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.025 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 4096 + m_UseOverride: 1 + m_Level: 3 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 +--- !u!108 &1475636824 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475636821} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 73123.09 + 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: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!1001 &1484384187 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.37699997 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522512, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522514, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_Name + value: Wheel_DOTS + objectReference: {fileID: 0} + - target: {fileID: 6755511880764522514, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 259a0b1a4eac06dcabd6760cfd22478d, type: 3} +--- !u!1001 &1955405355 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5430879970100101676, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_Name + value: Environment_DOTS + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430879970100101677, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e2a526b1078a630ea9579398ca16604, type: 3} +--- !u!1 &1983623916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1983623917} + - component: {fileID: 1983623918} + m_Layer: 0 + m_Name: Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1983623917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983623916} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1983623918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983623916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 87ed1f4fcbcd01348b783774e8f29934, type: 2} +--- !u!1001 &2051504625 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3104602252126919253, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_Name + value: Ball_DOTS + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3104602252126919259, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d7c68255af74bbac883428ecc51ed9c4, type: 3} +--- !u!1 &2122627082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2122627087} + - component: {fileID: 2122627086} + - component: {fileID: 2122627085} + - component: {fileID: 2122627084} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2122627084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122627082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 1.5 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + taaJitterScale: 1 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 72198262773251917 + data2: 13763000468760363032 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 9 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 +--- !u!81 &2122627085 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122627082} + m_Enabled: 1 +--- !u!20 &2122627086 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122627082} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 12 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &2122627087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122627082} + m_LocalRotation: {x: 0.23911765, y: 0.3696438, z: -0.09904577, w: 0.89239913} + m_LocalPosition: {x: -34, y: 28, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 30, y: 45, z: 0} diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity.meta new file mode 100644 index 000000000..488e0d968 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d9f1c09b8e727437ad37858c84e27d6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials.meta new file mode 100644 index 000000000..0bf5a58ed --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c757f9a845724d8409cb446d543746f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat new file mode 100644 index 000000000..ce905004d --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat @@ -0,0 +1,266 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CheckerDOTS + m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2225 + stringTagMap: {} + disabledShaderPasses: + - TransparentDepthPrepass + - TransparentDepthPostpass + - TransparentBackface + - RayTracingPrepass + - MOTIONVECTORS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AnisotropyMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseColorMap: + m_Texture: {fileID: 2800000, guid: 8626c3d6a9d411299a4238fcc07620a2, type: 3} + m_Scale: {x: 0.4, y: 0.4} + m_Offset: {x: 0, y: 0} + - _BentNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CoatMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _HeightMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8626c3d6a9d411299a4238fcc07620a2, type: 3} + m_Scale: {x: 0.4, y: 0.4} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SubsurfaceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TransmittanceColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AORemapMax: 1 + - _AORemapMin: 0 + - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 + - _AlbedoAffectEmissive: 0 + - _AlphaCutoff: 0.5 + - _AlphaCutoffEnable: 0 + - _AlphaCutoffPostpass: 0.5 + - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 + - _Anisotropy: 0 + - _BlendMode: 0 + - _CoatMask: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _Cutoff: 0.5 + - _DepthOffsetEnable: 0 + - _DetailAlbedoScale: 1 + - _DetailNormalScale: 1 + - _DetailSmoothnessScale: 1 + - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 + - _DisplacementLockObjectScale: 1 + - _DisplacementLockTilingScale: 1 + - _DisplacementMode: 0 + - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 + - _DoubleSidedNormalMode: 1 + - _DstBlend: 0 + - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 + - _EnableBlendModePreserveSpecularLighting: 1 + - _EnableFogOnTransparent: 1 + - _EnableGeometricSpecularAA: 0 + - _EnergyConservingSpecularColor: 1 + - _HeightAmplitude: 0.02 + - _HeightCenter: 0.5 + - _HeightMapParametrization: 0 + - _HeightMax: 1 + - _HeightMin: -1 + - _HeightOffset: 0 + - _HeightPoMAmplitude: 2 + - _HeightTessAmplitude: 2 + - _HeightTessCenter: 0.5 + - _InvTilingScale: 2.5 + - _Ior: 1.5 + - _IridescenceMask: 1 + - _IridescenceThickness: 1 + - _LinkDetailsWithBase: 1 + - _MaterialID: 1 + - _Metallic: 0 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 + - _NormalMapSpace: 0 + - _NormalScale: 1 + - _OpaqueCullMode: 2 + - _PPDLodThreshold: 5 + - _PPDMaxSamples: 15 + - _PPDMinSamples: 5 + - _PPDPrimitiveLength: 1 + - _PPDPrimitiveWidth: 1 + - _RayTracing: 0 + - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 + - _RefractionModel: 0 + - _Smoothness: 0.5 + - _SmoothnessRemapMax: 1 + - _SmoothnessRemapMin: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 8 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 40 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskGBuffer: 14 + - _StencilWriteMaskMV: 40 + - _SubsurfaceMask: 1 + - _SupportDecals: 1 + - _SurfaceType: 0 + - _TexWorldScale: 1 + - _TexWorldScaleEmissive: 1 + - _Thickness: 1 + - _TransmissionEnable: 1 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UVBase: 0 + - _UVDetail: 0 + - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestGBuffer: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} + - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} + - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} + - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &7584047240347991051 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: da692e001514ec24dbc4cca1949ff7e8, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat.meta new file mode 100644 index 000000000..4474e407e --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/CheckerDOTS.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f634fa0be4c75af219dc3e8c94c40276 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial new file mode 100644 index 000000000..b0c0743d5 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DeterminismPhysicsTestMaterialDOTS + dynamicFriction: 0.6 + staticFriction: 0.6 + bounciness: 0.5 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial.meta new file mode 100644 index 000000000..c0cac8e16 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/DeterminismPhysicsTestMaterialDOTS.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98a3e05fac3eb10efaf6f880f19178ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat new file mode 100644 index 000000000..45392a681 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat @@ -0,0 +1,266 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GroundDOTS + m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2225 + stringTagMap: {} + disabledShaderPasses: + - TransparentDepthPrepass + - TransparentDepthPostpass + - TransparentBackface + - RayTracingPrepass + - MOTIONVECTORS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AnisotropyMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseColorMap: + m_Texture: {fileID: 2800000, guid: 05dae6df54609c2368a495ce4fac6dc2, type: 3} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + - _BentNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CoatMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _HeightMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 05dae6df54609c2368a495ce4fac6dc2, type: 3} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SubsurfaceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TransmittanceColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AORemapMax: 1 + - _AORemapMin: 0 + - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 + - _AlbedoAffectEmissive: 0 + - _AlphaCutoff: 0.5 + - _AlphaCutoffEnable: 0 + - _AlphaCutoffPostpass: 0.5 + - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 + - _Anisotropy: 0 + - _BlendMode: 0 + - _CoatMask: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _Cutoff: 0.5 + - _DepthOffsetEnable: 0 + - _DetailAlbedoScale: 1 + - _DetailNormalScale: 1 + - _DetailSmoothnessScale: 1 + - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 + - _DisplacementLockObjectScale: 1 + - _DisplacementLockTilingScale: 1 + - _DisplacementMode: 0 + - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 + - _DoubleSidedNormalMode: 1 + - _DstBlend: 0 + - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 + - _EnableBlendModePreserveSpecularLighting: 1 + - _EnableFogOnTransparent: 1 + - _EnableGeometricSpecularAA: 0 + - _EnergyConservingSpecularColor: 1 + - _HeightAmplitude: 0.02 + - _HeightCenter: 0.5 + - _HeightMapParametrization: 0 + - _HeightMax: 1 + - _HeightMin: -1 + - _HeightOffset: 0 + - _HeightPoMAmplitude: 2 + - _HeightTessAmplitude: 2 + - _HeightTessCenter: 0.5 + - _InvTilingScale: 0.1 + - _Ior: 1.5 + - _IridescenceMask: 1 + - _IridescenceThickness: 1 + - _LinkDetailsWithBase: 1 + - _MaterialID: 1 + - _Metallic: 0 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 + - _NormalMapSpace: 0 + - _NormalScale: 1 + - _OpaqueCullMode: 2 + - _PPDLodThreshold: 5 + - _PPDMaxSamples: 15 + - _PPDMinSamples: 5 + - _PPDPrimitiveLength: 1 + - _PPDPrimitiveWidth: 1 + - _RayTracing: 0 + - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 + - _RefractionModel: 0 + - _Smoothness: 0.5 + - _SmoothnessRemapMax: 1 + - _SmoothnessRemapMin: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 8 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 40 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskGBuffer: 14 + - _StencilWriteMaskMV: 40 + - _SubsurfaceMask: 1 + - _SupportDecals: 1 + - _SurfaceType: 0 + - _TexWorldScale: 1 + - _TexWorldScaleEmissive: 1 + - _Thickness: 1 + - _TransmissionEnable: 1 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UVBase: 0 + - _UVDetail: 0 + - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestGBuffer: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} + - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} + - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} + - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &7584047240347991051 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: da692e001514ec24dbc4cca1949ff7e8, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 12 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat.meta new file mode 100644 index 000000000..b7b57f118 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/GroundDOTS.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d75c75e299304d58867ff7fb53de595 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures.meta new file mode 100644 index 000000000..6da419a49 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a06ef0609eb3db1faba3d641c7078c91 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/CheckerBoardDOTS.png b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Materials/Textures/CheckerBoardDOTS.png new file mode 100644 index 0000000000000000000000000000000000000000..8959ab0fb7809c5f4f5c7019d4010d9b93f6ba48 GIT binary patch literal 11854 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%0D~(?1zJl1|q9hlfDWxsvn4aoABk< zkI&1wWHcEoDt*^jf<(-r+a$sGd5oN?FNtrix^s$Dx0)E4=#;0`kF(X%&-xnH>LZ}c zuiYWH3M;L|NEJu|_&FeH>UjnQAhj=Ir(D>$Ln+0xAU!YM@!B&>%;~b z$eo^?y$XqaMJn;drduo=#4op_8A!!*nCUM|MNkk>H+!N%y4e*aI>ojSVx1Vg+`4aJ zs77Lb6G!l0OoQg=7lSRP>)8pL8Y1JYfphdn@qCj{?oU;$8BV^}#dyuNclbHTs@)mR z2kPcyRk}0|#{g-_?I#=7Pnd!OJ5pBqRww7}OOWjBP5zJ4H03HywA9#Jfj13KVKg(o zO{Kh&`8kHhwy`H7#KpG7@cR>Y)8v_My46zwGmNde+d+@6W1lXMNF^>X6IANczmwJP zeZJHv(A4B6W-?L}mX*G&gohvFr&nrV#*Q2b+J8iszPtQvw8|ja;m(-nMC1WuNX(E3 z

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 So$p>B_MGX((}() + .WithoutBurst() + .ForEach((in Translation translation, in PhysicsVelocity velocity) => + { + OutputData data = new() + { + Time = _currTime, + PosX = translation.Value.x, + PosY = translation.Value.y, + PosZ = translation.Value.z, + VelX = velocity.Linear.x, + VelY = velocity.Linear.y, + VelZ = velocity.Linear.z, + }; + + _output.Data.Add(data); + _currTime += deltaTime; + }).Run(); + } + + private string SaveData() + { + string jsonData = JsonUtility.ToJson(_output); + string jsonPath = Application.persistentDataPath + "/dots_scenario_.json"; + System.IO.File.WriteAllText(jsonPath, jsonData); + return jsonPath; + } + + [System.Serializable] + public class OutputJson + { + public List Data = new List(); + } + + [System.Serializable] + public class OutputData + { + public float Time; + + public float PosX; + public float PosY; + public float PosZ; + + public float VelX; + public float VelY; + public float VelZ; + } + } +} \ No newline at end of file diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallDataSaveSystem.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallDataSaveSystem.cs.meta new file mode 100644 index 000000000..2468daab4 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallDataSaveSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4c2560142c4dab90bcd1c99a09043b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs new file mode 100644 index 000000000..722cb7760 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs @@ -0,0 +1,57 @@ +using UnityEngine; +using Unity.Entities; +using Unity.Transforms; +using Unity.Jobs; +using Unity.Physics; +using Unity.Physics.Extensions; +using Unity.Mathematics; + +namespace AWSIM.PhysicsTest +{ + [UpdateInGroup(typeof(FixedStepSimulationSystemGroup))] + partial class BallMovementSystem : SystemBase + { + private float _currTime = 0f; + + protected override void OnStartRunning() + { + _currTime = 0f; + } + + protected override void OnUpdate() + { + float deltaTime = Time.DeltaTime; + float speed = 0f; + + if (_currTime >= 2f && _currTime < 7f) + { + speed = 1.5f; + } + else if (_currTime >= 7f && _currTime < 12f) + { + speed = 0f; + } + else if (_currTime >= 12f && _currTime < 17f) + { + speed = -1.5f; + } + else + { + speed = 0f; + } + + _currTime += Time.DeltaTime; + + float3 direction = new float3(0f, 0f, 1f); + + Entities + .WithAll() + .ForEach((ref PhysicsVelocity physicsVelocity, ref PhysicsMass physicsMass) => + { + float3 impulse = direction * deltaTime * speed; + + physicsVelocity.ApplyLinearImpulse(physicsMass, impulse); + }).Run(); + } + } +} diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs.meta new file mode 100644 index 000000000..3bcd43ee3 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallMovementSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3378290005ddba2ffa80d2d3985c83ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs new file mode 100644 index 000000000..76ddf93ba --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs @@ -0,0 +1,10 @@ +using Unity.Entities; + +namespace AWSIM.PhysicsTest +{ + [GenerateAuthoringComponent] + public struct BallTag : IComponentData + { + + } +} diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs.meta new file mode 100644 index 000000000..1bd140e79 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/BallTag.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b366b75e72c121c2393e5b6a6e336e2a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs new file mode 100644 index 000000000..e3bb55282 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs @@ -0,0 +1,83 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Unity.Entities; +using Unity.Transforms; +using Unity.Mathematics; +using Unity.Physics; + +namespace AWSIM.PhysicsTest +{ + [UpdateInGroup(typeof(FixedStepSimulationSystemGroup))] + partial class WheelDataSaveSystem : SystemBase + { + private OutputJson _output = default; + private float _currTime = 0f; + + protected override void OnStartRunning() + { + _currTime = 0f; + _output = new OutputJson(); + } + + protected override void OnStopRunning() + { + string outputPath = SaveData(); + Debug.Log("DONE " + outputPath); + } + + protected override void OnUpdate() + { + float deltaTime = Time.DeltaTime; + + Entities + .WithAll() + .WithoutBurst() + .ForEach((in Translation translation, in PhysicsVelocity velocity) => + { + OutputData data = new() + { + Time = _currTime, + PosX = translation.Value.x, + PosY = translation.Value.y, + PosZ = translation.Value.z, + VelX = velocity.Linear.x, + VelY = velocity.Linear.y, + VelZ = velocity.Linear.z, + }; + + _output.Data.Add(data); + _currTime += deltaTime; + + }).Run(); + } + + private string SaveData() + { + string jsonData = JsonUtility.ToJson(_output); + string jsonPath = Application.persistentDataPath + "/dots_scenario_.json"; + System.IO.File.WriteAllText(jsonPath, jsonData); + return jsonPath; + } + + [System.Serializable] + public class OutputJson + { + public List Data = new List(); + } + + [System.Serializable] + public class OutputData + { + public float Time; + + public float PosX; + public float PosY; + public float PosZ; + + public float VelX; + public float VelY; + public float VelZ; + } + } +} diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs.meta new file mode 100644 index 000000000..da2e3569c --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelDataSaveSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c7d51fa3cc4058c80b97d4e313906c07 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs new file mode 100644 index 000000000..6779ad81d --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs @@ -0,0 +1,10 @@ +using Unity.Entities; + +namespace AWSIM.PhysicsTest +{ + [GenerateAuthoringComponent] + public struct WheelIdData : IComponentData + { + public int Id; + } +} diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs.meta new file mode 100644 index 000000000..12b40046a --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelIdData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 265e7339742091cd0903c864a6301f79 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs new file mode 100644 index 000000000..c0bdfa45c --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs @@ -0,0 +1,58 @@ +using Unity.Entities; +using Unity.Transforms; +using Unity.Jobs; +using Unity.Physics; +using Unity.Physics.Extensions; +using Unity.Mathematics; + +namespace AWSIM.PhysicsTest +{ + [UpdateInGroup(typeof(FixedStepSimulationSystemGroup))] + partial class WheelMovementSystem : SystemBase + { + private float _currTime = 0f; + + protected override void OnStartRunning() + { + _currTime = 0f; + } + + protected override void OnUpdate() + { + float deltaTime = Time.DeltaTime; + float speed = 0f; + + if (_currTime >= 4f && _currTime < 14f) + { + speed = 1.5f; + } + else if (_currTime >= 14f && _currTime < 24f) + { + speed = 0f; + } + else if (_currTime >= 24f && _currTime < 34f) + { + speed = -1.5f; + } + else + { + speed = 0f; + } + + _currTime += Time.DeltaTime; + + Entities + .WithAll() + .ForEach((ref PhysicsVelocity physicsVelocity, ref PhysicsMass physicsMass, in Rotation rotation) => + { + float3 direction = math.normalize(math.mul(rotation.Value, new float3(1f, 0f, 0f))); + float3 forwardDirection = math.normalize(math.mul(quaternion.AxisAngle(math.up(), math.radians(-90)), direction)); + + float3 impulse = forwardDirection * deltaTime * speed; + + physicsVelocity.ApplyLinearImpulse(physicsMass, impulse); + + }).Run(); + } + } +} \ No newline at end of file diff --git a/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs.meta b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs.meta new file mode 100644 index 000000000..5f947c862 --- /dev/null +++ b/Assets/AWSIM/Scenes/Samples/DeterminismPhysicsTestDOTSSample/Scripts/WheelMovementSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ef11b2596595ad41b2088aa5f909988 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: