Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DX12 raytracing & IET updates for the HDRP template #7531

Merged
merged 30 commits into from
Oct 3, 2022
Merged

DX12 raytracing & IET updates for the HDRP template #7531

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7c00533
converted to DX12, added 2 new RT quality levels
pierre-unity Jun 21, 2022
9882afb
rebaked reflection probes and updated hdrp asset to work with new ref…
pierre-unity Jun 27, 2022
4c54cda
updated RT settings, recaptured a few tutorial images
pierre-unity Jul 4, 2022
592beaf
Added 3rd person controller for testing
Jul 5, 2022
1c22384
updated IET pages, cleaned up hierarchy, updated a few RT settings
pierre-unity Jul 5, 2022
86b8498
Merge branch 'master' into hd-template-dx12-raytracing-IET-updates
pierre-unity Jul 5, 2022
cade6fc
merged master, minor cleanups
pierre-unity Jul 5, 2022
9762ca6
updated IET
pierre-unity Jul 5, 2022
21c54c0
pushed auto updated materials
pierre-unity Jul 5, 2022
c44f4f0
updated materials
pierre-unity Jul 5, 2022
9b1e0da
pushed updated quality levels
pierre-unity Jul 5, 2022
b51e823
added "addtionnal properties" page
pierre-unity Jul 6, 2022
ed92479
added prefab editing scene
pierre-unity Jul 6, 2022
7339b8a
fixed collision on chair (pivot was incorrect)
pierre-unity Jul 6, 2022
2306e48
fixed typos
pierre-unity Jul 7, 2022
96f3546
Added First person controller. Need to remove old one if this is better.
Jul 19, 2022
49fb98b
Small tweaks to Controllers
Jul 27, 2022
04e4a02
Removed old controller
Jul 27, 2022
4af673e
Merge branch 'master' into hd-template-dx12-raytracing-IET-updates
pierre-unity Aug 12, 2022
9929f32
Update low/mid/high volume settings for RTAO and SSR
pierre-unity Aug 12, 2022
33699c3
implemented rendering feedback from Remi
pierre-unity Aug 12, 2022
0075456
Modified 3d Controller textures and changed its camera positioning
Sep 8, 2022
85f58c2
Fixing last commit, didnt push material changes
Sep 9, 2022
3020537
changed mask maps to be TIFs, fixed aliasing around visor, tuned irid…
pierre-unity Sep 9, 2022
1c9d490
set texture to 8bit per channel rather than 16
pierre-unity Sep 9, 2022
5795d0d
Merge branch 'master' into hd-template-dx12-raytracing-IET-updates
pierre-unity Sep 10, 2022
936ae16
disabled receiver motion rejection for RT AO as well
pierre-unity Sep 13, 2022
1954afe
Renamed RTX presets, RT shadows are enabled for both, updated 1 tutor…
Sep 13, 2022
bfd0d74
Update CHANGELOG.md
sebastienlagarde Oct 3, 2022
560e545
bump package version to 15.1
sebastienlagarde Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.template-hd/Assets/HDRPDefaultResources/DefaultLookDevProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ MonoBehaviour:
m_Value: 0
m_MaximumRadiusInPixels:
m_OverrideState: 0
m_Value: 32
m_Value: 40
m_BilateralUpsample:
m_OverrideState: 0
m_Value: 0
m_Value: 1
m_DirectionCount:
m_OverrideState: 0
m_Value: 1
Expand Down
0 ...-hd/Assets/SampleSceneAssets/Scripts.meta → ...Assets/SampleSceneAssets/Controllers.meta
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions com.unity.template-hd/Assets/SampleSceneAssets/Controllers/Common.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions com.unity.template-hd/Assets/SampleSceneAssets/Controllers/Common/BasicRigidBodyPush.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using UnityEngine;

public class BasicRigidBodyPush : MonoBehaviour
{
public LayerMask pushLayers;
public bool canPush;
[Range(0.5f, 5f)] public float strength = 1.1f;

private void OnControllerColliderHit(ControllerColliderHit hit)
{
if (canPush) PushRigidBodies(hit);
}

private void PushRigidBodies(ControllerColliderHit hit)
{
// https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html

// make sure we hit a non kinematic rigidbody
Rigidbody body = hit.collider.attachedRigidbody;
if (body == null || body.isKinematic) return;

// make sure we only push desired layer(s)
var bodyLayerMask = 1 << body.gameObject.layer;
if ((bodyLayerMask & pushLayers.value) == 0) return;

// We dont want to push objects below us
if (hit.moveDirection.y < -0.3f) return;

// Calculate push direction from move direction, horizontal motion only
Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);

// Apply the push and take strength into account
body.AddForce(pushDir * strength, ForceMode.Impulse);
}
}
2 changes: 1 addition & 1 deletion ...ceneAssets/Scripts/PlayerMovement.cs.meta → ...rollers/Common/BasicRigidBodyPush.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions com.unity.template-hd/Assets/SampleSceneAssets/Controllers/Common/InputSystem.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

