Skip to content

Commit e51c394

Browse files
JulienIgnace-UnityanisunityFrancescoC-unityadrien-de-tocquevilleAntoine Lelievre
authored
HDRP bugfix branch to master (#2350)
* Fixing exceptions in the console when putting the SSGI in low quality mode (render graph). (#2323) * Add VT frame settings (#2286) * Add frame setting * changelog * Grey setting out and make it always available. * Reverts tuff meant for antoher branch Co-authored-by: JulienIgnace-Unity <[email protected]> * Fix undo/redo compositor (#2300) * Rename function * Undoable "enable compositor" * Undo/Redo Enable/Disable compositor Co-authored-by: JulienIgnace-Unity <[email protected]> * Restored purge of unused resources in render graph (#2306) * Improve punctual shadow resolution rescale algorithm (#2309) * Improved the punctual shadow algorithm (it's less agressive now) * Updated changelog * Remove unused references of the HDRP asset in decal code (#2326) * Remove perChannelMask * changelog * Fix diffusion profile dependency (#2327) * Fixed a nullref when a diffusion profile was created * Updated changelog * Trying to fix diffusion profile asset dependency * Fixed export as package * Updated changelog Co-authored-by: JulienIgnace-Unity <[email protected]> * Standardize naming for Transparent receive SSR (#2329) * Renaming * Changelog * Fix typos * Revert "Standardize naming for Transparent receive SSR (#2329)" This reverts commit 58152f0. # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md * Improvements to the DXR Wizard (#2295) * - Now the DXR wizard displays the name of the target asset that needs to be changed. - The DXR wizard displays asset changes as warnings and default frame settings as infos. - Added the status check of default camera frame settings in the DXR wizard. * review corrections Co-authored-by: JulienIgnace-Unity <[email protected]> * Expose HDRP shader tag IDs and per object config (#2292) * Expose shader pass names API * Updated changelog * exposed per object data in HDUtils * changed constants to accessors * Moved getters to static Co-authored-by: JulienIgnace-Unity <[email protected]> * - Updated the documentation about shadow matte and SSShadow and RTShadows. (#2339) * - Updated the documentation about shadow matte and SSShadow and RTShadows. * Update CHANGELOG.md Co-authored-by: sebastienlagarde <[email protected]> * Fixed warnings when new input system is enabled (#2274) * Fix nan when decal affect normals (#2319) * Use SafeNormalize * Update CHANGELOG.md Co-authored-by: JulienIgnace-Unity <[email protected]> * Fix bleeding of a view into another caused by TAA (#2317) * Make sure we clamp correctly when sampling in TAA * Changelog * More safe fix. Co-authored-by: JulienIgnace-Unity <[email protected]> * Reset RT Handle size every now and then in editor if set to a big resolution and then reverted back (#2322) * Reset every now and then * Changelog * Bump min to 1440 * Update CHANGELOG.md Fixed changelog * Avoid reset if we still need the high res Co-authored-by: JulienIgnace-Unity <[email protected]> * Hdrp/standardize transparent receive ssr (#2338) * Renaming * Changelog * Fix typos * Update HDWizard.Window.cs typo * Update HDWizard.Window.cs typo 2 Co-authored-by: FrancescoC-Unity <[email protected]> * Added default volume profile asset change to the undo stack (case 1285268). (#2330) * Added default volume profile asset change to the undo stack. * Updated changelog. * ... * ... Co-authored-by: JulienIgnace-Unity <[email protected]> * Restored default directional light intensity constant (#2345) * Fixed changelog * More changelog fix * Remove useless menu entry (#2335) * Fixed the ray tracing shadow UI being displayed while it shouldn't (case 1286391). (#2341) Co-authored-by: sebastienlagarde <[email protected]> * Add fade distance for light impact on volumetrics (#2291) * Fade * changelog * Don't display on directional Co-authored-by: sebastienlagarde <[email protected]> * Fix bit in FrameSettings * Update sample cubemap image * Revert "Update sample cubemap image" This reverts commit 32ba2a8. * revert: Improve punctual shadow resolution rescale algorithm (#2309) * Update TestCaseFilters.asset * Merge branch 'master' into hd/bugfix * Update SG_DS_Flipped.mat * update settings * Update CHANGELOG.md * remove test case filter in runtime test * migrate correctly to enable virtual texturing. * revert some change one in Hdrp/standardize transparent receive ssr #2338 * Fix breaking change in CoreEditorUtils.cs * Revert "remove test case filter in runtime test" This reverts commit ce8389b. * Revert "Restored purge of unused resources in render graph (#2306)" This reverts commit bc54701. * Update documentation * Revert: Fix nan when decal affect normals (#2319) Co-authored-by: anisunity <[email protected]> Co-authored-by: FrancescoC-unity <[email protected]> Co-authored-by: Adrien de Tocqueville <[email protected]> Co-authored-by: Antoine Lelievre <[email protected]> Co-authored-by: sebastienlagarde <[email protected]> Co-authored-by: FrancescoC-Unity <[email protected]> Co-authored-by: Emmanuel Turquin <[email protected]>
1 parent ad2ddd9 commit e51c394

File tree

54 files changed

+493
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+493
-267
lines changed

TestProjects/HDRP_DXR_Tests/ProjectSettings/ProjectSettings.asset

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 20
6+
serializedVersion: 21
77
productGUID: 504231709d29f6341950ddd13dd16f85
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -113,8 +113,14 @@ PlayerSettings:
113113
switchNVNShaderPoolsGranularity: 33554432
114114
switchNVNDefaultPoolsGranularity: 16777216
115115
switchNVNOtherPoolsGranularity: 16777216
116+
switchNVNMaxPublicTextureIDCount: 0
117+
switchNVNMaxPublicSamplerIDCount: 0
118+
stadiaPresentMode: 0
119+
stadiaTargetFramerate: 0
116120
vulkanNumSwapchainBuffers: 3
117121
vulkanEnableSetSRGBWrite: 0
122+
vulkanEnablePreTransform: 0
123+
vulkanEnableLateAcquireNextImage: 0
118124
m_SupportedAspectRatios:
119125
4:3: 1
120126
5:4: 1
@@ -129,31 +135,6 @@ PlayerSettings:
129135
xboxOneDisableKinectGpuReservation: 0
130136
xboxOneEnable7thCore: 0
131137
vrSettings:
132-
cardboard:
133-
depthFormat: 0
134-
enableTransitionView: 0
135-
daydream:
136-
depthFormat: 0
137-
useSustainedPerformanceMode: 0
138-
enableVideoLayer: 0
139-
useProtectedVideoMemory: 0
140-
minimumSupportedHeadTracking: 0
141-
maximumSupportedHeadTracking: 1
142-
hololens:
143-
depthFormat: 1
144-
depthBufferSharingEnabled: 0
145-
lumin:
146-
depthFormat: 0
147-
frameTiming: 2
148-
enableGLCache: 0
149-
glCacheMaxBlobSize: 524288
150-
glCacheMaxFileSize: 8388608
151-
oculus:
152-
sharedDepthBuffer: 1
153-
dashSupport: 1
154-
lowOverheadMode: 0
155-
protectedContext: 0
156-
v2Signing: 1
157138
enable360StereoCapture: 0
158139
isWsaHolographicRemotingEnabled: 0
159140
enableFrameTimingStats: 0
@@ -164,8 +145,13 @@ PlayerSettings:
164145
resolutionScalingMode: 0
165146
androidSupportedAspectRatio: 1
166147
androidMaxAspectRatio: 2.1
167-
applicationIdentifier: {}
168-
buildNumber: {}
148+
applicationIdentifier:
149+
Standalone: com.DefaultCompany.HDRPDXRTests
150+
buildNumber:
151+
Standalone: 0
152+
iPhone: 0
153+
tvOS: 0
154+
overrideDefaultApplicationIdentifier: 0
169155
AndroidBundleVersionCode: 1
170156
AndroidMinSdkVersion: 19
171157
AndroidTargetSdkVersion: 0
@@ -192,22 +178,6 @@ PlayerSettings:
192178
uIStatusBarHidden: 1
193179
uIExitOnSuspend: 0
194180
uIStatusBarStyle: 0
195-
iPhoneSplashScreen: {fileID: 0}
196-
iPhoneHighResSplashScreen: {fileID: 0}
197-
iPhoneTallHighResSplashScreen: {fileID: 0}
198-
iPhone47inSplashScreen: {fileID: 0}
199-
iPhone55inPortraitSplashScreen: {fileID: 0}
200-
iPhone55inLandscapeSplashScreen: {fileID: 0}
201-
iPhone58inPortraitSplashScreen: {fileID: 0}
202-
iPhone58inLandscapeSplashScreen: {fileID: 0}
203-
iPadPortraitSplashScreen: {fileID: 0}
204-
iPadHighResPortraitSplashScreen: {fileID: 0}
205-
iPadLandscapeSplashScreen: {fileID: 0}
206-
iPadHighResLandscapeSplashScreen: {fileID: 0}
207-
iPhone65inPortraitSplashScreen: {fileID: 0}
208-
iPhone65inLandscapeSplashScreen: {fileID: 0}
209-
iPhone61inPortraitSplashScreen: {fileID: 0}
210-
iPhone61inLandscapeSplashScreen: {fileID: 0}
211181
appleTVSplashScreen: {fileID: 0}
212182
appleTVSplashScreen2x: {fileID: 0}
213183
tvOSSmallIconLayers: []
@@ -235,15 +205,16 @@ PlayerSettings:
235205
iOSLaunchScreeniPadFillPct: 100
236206
iOSLaunchScreeniPadSize: 100
237207
iOSLaunchScreeniPadCustomXibPath:
238-
iOSUseLaunchScreenStoryboard: 0
239208
iOSLaunchScreenCustomStoryboardPath:
209+
iOSLaunchScreeniPadCustomStoryboardPath:
240210
iOSDeviceRequirements: []
241211
iOSURLSchemes: []
242212
iOSBackgroundModes: 0
243213
iOSMetalForceHardShadows: 0
244214
metalEditorSupport: 1
245215
metalAPIValidation: 1
246216
iOSRenderExtraFrameOnPause: 0
217+
iosCopyPluginsCodeInsteadOfSymlink: 0
247218
appleDeveloperTeamID:
248219
iOSManualSigningProvisioningProfileID:
249220
tvOSManualSigningProvisioningProfileID:
@@ -253,9 +224,17 @@ PlayerSettings:
253224
iOSRequireARKit: 0
254225
iOSAutomaticallyDetectAndAddCapabilities: 1
255226
appleEnableProMotion: 0
227+
shaderPrecisionModel: 0
256228
clonedFromGUID: 7aaaa0dc1bd27d24f84a19b5893c8bae
257229
templatePackageId: [email protected]
258230
templateDefaultScene: Assets/Scenes/SampleScene.unity
231+
useCustomMainManifest: 0
232+
useCustomLauncherManifest: 0
233+
useCustomMainGradleTemplate: 0
234+
useCustomLauncherGradleManifest: 0
235+
useCustomBaseGradleTemplate: 0
236+
useCustomGradlePropertiesTemplate: 0
237+
useCustomProguardFile: 0
259238
AndroidTargetArchitectures: 1
260239
AndroidSplashScreenScale: 0
261240
androidSplashScreen: {fileID: 0}
@@ -273,13 +252,16 @@ PlayerSettings:
273252
height: 180
274253
banner: {fileID: 0}
275254
androidGamepadSupportLevel: 0
255+
AndroidMinifyWithR8: 0
256+
AndroidMinifyRelease: 0
257+
AndroidMinifyDebug: 0
276258
AndroidValidateAppBundleSize: 1
277259
AndroidAppBundleSizeToValidate: 100
278260
m_BuildTargetIcons: []
279261
m_BuildTargetPlatformIcons: []
280262
m_BuildTargetBatching:
281263
- m_BuildTarget: Standalone
282-
m_StaticBatching: 1
264+
m_StaticBatching: 0
283265
m_DynamicBatching: 0
284266
- m_BuildTarget: tvOS
285267
m_StaticBatching: 1
@@ -334,7 +316,7 @@ PlayerSettings:
334316
m_Automatic: 1
335317
- m_BuildTarget: AppleTVSupport
336318
m_APIs: 10000000
337-
m_Automatic: 0
319+
m_Automatic: 1
338320
- m_BuildTarget: WebGLSupport
339321
m_APIs: 0b000000
340322
m_Automatic: 1
@@ -368,6 +350,7 @@ PlayerSettings:
368350
- m_BuildTarget: Windows Store Apps
369351
m_EncodingQuality: 2
370352
m_BuildTargetGroupLightmapSettings: []
353+
m_BuildTargetNormalMapEncoding: []
371354
playModeTestRunnerEnabled: 0
372355
runPlayModeTestAsEditModeTest: 0
373356
actionOnDotNetUnhandledException: 1
@@ -509,6 +492,7 @@ PlayerSettings:
509492
switchSocketInitializeEnabled: 1
510493
switchNetworkInterfaceManagerInitializeEnabled: 1
511494
switchPlayerConnectionEnabled: 1
495+
switchUseNewStyleFilepaths: 0
512496
ps4NPAgeRating: 12
513497
ps4NPTitleSecret:
514498
ps4NPTrophyPackPath:
@@ -535,6 +519,7 @@ PlayerSettings:
535519
ps4ShareFilePath:
536520
ps4ShareOverlayImagePath:
537521
ps4PrivacyGuardImagePath:
522+
ps4ExtraSceSysFile:
538523
ps4NPtitleDatPath:
539524
ps4RemotePlayKeyAssignment: -1
540525
ps4RemotePlayKeyMappingDir:
@@ -560,6 +545,7 @@ PlayerSettings:
560545
ps4UseResolutionFallback: 0
561546
ps4ReprojectionSupport: 0
562547
ps4UseAudio3dBackend: 0
548+
ps4UseLowGarlicFragmentationMode: 1
563549
ps4SocialScreenEnabled: 0
564550
ps4ScriptOptimizationLevel: 0
565551
ps4Audio3dVirtualSpeakerCount: 14
@@ -576,6 +562,8 @@ PlayerSettings:
576562
ps4disableAutoHideSplash: 0
577563
ps4videoRecordingFeaturesUsed: 0
578564
ps4contentSearchFeaturesUsed: 0
565+
ps4CompatibilityPS5: 0
566+
ps4GPU800MHz: 1
579567
ps4attribEyeToEyeDistanceSettingVR: 0
580568
ps4IncludedModules:
581569
- libc.prx
@@ -606,17 +594,23 @@ PlayerSettings:
606594
webGLAnalyzeBuildSize: 0
607595
webGLUseEmbeddedResources: 0
608596
webGLCompressionFormat: 1
597+
webGLWasmArithmeticExceptions: 0
609598
webGLLinkerTarget: 1
610599
webGLThreadsSupport: 0
611600
webGLDecompressionFallback: 0
612601
scriptingDefineSymbols:
613602
1: UNITY_HDRP_DXR_TESTS_DEFINE;ENABLE_RAYTRACING
603+
additionalCompilerArguments: {}
614604
platformArchitecture: {}
615605
scriptingBackend: {}
616606
il2cppCompilerConfiguration: {}
617607
managedStrippingLevel: {}
618608
incrementalIl2cppBuild: {}
609+
suppressCommonWarnings: 1
619610
allowUnsafeCode: 0
611+
useDeterministicCompilation: 1
612+
useReferenceAssemblies: 1
613+
enableRoslynAnalyzers: 1
620614
additionalIl2CppArgs:
621615
scriptingRuntimeVersion: 1
622616
gcIncremental: 0
@@ -676,10 +670,8 @@ PlayerSettings:
676670
XboxOnePersistentLocalStorageSize: 0
677671
XboxOneXTitleMemory: 8
678672
XboxOneOverrideIdentityName:
679-
vrEditorSettings:
680-
daydream:
681-
daydreamIconForeground: {fileID: 0}
682-
daydreamIconBackground: {fileID: 0}
673+
XboxOneOverrideIdentityPublisher:
674+
vrEditorSettings: {}
683675
cloudServicesEnabled:
684676
UNet: 1
685677
luminIcon:
@@ -694,12 +686,12 @@ PlayerSettings:
694686
m_VersionCode: 1
695687
m_VersionName:
696688
apiCompatibilityLevel: 6
689+
activeInputHandler: 0
697690
cloudProjectId:
698691
framebufferDepthMemorylessMode: 0
692+
qualitySettingsNames: []
699693
projectName:
700694
organizationId:
701695
cloudEnabled: 0
702-
enableNativePlatformBackendsForNewInputSystem: 0
703-
disableOldInputManagerSupport: 0
704696
legacyClampBlendShapeWeights: 0
705697
virtualTexturingSupportEnabled: 0

TestProjects/HDRP_RuntimeTests/Assets/TestCaseFilters.asset

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,7 @@ MonoBehaviour:
1717
FilteredScenes:
1818
- {fileID: 102900000, guid: b0ec7521f32466147a09e7dadff3ae0e, type: 3}
1919
ColorSpace: 1
20-
BuildPlatform: 5
21-
GraphicsDevice: 21
22-
XrSdk:
23-
StereoModes: 0
24-
Reason: all black on Yamato but work locally
25-
- FilteredScene: {fileID: 0}
26-
FilteredScenes:
27-
- {fileID: 102900000, guid: b0ec7521f32466147a09e7dadff3ae0e, type: 3}
28-
ColorSpace: 1
29-
BuildPlatform: 24
30-
GraphicsDevice: 21
31-
XrSdk:
32-
StereoModes: 0
33-
Reason: all black on Yamato but work locally
34-
- FilteredScene: {fileID: 0}
35-
FilteredScenes:
36-
- {fileID: 102900000, guid: 897c2870240f77a46a18884a0446b797, type: 3}
37-
ColorSpace: 1
38-
BuildPlatform: 5
20+
BuildPlatform: -2
3921
GraphicsDevice: 21
4022
XrSdk:
4123
StereoModes: 0
@@ -44,7 +26,7 @@ MonoBehaviour:
4426
FilteredScenes:
4527
- {fileID: 102900000, guid: 897c2870240f77a46a18884a0446b797, type: 3}
4628
ColorSpace: 1
47-
BuildPlatform: 24
29+
BuildPlatform: -2
4830
GraphicsDevice: 21
4931
XrSdk:
5032
StereoModes: 0

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_Flipped.mat

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 9
15+
version: 11
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
127127
m_Texture: {fileID: 0}
128128
m_Scale: {x: 1, y: 1}
129129
m_Offset: {x: 0, y: 0}
130+
- unity_Lightmaps:
131+
m_Texture: {fileID: 0}
132+
m_Scale: {x: 1, y: 1}
133+
m_Offset: {x: 0, y: 0}
134+
- unity_LightmapsInd:
135+
m_Texture: {fileID: 0}
136+
m_Scale: {x: 1, y: 1}
137+
m_Offset: {x: 0, y: 0}
138+
- unity_ShadowMasks:
139+
m_Texture: {fileID: 0}
140+
m_Scale: {x: 1, y: 1}
141+
m_Offset: {x: 0, y: 0}
130142
m_Floats:
131143
- Vector1_52486F46: 0.5
132144
- Vector1_BEAFB0DB: 0.5

TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
version: 1
16-
m_DefaultScenePrefabSaved: {fileID: 4893056312182120781, guid: a1dfdae16e0448542a6124642d4c13e9,
17-
type: 3}
18-
m_DefaultDXRScenePrefabSaved: {fileID: 0}
1916
m_ProjectSettingFolderPath: HDRPDefaultResources
2017
m_WizardPopupAtStart: 0
2118
m_WizardPopupAlreadyShownOnce: 0

TestProjects/HDRP_Tests/ProjectSettings/QualitySettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QualitySettings:
2727
realtimeReflectionProbes: 1
2828
billboardsFaceCameraPosition: 1
2929
vSyncCount: 1
30-
lodBias: 2
30+
lodBias: 1
3131
maximumLODLevel: 0
3232
streamingMipmapsActive: 0
3333
streamingMipmapsAddAllCameras: 1

com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,18 @@ public static bool DrawSubHeaderFoldout(GUIContent title, bool state, bool isBox
448448
/// <param name="hasMoreOptions">Delegate saying if we have MoreOptions</param>
449449
/// <param name="toggleMoreOptions">Callback called when the MoreOptions is toggled</param>
450450
/// <returns>return the state of the foldout header</returns>
451+
public static bool DrawHeaderToggle(string title, SerializedProperty group, SerializedProperty activeField, Action<Vector2> contextAction = null, Func<bool> hasMoreOptions = null, Action toggleMoreOptions = null)
452+
=> DrawHeaderToggle(EditorGUIUtility.TrTextContent(title), group, activeField, contextAction, hasMoreOptions, toggleMoreOptions, null);
453+
454+
/// <summary>Draw a header toggle like in Volumes</summary>
455+
/// <param name="title"> The title of the header </param>
456+
/// <param name="group"> The group of the header </param>
457+
/// <param name="activeField">The active field</param>
458+
/// <param name="contextAction">The context action</param>
459+
/// <param name="hasMoreOptions">Delegate saying if we have MoreOptions</param>
460+
/// <param name="toggleMoreOptions">Callback called when the MoreOptions is toggled</param>
461+
/// <param name="documentationURL">Documentation URL</param>
462+
/// <returns>return the state of the foldout header</returns>
451463
public static bool DrawHeaderToggle(string title, SerializedProperty group, SerializedProperty activeField, Action<Vector2> contextAction = null, Func<bool> hasMoreOptions = null, Action toggleMoreOptions = null, string documentationURL = null)
452464
=> DrawHeaderToggle(EditorGUIUtility.TrTextContent(title), group, activeField, contextAction, hasMoreOptions, toggleMoreOptions, documentationURL);
453465

@@ -459,6 +471,17 @@ public static bool DrawHeaderToggle(string title, SerializedProperty group, Seri
459471
/// <param name="hasMoreOptions">Delegate saying if we have MoreOptions</param>
460472
/// <param name="toggleMoreOptions">Callback called when the MoreOptions is toggled</param>
461473
/// <returns>return the state of the foldout header</returns>
474+
public static bool DrawHeaderToggle(GUIContent title, SerializedProperty group, SerializedProperty activeField, Action<Vector2> contextAction = null, Func<bool> hasMoreOptions = null, Action toggleMoreOptions = null)
475+
=> DrawHeaderToggle(title, group, activeField, contextAction, hasMoreOptions, toggleMoreOptions, null);
476+
/// <summary>Draw a header toggle like in Volumes</summary>
477+
/// <param name="title"> The title of the header </param>
478+
/// <param name="group"> The group of the header </param>
479+
/// <param name="activeField">The active field</param>
480+
/// <param name="contextAction">The context action</param>
481+
/// <param name="hasMoreOptions">Delegate saying if we have MoreOptions</param>
482+
/// <param name="toggleMoreOptions">Callback called when the MoreOptions is toggled</param>
483+
/// <param name="documentationURL">Documentation URL</param>
484+
/// <returns>return the state of the foldout header</returns>
462485
public static bool DrawHeaderToggle(GUIContent title, SerializedProperty group, SerializedProperty activeField, Action<Vector2> contextAction = null, Func<bool> hasMoreOptions = null, Action toggleMoreOptions = null, string documentationURL = null)
463486
{
464487
var backgroundRect = GUILayoutUtility.GetRect(1f, 17f);

com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class FreeCamera : MonoBehaviour
3535
/// </summary>
3636
public float m_Turbo = 10.0f;
3737

38+
#if !USE_INPUT_SYSTEM
3839
private static string kMouseX = "Mouse X";
3940
private static string kMouseY = "Mouse Y";
4041
private static string kRightStickX = "Controller Right Stick X";
@@ -44,6 +45,7 @@ public class FreeCamera : MonoBehaviour
4445

4546
private static string kYAxis = "YAxis";
4647
private static string kSpeedAxis = "Speed Axis";
48+
#endif
4749

4850
#if USE_INPUT_SYSTEM
4951
InputAction lookAction;

0 commit comments

Comments
 (0)