Skip to content

Commit

Permalink
DX12 raytracing & IET updates for the HDRP template (Unity-Technologi…
Browse files Browse the repository at this point in the history 
…es#7531)

* converted to DX12, added 2 new RT quality levels

* rebaked reflection probes and updated hdrp asset to work with new reflection probe atlas system

* updated RT settings, recaptured a few tutorial images

* Added 3rd person controller for testing
  - Renamed Scripts folder to Controllers
  - Deleted script SimpleCameraController because it was not used
  - Added 3rd person controller

* updated IET pages, cleaned up hierarchy, updated a few RT settings

* merged master, minor cleanups

* updated IET

* pushed auto updated materials

* updated materials

* pushed updated quality levels

* added "addtionnal properties" page

* added prefab editing scene

* fixed collision on chair (pivot was incorrect)

* fixed typos

* Added First person controller. Need to remove old one if this is better.

* Small tweaks to Controllers
  - Enabled Dithering
  - Tweaked the camera to feel more personal for 3rd
  - Created a prefab for 1st

* Removed old controller

* Update low/mid/high volume settings for RTAO and SSR

* implemented rendering feedback from Remi

- slightly moved spotlights in 2 lamp prefabs for optimal path tracing
- disabled receive motion occluder for ssgi
- probe near exit of room 1 increased in size
- removed clear coat from sandblast metal
- set directional shadow fallback for room 1

* Modified 3d Controller textures and changed its camera positioning
  - Changed the way textures were resized. Used bicubic smoother instead of sharper
  - Manually painted the body normal map to fix some issues

* Fixing last commit, didnt push material changes

* changed mask maps to be TIFs, fixed aliasing around visor, tuned iridescence, set max light cluster to 18 for raytracing to avoid light popping

* set texture to 8bit per channel rather than 16

* disabled receiver motion rejection for RT AO as well

* Renamed RTX presets, RT shadows are enabled for both, updated 1 tutorial pagae and 1 image

* Update CHANGELOG.md

* bump package version to 15.1

Co-authored-by: Motiejus Viltrakis <motiejus.viltrakis@hq.unity3d.com>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>
  • Loading branch information
@pierre-unity @sebastienlagarde
3 people committed Oct 3, 2022
1 parent 7a0d8b1 commit f501983
Show file tree
Hide file tree
Showing 216 changed files with 21,723 additions and 1,495 deletions.
4 changes: 2 additions & 2 deletions com.unity.template-hd/Assets/HDRPDefaultResources/DefaultLookDevProfile.asset
View file
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
File renamed without changes.
8 changes: 8 additions & 0 deletions com.unity.template-hd/Assets/SampleSceneAssets/Controllers/Common.meta
View file

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
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

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

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
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

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
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

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

Loading

0 comments on commit f501983

Please sign in to comment.