270 changes: 270 additions & 0 deletions ...ate-hd/Assets/SampleSceneAssets/Controllers/Common/InputSystem/StarterAssets.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
{
"name": "StarterAssets",
"maps": [
{
"name": "Player",
"id": "f62a4b92-ef5e-4175-8f4c-c9075429d32c",
"actions": [
{
"name": "Move",
"type": "Value",
"id": "6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Look",
"type": "Value",
"id": "2690c379-f54d-45be-a724-414123833eb4",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Jump",
"type": "Button",
"id": "8c4abdf8-4099-493a-aa1a-129acec7c3df",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Sprint",
"type": "PassThrough",
"id": "980e881e-182c-404c-8cbf-3d09fdb48fef",
"expectedControlType": "",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "WASD",
"id": "b7594ddb-26c9-4ba2-bd5a-901468929edc",
"path": "2DVector(mode=1)",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "2063a8b5-6a45-43de-851b-65f3d46e7b58",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "64e4d037-32e1-4fb9-80e4-fc7330404dfe",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "0fce8b11-5eab-4e4e-a741-b732e7b20873",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "7bdda0d6-57a8-47c8-8238-8aecf3110e47",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "bb94b405-58d3-4998-8535-d705c1218a98",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "929d9071-7dd0-4368-9743-6793bb98087e",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "28abadba-06ff-4d37-bb70-af2f1e35a3b9",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "45f115b6-9b4f-4ba8-b500-b94c93bf7d7e",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "e2f9aa65-db06-4c5b-a2e9-41bc8acb9517",
"path": "<Gamepad>/leftStick",
"interactions": "",
"processors": "StickDeadzone",
"groups": "Gamepad",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ed66cbff-2900-4a62-8896-696503cfcd31",
"path": "<Pointer>/delta",
"interactions": "",
"processors": "InvertVector2(invertX=false),ScaleVector2(x=0.05,y=0.05)",
"groups": "KeyboardMouse",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d1d171b6-19d8-47a6-ba3a-71b6a8e7b3c0",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "InvertVector2(invertX=false),StickDeadzone,ScaleVector2(x=300,y=300)",
"groups": "Gamepad",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1bd55a0b-761e-4ae4-89ae-8ec127e08a29",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9f973413-5e27-4239-acee-38c4a63feeba",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "dc65b89f-9bd3-43fb-92af-d0d87ba5faa4",
"path": "<Keyboard>/leftShift",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c8fcd86e-dcfd-4f88-8e93-b638cdbf3320",
"path": "<Gamepad>/leftTrigger",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "KeyboardMouse",
"bindingGroup": "KeyboardMouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": true,
"isOR": false
},
{
"devicePath": "<XInputController>",
"isOptional": true,
"isOR": false
},
{
"devicePath": "<DualShockGamepad>",
"isOptional": true,
"isOR": false
}
]
},
{
"name": "Xbox Controller",
"bindingGroup": "Xbox Controller",
"devices": []
},
{
"name": "PS4 Controller",
"bindingGroup": "PS4 Controller",
"devices": []
}
]
}
14 changes: 14 additions & 0 deletions ...d/Assets/SampleSceneAssets/Controllers/Common/InputSystem/StarterAssets.inputactions.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions ...Assets/SampleSceneAssets/Controllers/Common/InputSystem/StarterAssets.inputsettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%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: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
m_Name: StarterAssets.inputsettings
m_EditorClassIdentifier:
m_SupportedDevices: []
m_UpdateMode: 1
m_CompensateForScreenOrientation: 0
m_FilterNoiseOnCurrent: 0
m_DefaultDeadzoneMin: 0.125
m_DefaultDeadzoneMax: 0.925
m_DefaultButtonPressPoint: 0.5
m_DefaultTapTime: 0.2
m_DefaultSlowTapTime: 0.5
m_DefaultHoldTime: 0.4
m_TapRadius: 5
m_MultiTapDelayTime: 0.75
8 changes: 8 additions & 0 deletions ...s/SampleSceneAssets/Controllers/Common/InputSystem/StarterAssets.inputsettings.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading