Files
UnrealEngineUWP/Engine/Shaders/ShadingModels.usf

745 lines
24 KiB
Plaintext
Raw Normal View History

// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
#pragma once
#include "DeferredShadingCommon.usf"
#include "BRDF.usf"
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3028454) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3028439 on 2016/06/27 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28 @ CL 3028090 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3028437 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3027952 on 2016/06/26 by Jurre.deBaare - Integrating code fixes/changes from Simplygon for Normals issue on Simplygon Swarm + landscape culling - Readded landscape/volume culling for in-engine static mesh merging path - Fixed issue with r.HLOD force -1 (now stops forcing hlods) - Marked hlodcullingvolume as experimental - Added Landscape culling flag + precision level #codereview Michael.Noland #rb Michael.Noland #tests build clusters locally/cloud + landscape culling tests Change 3027702 on 2016/06/25 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3027698 #RB:none #Tests:none Change 3027312 on 2016/06/24 by Daniel.Lamb Changed the way reentry data is stored in the cooker, reduce work load by main thread, also fix issue with reentry data being used from incorrect packages. #rb Peter.Sauerbrei #test QA game launch on and cook by the book + cook on the fly paragon Change 3027165 on 2016/06/24 by Daniel.Lamb Fix compiler warnings from cvars changes. #rb none #test cook paragon Change 3026900 on 2016/06/24 by Daniel.Lamb Change the way low quality lightmap shaders are enabled / disabled as the engine can't be used in the should cache function. #rb Marcus.Wasmer #test Cook on the fly paragon #codereview Rolando.Caloca Change 3026874 on 2016/06/24 by Olaf.Piesche #jira OR-18363 fix distortion in particle macro UVs with camera movement #rb frank.fella #tests PC Editor/Game Change 3026494 on 2016/06/24 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3026460 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3026476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3026381 on 2016/06/24 by Graeme.Thornton Strip particle modules, emitters and lodlevels from cooked server data. Saves ~10mb of runtime memory on Paragon #rb simon.tovey #codereview dmitry.rekman #tests pc cooked client/server, golden path Change 3025760 on 2016/06/23 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3025687 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3025709 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword.uasset - can't integrate exclusive file already opened //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword_Skeleton.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3025661 on 2016/06/23 by Mieszko.Zielinski Added a feature to PathfollowingComponent allowing it to identify when it starts following a navigation link #UE4 #rb Lukasz.Furman #test golden path Change 3025359 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #online,externalui,ps4 - expose access to reset cookies before invoking embedded web browser - fixed not capturing resulting Url when PS4 browser is closed #rb none #tests ps4 #ROBOMERGE-SOURCE: CL 3025356 in //Orion/Release-28/... via CL 3025358 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3025184 on 2016/06/23 by Lina.Halper Fix crash with morphtargets #jira: OR-24257 #rb: Rolando.Caloca #tests: switching mesh with different morphtargets in editor Change 3024714 on 2016/06/23 by Lukasz.Furman added vlog extension to visual debugger tool, added object whitelist to vlog to include selected minion data in games started with -LogBotGame param #rb Mieszko.Zielinski #tests server game with and without LogBotGame cmdline Change 3024709 on 2016/06/23 by Daniel.Lamb Added support for async save when saving seperate bulk data file. Added mb saved to cooking package stats. #rb Andrew.Grant,Wes.Hunt #test Cook Paragon Change 3024674 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani Merging //Orion/Release-28 to Main (//Orion/Main) #online,identity,ps4 - add psplus flag to online account after privilege check #rb none #tests ps4 login flow #ROBOMERGE-SOURCE: CL 3024672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3024510 on 2016/06/23 by Graeme.Thornton Added more info to the dumpparticlesystems exec command output #rb simon.tovey #tests cooked pc client, golden path Change 3024504 on 2016/06/23 by Graeme.Thornton Asset registry memory optimisation - make sure all dependency node link arrays are sized exactly as they need to be (saves ~1mb) #rb robert.manuszewski #tests windows cooked client, golden path Change 3024213 on 2016/06/22 by Ryan.Gerleve Handle a rare case in replays where the spectator controller is null but we still find a valid NetGUID for it. Added an ensure before a check that would fail in this case so we'll know if it happens again. #tests replays #rb john.pollard Change 3024127 on 2016/06/22 by John.Pollard Bulk merge using Dev-Networking_->_Dev-General_(Orion) 3002989 Add ability to skip missing/changed properties in FFastArraySerializer 3003072 Fix crash related to new replay backwards compatibility changes 3008097 Renaming CompatibleReplayout to NetFieldExportGroup preparing to unify ability to use FNetFieldExportGroup for both RepLayout and FClassNetCache 3009684 Added ability to use FNetFieldExportGroups for FClassNetCache as well as FRepLayout * Adds ability to track missing/changed custom delta properties names * Adds ability to track missing/changed RPC's 3013455 Add ability to skip over RPC parameters that have changes/missing in replays for backwards compatibility * We now mark FClassNetCache properties as bIncompatible so we don't spam forever when they are out of date * No longer factor in parameters when building checksum for RPC's * Save FNetFieldExport handle for FClassNetCache fields * Use WriteIntWrapped when saving FClassNetCache fields FNetFieldExport handles (and use NetFieldExportGroup->NetFieldExports.Num() to determine max value) * Lots of cleanup and sanity checking improvements 3018078 Optimize replay checkpoints * Share work that was already done during normal replication, and re-use this data to remove the need to compare any checkpoint properties * When saving a checkpoint, we no longer create a new connection and new channels, instead we re-use the existing channels, and added the ability to make this a transient operation * To make custom delta serialize properties work, we compare against the CDO state instead of current state when saving out a checkpoint 3021196 Fix issue with Fast tarray exporting package map info during checkpoints * Add ability to save and restore package map ack status * Save package map ack status before saving checkpoint, and then restore it back afterwards, this will then allow the stream that writes afterward to re-export anything that was new in the checkpoint * No longer queue up reliable bunches on ack list for internal ack connections 3024033 Prune the cached change list before using when saving out checkpoints * Fixes issues when saving checkpoint, and the live properties change array size, which throws everything off when it comes time to use the LifetimeChangelist 3024034 Don't close channels when saving checkpoints, fixes issue where it creates a bunch with bOpen/bClose (because we're forcing all SendBunches to re-open channels), which throws off the stream #rb RyanG #tests Replays Change 3024021 on 2016/06/22 by Dmitry.Rekman Fix PS4 build. #rb Michael.Noland #tests none #codereview Michael.Noland, Dan.Youhon, Sammy.James Change 3023734 on 2016/06/22 by Lukasz.Furman added replication for input events and tool state for both gameplay debugger categories and extensions #ue4 #rb Mieszko.Zielinski #tests PIE, server game Change 3023708 on 2016/06/22 by Dmitry.Rekman Add a separate macro for a poison malloc proxy usage. #rb Michael.Noland #codereview Michael.Noland, Gil.Gribb #tests Compiled OrionServer-Linux-Debug, ran it Change 3023670 on 2016/06/22 by Nick.Darnell Home screen - Fixing safezones on the homescreen. Adding a scale option to the XP_Fill widget. Adding better animations to the tiles. Showing subtitles again. Hero XP summary widget now takes you to that hero. #rb none #tests PIE Change 3023632 on 2016/06/22 by Dmitry.Rekman Fix incorrect matching condition in comments. #rb none #tests Compiled OrionServer-Linux-Debug #codereview Michael.Noland Change 3023475 on 2016/06/22 by Rolando.Caloca O - Back out changelist 3022847 as it broke SSS on PC #rb none #tests re-run editor on PC Change 3023178 on 2016/06/22 by Michael.Noland Engine: Added system memory and % of time spent hitching to analytics #rb bob.tellez #tests Tested a match in Paragon Change 3022963 on 2016/06/22 by Mieszko.Zielinski Fixed a subtle navigation repathing bug #UE4 While repathing to a location, rather than an actor, the navigation query used path's end while it should be using the original query's EndLocation. #rb Lukasz.Furman #test golden path Change 3022865 on 2016/06/22 by David.Ratti gameplay cue editor: remove "GameplayCue_" prefix from default GameplayCueNotify filename in default ability system projects #rb none #tests ability system sample project Change 3022847 on 2016/06/22 by Rolando.Caloca O - Remove checkerboard SSS rendering and recombine post process pass when SSS not enabled #rb Marcus.Wassmer #codereview Marcus.Wassmer, Brian.Karis #tests Load Agora_P, check perf, toggle r.SSS.Quality 1/0, check characters with skin Change 3022804 on 2016/06/22 by Mieszko.Zielinski Fixed AIController clearing out CachedGameplayTasksComponent on UnPosses, even if Pawn was not the CachedGameplayTasksComponent's owner #UE4 Also, made running BT not clearing info in BB if AI's current BB is compatible with the one required by BT #rb Lukasz.Furman #test golden path Change 3022674 on 2016/06/22 by Robert.Manuszewski Reimplementing CL #2993969 (Dev-Blueprints) by Maciej.Mroz: UE-30729 Crash in Native Orion when selecting Sword or Tomahawk Clear AsyncLoading in subobjects. #jira OR-23997 #rb me #tests Golden path in editor build, selecting Venus Change 3022405 on 2016/06/21 by Ryan.Gerleve Fix for OR-23948, crash with death cam enabled. Use a weak pointer to store the viewer on the DemoNetDriver and update it when the game player controller is received. #rb john.pollard #tests bug repro Change 3022387 on 2016/06/21 by Ryan.Gerleve Added the ability to disable ticking of individual worlds. #tests golden path #rb john.pollard #codereview marc.audy Change 3022312 on 2016/06/21 by Nick.Darnell Home Screen - Adding a max aspect ratio lock to SBox, may need some more fine tuning math may still be a bit pants in some cases. The XP ovewview panels now have a basic support for account and hero progression. Hero one shows the last hero you played, widget is invisibile until you play your first game. The tiles now use the Max Aspect Ratio to prevent stretching forever on 21:9 monitors causing them to just look crazy. Weekly quests now show the weekly quests screen when clicked. OrionUserWidgetBase no longer prevents blueprints from running code in reponse to mouse down/up actions if the userwidget consumes input - it always calls the blueprint code first, and always returns handled if it consumes input. #rb none #tests PIE Change 3022207 on 2016/06/21 by Wes.Hunt Fix Analytics provider to retain passed in AppVersion string instead of using default %VERSION%. #rb none #tests run windows server with one bot connecting and checking analytics version is what is expected. Change 3021808 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - call GetTotalMicroseconds instead of GetTotalMilliseconds * 1000 #rb none #tests compile run ps4 #ROBOMERGE-SOURCE: CL 3021805 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021663 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - CancelFindSessions() didn't null out search result - future FindSession() calls would fail with "search in progress" #rb joe.wilcox #tests UT matchmaking #ROBOMERGE-SOURCE: CL 3021655 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021508 on 2016/06/21 by Marcus.Wassmer Remove anti-ghosting AA for now. Causes dithered transparency to be very wrong (Dekker shoulders) And also a border around all characters of 'noisy fuzz' even when they are not moving #rb none #test PC/PS4 #codereview Brian.Karis,Jordan.Walker Change 3021475 on 2016/06/21 by Marcus.Wassmer Duplicate fix for subsurface spec in prep for PS4 optimization. (DevRendering 3018664) unified some code for easier maintainance, fixed missing multiply from former change #rb none #test PS4/PC agora Change 3021468 on 2016/06/21 by Michael.Noland Physics: Added more information when convex cooking partially succeeds (fails initially but succeeds with inflation) indicating the full path of the mesh that failed #rb ori.cohen #tests Compiled changes, will provide more information when issue reoccurs in build machine cooks #jira OR-24082 Change 3021460 on 2016/06/21 by Michael.Noland Engine: Added time spent in each hitch bucket to FPS chart .log output and analytics output #rb bob.tellez #tests Tested a match in Paragon #codereview dmitry.rekman Change 3021368 on 2016/06/21 by Marcus.Wassmer Create Tonemapper configuration with no ColorFringe to save .15ms on PS4 when colorfringe is not used. #rb rolando.caloca #test agora with/wo new config #codereview brian.karis Change 3021119 on 2016/06/21 by David.Ratti Make -notimeouts work during initial connecting phase #codereview John.Pollard #rb none #tests pie agora Change 3021048 on 2016/06/21 by David.Ratti minor tweaks to gameplay cues: -Descriptions of engine GC notify classes -Added 'auto attach to owner' flag on actor notify class. #rb none #test ability system sample project Change 3020694 on 2016/06/20 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3020301 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3020674 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #CodeReview: cody.haskell Change 3020624 on 2016/06/20 by Michael.Noland Engine: Pushing more fps chart analytics up to engine level code from Paragon Engine: Pushing benchmark config vars up to engine level code from Paragon, and added records of individual sub-steps of benchmarks #rb Bob.Tellez #tests Golden path Solo VS AI in Paragon and forced a match #codereview bob.tellez, peter.knepley Change 3020181 on 2016/06/20 by Dmitry.Rekman Re-do allowing allocations in NullRHI (OR-24029). - Originally CL 2990582 by MarcusW, stomped during merge by CL 3006926. #rb none #codereview Marcus.Wassmer, Andrew.Grant #tests none Change 3020139 on 2016/06/20 by Ryan.Gerleve Added ability to pause replay recording while keeping the current replay open. #rb john.pollard #tests paused deathcam recording while disabled Change 3019817 on 2016/06/20 by Dmitry.Rekman Poison allocated/freed memory in Debug and Development (non-editor) configs. - With this Paragon client may be more likely to crash on start. #rb Steve.Robb #codereview Robert.Manuszewski, Michael.Noland, Andrew.Grant, Gil.Gribb, Steve.Robb #tests Built Linux server and Windows client, ran them, also built Windows Orion editor. Change 3019599 on 2016/06/20 by Rolando.Caloca O - Fix flickering on heroes with morph targets #rb Marcus.Wassmer #tests Load Agora_P #jira OR-23866 Change 3019581 on 2016/06/20 by Wes.Hunt Fix crash reporter client analytics for internal builds. (Pushing critical fix immediately from //UE4/Orion-Staging) #rb Chris.Wood #tests none Change 3019524 on 2016/06/20 by David.Ratti call APawn::OnRep_Controller when ClientRetryClientRestart sets the pawn directly #rb none #tests golden path Change 3019406 on 2016/06/20 by Marcus.Wassmer Duplicate 3014956 from Dev-Rendering Fixed HLOD and mesh LODs getting hit by Lightmass ray traces that didn't originate from a mesh Volume lighting samples and precomputed visibility cells are now only placed on LOD0 (of both mesh LODs and HLOD) #rb none #test none #codereview Jordan.Walker Change 3019371 on 2016/06/20 by Graeme.Thornton Optimize cooked asset registry dependency node data structures. Saves ~10mb on Paragon. #rb robert.manuszewski #tests tested with cooked pc client + server Change 3018492 on 2016/06/17 by Laurent.Delayen FBoneReferenceCustomization: support editing properties in AnimBP defaults. #rb none #tests: Sword. Change 3017974 on 2016/06/17 by Ryan.Gerleve Add an option to toggle deathcam in the gameplay settings UI if the OrionRuntimeOption for deathcam is enabled. #rb cody.haskell #tests settings menu, enabled and disabled deathcam Change 3017913 on 2016/06/17 by Robert.Manuszewski Fixing leaked log archive. #rb Steve.Robb #tests Cooked Win64 client + server Change 3017873 on 2016/06/17 by Daniel.Lamb Fix warning in diff cooked build. #test none #rb none Change 3017676 on 2016/06/17 by Sam.Zamani #online,identity,mcp fix for uninitialized variable #rb dmitry.rekman #tests none Change 3017671 on 2016/06/17 by Robert.Manuszewski Fxied and improved log message when cluster assumptions are violated. #rb Steve.Robb #tests Win64 client + server (cooked) golden path Change 3017358 on 2016/06/16 by Nick.Atamas Checking in Darnell's change that adds correct geometry to widgets inside retainer widgets. #rb none #test PIE Change 3017242 on 2016/06/16 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3017179 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3017233 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/UI/Tooltips/Hero/AbilityTooltip.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3017237 on 2016/06/16 by Dmitry.Rekman Fix accessing uninitialized field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant, Ori.Cohen #tests Compiled and ran Linux server. Change 3017236 on 2016/06/16 by Dmitry.Rekman Initialize missed field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant #tests Compiled and ran Linux server. Change 3017186 on 2016/06/16 by Dmitry.Rekman Linux: Add hooks for libcrypto memory functions. - Libcurl uses OpenSSL, which allocates memory using libcrypto's CRYPTO_malloc() and apparently on purpose does not initialize it. - This change a) redirects these allocations to use UE's malloc b) initializes it with zeros, avoiding valgrind's warnings. - This behavior is not used on Shipping configurations because the impact on entropy is not understood (TBD later). #rb Michael.Noland, Rob.Cannaday (original version) #codereview Michael.Noland, Rob.Cannaday, Alex.Fennel, Chris.Babcock, Sam.Zamani #tests Compiled Linux server and ran it. Change 3017037 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Merging content fix for driver crash from Release-27 #ROBOMERGE-SOURCE: CL 3017036 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016838 on 2016/06/16 by Alexis.Matte #jira UE-31901 fix to export all blueprint component to obj #rb uriel.doyon #codereview matt.kuhlenschmidt #test export a blueprint containing multiple staticmesh component to obj Change 3016629 on 2016/06/16 by Dmitry.Rekman Make Binned default on Linux non-editor builds. #codereview Andrew.Grant #rb none #tests none Change 3016615 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Temporarily disabling jemalloc for Linux #rb #tests none [CodeReviewed] Dmitry.Rekman #ROBOMERGE-SOURCE: CL 3016612 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016566 on 2016/06/16 by Michael.Noland Engine: Fixed a regression that broke safe zone debugging features in Windows by reintroducing code from CL# 2861030 that was accidentally deleted in a merge #codereview andrew.grant #rb dan.hertzka #tests Tested r.DebugSafeZone.Mode 1 with r.DebugSafeZone.TitleRatio 0.9 in PIE and confirmed that SSafeZone obeyed it and the red overlay appeared Change 3016521 on 2016/06/16 by Ryan.Gerleve Client recoreded replay fixes and optimizations from Dev-Networking (and one from //UE4/Main), for deathcam. Includes the following CLs from Dev-Networking: 2997908 2998001 2998832 2999054 2999057 2999749 3000051 3001361 3001365 3004958 3009972 3009973 And this CL from //UE4/Main: 3015528 #tests golden path, replays #rb john.pollard Change 3016503 on 2016/06/16 by Brian.Karis Fixed uninitialized variables on particle lights. Fixes hair shading. #rb none #tests editor Change 3016429 on 2016/06/16 by Max.Chen Sequencer: Fix StartTime when clamping start offset 0. Follow up to CL #3009386. #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3016356 on 2016/06/16 by Lina.Halper - Fix crash on rampage morphtarget Merging using //UE4/Dev-Framework_to_//Orion/Dev-General - this is dupe change from Dev-Framework #jira: https://jira.ol.epicgames.net/browse/OR-23194 #rb: Ori.Cohen #tests: editor/pie spawn as rampage's alt skin Change 3015696 on 2016/06/15 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3015646 This re-unifies our build pipeline. Fingers crossed. (only 6 files are actually different) #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3015672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3015642 on 2016/06/15 by Mieszko.Zielinski Fixes to multiple reasons AI bots were getting stuck #Orion #rb Lukasz.Furman #test golden path Change 3015622 on 2016/06/15 by Mieszko.Zielinski fixed FMetaNavMeshPath doing navmesh path update without checking nav agent if pathfinding should be postponed #UE4 #rb Lukasz.Furman #test golden path Change 3015514 on 2016/06/15 by Uriel.Doyon Fixed GlobalMipBias not affecting max texture resolution. This fix is implemented differently in Dev-Rendering in CL 301498. #jira OR-23511 #rb marcus.wassmer #test played game with different quality settings Change 3015258 on 2016/06/15 by Lina.Halper Fix crash with recursive reference between two assets #rb: Ori.Cohen #tests: Sword Change 3014988 on 2016/06/15 by Wes.Hunt Fix Cook Analytics to correctly use the Legacy provider since it sends to a local data collector. #rb daniel.lamb #tests compile Orion Change 3014962 on 2016/06/15 by Olaf.Piesche Replicating CL 3013696 from Dev-Rendering; making quality level spawn rate scale work for GPU emitters. #rb simon.tovey #tests PC editor game Change 3014958 on 2016/06/15 by Laurent.Delayen Added SkeletalMeshComponent::bIncludeComponentLocationIntoBounds to help in cases where SMU_OnlyTickPoseWhenRendered is set, and an animation pushed the mesh beyond the capsule. This ensures that when the capsule is in view, the mesh will remain updated. #rb Michael.Noland #test Sword ultimate from another player's view. Change 3014833 on 2016/06/15 by Laurent.Delayen Fix for Base Heroes having their locomotion blendspace broken. #rb Thomas.Sarkanen #codereview Thomas.Sarkanen #tests Gadget networked PIE Change 3014688 on 2016/06/15 by Nick.Darnell UMG - Fixing IsHovered on UUserWidgets. SObjectWidget did not properly call the super for MouseEnter/MouseLeave allowing SWidget's implementation to set and unset the bool. #rb none #tests PIE Change 3014325 on 2016/06/15 by Marcus.Wassmer Duplicate 3012706: Scalability CVAR for ContactShadows #rb john.billon #test flip cvar in editor. Change 3014230 on 2016/06/15 by Robert.Manuszewski Fix potentially missing log output when serializing text of length equal to the async log writer buffer size. #rb Steve.Robb #tests Tested in editor build (client + server) Change 3013913 on 2016/06/14 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Updating from DMM (updated from 27.1MM) #RB:none #Tests:compiled #ROBOMERGE-SOURCE: CL 3013912 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3013437 on 2016/06/14 by Simon.Tovey Speculative fix for OR-23158 Couldnt' repro NANs but did see it reading garbage. Reinstated the check that direct accesses for particles in a zero size emitter will return null. Altered selection code to reselect when partilce is dead or returns null and to not allow new selection on zero size emitters. #tests GoldenPath, No broken fx and no more reading garbage. #rb Olaf.Piesche Change 3013063 on 2016/06/14 by Jason.Bestimt #ORION_DG - Unclog robomerge from DMM Merge #RB:none #tests:none Change 3012936 on 2016/06/14 by Rob.Cannaday Fix for multiple account login not kicking previous logins Client was not parsing response from backend. Client was expecting content-type to be "application/json" (using FString::Equals). Backend was returning "application/json;charset=UTF-8". Changed usage from FString::Equals to FString::StartsWith #jira FORT-25452 #rb sam.zamani #tests multiple account login, frontend only Merge from FN CL 3011647, plus fixing one other location expecting "application/json" Change 3012696 on 2016/06/14 by Max.Chen Sequencer: Select actors for corresponding selected keys or sections. Copy from Dev-Sequencer #jira UE-30727 #tests Load up AnnounceMaster and select keyframes #rb none Change 3012691 on 2016/06/14 by Max.Chen Sequencer: Fix dragging the leading edge of a skeletal animation section so that it adjusts the start offset of the animation clip. Copy from Dev-Sequencer #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3012690 on 2016/06/14 by Andrew.Grant Removed Linux work-around for memory stomp alignment #rb none #tests compiled Change 3012687 on 2016/06/14 by Max.Chen Sequencer: Fix lower bound when doing post render tick so that the start of a shot doesn't render with the previous shot's time. Copy from Dev-Sequencer #rb none #tests Load up AnnounceMaster and played through sequence Change 3012627 on 2016/06/14 by Mieszko.Zielinski Added logging of current MoveID to PathfollowingComponent's vlog snapshot #UE4 #rb none #test golden path Change 3012615 on 2016/06/14 by Mieszko.Zielinski Improved fix to BTDecorator_Blackboard's latent tasks aborting #UE4 #rb Lukasz.Furman #test golden path Change 3012572 on 2016/06/14 by Dmitry.Rekman Fix realloc with non-default alignment in jemalloc (OR-23541). - Removed obsolete check(), the code was already there since CL 1834526. #rb none #codereview Andrew.Grant, Robert.Manuszewski #tests none Change 3012481 on 2016/06/14 by David.Ratti ability system #include fixups and move orion attribute capture marcros into base engine ability system execution class #rb none #tests ability system sample project Change 3012457 on 2016/06/14 by Andrew.Grant Un-fix misaligned memory-stomp fix for Linux #rb none #tests compiled Change 3012320 on 2016/06/14 by Graeme.Thornton Fixes for MemoryAnalyser2 solution - Upgraded to VS 2015 - Clean up solution configurations. Only leave "Any CPU" - Switch project to build with "Any CPU" rather than "x64". Reimplementation of CL 3012221 from Dev-Core #rb robert.manuszewski #tests opened the main window form correctly in visual studio Change 3012316 on 2016/06/14 by Thomas.Sarkanen Fix copying non-POD structs in the fast path Prevents double-deletions of TArrays etc. #jira UE-31394 - Fix problems with non-POD UStructs using the anim BP fast-path #tests Played PIE & died as Sword in OrionEntry, Exited PIE. #rb Martin.Wilson Change 3012187 on 2016/06/14 by Graeme.Thornton Corrected error message when not specifying linux server device command line correctly in UAT #rb Dmitry.Rekman #tests Checked error message was useful when wrong command line was specified Change 3012026 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3011936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3011996 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/oriongame/Content/Characters/Heroes/Hammer/Abilities/Subjugate/FX/P_SubjugateSwirls.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3011969 on 2016/06/13 by Brian.Karis Tweaks for hair Change 3011638 on 2016/06/13 by Andrew.Grant Fixed issue where RepLayout could use unaligned memoryfor property construction if allocator did not use a suitable default (fixes crash when running with MemStomp). Also added sanity check in UScriptStruct::InitializeStruct that memory is correctly aligned before calling constructor #codereview Dave.Ratti, John.Pollard #rb none #tests Ran with/without memstomp Change 3011575 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3011414 NOTE - Card data was altered. Shame shame shame. Not authoritative in DUI #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith, sammy.james, matt.kuhlenschmidt #ROBOMERGE-SOURCE: CL 3011552 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3011462 on 2016/06/13 by Alexis.Matte #jira UE-31901 The outputdevice is adding 2 uninitialize character at the end of any log, this is cause by the terminator logic. The fix is to not add those characters when no terminator should be add. #rb nick.darnell #codereview Robert.Manuszewski #test export a obj file and verify all object are exported in maya or max Change 3011424 on 2016/06/13 by Martin.Wilson Hack out fastpath anim bp code until heap corruption issue can be fixed. #rb Laurent.Delayen #tests Persona + PIE Change 3011191 on 2016/06/13 by Mieszko.Zielinski Added missing initialization of PathFollowingComponent::CurrentMoveInput #UE4 #rb none #test golden path Change 3011138 on 2016/06/13 by Mieszko.Zielinski Switched bots over from travel mode to sprinting #Orion #rb Lukasz.Furman #test golden path Change 3011075 on 2016/06/13 by David.Ratti Default GameplayAbility instancing policy to InstancePerExecution #rb BenZ #tests compile Change 3011051 on 2016/06/13 by David.Ratti Add missing include so GameplayAbilitySet.h can be included on its own. #rb none #tests compile Change 3010968 on 2016/06/13 by Mieszko.Zielinski Fixed console variables crashing on "" string #UE4 #rb Lukasz.Furman #codereview Martin.Mittring #test PIE Change 3010888 on 2016/06/13 by Alexis.Matte #jira OR-23301 Close the OS handle when closing the FAsyncWriter. #rb Robert.Manuszewski #codereview Robert.Manuszewski #test try to export a obj file Change 3010239 on 2016/06/11 by Michael.Noland UMG - Adding back the logic to use the normal WidgetTree when the DesignerWidgetTree is not defined. [duplicated fix from CL# 2998267] #jira UE-31570 #tests Compiled some blueprints #rb none Change 3009870 on 2016/06/10 by Wes.Hunt Remove logging of analytics payloads from dedicated servers #jira UE-31858 #codereview:dmitry.rekman #rb none #tests All testing was done in Dev-Framework. This change was redone in this branch to get it here faster. Change 3009599 on 2016/06/10 by Michael.Noland Rendering: Corrected a misleading help comment on r.StaticMeshLODDistanceScale, explaining how it affects LOD calculations (it multiplies the effective distance, so larger numbers make transitions happen sooner) #tests Verified in the output of the help command #rb none #rn Change 3009559 on 2016/06/10 by Marcus.Wassmer Fix 11/11/10 SceneColorFormat option, enable AntiGhosting on TemporalAA, ensure TemporalAA output is the correct format for accumulating results. Set SceneColorFormat to 2 on PS4 and lowspec PC. All in all saves .3-.5ms on PS4 and improves temporalAA ghosting. #rb Brian.Karis #test Agora PS4 / PC Change 3009525 on 2016/06/10 by David.Ratti Fix case where ObjectLIbrary would not be able to find classes when searching "/Game" path. #rb none #tests object libraries in paragon Change 3009228 on 2016/06/10 by David.Ratti remove world check. Can be triggered in editor with PIE #rb none #tests pie Change 3009050 on 2016/06/10 by Dmitry.Rekman Fix LinuxClient platform not being built on Windows, and not instantiating a target platform instance. - Fixes by BenM. #rb none #codereview Ben.Marsh #tests Compiled OrionEditor on Linux. Change 3008973 on 2016/06/10 by Marcus.Wassmer Fix Windualshock on VS2015 #rb Rolando.Caloca #test PS4 controller on VS2015 build Change 3008970 on 2016/06/10 by David.Ratti Fix warning about minimal replication tag count -Made bit count a config setting. Bumped to 5 -Minor optimization to UAbilitySystemGlobals::Get() #rb none #tests goldne path, pie Change 3008478 on 2016/06/09 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3008469 #RB:none #Tests:none Change 3008416 on 2016/06/09 by Andrew.Grant Adding 'config' as an option to set both clientconfig / serverconfig when using BuildCookRun #review-3008417 Ben.Marsh, Justin.Sargent #rb none #tests BuildCookRun with config Change 3008286 on 2016/06/09 by Dmitry.Rekman Add LinuxClient target platform. #rb none #tests Compile OrionEditor on Linux. #codereview Brad.Angelcyk, Ben.Marsh Change 3007978 on 2016/06/09 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3007507 #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith #ROBOMERGE-SOURCE: CL 3007968 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3007771 on 2016/06/09 by Laurent.Delayen Fixed GetIntFromComp breaking with INDEX_NONE. Fixes crash in OrientationWarping node. #rb martin.wilson #codereview martin.wilson #tests Sword Leap. Change 3007436 on 2016/06/09 by David.Ratti change designer facing parameter name #rb none #test compile Change 3007408 on 2016/06/09 by David.Ratti WaitGameplayEffectBlockedImmunity - ability task for listening to immunity events #rb danY #tests pie Change 3007250 on 2016/06/09 by bruce.nesbit Banner impact location fix. (OR-23179) #rb none #tests Game+PIE Change 3007228 on 2016/06/09 by Ben.Marsh BuildGraph: Rename -SkipNodesWithoutTickets parameter to -SkipTargetsWithoutTickets, to reflect that it's filtering the list of targets rather than the full graph. #rb none #tests none Change 3007225 on 2016/06/09 by Ben.Marsh EC: Set the -TicketSignature=... parameter for all BuildGraph jobs started by EC to the URL of the current job. Change 3006985 on 2016/06/08 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3006936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3006978 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3006926 on 2016/06/08 by Andrew.Grant Merging //UE4/Main @ 300872 via //UE4/Orion-Staging #rb none #tests engine QA, orion qa smoke Change 3006444 on 2016/06/08 by Ben.Marsh BuildGraph: Add mechanism to specify that nodes can only be built once for a given changelist. Nodes can have an associated ticket file, and they are only permitted to build if the ticket is assigned to the current job. Tickets are created if they don't exist, and written with a signature specific to the job specified via the -TicketSignature="..." parameter. By default, builds will fail if a ticket has been already granted to another job, but the -SkipNodesWithoutTickets parameter instructs the graph to skip affected nodes instead. #rb none #tests none Change 3006389 on 2016/06/08 by Daniel.Lamb Delay the processing of packages which aren't ready till the end of the cook. This allows other packages to be processed sooner. #rb Peter.Sauerbrei #test cook orion. Change 3006306 on 2016/06/08 by Michael.Noland Rendering: Added FreezeRendering to the console autocomplete list #rn Change 3006305 on 2016/06/08 by Michael.Noland HLOD: Added a way to control how far down the HLOD hierarchy to allow showing (can be used to limit quality loss and streaming texture memory usage on high scalability settings for example) Controlled by the new cvar r.HLOD.MaximumLevel, which can be set to the following values: -1: No maximum level (default) 0: Prevent ever showing a HLOD cluster instead of individual meshes 1: Allow only the first level of HLOD clusters to be shown 2+: Allow up to the Nth level of HLOD clusters to be shown Note: This does not affect the memory used by the HLOD meshes itself or their always loaded low mip levels, it will only save the memory associated with streaming in the higher mip levels HLOD: Allowed r.HLOD console command to be used in Test configurations HLOD: Removed some dead code in ALODActor and scene view / scene proxy relating to a different way to force visualization that has no trigger HLOD: Fixed an uninitialized memory bug in the static mesh scene proxy HLODcoloration visualization code #rn #codereview jurre.debaare #rb marc.audy #tests Tested with various settings in Paragon and tried creating some new clusters in the editor Change 3006304 on 2016/06/08 by Michael.Noland Engine: Changed the code in AActor::IncrementalRegisterComponents to obey bAutoRegister for the root component rather than asserting that it is true. Note: If children components have bAutoRegister=true, they will still pull the root component into the fray and cause it to be registered first #rb marc.audy #tests Tested with code that registers or unregisters HLOD clusters at varying levels in Paragon Change 3006041 on 2016/06/08 by Andrew.Grant Added buildidoverride to shipping whitelist #rb none #tests compiled and used param in shipping Change 3005678 on 2016/06/08 by Ben.Marsh Back out changelist 3004395 #rb none #tests none Change 3005265 on 2016/06/07 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3005120 #RB: none #Tests: none #ROBOMERGE-SOURCE: CL 3005250 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3005081 on 2016/06/07 by Daniel.Lamb Reworked the way packages which are renamed on load are added to the cooked package list. Cooker now has options for MaxMemoryAllowance as a percentage and also MinFreeMemory (which takes into account used system memory not just total system memory). #rb Andrew.Grant, Marcus.Wasmer #test cook orion Change 3004752 on 2016/06/07 by Daniel.Lamb Requeue packages to the next package on the list instead of to the end of the list. #rb Andrew.Grant #test cook orion Change 3004560 on 2016/06/07 by David.Ratti Kill timelines, latent actions, timer when recycling gameplay cues #rb danY #tests pie Change 3004559 on 2016/06/07 by David.Ratti Object Library: -Added bool bIncludeOnlyOnDiskAssets that can be set by owner. Passed on to the AR filter when gathering assets. GameplayCue Editor: -Fix issue with new notifies not showing up after being created through the GC Editor (until restart). -Fix issue for new projects, that don't have gameplayclue tags defined, not being able to add gameplay cue tags through the editor without restarting once. #rb none #tests editor Change 3004395 on 2016/06/07 by Ben.Marsh BuildGraph: Add a script function to ensure exclusive access to a given resource. The AcquireLockFile() function takes two arguments; a path to a text file, and the name of an owner. The file is created and the owner name written to it if it doesn't already exist, otherwise the contents of it are compared against the given owner string. The operation happens transactionally, and the function returns true if file contains the given owner string on exit. Logical and/or conditions are now also short-circuited, so the result of the AcquireLockFile() function can be used to control derived property definitions within an executing job. #rb none #tests none Change 3004164 on 2016/06/07 by David.Ratti Ability system: use player controller netmode over avatar actor when possible. Fixes issue if torn off, authority, client side actor tries to activate an ability. #rb danY #tests multi pie Change 3003837 on 2016/06/07 by David.Ratti Ability system engine work -Default to /Game as search path for gameplay cues, if no explicit paths are set in the config. #rb none #tests ability sample project Change 3002800 on 2016/06/06 by Marcus.Wassmer Fix shader crash in PIE #rb none #test PIE Change 3002657 on 2016/06/06 by Dmitry.Rekman Do not copy to clipboard on crash if headless or on the wrong thread. - Could result in crash handler crashing itself in some circumstances. #rb none #codereveiw Brad.Angelcyk #tests Compiled Linux dedicated server and CrashReportClient. Change 3002546 on 2016/06/06 by Daniel.Lamb Improve cooking performance. Allow cooker to save other packages opportunistically if main package is compiling shaders. Allow cooker to load more packages if there aren't many packages to save. #rb Josh.Adams #test cook orion Change 3002369 on 2016/06/06 by Marcus.Wassmer Project setting for optional rendering features to reduce shader compile times. # of shaders per material is reduced by ~30-40% depending on material #rb Daniel.Wright #test Editor with/without all options, cooked ps4. Change 3002142 on 2016/06/06 by David.Ratti Ability system engine level: -Fix crash when gameplay cue editor starts if there are no gameplay cue paths specified -Fix crash when GameplayCue tag is not specified #rb none #tests sample ability system project, paragon Change 3002106 on 2016/06/06 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #orion - add support for code tokens which can be shared/redeemed - refactor of existing friend founder's pack codes to be displayed in a generic way using code token info - added CodeToken.FounderFriendInviteT0 for new paragon tier 0 code which grants access to game without also giving a Founder's pack - added CodeToken.FounderFriendInviteT1 to replace existing CodeToken.FriendPC and CodeToken.FriendPS4 Founder's pack codes. Existing codes aliased to the new CodeToken.FounderFriendInviteT1 code - No longer differentiation between PC/PS4 friend codes - "Share Friend Code" button will now process all available codes that can be issued instead of just 1 - updated Orion service Mcp call for getUnredeemedCodes() to ignore the code template id and return all available codes. Each returned code will also include the type [CodeReviewed]: david.nikdel, jason.bestimt #rb david.nikdel #tests PC PIE using localhost and profile proxy for granting codes, also existing account with legacy codes #ROBOMERGE-SOURCE: CL 3002104 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3001218 on 2016/06/05 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3001162 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3001200 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 2999508 on 2016/06/03 by jason.bestimt #ORION_MAIN - Merge 27 @ CL 2999463 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 2999498 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Audio/ClassesAndMixes/Classes/Master.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 2999465 on 2016/06/03 by Robert.Manuszewski Whitelisting more DLLs for injection. #rb none #tests none Change 2999455 on 2016/06/03 by Lukasz.Furman disabled path invalidation events for minions #orion #rb Mieszko.Zielinski #tests PIE with additional debug logging Change 2998488 on 2016/06/02 by Michael.Noland Engine: Prevent forced drawing of spline components in Test configuration #codereview james.golding #tests Ran a cooked Test build on a map with splines in it #rb david.ratti #robomerge: main Change 2997954 on 2016/06/02 by Jason.Bestimt #ROBOMERGE-AUTHOR: jon.lietz OR-22425 no longer try to updat the tag map and modifiers when the gameplay effect that is being removed was not active. #RB Dave.Ratti #Tests golden path #ROBOMERGE-SOURCE: CL 2997940 in //Orion/Release-0.27/... via CL 2997943 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 2997750 on 2016/06/02 by Graeme.Thornton Add FPakFile::Check() that attempts to open and read the data out of every file in a pak, to check for corruption Added -checkpak option for force a check of every mounted pak file #rb robert.manuszewski #tests tested against cooked pc client. made sure my data succeeded. made sure corrupted data throws an error. [CL 3031715 by Andrew Grant in Main branch]
2016-06-28 17:59:42 -04:00
#include "FastMath.usf"
#if 0
void StandardShadingShared( float3 DiffuseColor, float3 SpecularColor, float Roughness, float3 V, half3 N )
{
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
// Diffuse_Lambert
Shared.DiffuseMul = DiffuseColor * (1.0 / PI);
// D_GGX, Vis_SmithJointApprox
float m = Roughness * Roughness;
Shared.m2 = m * m;
Shared.SpecularMul = (0.5 / PI) * Shared.m2;
Shared.VisMad = float2( 2 * NoV * ( 1 - m ) + m, NoV * m );
// F_Schlick
Shared.SpecularMul *= saturate( 50.0 * SpecularColor.g );
}
void StandardShadingPerLight( Shared, float3 L, float3 V, half3 N )
{
float3 H = normalize(V + L); // 3 add, 2 mad, 4 mul, 1 rsqrt
float NoL = saturate( dot(N, L) ); // 2 mad, 1 mul
float NoH = saturate( dot(N, H) ); // 2 mad, 1 mul
float VoH = saturate( dot(V, H) ); // 2 mad, 1 mul
// D_GGX, Vis_SmithJointApprox
float d = ( NoH * Shared.m2 - NoH ) * NoH + 1; // 2 mad
float v = NoL * Shared.VisMad.x + Shared.VisMad.y; // 1 mad
float D_Vis = Shared.SpecularMul * rcp( d * d * v ); // 3 mul, 1 rcp
// F_Schlick
float Fc = pow( 1 - VoH, 5 ); // 1 sub, 3 mul
float3 F = Fc + (1 - Fc) * SpecularColor; // 1 sub, 3 mad
return Shared.DiffuseMul + D_Vis * F; // 3 mad
}
#endif
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3122278) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3109545 on 2016/09/01 by Zabir.Hoque Merging DX12 RHIs stage 1. #Tests Ran InfiltratorDemo, ElementalDemo, ShooterGame Change 3109580 on 2016/09/01 by Zabir.Hoque Merging DX12 RHI. Stage 2: Moving XB and Windows APIs to a common location. This will cause a build break, but will allow us to preserve history. Change 3109632 on 2016/09/01 by Zabir.Hoque Merge DX12 RHI. Stage 3. Ported all changes and merged RHI into common and Win and XB1 specialized folder. Current with MS partners branch and Release 4.13. Change 3109690 on 2016/09/01 by Zabir.Hoque Fixing build break after large merge from partners branch and syncing to latest Dev-Rendering. Change 3109716 on 2016/09/01 by Zabir.Hoque Fix build warnings after merge. Change 3109733 on 2016/09/01 by Zabir.Hoque More build fixes for things pointing from XboxOneD3D12RHI to D3D12RHI Change 3109773 on 2016/09/01 by Zabir.Hoque Fixing code analysis warnings. Change 3109870 on 2016/09/01 by Rolando.Caloca DR - Simple clear mode Change 3110066 on 2016/09/01 by Zabir.Hoque Remove C++11 feature so VS2013 can compile for Fortnite. Change 3110335 on 2016/09/01 by Brian.Karis Fixed double lighting of clear coat, cloth, and eyes #review-3108222 @Ben.Woodhouse Change 3110411 on 2016/09/01 by Rolando.Caloca DR - vk - Fix bogus assert - Fix pipeline barrier with levelCount=0 Change 3110573 on 2016/09/01 by Zabir.Hoque Exclude D3D12 merged RHI from Mac Builds. Change 3110681 on 2016/09/01 by Rolando.Caloca DR - vk - Swapchain fix for drivers returning infinite swapchain images Change 3110936 on 2016/09/01 by Rolando.Caloca DR - vk - Fix crash when dumping unused heaps - Show file/line if enabled Change 3111034 on 2016/09/01 by Rolando.Caloca DR - vk - Fix exclude rect clear Change 3111139 on 2016/09/01 by Rolando.Caloca DR - Automatically enable capturing mode if running under RenderDoc Change 3111170 on 2016/09/01 by Rolando.Caloca DR - vk - Store max info per descriptor set pool Change 3111234 on 2016/09/01 by Zabir.Hoque XB1 compiler warnings. Change 3111763 on 2016/09/02 by Rolando.Caloca DR - Fix typo in shader PR #2759 #jira UE-35496 Change 3111846 on 2016/09/02 by Rolando.Caloca DR - vk - Update to SDK 1.0.24.0 (including glslang) Change 3111916 on 2016/09/02 by Ben.Woodhouse Fix for timestamp query results being broken in the XB1 DX11 RHI (caused by a merge issue with dev-platform) Also clarify some variable naming Change 3112048 on 2016/09/02 by Rolando.Caloca DR - vk - Compile fix for build machines Change 3112315 on 2016/09/02 by Rolando.Caloca DR - vk - Added peak usage to mem dump Change 3112791 on 2016/09/02 by Daniel.Wright FD3D12PipelineStateCache debug fix Change 3113483 on 2016/09/05 by Ben.Woodhouse Fix potential issue with timestamp and occlusion queries overlapping with new query packing optimisation. We may want to put these into separate buffers to avoid reduce the padding with timestamp queries (timestamp queries currently use 4x the memory they actually need due to additional padding) Change 3113488 on 2016/09/05 by Ben.Woodhouse GPu profiler : fix for render thread performance issues, enable GPU profiler by default Avoids RHIThread stalls in query creation by reusing queries via a pool. A FRenderQueryPool class already existed for doing this, so this was moved into the engine to make it accessible from both the engine and renderer modules Tested on XB1,PS4,PC dx11 Change 3114286 on 2016/09/06 by Chris.Bunner Copying CL 3114173 from 4.13 - Better enforce render resource limits on widget draw size.Jira UE-26375. Change 3114883 on 2016/09/06 by Rolando.Caloca DR - vk - Delete resources on the RHI thread - Set blend factor to 1 - Added num mips & num layers to RT views - Added missing destructors - Fix for crash on rhi thread Change 3116308 on 2016/09/07 by Rolando.Caloca DR - vk - New renderpass/transition/barrier rewrite for sm4 (disabled) - Fixes for 3d texture RTs Change 3117409 on 2016/09/08 by Gil.Gribb Merging //UE4/Dev-Main@3117389 to Dev-Rendering (//UE4/Dev-Rendering) Change 3117445 on 2016/09/08 by Gil.Gribb Fix merge fallout Change 3117555 on 2016/09/08 by Rolando.Caloca DR - Fix merge issue Change 3117687 on 2016/09/08 by Marc.Olano Create new Vector Noise material node, and *3DDeriv numerical derivative material functions Vector Noise node has noise functions with 3D output, including cellnoise (random color per cell), computed noise with vector output, gradient of 3D noise, curl of 3D noise, and version of Voronoi noise returning seed position in the closest Voronoi cell. 3DDeriv functions compute gradient and curl on any expression using centered differences from four samples offset in a tetrahedral pattern (two fewer than the common axis-aligned offset method) Change 3117696 on 2016/09/08 by Rolando.Caloca DR - Replicate 4.13.1 fix from 3117678 UE4.13 - Better error reporting when SCW fails/crashes jira UE-17227 Change 3117720 on 2016/09/08 by Rolando.Caloca DR - vk - Fix for static analysis Change 3117786 on 2016/09/08 by Rolando.Caloca DR - vk - Use new alignment Change 3118145 on 2016/09/08 by Marcus.Wassmer Fix async compute clear not waiting for the gfx pipe properly. Also appears to fix a rare PS4 gpu hang. Change 3118329 on 2016/09/08 by Brian.Karis Fix screen size calculations for LOD Change 3118351 on 2016/09/08 by Brian.Karis Quadric mesh simplifier! In and working for the first time. ScreenSize is now correctly calculated from MaxDeviation Pixel Error now a reduction setting in LOD group. Binary Heap is fixed and functional. Still needs to play better with 3rd party reduction. Change 3118457 on 2016/09/08 by Rolando.Caloca DR - vk - Fix cube & 3d texture transitions & copies Change 3118540 on 2016/09/08 by Benjamin.Hyder Re-Submitting Noise assets to get engine version Change 3119438 on 2016/09/09 by Rolando.Caloca DR - vk - Added barrier & cache flushes when reading back GPU memory - Added cubemap & 3d texture barriers - Added cubemap & 3d texture copy image Change 3119518 on 2016/09/09 by Brian.Karis Fixed compile error Change 3119580 on 2016/09/09 by Marc.Olano Documentation for Vector noise Change 3119710 on 2016/09/09 by Rolando.Caloca DR - vk - Fix read stencil mask & front/back Change 3119865 on 2016/09/09 by Rolando.Caloca DR - vk - RHIReadSurfaceFloatData - Fix redundant write transitions - Simplify copy and transition code Change 3120059 on 2016/09/09 by Rolando.Caloca DR - vk - Static analysis warnings Change 3120413 on 2016/09/09 by Mark.Satterthwaite Fix AVFMedia plugin failing when a movie has captions. #jira UE-35828 Change 3120936 on 2016/09/12 by Ben.Woodhouse Add slate rendering to the GPU stats Change 3121204 on 2016/09/12 by Rolando.Caloca DR - vk - Fix geometry shaders position - Revert translucent workaround Change 3121467 on 2016/09/12 by Rolando.Caloca DR - Fix integration issue (lost some shader defines) Change 3121862 on 2016/09/12 by Zabir.Hoque Fixing Code Analysis warnings. #jira: UE-35860 Change 3122139 on 2016/09/12 by Ben.Woodhouse Re-enable the checkerboard lighting by default to workaround skin lighting issue in fortnite (again) #jira UE-35886 Change 3122278 on 2016/09/12 by Zabir.Hoque 2nd Attempt at Code Analysis warnings [CL 3122339 by Marcus Wassmer in Main branch]
2016-09-12 22:23:27 -04:00
float3 StandardShading( float3 DiffuseColor, float3 SpecularColor, float3 LobeRoughness, float3 LobeEnergy, float3 L, float3 V, half3 N )
{
float3 H = normalize(V + L);
float NoL = saturate( dot(N, L) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
float NoH = saturate( dot(N, H) );
float VoH = saturate( dot(V, H) );
// Generalized microfacet specular
float D = D_GGX( LobeRoughness[1], NoH ) * LobeEnergy[1];
float Vis = Vis_SmithJointApprox( LobeRoughness[1], NoV, NoL );
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
float3 F = F_Schlick( SpecularColor, VoH );
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
float3 Diffuse = Diffuse_Lambert( DiffuseColor );
//float3 Diffuse = Diffuse_Burley( DiffuseColor, LobeRoughness[1], NoV, NoL, VoH );
//float3 Diffuse = Diffuse_OrenNayar( DiffuseColor, LobeRoughness[1], NoV, NoL, VoH );
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3122278) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3109545 on 2016/09/01 by Zabir.Hoque Merging DX12 RHIs stage 1. #Tests Ran InfiltratorDemo, ElementalDemo, ShooterGame Change 3109580 on 2016/09/01 by Zabir.Hoque Merging DX12 RHI. Stage 2: Moving XB and Windows APIs to a common location. This will cause a build break, but will allow us to preserve history. Change 3109632 on 2016/09/01 by Zabir.Hoque Merge DX12 RHI. Stage 3. Ported all changes and merged RHI into common and Win and XB1 specialized folder. Current with MS partners branch and Release 4.13. Change 3109690 on 2016/09/01 by Zabir.Hoque Fixing build break after large merge from partners branch and syncing to latest Dev-Rendering. Change 3109716 on 2016/09/01 by Zabir.Hoque Fix build warnings after merge. Change 3109733 on 2016/09/01 by Zabir.Hoque More build fixes for things pointing from XboxOneD3D12RHI to D3D12RHI Change 3109773 on 2016/09/01 by Zabir.Hoque Fixing code analysis warnings. Change 3109870 on 2016/09/01 by Rolando.Caloca DR - Simple clear mode Change 3110066 on 2016/09/01 by Zabir.Hoque Remove C++11 feature so VS2013 can compile for Fortnite. Change 3110335 on 2016/09/01 by Brian.Karis Fixed double lighting of clear coat, cloth, and eyes #review-3108222 @Ben.Woodhouse Change 3110411 on 2016/09/01 by Rolando.Caloca DR - vk - Fix bogus assert - Fix pipeline barrier with levelCount=0 Change 3110573 on 2016/09/01 by Zabir.Hoque Exclude D3D12 merged RHI from Mac Builds. Change 3110681 on 2016/09/01 by Rolando.Caloca DR - vk - Swapchain fix for drivers returning infinite swapchain images Change 3110936 on 2016/09/01 by Rolando.Caloca DR - vk - Fix crash when dumping unused heaps - Show file/line if enabled Change 3111034 on 2016/09/01 by Rolando.Caloca DR - vk - Fix exclude rect clear Change 3111139 on 2016/09/01 by Rolando.Caloca DR - Automatically enable capturing mode if running under RenderDoc Change 3111170 on 2016/09/01 by Rolando.Caloca DR - vk - Store max info per descriptor set pool Change 3111234 on 2016/09/01 by Zabir.Hoque XB1 compiler warnings. Change 3111763 on 2016/09/02 by Rolando.Caloca DR - Fix typo in shader PR #2759 #jira UE-35496 Change 3111846 on 2016/09/02 by Rolando.Caloca DR - vk - Update to SDK 1.0.24.0 (including glslang) Change 3111916 on 2016/09/02 by Ben.Woodhouse Fix for timestamp query results being broken in the XB1 DX11 RHI (caused by a merge issue with dev-platform) Also clarify some variable naming Change 3112048 on 2016/09/02 by Rolando.Caloca DR - vk - Compile fix for build machines Change 3112315 on 2016/09/02 by Rolando.Caloca DR - vk - Added peak usage to mem dump Change 3112791 on 2016/09/02 by Daniel.Wright FD3D12PipelineStateCache debug fix Change 3113483 on 2016/09/05 by Ben.Woodhouse Fix potential issue with timestamp and occlusion queries overlapping with new query packing optimisation. We may want to put these into separate buffers to avoid reduce the padding with timestamp queries (timestamp queries currently use 4x the memory they actually need due to additional padding) Change 3113488 on 2016/09/05 by Ben.Woodhouse GPu profiler : fix for render thread performance issues, enable GPU profiler by default Avoids RHIThread stalls in query creation by reusing queries via a pool. A FRenderQueryPool class already existed for doing this, so this was moved into the engine to make it accessible from both the engine and renderer modules Tested on XB1,PS4,PC dx11 Change 3114286 on 2016/09/06 by Chris.Bunner Copying CL 3114173 from 4.13 - Better enforce render resource limits on widget draw size.Jira UE-26375. Change 3114883 on 2016/09/06 by Rolando.Caloca DR - vk - Delete resources on the RHI thread - Set blend factor to 1 - Added num mips & num layers to RT views - Added missing destructors - Fix for crash on rhi thread Change 3116308 on 2016/09/07 by Rolando.Caloca DR - vk - New renderpass/transition/barrier rewrite for sm4 (disabled) - Fixes for 3d texture RTs Change 3117409 on 2016/09/08 by Gil.Gribb Merging //UE4/Dev-Main@3117389 to Dev-Rendering (//UE4/Dev-Rendering) Change 3117445 on 2016/09/08 by Gil.Gribb Fix merge fallout Change 3117555 on 2016/09/08 by Rolando.Caloca DR - Fix merge issue Change 3117687 on 2016/09/08 by Marc.Olano Create new Vector Noise material node, and *3DDeriv numerical derivative material functions Vector Noise node has noise functions with 3D output, including cellnoise (random color per cell), computed noise with vector output, gradient of 3D noise, curl of 3D noise, and version of Voronoi noise returning seed position in the closest Voronoi cell. 3DDeriv functions compute gradient and curl on any expression using centered differences from four samples offset in a tetrahedral pattern (two fewer than the common axis-aligned offset method) Change 3117696 on 2016/09/08 by Rolando.Caloca DR - Replicate 4.13.1 fix from 3117678 UE4.13 - Better error reporting when SCW fails/crashes jira UE-17227 Change 3117720 on 2016/09/08 by Rolando.Caloca DR - vk - Fix for static analysis Change 3117786 on 2016/09/08 by Rolando.Caloca DR - vk - Use new alignment Change 3118145 on 2016/09/08 by Marcus.Wassmer Fix async compute clear not waiting for the gfx pipe properly. Also appears to fix a rare PS4 gpu hang. Change 3118329 on 2016/09/08 by Brian.Karis Fix screen size calculations for LOD Change 3118351 on 2016/09/08 by Brian.Karis Quadric mesh simplifier! In and working for the first time. ScreenSize is now correctly calculated from MaxDeviation Pixel Error now a reduction setting in LOD group. Binary Heap is fixed and functional. Still needs to play better with 3rd party reduction. Change 3118457 on 2016/09/08 by Rolando.Caloca DR - vk - Fix cube & 3d texture transitions & copies Change 3118540 on 2016/09/08 by Benjamin.Hyder Re-Submitting Noise assets to get engine version Change 3119438 on 2016/09/09 by Rolando.Caloca DR - vk - Added barrier & cache flushes when reading back GPU memory - Added cubemap & 3d texture barriers - Added cubemap & 3d texture copy image Change 3119518 on 2016/09/09 by Brian.Karis Fixed compile error Change 3119580 on 2016/09/09 by Marc.Olano Documentation for Vector noise Change 3119710 on 2016/09/09 by Rolando.Caloca DR - vk - Fix read stencil mask & front/back Change 3119865 on 2016/09/09 by Rolando.Caloca DR - vk - RHIReadSurfaceFloatData - Fix redundant write transitions - Simplify copy and transition code Change 3120059 on 2016/09/09 by Rolando.Caloca DR - vk - Static analysis warnings Change 3120413 on 2016/09/09 by Mark.Satterthwaite Fix AVFMedia plugin failing when a movie has captions. #jira UE-35828 Change 3120936 on 2016/09/12 by Ben.Woodhouse Add slate rendering to the GPU stats Change 3121204 on 2016/09/12 by Rolando.Caloca DR - vk - Fix geometry shaders position - Revert translucent workaround Change 3121467 on 2016/09/12 by Rolando.Caloca DR - Fix integration issue (lost some shader defines) Change 3121862 on 2016/09/12 by Zabir.Hoque Fixing Code Analysis warnings. #jira: UE-35860 Change 3122139 on 2016/09/12 by Ben.Woodhouse Re-enable the checkerboard lighting by default to workaround skin lighting issue in fortnite (again) #jira UE-35886 Change 3122278 on 2016/09/12 by Zabir.Hoque 2nd Attempt at Code Analysis warnings [CL 3122339 by Marcus Wassmer in Main branch]
2016-09-12 22:23:27 -04:00
return Diffuse * LobeEnergy[2] + (D * Vis) * F;
}
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
float3 SimpleShading( float3 DiffuseColor, float3 SpecularColor, float Roughness, float3 L, float3 V, half3 N )
{
float3 H = normalize(V + L);
float NoH = saturate( dot(N, H) );
// Generalized microfacet specular
float D = D_GGX( Roughness, NoH );
float Vis = Vis_Implicit();
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
float3 F = F_None( SpecularColor );
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
return Diffuse_Lambert( DiffuseColor ) + (D * Vis) * F;
}
float3 ClearCoatShading( FGBufferData GBuffer, float3 LobeRoughness, float3 LobeEnergy, float3 L, float3 V, half3 N )
{
const float ClearCoat = GBuffer.CustomData.x;
const float ClearCoatRoughness = GBuffer.CustomData.y;
const float Film = 1 * ClearCoat;
const float MetalSpec = 0.9;
#if 1
float3 H = normalize(V + L);
float NoL = saturate( dot(N, L) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
float NoH = saturate( dot(N, H) );
float VoH = saturate( dot(V, H) );
// Generalized microfacet specular
float D = D_GGX( LobeRoughness[0], NoH ) * LobeEnergy[0];
float Vis = Vis_Kelemen( VoH );
// F_Schlick
float F0 = 0.04;
float Fc = Pow5( 1 - VoH );
float F = Fc + (1 - Fc) * F0;
F *= ClearCoat;
float Fr1 = D * Vis * F;
float LayerAttenuation = (1 - F);
Copying //UE4/Release-Staging-4.12 to //UE4/Dev-Main (Source: //UE4/Release-4.12 @ 2955635) ========================== MAJOR FEATURES + CHANGES ========================== Change 2955635 on 2016/04/26 by Max.Chen Sequencer: Fix filtering so that folders that contain filtered nodes will also appear. #jira UE-28213 Change 2955617 on 2016/04/25 by Dmitriy.Dyomin Better fix for: Post processing rendering artifacts Nexus 6 this device on Android 5.0.1 does not support BGRA8888 texture as a color attachment #jira: UE-24067 Change 2955522 on 2016/04/25 by Max.Chen Sequencer: Fix crash when resolving object guid and context is null. #jira UE-29916 Change 2955504 on 2016/04/25 by Alexis.Matte #jira UE-29926 Fix build error for SplineComponent. I just move variable under #if !UE_BUILD_SHIPPING instead #if WITH_EDITORONLY_DATA to fix all build flavor, please feel free to adjust according to what the initial fix was suppose to do. Change 2955500 on 2016/04/25 by Dan.Oconnor Integration of 2955445 from Dev-BP #jira UE-29012 Change 2955234 on 2016/04/25 by Lina.Halper Fixed tool tip of twist node #jira : UE-29907 Change 2955211 on 2016/04/25 by Ben.Marsh Exclude all plugins which aren't required for a project (ie. don't have any content or modules for the current target) from its target receipt. Prevents dependencies on .uplugin files whose dependencies are otherwise compiled out. Re-enable PS4Media plugin by default. #jira UE-29842 Change 2955155 on 2016/04/25 by Jamie.Dale Fixed an issue where text committed via a focus loss might not display the correct text if it was changed during commit #jira UE-28756 Change 2955144 on 2016/04/25 by Jamie.Dale Fixed a case where editable text controls would fail to select their text when focused There was an order of operations issue between the options to select all text and move the cursor to the end of the document, which caused the cursor move to happen after the select all, and undo the selection. The order of these operations has now been flipped. #jira UE-29818 #jira UE-29772 Change 2955136 on 2016/04/25 by Chad.Taylor Merging to 4.12: Morpheus latency fix. Late update tracking frame was getting unnecessarily buffered an extra frame on the RHI thread. Removed buffering and the issue is fixed. #jira UE-22581 Change 2955134 on 2016/04/25 by Lina.Halper Removed code that blocks moving actor when they don't have physics asset #jira : UE-29796 #code review: Benn.Gallagher Change 2955130 on 2016/04/25 by Zak.Middleton #ue4 - (4.12) Don't reject low distance MTD, it could cause us to not process some valid overlaps. (copy of 2955001 in Main) #jira UE-29531 #lockdown Nick.Penwarden Change 2955098 on 2016/04/25 by Marc.Audy Don't spawn a child actor on the client if the server is going to have created one and be replicating it to the client #jira UE-7539 Change 2955049 on 2016/04/25 by Richard.TalbotWatkin Changes to how SplineComponents debug render. Added a SetDrawDebug method to control whether a spline is rendered. Also extended the facility to non-editor builds. #jira UE-29753 - Add ability to display a SplineComponent in-game Change 2955040 on 2016/04/25 by Chris.Gagnon Fixed Initializer Order Warning in hot reload ctor. #jira UE-28811, UE-28960 Change 2954995 on 2016/04/25 by Marc.Audy Make USceneComponent::Pre/PostNetReceive and PostRepNotifies protected instead of private so that subclasses can implement replication behaviors #jira UE-29909 Change 2954970 on 2016/04/25 by Peter.Sauerbrei fix for openwrite with O_APPEND flag #jira UE-28417 Change 2954917 on 2016/04/25 by Chris.Gagnon Moved a desired change from Main to 4.12 Added input settings to: - control if the viewport locks the mouse on acquire capture. - control if the viewport acquires capture on the application launch (first window activate). #jira UE-28811, UE-28960 parity with 4.11 (UE-28811, UE-28960 would be reintroduced without this) Change 2954908 on 2016/04/25 by Alexis.Matte #jira UE-29478 Prevent modal dialog to use 100% of a core Change 2954888 on 2016/04/25 by Marcus.Wassmer Fix compile issue with chinese locale #jira UE-29708 Change 2954813 on 2016/04/25 by Lina.Halper Fix when not re-validating the correct asset #jira : UE-29789 #code review: Martin.Wilson Change 2954810 on 2016/04/25 by mason.seay Updated map to improve coverage #jira UE-29618 Change 2954785 on 2016/04/25 by Max.Chen Sequencer: Always spawn sequencer spawnables. Disregard collision settings. #jira UE-29825 Change 2954781 on 2016/04/25 by mason.seay Test map for Audio Occlusion trace channels #jira UE-29618 Change 2954684 on 2016/04/25 by Marc.Audy Add GetIsReplicated accessor to AActor Deprecate specific GameplayAbility class implementations that was exposing bReplicates #jira UE-29897 Change 2954675 on 2016/04/25 by Alexis.Matte #jira UE-25430 Light Intensity value in FBX is a ratio. So I just multiply the default intensity value by the ratio to have something closer to the look in the DCCs Change 2954669 on 2016/04/25 by Alexis.Matte #jira UE-29507 Import of rigid mesh animation is broken Change 2954579 on 2016/04/25 by Ben.Marsh Temporarily stop the PS4Media plugin being enabled by default, so the UE4Game built for the binary release doesn't depend on it. Will implement whitelist/blacklist for platforms later. #jira UE-29842 Change 2954556 on 2016/04/25 by Taizyd.Korambayil #jira UE-29877 Setup ThirdPersonCharacter based on correct Code Class Change 2954552 on 2016/04/25 by Taizyd.Korambayil #jira UE-29877 Deleting BP class Change 2954498 on 2016/04/25 by Ryan.Gerleve Fix for remote player controllers reporting that they're actually local player controllers after a seamless travel on the server. Transition actors to the new level in a second pass after non-transitioning actors are handled. #jira UE-29213 Change 2954446 on 2016/04/25 by Max.Chen Sequencer: Fixed spawning actors with instance or multiple owned components - Also fixed issue where recorded actors were sometimes set as transient, meaning they didn't get saved #jira UE-29774, UE-29859 Change 2954430 on 2016/04/25 by Marc.Audy Don't schedule a tick function with a tick interval that was disabled while it was pending rescheduling #jira UE-29118 #jira UE-29747 Change 2954292 on 2016/04/25 by Richard.TalbotWatkin Replicated from //UE4/Dev-Editor CL 2946363 (by Frank.Fella) CurveEditorViewportClient - Bounds check when box selecting. Prevents crashing when the box is outside the viewport. #jira UE-29265 - Crash when drag selecting curve keys in matinee Change 2954262 on 2016/04/25 by Graeme.Thornton Fixed a editor crash when destroying linkers half way through a package EndLoad #jira UE-29437 Change 2954239 on 2016/04/25 by Marc.Audy Fix error message #jira UE-00000 Change 2954177 on 2016/04/25 by Dmitriy.Dyomin Fixed: Hidden surface removal is not enabled on PowerVR Android devices #jira UE-29871 Change 2954026 on 2016/04/24 by Josh.Adams [Somehow most files got unchecked in my previous checkin, grr] - ProtoStar content/config updates (enabled TAA in the levels, disabled es2 shaders, hides the Unbuilt lighting warning on Android) #lockdown nick.penwarden #jira UE-29863 Change 2954025 on 2016/04/24 by Josh.Adams - ProtoStar content/config updates (enabled TAA in the levels, disabled es2 shaders, hides the Unbuilt lighting warning on Android) #lockdown nick.penwarden #jira UE-29863 Change 2953946 on 2016/04/24 by Max.Chen Sequencer: Fix crash on undo of a sub section. #jira UE-29856 Change 2953898 on 2016/04/23 by mitchell.wilson #jira UE-29618 Adding subscene_001 sequence for nonlinear workflow testing Change 2953859 on 2016/04/23 by Maciej.Mroz Merged from Dev-Blueprints 2953858 #jira UE-29790 Editor crashes when opening KiteDemo Change 2953764 on 2016/04/23 by Max.Chen Sequencer: Remove "Experimental" tag on the Level Sequence Actor #jira UETOOl-625 Change 2953763 on 2016/04/23 by Max.Chen Cinematics: Change text to "Edit Existing Cinematics" #jira UE-29102 Change 2953762 on 2016/04/23 by Max.Chen Sequencer: Follow up time slider hit testing fix. Don't hit test the selection range if it's empty. This was causing false positives when hovering close to the ranges. #jira UE-29658 Change 2953652 on 2016/04/22 by Rolando.Caloca UE4.12 - vk - Workaround driver bugs wrt texture format caps #jira UE-28140 Change 2953596 on 2016/04/22 by Marcus.Wassmer #jira UE-20276 Merging dual normal clearcoat shading model. 2863683 2871229 2876362 2876573 2884007 2901595 Change 2953594 on 2016/04/22 by Chris.Babcock Disable crash handler for VulkanRHI on Android to prevent sig11 on loading driver #jira UE-29851 #ue4 #android Change 2953520 on 2016/04/22 by Rolando.Caloca UE4.12 - vk - Enable deferred resource deletion - Added one resource heap per memory type - Improved DumpMemory() - Added ensures for missing format features #jira UE-28140 Change 2953459 on 2016/04/22 by Taizyd.Korambayil #jira UE-29748 Resaved Maps to Fix EC Build Warnings #jira UE-29744 Change 2953448 on 2016/04/22 by Ryan.Gerleve Fix Mac/Linux compile. #jira UE-29545 Change 2953311 on 2016/04/22 by Ryan.Gerleve Fix for infinite hang when loading a replay from within an actor tick while demo.AsyncLoadWorld is false. LoadMap for the replay is now deferred using the existing PendingNetGame mechanism. Added virtual UPendingNetGame::LoadMapCompleted function so that the base PendingNetGame and DemoPendingNetGame can have different behavior. To keep things simpler, also parse all replay metadata and streaming levels after the LoadMap call. #jira UE-29545 Change 2953219 on 2016/04/22 by mason.seay Test map for show collision features #jira UE-29618 Change 2953199 on 2016/04/22 by Phillip.Kavan [UE-29449] Fix InitProperties() optimization for Blueprint class instances when array property values differ in size. change summary: - improved UBlueprintGeneratedClass::BuildCustomArrayPropertyListForPostConstruction() by continuing to emit only delta entries for array values that exceed the default array value's size; previously we emitted a NULL in this case to signal a need to initialize all remaining array values in InitProperties(), even if they didn't differ from the default value of the inner property (which in most cases would already have been set at construction time, and thus potentially incurred a redundant copy iteration for each entry) - modified FObjectInitializer::InitArrayPropertyFromCustomList() to no longer reset the array value on the instance prior to initialization - added code to properly resize the array on the instance prior to initialization (if it differs in size from the default array value) - removed code that handled a NULL property value in the custom property list stream (this is no longer necessary, see above) - modified FObjectInitializer::InitProperties() to restore the post-construction optimization for Blueprint class instances (back to being enabled by default) #jira UE-29449 Change 2953195 on 2016/04/22 by Max.Chen Sequencer: Fix crash in actor reference track in the cached guid to actor map. #jira UE-27523 Change 2953124 on 2016/04/22 by Rolando.Caloca UE4.12 - vk - Increase temp frame buffer #jira UE-28140 Change 2953121 on 2016/04/22 by Chris.Babcock Rebuilt lighting for all levels #jira UE-29809 Change 2953073 on 2016/04/22 by mason.seay Test assets for notifies in animation composites and montages #jira UE-29618 Change 2952960 on 2016/04/22 by Richard.TalbotWatkin Changed eye dropper operation so that LMB click selects a color, and pressing Esc cancels the selection and restores the old color. #jira UE-28410 - Eye dropper selects color without clicking Change 2952934 on 2016/04/22 by Allan.Bentham Ensure pool's refractive index >= 1 #jira UE-29777 Change 2952881 on 2016/04/22 by Jamie.Dale Better fix for UE-28560 that doesn't regress thumbnail rendering We now just silence the warning if dealing with an inactive world. #jira UE-28560 Change 2952867 on 2016/04/22 by Thomas.Sarkanen Fix issues with matinee-controlled anim instances Regression caused by us no longer saving off the anim sequence between updates. #jira UE-29812 - Protostar Neutrino spawns but does not Animate or move. Change 2952826 on 2016/04/22 by Maciej.Mroz Merged from Dev-Blueprints 2952820 #jira UE-28895 Nativizing a blueprint project causes the next non-nativizing package attempt to fail Change 2952819 on 2016/04/22 by Josh.Adams - Fixed crash in a Vulkan shader printout #lockdown nick.penwarden #jira UE-29820 Change 2952817 on 2016/04/22 by Rolando.Caloca UE4.12 - vk - Revert back to simple layouts #jira UE-28140 Change 2952792 on 2016/04/22 by Jamie.Dale Removed some code that caused worlds loaded by the Content Browser to be initialized before they were ready Supposedly this code existed for world thumbnail rendering, however only the active editor world generates a thumbnail, so initializing other worlds wasn't having any effect and thumbnails look identical to before. #jira UE-28560 Change 2952783 on 2016/04/22 by Taizyd.Korambayil #jira UE-28477 Resaved Flying Template Map Change 2952767 on 2016/04/22 by Taizyd.Korambayil #jira UE-29736 Resaved Map to Fix EC Warnings Change 2952762 on 2016/04/22 by Allan.Bentham Update reflection capture to contain only room5 content. #jira UE-29777 Change 2952749 on 2016/04/22 by Taizyd.Korambayil #jira UE-29740 Resaved Material and Map to Fix Empty Engine Version Error Change 2952688 on 2016/04/22 by Martin.Wilson Fix for BP notifies not displaying when they derive from an abstract base class #jira UE-28556 Change 2952685 on 2016/04/22 by Thomas.Sarkanen Fix CIS for non-editor builds #jira UE-29308 - Fix crash from GC-ed animation asset Change 2952664 on 2016/04/22 by Thomas.Sarkanen Made up/down behaviour for console history consistent and reverted to old ordering by default Pressing up or down now brings up history. Sorting can now be optionally bottom-to-top or top-to-bottom. Default behaviour is preserved to what it was before the recent changes. #jira UE-29595 - Console autocomplete behavior is non-intuitive / frustrating Change 2952655 on 2016/04/22 by Jamie.Dale Changed the class filter to use an expression evaluator This makes it consistent with the other filters in the editor #jira UE-29811 Change 2952647 on 2016/04/22 by Allan.Bentham Back out changelist 2951539 #jira UE-29777 Change 2952618 on 2016/04/22 by Benn.Gallagher Fixed naming error in rotation multiplier node #jira UE-29583 Change 2952612 on 2016/04/22 by Thomas.Sarkanen Fix garbage collection and undo/redo issues with anim instance proxy UObject-based properties are now cached each update on the proxy and nulled-out outside of evaluate/update phases. Moved some initialization code for CurrentAsset/CurrentVertexAnim from the proxy back to the instance (as its is encapsulated there now). #jira UE-29308 - Fix crash from GC-ed animation asset Change 2952608 on 2016/04/22 by Richard.TalbotWatkin Changed 'Recently Used Levels' and 'Favorite Levels' to hold long package names instead of absolute paths. This means they are now project-relative and will remain valid even if the project location changes. #jira UE-29731 - Editor map recent files are not project relative, leading to missing links when moving projects. Change 2952599 on 2016/04/22 by Dmitriy.Dyomin Disabled vulkan pipeline cache as it causes rendering artifacts right now #jira UE-29807 Change 2952540 on 2016/04/22 by Maciej.Mroz #jira UE-29787 Obsolete nativized files are never removed merged from Dev-Blueprints 2952531 Change 2952372 on 2016/04/21 by Josh.Adams - Fixed Vk memory allocations when reusing free pages #lockdown nick.penwarden #jira ue-29802 Change 2952350 on 2016/04/21 by Eric.Newman Added support for UEReleaseTesting backends to Orion and Ocean #jira op-3640 Change 2952140 on 2016/04/21 by Dan.Oconnor Demoted back to warning to fix regressions in content examples, in main we've added the ability to elevate warnings to errors, but no reason to rush that feature into 4.12 #jira UE-28971 Change 2952135 on 2016/04/21 by Jeff.Farris Fixed issue in PlayerCameraManager where the priority-based sorting of CameraModifiers wasn't sorting properly. Manual re-implementation of CL 2948123 in 4.12 branch. #jira UE-29634 Change 2952121 on 2016/04/21 by Lee.Clark PS4 - 4.12 - Fix staging and deploying of system prxs #jira UE-29801 Change 2952120 on 2016/04/21 by Rolando.Caloca UE4.12 - vk - Move descriptor allocation to BSS #jira UE-21840 Change 2952027 on 2016/04/21 by Rolando.Caloca UE4.12 - vk - Fix descriptor sets lifetimes - Fix crash with null texture #jira UE-28140 Change 2951890 on 2016/04/21 by Eric.Newman Updating locked common dependencies for OrionService #jira OP-3640 Change 2951863 on 2016/04/21 by Eric.Newman Updating locked dependencies for UE 4.12 OrionService #jira OP-3640 Change 2951852 on 2016/04/21 by Owen.Stupka Fixed meteors destruct location #jira UE-29714 Change 2951739 on 2016/04/21 by Max.Chen Sequencer: Follow up for integral keys. #jira UE-29791 Change 2951717 on 2016/04/21 by Rolando.Caloca UE4.12 - Fix shader platform names #jira UE-28140 Change 2951714 on 2016/04/21 by Max.Chen Sequencer: Fix setting a key if it already exists at the current time. #jira UE-29791 Change 2951708 on 2016/04/21 by Rolando.Caloca UE4.12 - vk - Separate upload cmd buffer #jira UE-28140 Change 2951653 on 2016/04/21 by Marc.Audy If a child actor component is destroyed during garbage collection, do not rename, instead clear the caching mechanisms so that a new name is chosen if a new child is created in the future Remove now unused bRenameRequired parameter #jira UE-29612 Change 2951619 on 2016/04/21 by Chris.Babcock Move bCreateRenderStateForHiddenComponents out of WITH_EDITOR #jira UE-29786 #ue4 Change 2951603 on 2016/04/21 by Cody.Albert #jira UE-29785 Revert Github readme page back to original Change 2951599 on 2016/04/21 by Ryan.Gerleve Fix assert when attempting to record a replay when the map has a placed actor that writes replay external data (such as ACharacter) #jira UE-29778 Change 2951558 on 2016/04/21 by Chris.Babcock Always rename destroyed child actor #jira UE-29709 #ue4 Change 2951552 on 2016/04/21 by James.Golding Remove old code for handling 'show collision' in game, uses same method as editor now, fixes hidden meshes showing up in game when doing 'show collision' #jira UE-29303 Change 2951539 on 2016/04/21 by Allan.Bentham Use screenuv for distortion with ES2/31. #jira UE-29777 Change 2951535 on 2016/04/21 by Max.Chen We need to test if the hmd is enabled if it exists. Otherwise, this will return true even if we aren't rendering in stereo if there's an hmd plugin loaded. #jira UE-29711 Change 2951521 on 2016/04/21 by Taizyd.Korambayil #jira UE-29746 Replaced Deprecated Time Handler node in GameLevel_GM Change 2951492 on 2016/04/21 by Jeremiah.Waldron Fix for Android IAP information reporting back incorrectly. #jira UE-29776 Change 2951486 on 2016/04/21 by Taizyd.Korambayil #jira UE-29741 Updated Infiltrator Demo Project to open with the correct Map Change 2951450 on 2016/04/21 by Gareth.Martin Fix non-editor build #jira UE-16525 Change 2951380 on 2016/04/21 by Gareth.Martin Fix Landscape layer blend nodes not updating connections correctly when an input is changed from weight/alpha (one input) to height blend (two inputs) or vice-versa #jira UE-16525 Change 2951357 on 2016/04/21 by Richard.TalbotWatkin Fixed a crash when pushing a new menu leads to a window activation change which would result in the old root menu being dismissed. #jira UE-27981 - [CrashReport] Crash When Attempting to Select Variable Type After Clearing the Name Field Change 2951352 on 2016/04/21 by Richard.TalbotWatkin Added slider bar thickness as a new property in FSliderStyle. #jira UE-19173 - SSlider is not fully stylable Change 2951344 on 2016/04/21 by Gareth.Martin Fix bounds calculation for landscape splines that was causing the first landscape spline point to be invisible and later points to flicker. - Also fixes landscape spline lines not showing up on a flat landscape #jira UE-25114 Change 2951326 on 2016/04/21 by Taizyd.Korambayil #jira UE-28477 Resaving Maps Change 2951271 on 2016/04/21 by Jamie.Dale Fixed a crash when pasting a path containing a class into the asset view of the Content Browser #jira UE-29616 Change 2951237 on 2016/04/21 by Jack.Porter Fix black screen on PC due to planar reflections #jira UE-29664 Change 2951184 on 2016/04/21 by Jamie.Dale Fixed crash in FCurveStructCustomization when no objects were selected for editing #jira UE-29638 Change 2951177 on 2016/04/21 by Ben.Marsh Fix hot reload from IDE failing when project is up to date. UBT returns an exit code of 2, and any non-zero exit code is treated as an error by Visual Studio. Build.bat was not correctly forwarding on the exit code at all prior to CL 2790858. #jira UE-29757 Change 2951171 on 2016/04/21 by Matthew.Griffin Fixed issue with Rebuild not working when installed in Program Files (x86) The brackets seem to cause lots of problems in combination with the if/else ones #jira UE-29648 Change 2951163 on 2016/04/21 by Jamie.Dale Changed the text customization to use the property handle functions to get/set the text value That ensures that it both transacts and notifies correctly. Added new functions to deal with multiple objects selection efficiently with the existing IEditableTextProperty API: - FPropertyHandleBase::SetPerObjectValue - FPropertyHandleBase::GetPerObjectValue - FPropertyHandleBase::GetNumPerObjectValues These replace the need to cache the raw pointers. #jira UE-20223 Change 2951103 on 2016/04/21 by Thomas.Sarkanen Un-deprecated blueprint functions for attachment/detachment Renamed functions to <FuncName> (Deprecated). Hid functions in the BP context menu so new ones cant be added. #jira UE-23216 - "Snap to Target, Keep World Scale" when attaching doesn't work properly if parent is scaled. Change 2951101 on 2016/04/21 by Allan.Bentham Enable mobile HQ DoF #jira UE-29765 Change 2951097 on 2016/04/21 by Thomas.Sarkanen Standalone games now benefit from parallel anim update if possible We now simply use the fact we want root motion to determine if we need to run immediately. #jira UE-29431 - Parallel anim update does not work in non-multiplayer games Change 2951036 on 2016/04/21 by Lee.Clark PS4 - Fix WinDualShock working with VS2015 #jira UE-29088 Change 2951034 on 2016/04/21 by Jack.Porter ProtoStar: Removed content not needed by remaining maps, resaved all content to fix version 0 issues #jira UE-29666 Change 2950995 on 2016/04/21 by Jack.Porter ProtoStar - delete unneeded maps #jira UE-29665 Change 2950787 on 2016/04/20 by Nick.Darnell SuperSearch - Moving the settings object into a seperate plugin to avoid there needing to be a circular dependency between SuperSearch and UnrealEd. #jira UE-29749 #codeview Ben.Marsh Change 2950786 on 2016/04/20 by Nick.Darnell Back out changelist 2950769 - Going to re-enable super search - about to move the settings into a plugin to prevent the circular reference. #jira UE-29749 Change 2950769 on 2016/04/20 by Ben.Marsh Comment out editor integration for super search to fix problems with the circular dependencies breaking hot reload and compiling QAGame in binary release. Change 2950724 on 2016/04/20 by Lina.Halper Support for negative scaling for mirroring - Merging CL 2950718 using //UE4/Dev-Framework_to_//UE4/Release-4.12 #jira: UE-27453 Change 2950293 on 2016/04/20 by andrew.porter Correcting sequencer test content #jira UE-29618 Change 2950283 on 2016/04/20 by Marc.Audy Don't route FlushPressedKeys on PIE shut down #jira UE-28734 Change 2950071 on 2016/04/20 by mason.seay Adjusted translation retargeting on head bone of UE4_Mannequin -Needed for anim bp test. Tested animations and did not see any fallout from change. If there is, it can be reverted. #jira UE-29618 Change 2950049 on 2016/04/20 by Mark.Satterthwaite Undo CL #2949690 and instead on Mac where we want to be able to capture videos of gameplay we just insert an intermediate texture as the back-buffer and use a manual blit to the drawable prior to present. This also changes the code to enforce that the back-buffer render-target should never be nil as the code & Metal API itself assumes that this situation cannot occur but it would appear from continued crashes inside PrepareToDraw that it actually can in the field. This will address another potential cause of UE-29006. #jira UE-29006 #jira UE-29140 Change 2949977 on 2016/04/20 by Max.Chen Sequencer: Add FieldOfView to default tracks for CameraActor. Add FieldOfView to exclusion list for CineCameraActor. #jira UE-29660 Change 2949836 on 2016/04/20 by Gareth.Martin Fix landscape components flickering when perfectly flat (bounds size is 0) - This often happens for newly created landscapes #jira UE-29262 Change 2949768 on 2016/04/20 by Thomas.Sarkanen Moving parent & grouped child actors now does not result in deltas being applied twice Grouping and attachment now interact correctly. Also fixed up according to coding standard. Discovered and proposed by David.Bliss2 (Rocksteady). #jira UE-29233 - Delta applied twice when moving parent and grouped child actors From UDN: https://udn.unrealengine.com/questions/286537/moving-parent-grouped-child-actors-results-in-delt.html Change 2949759 on 2016/04/20 by Thomas.Sarkanen Fix split pins not working as anim graph node inputs Limit surface area of this change by only modifying the anim BP compiler. A better version might be to move the call in the general blueprint compiler but it is riskier. #jira UE-12326 - Splitting a struct in an Anim Blueprint does not work Change 2949739 on 2016/04/20 by Thomas.Sarkanen Fix layered bone per blend accessed from a struct in the fast-path Made sure that the fallback event is always built (logic was still split so if PatchFunctionNamesAndCopyRecordsInto aborted because of some unhandled case if might not have an event to call). Covered struct source->array dest case. Indicator icon is now built from the copy record itself, ensuring it is accurate to actual runtime data. #jira UE-29389 - Fast-Path: Layered Blend per Bone node failing to grab updated values from struct. Change 2949715 on 2016/04/20 by Max.Chen Sequencer: Fix mouse wheel zoom so it defaults to zooming in on the current time/frame. This is a toggleable option in the Editor Preferences (Zoom Position = Current Time or Mouse Position) #jira UE-29661 Change 2949712 on 2016/04/20 by Taizyd.Korambayil #jira UE-28544 adjusted Player crosshair to be centered Change 2949710 on 2016/04/20 by Alexis.Matte #jira UE-29477 Pixel Inspector, UI get polish and adding "scene color" inspect property Change 2949706 on 2016/04/20 by Alexis.Matte #jira UE-29475 #jira UE-29476 Favorite allow all UProperty to be favorite (the FStruct is now supported) Favorite scrollig is auto adjust to avoid scrolling when adding/removing a favorite Change 2949691 on 2016/04/20 by Mark.Satterthwaite Fix typo from previous commit - retain not release... #jira UE-29140 Change 2949690 on 2016/04/20 by Mark.Satterthwaite Double-buffer the Metal viewport's back-buffer so that we can access the contents of the back-buffer after EndDrawingViewport is called until BeginDrawingViewport is called again on this viewport, this makes it possible to capture movies on Metal. #jira UE-29140 Change 2949616 on 2016/04/20 by Marc.Audy 'Merge' latest version of Vulkan from Dev-Rendering to Release-4.12 #jira UE-00000 Change 2949572 on 2016/04/20 by Jamie.Dale Fixed crash undoing a text property changed caused by a null entry in the array #jira UE-20223 Change 2949562 on 2016/04/20 by Alexis.Matte #jira UE-29447 Fix the batch fbx import "not show options" dialog where some option can be different. Change 2949560 on 2016/04/20 by Alexis.Matte #jira UE-28898 Avoid importing multiple static mesh in the same package Change 2949547 on 2016/04/20 by Mark.Satterthwaite You must use STENCIL_COMPONENT_SWIZZLE to access the stencil component of a texture - not all APIs can swizzle it into .g automatically. #jira UE-29672 Change 2949443 on 2016/04/20 by Allan.Bentham Disable sRGB textures when ES31 feature level is set. Only use vk's sRGB formats when feature level > ES3_1 #jira UE-29623 Change 2949428 on 2016/04/20 by Allan.Bentham Back out changelist 2949405 #jira UE-29623 Change 2949405 on 2016/04/20 by Allan.Bentham Disable sRGB textures when ES31 feature level is set. Only use vk's sRGB formats when feature level > ES3_1 #jira UE-29623 Merging using Dev-Mobile_->_Release-4.12 Change 2949391 on 2016/04/20 by Richard.TalbotWatkin PIE with multiple windows now starts focused on Client 1, or the server if not a dedicated server. Added a new virtual call UEditorEngine::OnLoginPIEAllComplete, called when all clients have been successfully logged in when starting PIE. The default behavior is to set focus to the first client. #jira UE-26037 - Cumbersome workflow when running PIE with 2 clients #jira UE-26905 - First client window does not gain focus or mouse control when launching two clients Change 2949389 on 2016/04/20 by Richard.TalbotWatkin Fixed regression which was saving the viewport config settings incorrectly. Viewports are keyed by their layout on the same key as the config key, hence we do not need to prepend the SpecificLayoutString when saving out the config data when iterating through a layout's viewports. #jira UE-29058 - Viewport settings are not saved after shutting down editor Change 2949388 on 2016/04/20 by Richard.TalbotWatkin Change auto-reimport settings so that "Detect Changes on Startup" defaults to true. Also removed the warning of potential unwanted behaviour when working in conjunction with source control; this is no longer necessary now that there is a prompt prior to auto-reimport. #jira UE-29257 - Auto import does not import assets Change 2949203 on 2016/04/19 by Max.Chen Sequencer: Fix spawnables not getting default tracks. #jira UE-29644 Change 2949202 on 2016/04/19 by Max.Chen Sequencer: Fix particles not firing on loop. #jira UE-27881 Change 2949201 on 2016/04/19 by Max.Chen Sequencer: Fix multiple labels support #jira UE-26812 Change 2949200 on 2016/04/19 by Max.Chen Sequencer: Expose settings sequencer settings in the Editor Preferences page. Note, UMG and Niagara have separate sequencer settings pages. #jira UE-29516 Change 2949197 on 2016/04/19 by Max.Chen Sequencer: Fix unwind rotation when keying rotation so that rotations are always set to the nearest. #jira UE-22228 Change 2949196 on 2016/04/19 by Max.Chen Sequencer: Disable selection range drawing if it's empty so that playback range dragging can take precedence when they overlap. This fixes a bug where you can't drag the starting playback range when sequencer starts up. #jira UE-29657 Change 2949195 on 2016/04/19 by Max.Chen MovieSceneCapture: Default image compression quality to 100 (rather than 75). #jira UE-29657 Change 2949194 on 2016/04/19 by Max.Chen Sequencer: Matinee to Level Sequence fix for mapping properties correctly. This fixes focus distance not getting set properly on the conversion. #jira UETOOL-467 Change 2949193 on 2016/04/19 by Max.Chen Sequencer - Fix issues with level visibility. + Don't mark sub-levels as dirty when the track evaluates. + Fix an issue where sequencer gets into a refresh loop because drawing thumbnails causes levels to be added which was rebuilding the tree, which was redrawing thumbnails. + Null check for when an objects world is null but the track is still evaluating. + Remove UnrealEd references. #jira UE-25668 Change 2948990 on 2016/04/19 by Aaron.McLeran #jira UE-29654 FadeIn invalidates Audio Components in 4.11 Change 2948890 on 2016/04/19 by Jamie.Dale Downgraded an assert in SPathView::LoadSettings to avoid a common crash when a saved path no longer exists #jira UE-28858 Change 2948860 on 2016/04/19 by Mike.Beach Mirroring CL 2940334 (from Dev-Blueprints): Bettering CreateEvent node errors, so users are able to recover from API changes (not clearing the function name field, calling out the function by name in the error, etc.) #jira UE-28911 Change 2948857 on 2016/04/19 by Jamie.Dale Added an Asset Localization context menu to the Content Browser This allows you to create, edit, and view localized assets from any source asset, as well as edit and view source assets from any localized asset. #jira UE-29493 Change 2948854 on 2016/04/19 by Jamie.Dale UAT now stages all project translation targets #jira UE-20248 Change 2948831 on 2016/04/19 by Mike.Beach Mirroring CL 2945994 (from Dev-Blueprints): Pasting EdGraphNodes will no longer query sub-nodes for compatibility if the root cannot be pasted (for things like collapsed graphs, and anim state-machine nodes). #jira UE-29035 Change 2948825 on 2016/04/19 by Jamie.Dale Fixed shadow warning #jira UE-29212 Change 2948812 on 2016/04/19 by Marc.Audy Gracefully handle failure to load configurable engine classes #jira UE-26527 Change 2948791 on 2016/04/19 by Jamie.Dale Fixed regression in SEditableText bIsCaretMovedWhenGainFocus when using auto-complete Fixed regression in FSlateEditableTextLayout::SetText that caused it to call OnTextChanged when nothing had changed #jira UE-29494 #jira UE-28886 Change 2948761 on 2016/04/19 by Jamie.Dale Sub-fonts are now only used when they contain the character to be rendered #jira UE-29212 Change 2948718 on 2016/04/19 by Jamie.Dale Fixed an issue where FEnginePackageLocalizationCache could be initialized before CoreUObject was ready This is now done lazily, either when the first CDO tries to load an asset (which is after CoreUObject is ready), or after the first call to ProcessNewlyLoadedUObjects (if no CDO loads an asset). #jira UE-29649 Change 2948717 on 2016/04/19 by Jamie.Dale Removed the AssetRegistry's dependency on MessageLog It was only there to add a category that was only ever used by the AssetTools module. #jira UE-29649 Change 2948683 on 2016/04/19 by Phillip.Kavan [UE-18419] Fix GetClassDefaults nodes to update properly in response to structural BP class changes. change summary: - modified UK2Node_GetClassDefaults::CreateOutputPins() to bind/unbind delegate handlers for the OnChanged() & OnCompile() events for BP class types. #jira UE-18419 Change 2948681 on 2016/04/19 by Phillip.Kavan [UE-17794] The "Delete Unused Variable" feature now considers the GetClassDefaults node as well. change summary: - added external linkage to UK2Node_GetClassDefaults::FindClassPin(). - added an include for the K2Node_GetClassDefaults header file to BlueprintGraphDefinitions.h. - added UK2Node_GetClassDefaults::GetInputClass() as a public API w/ external linkage; moved default 'nullptr' param logic into this impl. - modified FBlueprintEditorUtils::IsVariableUsed() to add an extra check for a GetClassDefaults node with a visible output pin for the variable that's also connected. - modified UK2Node_GetClassDefaults::GetInputClass() to return the generated skeleton class for Blueprint class types. #jira UE-17794 Change 2948638 on 2016/04/19 by Lee.Clark PS4 - Fix SDK compile warnings #jira UE-29647 Change 2948401 on 2016/04/19 by Taizyd.Korambayil #jira UE-29250 Revuilt Lighting for Landscapes Map Change 2948398 on 2016/04/19 by Mark.Satterthwaite Add a Mac Metal ES2 shader platform to allow the various ES2 emulation modes to work in the Editor. Fix various issues with the shader code to ensure that Metal can run with ES2 shader code at least in my limited test cases in QAGame. #jira UE-29170 Change 2948366 on 2016/04/19 by Taizyd.Korambayil #jira UE-29109 Replaced Box Mesh with BSP Floor Change 2948360 on 2016/04/19 by Maciej.Mroz merged from Dev-Blueprints 2947488 #jira UE-29115 Nativized BulletTrain - cannot shoot targets in intro tutorial #jira UE-28965 Packaging Project with Nativize Blueprint Assets Prevents Overlap Events from Firing #jira UE-29559 - fixed private enum access - fixed private bitfield access - removed forced PostLoad - add BodyInstance.FixupData call to fix ResponseChannels - ignored RelativeLocation and RelativeRotation in converted root component - fixed AttachToComponent (UE-29559) Change 2948358 on 2016/04/19 by Maciej.Mroz merged from Dev-Blueprints 2947953 #jira UE-29605 Wrong bullet trails in nativized ShowUp Fixed USimpleConstructionScript::GetSceneRootComponentTemplate. Change 2948357 on 2016/04/19 by Maciej.Mroz merged from Dev-Blueprints 2947984 #jira UE-29374 Crash when hovering over Create Widget node in blueprints Safe UK2Node_ConstructObjectFromClass::GetPinHoverText. Change 2948353 on 2016/04/19 by Maciej.Mroz merged from Dev-Blueprints 2948095 #jira UE-29246 ExpandEnumAsExecs + UMETA(Hidden) Crashes Blueprint Compile "Hidden" and "Spacer" elementa from an enum does not generated exec pins for "ExpandEnumAsExecs" Change 2948332 on 2016/04/19 by Benn.Gallagher Fixed old pins being left as non-transactional #jira UE-13801 Change 2948203 on 2016/04/19 by Lee.Clark PS4 - Use SDK 3.508.031 #jira UEPLAT-1225 Change 2948168 on 2016/04/19 by mason.seay Updating test content: -Added Husk AI to level to test placed AI -Updated Spawn Husk BP to destroy itself to prevent spawn spamming #jira UE-29618 Change 2948153 on 2016/04/19 by Benn.Gallagher Missed mesh update for Owen IK fix. #jira UE-22540 Change 2948130 on 2016/04/19 by Benn.Gallagher Fixed old Owen punch IK setup so it no longer jitters when placing the hands on the surface. #jira UE-22540 Change 2948117 on 2016/04/19 by Taizyd.Korambayil #jira UE-28477 Resaved Template Map's to fix Warning Toast on Templates Change 2948063 on 2016/04/19 by Lina.Halper - Anim composite notify change for better - Fixed all nested anim notify - Merging CL 2944396 using //UE4/Dev-Framework_to_//UE4/Release-4.12 #jira : UE-29101 Change 2948060 on 2016/04/19 by Lina.Halper Fix for composite section metadata saving for montage Merging CL 2944397 using //UE4/Dev-Framework_to_//UE4/Release-4.12 #jira : UE-29228 Change 2948029 on 2016/04/19 by Ben.Marsh EC: Prevent automatically pushing CIS builds to the launcher; the changelist might be run more than once. Change 2947986 on 2016/04/19 by Benn.Gallagher Fixed BP callable functions that affect skeletal mesh component transforms not working when simulating physics. #jira UE-27783 Change 2947976 on 2016/04/19 by Mark.Satterthwaite Duplicate CL #2943702 from 4.11.2: Change the way Metal validates the render-target state so that in FMetalContext::PrepareToDraw it can issue a last-ditch attempt to restore the render-targets. This won't fix the cause of the Mac Metal crashes but it might mitigate some of them and provide more information about why they are occurring. #jira UE-29006 Change 2947975 on 2016/04/19 by Mark.Satterthwaite Duplicate CL #2945061 from UE4-UT: Address UT issue UE-29150 directly in the UT branch: users without a sufficiently up-to-date Xcode won't have the 'metal' offline shader compiler so will have to use the slower online compiled text shader format. #jira UE-29150 Change 2947679 on 2016/04/19 by Jack.Porter Fixed 4.12 branch not compiling with the 1.0.8 Vulkan SDK #jira UE-29601 Change 2947657 on 2016/04/18 by Jack.Porter Update protostar reflection capture contents #jira UE-29600 Change 2947301 on 2016/04/18 by Ben.Marsh EC: Fix trigger ready emails failing to send due to recipient list being a space-separated list of addresses rather than an array reference. Change 2947263 on 2016/04/18 by Marc.Audy Merging CL# 2945921 //UE4/Release-4.11 to //UE4/Release-4.12 Ensure that all OwnedComponents in an Actor are duplicated for PIE even if not referenced by a property, unless that component is explicitly transient #jira UE-29209 Change 2946984 on 2016/04/18 by Ben.Marsh GUBP: Allow Ocean cooks in the release branch (fixes build startup failures) Change 2946870 on 2016/04/18 by Ben.Marsh Remaking CL 2946810 to fix compile error in ShooterGame editor. Change 2946859 on 2016/04/18 by Ben.Marsh GUBP: Don't exclude Ocean from builds in the release branch. Change 2946847 on 2016/04/18 by Ben.Marsh GUBP: Fix warning on every build step due to OrionGame_Win32_Mono no longer existing. Change 2946771 on 2016/04/18 by Ben.Marsh EC: Correct initial agent type for release branches. Causing full branch syncs on all agents. Change 2946641 on 2016/04/18 by Ben.Marsh EC: Remove rogue comma causing branch definition parsing to fail. Change 2946592 on 2016/04/18 by Ben.Marsh EC: Adding branch definition for 4.12 release #lockdown Nick.Penwarden [CL 2962354 by Ben Marsh in Main branch]
2016-05-01 17:37:41 -04:00
#if CLEAR_COAT_BOTTOM_NORMAL
{
//const float3 ClearCoatUnderNormal = OctahedronToUnitVector((float2(GBuffer.CustomData.a, GBuffer.CustomData.z) * 2) - (256.0/255.0));
const float2 oct1 = ((float2(GBuffer.CustomData.a, GBuffer.CustomData.z) * 2) - (256.0/255.0)) + UnitVectorToOctahedron(GBuffer.WorldNormal);
const float3 ClearCoatUnderNormal = OctahedronToUnitVector(oct1);
//float CNoL = saturate( dot(ClearCoatUnderNormal, L) );
//float CNoV = saturate( dot(ClearCoatUnderNormal, V) );
float CNoH = saturate( dot(ClearCoatUnderNormal, H) );
float D2 = D_GGX(LobeRoughness[1], CNoH ) * LobeEnergy[1];
float Vis2 = Vis_Schlick( LobeRoughness[1], NoV, NoL );
//float3 F2 = F_Schlick( GBuffer.SpecularColor, VoH );
float3 F2 = saturate( 50.0 * GBuffer.SpecularColor.g ) * Fc + (1 - Fc) * GBuffer.SpecularColor;
//Optional term taking into account Basic NdotL response of bottom normal. Not important for metallic which is the most common clearcoat case. Not energy conserving.
//float3 Fr2 = Diffuse_Lambert( GBuffer.DiffuseColor ) * CNoL + (D2 * Vis2) * F2;
float3 Fr2 = Diffuse_Lambert( GBuffer.DiffuseColor ) + (D2 * Vis2) * F2;
return Fr1 + Fr2 * LayerAttenuation;
//return float3(2,0,0);
//return ClearCoatUnderNormal;
}
#endif
// Generalized microfacet specular
float D2 = D_GGX( LobeRoughness[1], NoH ) * LobeEnergy[1];
float Vis2 = Vis_Schlick( LobeRoughness[1], NoV, NoL );
//float3 F2 = F_Schlick( GBuffer.SpecularColor, VoH );
float3 F2 = saturate( 50.0 * GBuffer.SpecularColor.g ) * Fc + (1 - Fc) * GBuffer.SpecularColor;
//float3 Fr2 = Diffuse_Burley( GBuffer.DiffuseColor, LobeRoughness[1], NoV, NoL, VoH ) * LobeEnergy[2] + (D2 * Vis2) * F2;
float3 Fr2 = Diffuse_Lambert( GBuffer.DiffuseColor ) * LobeEnergy[2] + (D2 * Vis2) * F2;
return Fr1 + Fr2 * LayerAttenuation;
#else
float3 H = normalize(V + L);
float NoL = saturate( dot(N, L) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
float NoH = saturate( dot(N, H) );
float VoH = saturate( dot(V, H) );
// Hard coded IOR of 1.5
// Generalized microfacet specular
float D = D_GGX( ClearCoatRoughness, NoH ) * LobeEnergy[0];
float Vis = Vis_Kelemen( VoH );
// F_Schlick
float F0 = 0.04;
float Fc = Pow5( 1 - VoH );
float F = Fc + (1 - Fc) * F0;
float Fr1 = D * Vis * F;
// Refract rays
//float3 L2 = refract( -L, -H, 1 / 1.5 );
//float3 V2 = refract( -V, -H, 1 / 1.5 );
// LoH == VoH
//float RefractBlend = sqrt( 4 * VoH*VoH + 5 ) / 3 + 2.0 / 3 * VoH;
//float3 L2 = RefractBlend * H - L / 1.5;
//float3 V2 = RefractBlend * H - V / 1.5;
//float NoL2 = saturate( dot(N, L2) );
//float NoV2 = saturate( dot(N, V2) );
// Approximation
float RefractBlend = (0.22 * VoH + 0.7) * VoH + 0.745; // 2 mad
// Dot products distribute. No need for L2 and V2.
float RefractNoH = RefractBlend * NoH; // 1 mul
float NoL2 = saturate( RefractNoH - (1 / 1.5) * NoL ); // 1 mad
float NoV2 = saturate( RefractNoH - (1 / 1.5) * NoV ); // 1 mad
// Should refract H too but unimportant
NoL2 = max( 0.001, NoL2 );
NoV2 = max( 0.001, NoV2 );
float AbsorptionDist = rcp(NoV2) + rcp(NoL2);
float3 Absorption = pow( AbsorptionColor, 0.5 * AbsorptionDist );
// Approximation
//float AbsorptionDist = ( NoV2 + NoL2 ) / ( NoV2 * NoL2 );
//float3 Absorption = AbsorptionColor * ( AbsorptionColor * (AbsorptionDist * 0.5 - 1) + (2 - 0.5 * AbsorptionDist) );
//float3 Absorption = AbsorptionColor + AbsorptionColor * (AbsorptionColor - 1) * (AbsorptionDist * 0.5 - 1); // use for shared version
//float F21 = Fresnel( 1 / 1.5, saturate( dot(V2, H) ) );
//float TotalInternalReflection = 1 - F21 * G_Schlick( Roughness, NoV2, NoL2 );
//float3 LayerAttenuation = ( (1 - F12) * TotalInternalReflection ) * Absorption;
// Approximation
float3 LayerAttenuation = (1 - F) * Absorption;
// Approximation for IOR == 1.5
//SpecularColor = ChangeBaseMedium( SpecularColor, 1.5 );
//SpecularColor = saturate( ( 0.55 * SpecularColor + (0.45 * 1.08) ) * SpecularColor - (0.45 * 0.08) );
// Treat SpecularColor as relative to IOR. Artist compensates.
// Generalized microfacet specular
float D2 = D_GGX( Roughness, NoH ) * LobeEnergy[2];
float Vis2 = Vis_Schlick( Roughness, NoV2, NoL2 );
float3 F2 = F_Schlick( GBuffer.SpecularColor, VoH );
float3 Fr2 = Diffuse_Lambert( GBuffer.DiffuseColor ) * LobeEnergy[2] + (D2 * Vis2) * F2;
return Fr1 + Fr2 * LayerAttenuation;
#endif
}
float3 ClothShading( FGBufferData GBuffer, float3 LobeRoughness, float3 LobeEnergy, float3 L, float3 V, half3 N )
{
const float3 FuzzColor = saturate(GBuffer.CustomData.rgb);
const float Cloth = saturate(GBuffer.CustomData.a);
float3 H = normalize(V + L);
float NoL = saturate( dot(N, L) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
float NoH = saturate( dot(N, H) );
float VoH = saturate( dot(V, H) );
// Diffuse
float3 Diffuse = Diffuse_Lambert( GBuffer.DiffuseColor );
float3 Diff = Diffuse * LobeEnergy[2];
// Cloth - Asperity Scattering - Inverse Beckmann Layer
float3 F1 = F_Schlick( FuzzColor, VoH );
float D1 = D_InvGGX( LobeRoughness[1], NoH );
float V1 = Vis_Cloth( NoV, NoL );
float3 Spec1 = D1 * V1 * F1;
// Generalized microfacet specular
float3 F2 = F_Schlick( GBuffer.SpecularColor, VoH );
float D2 = D_GGX( LobeRoughness[1], NoH ) * LobeEnergy[1];
float V2 = Vis_SmithJointApprox( LobeRoughness[1], NoV, NoL );
float3 Spec2 = D2 * V2 * F2;
float3 Spec = lerp(Spec2, Spec1, Cloth);
return Diff + Spec;
}
float Hair_g( float B, float Theta )
{
return exp( -0.5 * Pow2( Theta ) / (B*B) ) / ( sqrt(2*PI) * B );
}
float Hair_F( float CosTheta )
{
const float n = 1.55;
const float F0 = Pow2( (1 - n) / (1 + n) );
return F0 + (1 - F0) * Pow5( 1 - CosTheta );
}
#define HAIR_REFERENCE 0
#if HAIR_REFERENCE
struct FHairTemp
{
float SinThetaL;
float SinThetaV;
float CosThetaD;
float CosThetaT;
float CosPhi;
float CosHalfPhi;
float VoL;
float n_prime;
};
// Modified Bessel function
float I0( float x )
{
x = abs(x);
float a;
if( x < 3.75 )
{
float t = x / 3.75;
float t2 = t*t;
a = + 0.0045813;
a = a * t2 + 0.0360768;
a = a * t2 + 0.2659732;
a = a * t2 + 1.2067492;
a = a * t2 + 3.0899424;
a = a * t2 + 3.5156229;
a = a * t2 + 1.0;
}
else
{
float t = 3.75 / x;
a = + 0.00392377;
a = a * t - 0.01647633;
a = a * t + 0.02635537;
a = a * t - 0.02057706;
a = a * t + 0.00916281;
a = a * t - 0.00157565;
a = a * t + 0.00225319;
a = a * t + 0.01328592;
a = a * t + 0.39894228;
a *= exp(x) * rsqrt(x);
}
return a;
}
float LongitudinalScattering( float B, float SinThetaL, float SinThetaV )
{
float v = B*B;
float CosThetaL2 = 1 - SinThetaL * SinThetaL;
float CosThetaV2 = 1 - SinThetaV * SinThetaV;
float Mp = 0;
if( v < 0.1 )
{
float a = sqrt(CosThetaL2 * CosThetaV2) / v;
float b = -SinThetaL * SinThetaV / v;
float logI0a = a > 12 ? a + 0.5 * ( -log(2*PI) + log(1/a) + 0.125/a ) : log( I0(a) );
Mp = exp( logI0a + b - rcp(v) + 0.6931 + log(0.5 / v) );
}
else
{
Mp = rcp( exp(2/v) * v - v ) * exp( ( 1 - SinThetaL * SinThetaV ) / v ) * I0( sqrt(CosThetaL2 * CosThetaV2) / v );
}
return Mp;
}
float GaussianDetector( float Bp, float Phi )
{
float Dp = 0;
for( int k = -4; k <= 4; k++ )
{
// TODO use symmetry and detect for both Phi and -Phi
Dp += Hair_g( Bp, Phi - (2*PI) * k );
}
return Dp;
}
float3 Attenuation( uint p, float h, float3 Color, FHairTemp HairTemp )
{
float3 A;
if( p == 0 )
{
//A = F( cos( 0.5 * acos( HairTemp.VoL ) ) );
A = Hair_F( sqrt( 0.5 + 0.5 * HairTemp.VoL ) );
}
else
{
// ua is absorption
// ua = pe*Sigma_ae + pp*Sigma_ap
float3 Sigma_ae = { 0.419, 0.697, 1.37 };
float3 Sigma_ap = { 0.187, 0.4, 1.05 };
//float3 ua = 0.25 * Sigma_ae + 0.25 * Sigma_ap;
float3 ua = -0.25 * log( Color );
float3 ua_prime = ua / HairTemp.CosThetaT;
//float3 ua_prime = ua / sqrt( 1 - Pow2( HairTemp.CosThetaD ) / 2.4 );
float yi = asin(h);
float yt = asin(h / HairTemp.n_prime);
float f = Hair_F( HairTemp.CosThetaD * sqrt( 1 - h*h ) ); // (14)
//float3 T = exp( -2 * ua_prime * ( 1 + cos(2*yt) ) );
float3 T = exp( -2 * ua_prime * cos(yt) );
if( p == 1 )
A = Pow2(1 - f) * T; // (13)
else
A = Pow2(1 - f) * f * T*T; // (13)
}
return A;
}
float Omega( uint p, float h, FHairTemp HairTemp )
{
float yi = asin(h);
float yt = asin(h / HairTemp.n_prime);
return 2*p*yt - 2*yi + p*PI;
}
float3 AzimuthalScattering( uint p, float Bp, float3 Color, FHairTemp HairTemp, uint2 Random )
{
float Phi = acos( HairTemp.CosPhi );
// Np = 0.5 * Integral_-1^1( A(p,h) * Dp( Phi - Omega(p,h) ) * dh )
float Offset = float( Random.x & 0xffff ) / (1<<16);
uint Num = 16;
float3 Np = 0;
for( uint i = 0; i < Num; i++ )
{
float h = ( (float)( i + Offset ) / Num ) * 2 - 1;
Np += Attenuation( p, h, Color, HairTemp ) * GaussianDetector( Bp, Phi - Omega( p, h, HairTemp ) );
}
Np *= 2.0 / Num;
return 0.5 * Np;
}
// [d'Eon et al. 2011, "An Energy-Conserving Hair Reflectance Model"]
// [d'Eon et al. 2014, "A Fiber Scattering Model with Non-Separable Lobes"]
float3 HairShadingRef( FGBufferData GBuffer, float3 L, float3 V, half3 N, uint2 Random )
{
Copying //UE4/Orion-Staging to //UE4/Main (Source //Orion/Dev-General @ 2927258) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2927181 on 2016/03/29 by Dmitry.Rekman (Optionally) exclude idle time from server FPS charts. - Time spent waiting for the next frame in order to hit capped FPS can be optionally excluded by using t.FPSChart.ExcludeIdleTime (set to 1 for servers). - Server FPS charts analytics events and log output will include the information if idle time was excluded. - Also: added a log line each time we detect a server hitch for easier pin-pointing them in the log. #rb Paul.Moore #codereview Paul.Moore, Michael.Noland #tests Ran Linux server and Windows client on compatible content. Change 2927084 on 2016/03/29 by Ben.Marsh BuildGraph: Don't allow triggers to run until all their order dependencies are complete. Just because a downstream node doesn't have a dependency on an upstream node via temp storage doesn't mean it can run immediately. #rb none #tests none Change 2927060 on 2016/03/29 by Michael.Noland Renamed GPU analytics event from GPU to DesktopGPU to reflect that it is the default desktop adapter and not the one we initialized (which is GPUAdapter) Updated text/log based FPS chart events to print out GPUAdapter instead (with DesktopGPU in parens if they differ, e.g., in an optimus setup) #rb marcus.wassmer #tests Ran and did some fps charts Change 2927048 on 2016/03/29 by Michael.Noland HLOD: Removed an unused cvar r.HLODEnabled (everything is done thru r.HLOD) #tests Compiled and ran Paragon #rb marcus.wassmer Change 2926920 on 2016/03/29 by Ben.Marsh BuildGraph: Update schema with Rename task. Change 2926911 on 2016/03/29 by Ben.Marsh BuildGraph: Add a task which can rename files matching a given wildcard. Syntax is: <Rename Files="*.txt" To="*.md"> or <Rename Files="Engine/Build/..." From="*.txt" To="*.md"/> #rb none #tests none Change 2926908 on 2016/03/29 by Andrew.Grant Fix for CDO properties of renamed blueprints not being applied #rb none #tests loaded Origin map (renamed from Playgo3) and verified properties are applied. Change 2926799 on 2016/03/29 by Jason.Bestimt #ORION_DG - Merge MAIN (23) @ CL# 2926780 #RB:none #Tests:none Change 2926663 on 2016/03/29 by david.nikdel #ROBOMERGE-OBO: jason.bestimt #ROBOMERGE-SOURCE: CL 2926660 in //Orion/Release-0.23/... via CL 2926662 #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ORION_23 - Potential fix for Cook failures "Fix shelved in 2926635, tested in Dev-Blueprints. Could not run any GEditor related logic safely in ShutdownModule because of the same destruction issue orders that caused the bug in the first place. I will chat with Editor team about nulling out GEditor the same way we null out GUnrealEd." #RB:none #Tests: none [CodeReviewed]: andrew.grant, dan.oconnor Change 2926510 on 2016/03/29 by Andrew.Grant Potential fix for OR-18207 - editor becomes unresponsive (audio deadlock) #rb none #tests compiled Change 2926495 on 2016/03/29 by Rob.Cannaday Change storing HTTP requests as raw pointers to weak pointers with validity being checked via Pinning it #jira FORT-18947 #jira OR-17695 #tests golden path #rb eric.newman Change 2926427 on 2016/03/29 by Josh.Markiewicz #UE4 - fixed typo #rb none #tests none Change 2926250 on 2016/03/29 by Martin.Mittring fixed OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect #rb:Chris.Bunner #codereview:Brian.Karis Change 2926224 on 2016/03/29 by Daniel.Lamb Fix for potenital threading issue with Console manager removing vars which could cause double free. #rb Robert.Manuszewski #test Orion cook Change 2926174 on 2016/03/29 by Gareth.Martin Cloned fix for bUseMaterialPositionOffsetInStaticLighting crashing across from //UE4/Dev-Landscape/ to unblock people #rb #tests editor Change 2925968 on 2016/03/29 by David.Nikdel #MCP #OSS - Read RedirectUrl from ini #RB: Eric.Newman #TESTS: compiled in another branch (merge over) #ROBOMERGE: Main [CL 2929424 by Andrew Grant in Main branch]
2016-03-31 15:18:30 -04:00
// to prevent NaN with decals
// OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect
// OR-17578 HERO: HAMMER: E causes blinding light on heroes with hair
float ClampedRoughness = clamp(GBuffer.Roughness, 1/255.0f, 1.0f);
float n = 1.55;
FHairTemp HairTemp;
// N is the vector parallel to hair pointing toward root
HairTemp.VoL = dot(V,L);
HairTemp.SinThetaL = dot(N,L);
HairTemp.SinThetaV = dot(N,V);
// SinThetaT = 1/n * SinThetaL
HairTemp.CosThetaT = sqrt( 1 - Pow2( (1/n) * HairTemp.SinThetaL ) );
HairTemp.CosThetaD = cos( 0.5 * abs( asin( HairTemp.SinThetaV ) - asin( HairTemp.SinThetaL ) ) );
float3 Lp = L - HairTemp.SinThetaL * N;
float3 Vp = V - HairTemp.SinThetaV * N;
HairTemp.CosPhi = dot(Lp,Vp) * rsqrt( dot(Lp,Lp) * dot(Vp,Vp) );
HairTemp.CosHalfPhi = sqrt( 0.5 + 0.5 * HairTemp.CosPhi );
HairTemp.n_prime = sqrt( n*n - 1 + Pow2( HairTemp.CosThetaD ) ) / HairTemp.CosThetaD;
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
float Shift = 0.035;
float Alpha[] =
{
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
-Shift * 2,
Shift,
Shift * 4,
};
float B[] =
{
Copying //UE4/Orion-Staging to //UE4/Main (Source //Orion/Dev-General @ 2927258) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2927181 on 2016/03/29 by Dmitry.Rekman (Optionally) exclude idle time from server FPS charts. - Time spent waiting for the next frame in order to hit capped FPS can be optionally excluded by using t.FPSChart.ExcludeIdleTime (set to 1 for servers). - Server FPS charts analytics events and log output will include the information if idle time was excluded. - Also: added a log line each time we detect a server hitch for easier pin-pointing them in the log. #rb Paul.Moore #codereview Paul.Moore, Michael.Noland #tests Ran Linux server and Windows client on compatible content. Change 2927084 on 2016/03/29 by Ben.Marsh BuildGraph: Don't allow triggers to run until all their order dependencies are complete. Just because a downstream node doesn't have a dependency on an upstream node via temp storage doesn't mean it can run immediately. #rb none #tests none Change 2927060 on 2016/03/29 by Michael.Noland Renamed GPU analytics event from GPU to DesktopGPU to reflect that it is the default desktop adapter and not the one we initialized (which is GPUAdapter) Updated text/log based FPS chart events to print out GPUAdapter instead (with DesktopGPU in parens if they differ, e.g., in an optimus setup) #rb marcus.wassmer #tests Ran and did some fps charts Change 2927048 on 2016/03/29 by Michael.Noland HLOD: Removed an unused cvar r.HLODEnabled (everything is done thru r.HLOD) #tests Compiled and ran Paragon #rb marcus.wassmer Change 2926920 on 2016/03/29 by Ben.Marsh BuildGraph: Update schema with Rename task. Change 2926911 on 2016/03/29 by Ben.Marsh BuildGraph: Add a task which can rename files matching a given wildcard. Syntax is: <Rename Files="*.txt" To="*.md"> or <Rename Files="Engine/Build/..." From="*.txt" To="*.md"/> #rb none #tests none Change 2926908 on 2016/03/29 by Andrew.Grant Fix for CDO properties of renamed blueprints not being applied #rb none #tests loaded Origin map (renamed from Playgo3) and verified properties are applied. Change 2926799 on 2016/03/29 by Jason.Bestimt #ORION_DG - Merge MAIN (23) @ CL# 2926780 #RB:none #Tests:none Change 2926663 on 2016/03/29 by david.nikdel #ROBOMERGE-OBO: jason.bestimt #ROBOMERGE-SOURCE: CL 2926660 in //Orion/Release-0.23/... via CL 2926662 #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ORION_23 - Potential fix for Cook failures "Fix shelved in 2926635, tested in Dev-Blueprints. Could not run any GEditor related logic safely in ShutdownModule because of the same destruction issue orders that caused the bug in the first place. I will chat with Editor team about nulling out GEditor the same way we null out GUnrealEd." #RB:none #Tests: none [CodeReviewed]: andrew.grant, dan.oconnor Change 2926510 on 2016/03/29 by Andrew.Grant Potential fix for OR-18207 - editor becomes unresponsive (audio deadlock) #rb none #tests compiled Change 2926495 on 2016/03/29 by Rob.Cannaday Change storing HTTP requests as raw pointers to weak pointers with validity being checked via Pinning it #jira FORT-18947 #jira OR-17695 #tests golden path #rb eric.newman Change 2926427 on 2016/03/29 by Josh.Markiewicz #UE4 - fixed typo #rb none #tests none Change 2926250 on 2016/03/29 by Martin.Mittring fixed OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect #rb:Chris.Bunner #codereview:Brian.Karis Change 2926224 on 2016/03/29 by Daniel.Lamb Fix for potenital threading issue with Console manager removing vars which could cause double free. #rb Robert.Manuszewski #test Orion cook Change 2926174 on 2016/03/29 by Gareth.Martin Cloned fix for bUseMaterialPositionOffsetInStaticLighting crashing across from //UE4/Dev-Landscape/ to unblock people #rb #tests editor Change 2925968 on 2016/03/29 by David.Nikdel #MCP #OSS - Read RedirectUrl from ini #RB: Eric.Newman #TESTS: compiled in another branch (merge over) #ROBOMERGE: Main [CL 2929424 by Andrew Grant in Main branch]
2016-03-31 15:18:30 -04:00
Pow2( ClampedRoughness ),
Pow2( ClampedRoughness ) / 2,
Pow2( ClampedRoughness ) * 2,
};
float3 S = 0;
UNROLL for( uint p = 0; p < 3; p++ )
{
float SinThetaV = HairTemp.SinThetaV;
float Bp = B[p];
if( p == 0 )
{
Bp *= sqrt(2.0) * HairTemp.CosHalfPhi;
float sa, ca;
sincos( Alpha[p], sa, ca );
SinThetaV -= 2*sa * ( HairTemp.CosHalfPhi * ca * sqrt( 1 - SinThetaV * SinThetaV ) + sa * SinThetaV );
}
else
{
SinThetaV = sin( asin(SinThetaV) - Alpha[p] );
}
float Mp = LongitudinalScattering( Bp, HairTemp.SinThetaL, SinThetaV );
float3 Np = AzimuthalScattering( p, B[p], GBuffer.BaseColor, HairTemp, Random );
float3 Sp = Mp * Np;
S += Sp;
}
return S;
}
#endif
// Approximation to HairShadingRef using concepts from the following papers:
// [Marschner et al. 2003, "Light Scattering from Human Hair Fibers"]
// [Pekelis et al. 2015, "A Data-Driven Light Scattering Model for Hair"]
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
float3 HairShading( FGBufferData GBuffer, float3 L, float3 V, half3 N, float Shadow, float Backlit, float Area, uint2 Random )
{
Copying //UE4/Orion-Staging to //UE4/Main (Source //Orion/Dev-General @ 2927258) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2927181 on 2016/03/29 by Dmitry.Rekman (Optionally) exclude idle time from server FPS charts. - Time spent waiting for the next frame in order to hit capped FPS can be optionally excluded by using t.FPSChart.ExcludeIdleTime (set to 1 for servers). - Server FPS charts analytics events and log output will include the information if idle time was excluded. - Also: added a log line each time we detect a server hitch for easier pin-pointing them in the log. #rb Paul.Moore #codereview Paul.Moore, Michael.Noland #tests Ran Linux server and Windows client on compatible content. Change 2927084 on 2016/03/29 by Ben.Marsh BuildGraph: Don't allow triggers to run until all their order dependencies are complete. Just because a downstream node doesn't have a dependency on an upstream node via temp storage doesn't mean it can run immediately. #rb none #tests none Change 2927060 on 2016/03/29 by Michael.Noland Renamed GPU analytics event from GPU to DesktopGPU to reflect that it is the default desktop adapter and not the one we initialized (which is GPUAdapter) Updated text/log based FPS chart events to print out GPUAdapter instead (with DesktopGPU in parens if they differ, e.g., in an optimus setup) #rb marcus.wassmer #tests Ran and did some fps charts Change 2927048 on 2016/03/29 by Michael.Noland HLOD: Removed an unused cvar r.HLODEnabled (everything is done thru r.HLOD) #tests Compiled and ran Paragon #rb marcus.wassmer Change 2926920 on 2016/03/29 by Ben.Marsh BuildGraph: Update schema with Rename task. Change 2926911 on 2016/03/29 by Ben.Marsh BuildGraph: Add a task which can rename files matching a given wildcard. Syntax is: <Rename Files="*.txt" To="*.md"> or <Rename Files="Engine/Build/..." From="*.txt" To="*.md"/> #rb none #tests none Change 2926908 on 2016/03/29 by Andrew.Grant Fix for CDO properties of renamed blueprints not being applied #rb none #tests loaded Origin map (renamed from Playgo3) and verified properties are applied. Change 2926799 on 2016/03/29 by Jason.Bestimt #ORION_DG - Merge MAIN (23) @ CL# 2926780 #RB:none #Tests:none Change 2926663 on 2016/03/29 by david.nikdel #ROBOMERGE-OBO: jason.bestimt #ROBOMERGE-SOURCE: CL 2926660 in //Orion/Release-0.23/... via CL 2926662 #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ORION_23 - Potential fix for Cook failures "Fix shelved in 2926635, tested in Dev-Blueprints. Could not run any GEditor related logic safely in ShutdownModule because of the same destruction issue orders that caused the bug in the first place. I will chat with Editor team about nulling out GEditor the same way we null out GUnrealEd." #RB:none #Tests: none [CodeReviewed]: andrew.grant, dan.oconnor Change 2926510 on 2016/03/29 by Andrew.Grant Potential fix for OR-18207 - editor becomes unresponsive (audio deadlock) #rb none #tests compiled Change 2926495 on 2016/03/29 by Rob.Cannaday Change storing HTTP requests as raw pointers to weak pointers with validity being checked via Pinning it #jira FORT-18947 #jira OR-17695 #tests golden path #rb eric.newman Change 2926427 on 2016/03/29 by Josh.Markiewicz #UE4 - fixed typo #rb none #tests none Change 2926250 on 2016/03/29 by Martin.Mittring fixed OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect #rb:Chris.Bunner #codereview:Brian.Karis Change 2926224 on 2016/03/29 by Daniel.Lamb Fix for potenital threading issue with Console manager removing vars which could cause double free. #rb Robert.Manuszewski #test Orion cook Change 2926174 on 2016/03/29 by Gareth.Martin Cloned fix for bUseMaterialPositionOffsetInStaticLighting crashing across from //UE4/Dev-Landscape/ to unblock people #rb #tests editor Change 2925968 on 2016/03/29 by David.Nikdel #MCP #OSS - Read RedirectUrl from ini #RB: Eric.Newman #TESTS: compiled in another branch (merge over) #ROBOMERGE: Main [CL 2929424 by Andrew Grant in Main branch]
2016-03-31 15:18:30 -04:00
// to prevent NaN with decals
// OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect
// OR-17578 HERO: HAMMER: E causes blinding light on heroes with hair
float ClampedRoughness = clamp(GBuffer.Roughness, 1/255.0f, 1.0f);
//const float3 DiffuseN = OctahedronToUnitVector( GBuffer.CustomData.xy * 2 - 1 );
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
//const float Backlit = GBuffer.CustomData.z;
#if HAIR_REFERENCE
Copying //UE4/Orion-Staging to //UE4/Main (Source //Orion/Dev-General @ 2927258) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2927181 on 2016/03/29 by Dmitry.Rekman (Optionally) exclude idle time from server FPS charts. - Time spent waiting for the next frame in order to hit capped FPS can be optionally excluded by using t.FPSChart.ExcludeIdleTime (set to 1 for servers). - Server FPS charts analytics events and log output will include the information if idle time was excluded. - Also: added a log line each time we detect a server hitch for easier pin-pointing them in the log. #rb Paul.Moore #codereview Paul.Moore, Michael.Noland #tests Ran Linux server and Windows client on compatible content. Change 2927084 on 2016/03/29 by Ben.Marsh BuildGraph: Don't allow triggers to run until all their order dependencies are complete. Just because a downstream node doesn't have a dependency on an upstream node via temp storage doesn't mean it can run immediately. #rb none #tests none Change 2927060 on 2016/03/29 by Michael.Noland Renamed GPU analytics event from GPU to DesktopGPU to reflect that it is the default desktop adapter and not the one we initialized (which is GPUAdapter) Updated text/log based FPS chart events to print out GPUAdapter instead (with DesktopGPU in parens if they differ, e.g., in an optimus setup) #rb marcus.wassmer #tests Ran and did some fps charts Change 2927048 on 2016/03/29 by Michael.Noland HLOD: Removed an unused cvar r.HLODEnabled (everything is done thru r.HLOD) #tests Compiled and ran Paragon #rb marcus.wassmer Change 2926920 on 2016/03/29 by Ben.Marsh BuildGraph: Update schema with Rename task. Change 2926911 on 2016/03/29 by Ben.Marsh BuildGraph: Add a task which can rename files matching a given wildcard. Syntax is: <Rename Files="*.txt" To="*.md"> or <Rename Files="Engine/Build/..." From="*.txt" To="*.md"/> #rb none #tests none Change 2926908 on 2016/03/29 by Andrew.Grant Fix for CDO properties of renamed blueprints not being applied #rb none #tests loaded Origin map (renamed from Playgo3) and verified properties are applied. Change 2926799 on 2016/03/29 by Jason.Bestimt #ORION_DG - Merge MAIN (23) @ CL# 2926780 #RB:none #Tests:none Change 2926663 on 2016/03/29 by david.nikdel #ROBOMERGE-OBO: jason.bestimt #ROBOMERGE-SOURCE: CL 2926660 in //Orion/Release-0.23/... via CL 2926662 #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ORION_23 - Potential fix for Cook failures "Fix shelved in 2926635, tested in Dev-Blueprints. Could not run any GEditor related logic safely in ShutdownModule because of the same destruction issue orders that caused the bug in the first place. I will chat with Editor team about nulling out GEditor the same way we null out GUnrealEd." #RB:none #Tests: none [CodeReviewed]: andrew.grant, dan.oconnor Change 2926510 on 2016/03/29 by Andrew.Grant Potential fix for OR-18207 - editor becomes unresponsive (audio deadlock) #rb none #tests compiled Change 2926495 on 2016/03/29 by Rob.Cannaday Change storing HTTP requests as raw pointers to weak pointers with validity being checked via Pinning it #jira FORT-18947 #jira OR-17695 #tests golden path #rb eric.newman Change 2926427 on 2016/03/29 by Josh.Markiewicz #UE4 - fixed typo #rb none #tests none Change 2926250 on 2016/03/29 by Martin.Mittring fixed OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect #rb:Chris.Bunner #codereview:Brian.Karis Change 2926224 on 2016/03/29 by Daniel.Lamb Fix for potenital threading issue with Console manager removing vars which could cause double free. #rb Robert.Manuszewski #test Orion cook Change 2926174 on 2016/03/29 by Gareth.Martin Cloned fix for bUseMaterialPositionOffsetInStaticLighting crashing across from //UE4/Dev-Landscape/ to unblock people #rb #tests editor Change 2925968 on 2016/03/29 by David.Nikdel #MCP #OSS - Read RedirectUrl from ini #RB: Eric.Newman #TESTS: compiled in another branch (merge over) #ROBOMERGE: Main [CL 2929424 by Andrew Grant in Main branch]
2016-03-31 15:18:30 -04:00
// todo: ClampedRoughness is missing for this code path
float3 S = HairShadingRef( GBuffer, L, V, N, Random );
//float3 S = HairShadingMarschner( GBuffer, L, V, N );
#else
// N is the vector parallel to hair pointing toward root
const float VoL = dot(V,L);
const float SinThetaL = dot(N,L);
const float SinThetaV = dot(N,V);
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3028454) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3028439 on 2016/06/27 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28 @ CL 3028090 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3028437 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3027952 on 2016/06/26 by Jurre.deBaare - Integrating code fixes/changes from Simplygon for Normals issue on Simplygon Swarm + landscape culling - Readded landscape/volume culling for in-engine static mesh merging path - Fixed issue with r.HLOD force -1 (now stops forcing hlods) - Marked hlodcullingvolume as experimental - Added Landscape culling flag + precision level #codereview Michael.Noland #rb Michael.Noland #tests build clusters locally/cloud + landscape culling tests Change 3027702 on 2016/06/25 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3027698 #RB:none #Tests:none Change 3027312 on 2016/06/24 by Daniel.Lamb Changed the way reentry data is stored in the cooker, reduce work load by main thread, also fix issue with reentry data being used from incorrect packages. #rb Peter.Sauerbrei #test QA game launch on and cook by the book + cook on the fly paragon Change 3027165 on 2016/06/24 by Daniel.Lamb Fix compiler warnings from cvars changes. #rb none #test cook paragon Change 3026900 on 2016/06/24 by Daniel.Lamb Change the way low quality lightmap shaders are enabled / disabled as the engine can't be used in the should cache function. #rb Marcus.Wasmer #test Cook on the fly paragon #codereview Rolando.Caloca Change 3026874 on 2016/06/24 by Olaf.Piesche #jira OR-18363 fix distortion in particle macro UVs with camera movement #rb frank.fella #tests PC Editor/Game Change 3026494 on 2016/06/24 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3026460 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3026476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3026381 on 2016/06/24 by Graeme.Thornton Strip particle modules, emitters and lodlevels from cooked server data. Saves ~10mb of runtime memory on Paragon #rb simon.tovey #codereview dmitry.rekman #tests pc cooked client/server, golden path Change 3025760 on 2016/06/23 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3025687 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3025709 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword.uasset - can't integrate exclusive file already opened //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword_Skeleton.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3025661 on 2016/06/23 by Mieszko.Zielinski Added a feature to PathfollowingComponent allowing it to identify when it starts following a navigation link #UE4 #rb Lukasz.Furman #test golden path Change 3025359 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #online,externalui,ps4 - expose access to reset cookies before invoking embedded web browser - fixed not capturing resulting Url when PS4 browser is closed #rb none #tests ps4 #ROBOMERGE-SOURCE: CL 3025356 in //Orion/Release-28/... via CL 3025358 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3025184 on 2016/06/23 by Lina.Halper Fix crash with morphtargets #jira: OR-24257 #rb: Rolando.Caloca #tests: switching mesh with different morphtargets in editor Change 3024714 on 2016/06/23 by Lukasz.Furman added vlog extension to visual debugger tool, added object whitelist to vlog to include selected minion data in games started with -LogBotGame param #rb Mieszko.Zielinski #tests server game with and without LogBotGame cmdline Change 3024709 on 2016/06/23 by Daniel.Lamb Added support for async save when saving seperate bulk data file. Added mb saved to cooking package stats. #rb Andrew.Grant,Wes.Hunt #test Cook Paragon Change 3024674 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani Merging //Orion/Release-28 to Main (//Orion/Main) #online,identity,ps4 - add psplus flag to online account after privilege check #rb none #tests ps4 login flow #ROBOMERGE-SOURCE: CL 3024672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3024510 on 2016/06/23 by Graeme.Thornton Added more info to the dumpparticlesystems exec command output #rb simon.tovey #tests cooked pc client, golden path Change 3024504 on 2016/06/23 by Graeme.Thornton Asset registry memory optimisation - make sure all dependency node link arrays are sized exactly as they need to be (saves ~1mb) #rb robert.manuszewski #tests windows cooked client, golden path Change 3024213 on 2016/06/22 by Ryan.Gerleve Handle a rare case in replays where the spectator controller is null but we still find a valid NetGUID for it. Added an ensure before a check that would fail in this case so we'll know if it happens again. #tests replays #rb john.pollard Change 3024127 on 2016/06/22 by John.Pollard Bulk merge using Dev-Networking_->_Dev-General_(Orion) 3002989 Add ability to skip missing/changed properties in FFastArraySerializer 3003072 Fix crash related to new replay backwards compatibility changes 3008097 Renaming CompatibleReplayout to NetFieldExportGroup preparing to unify ability to use FNetFieldExportGroup for both RepLayout and FClassNetCache 3009684 Added ability to use FNetFieldExportGroups for FClassNetCache as well as FRepLayout * Adds ability to track missing/changed custom delta properties names * Adds ability to track missing/changed RPC's 3013455 Add ability to skip over RPC parameters that have changes/missing in replays for backwards compatibility * We now mark FClassNetCache properties as bIncompatible so we don't spam forever when they are out of date * No longer factor in parameters when building checksum for RPC's * Save FNetFieldExport handle for FClassNetCache fields * Use WriteIntWrapped when saving FClassNetCache fields FNetFieldExport handles (and use NetFieldExportGroup->NetFieldExports.Num() to determine max value) * Lots of cleanup and sanity checking improvements 3018078 Optimize replay checkpoints * Share work that was already done during normal replication, and re-use this data to remove the need to compare any checkpoint properties * When saving a checkpoint, we no longer create a new connection and new channels, instead we re-use the existing channels, and added the ability to make this a transient operation * To make custom delta serialize properties work, we compare against the CDO state instead of current state when saving out a checkpoint 3021196 Fix issue with Fast tarray exporting package map info during checkpoints * Add ability to save and restore package map ack status * Save package map ack status before saving checkpoint, and then restore it back afterwards, this will then allow the stream that writes afterward to re-export anything that was new in the checkpoint * No longer queue up reliable bunches on ack list for internal ack connections 3024033 Prune the cached change list before using when saving out checkpoints * Fixes issues when saving checkpoint, and the live properties change array size, which throws everything off when it comes time to use the LifetimeChangelist 3024034 Don't close channels when saving checkpoints, fixes issue where it creates a bunch with bOpen/bClose (because we're forcing all SendBunches to re-open channels), which throws off the stream #rb RyanG #tests Replays Change 3024021 on 2016/06/22 by Dmitry.Rekman Fix PS4 build. #rb Michael.Noland #tests none #codereview Michael.Noland, Dan.Youhon, Sammy.James Change 3023734 on 2016/06/22 by Lukasz.Furman added replication for input events and tool state for both gameplay debugger categories and extensions #ue4 #rb Mieszko.Zielinski #tests PIE, server game Change 3023708 on 2016/06/22 by Dmitry.Rekman Add a separate macro for a poison malloc proxy usage. #rb Michael.Noland #codereview Michael.Noland, Gil.Gribb #tests Compiled OrionServer-Linux-Debug, ran it Change 3023670 on 2016/06/22 by Nick.Darnell Home screen - Fixing safezones on the homescreen. Adding a scale option to the XP_Fill widget. Adding better animations to the tiles. Showing subtitles again. Hero XP summary widget now takes you to that hero. #rb none #tests PIE Change 3023632 on 2016/06/22 by Dmitry.Rekman Fix incorrect matching condition in comments. #rb none #tests Compiled OrionServer-Linux-Debug #codereview Michael.Noland Change 3023475 on 2016/06/22 by Rolando.Caloca O - Back out changelist 3022847 as it broke SSS on PC #rb none #tests re-run editor on PC Change 3023178 on 2016/06/22 by Michael.Noland Engine: Added system memory and % of time spent hitching to analytics #rb bob.tellez #tests Tested a match in Paragon Change 3022963 on 2016/06/22 by Mieszko.Zielinski Fixed a subtle navigation repathing bug #UE4 While repathing to a location, rather than an actor, the navigation query used path's end while it should be using the original query's EndLocation. #rb Lukasz.Furman #test golden path Change 3022865 on 2016/06/22 by David.Ratti gameplay cue editor: remove "GameplayCue_" prefix from default GameplayCueNotify filename in default ability system projects #rb none #tests ability system sample project Change 3022847 on 2016/06/22 by Rolando.Caloca O - Remove checkerboard SSS rendering and recombine post process pass when SSS not enabled #rb Marcus.Wassmer #codereview Marcus.Wassmer, Brian.Karis #tests Load Agora_P, check perf, toggle r.SSS.Quality 1/0, check characters with skin Change 3022804 on 2016/06/22 by Mieszko.Zielinski Fixed AIController clearing out CachedGameplayTasksComponent on UnPosses, even if Pawn was not the CachedGameplayTasksComponent's owner #UE4 Also, made running BT not clearing info in BB if AI's current BB is compatible with the one required by BT #rb Lukasz.Furman #test golden path Change 3022674 on 2016/06/22 by Robert.Manuszewski Reimplementing CL #2993969 (Dev-Blueprints) by Maciej.Mroz: UE-30729 Crash in Native Orion when selecting Sword or Tomahawk Clear AsyncLoading in subobjects. #jira OR-23997 #rb me #tests Golden path in editor build, selecting Venus Change 3022405 on 2016/06/21 by Ryan.Gerleve Fix for OR-23948, crash with death cam enabled. Use a weak pointer to store the viewer on the DemoNetDriver and update it when the game player controller is received. #rb john.pollard #tests bug repro Change 3022387 on 2016/06/21 by Ryan.Gerleve Added the ability to disable ticking of individual worlds. #tests golden path #rb john.pollard #codereview marc.audy Change 3022312 on 2016/06/21 by Nick.Darnell Home Screen - Adding a max aspect ratio lock to SBox, may need some more fine tuning math may still be a bit pants in some cases. The XP ovewview panels now have a basic support for account and hero progression. Hero one shows the last hero you played, widget is invisibile until you play your first game. The tiles now use the Max Aspect Ratio to prevent stretching forever on 21:9 monitors causing them to just look crazy. Weekly quests now show the weekly quests screen when clicked. OrionUserWidgetBase no longer prevents blueprints from running code in reponse to mouse down/up actions if the userwidget consumes input - it always calls the blueprint code first, and always returns handled if it consumes input. #rb none #tests PIE Change 3022207 on 2016/06/21 by Wes.Hunt Fix Analytics provider to retain passed in AppVersion string instead of using default %VERSION%. #rb none #tests run windows server with one bot connecting and checking analytics version is what is expected. Change 3021808 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - call GetTotalMicroseconds instead of GetTotalMilliseconds * 1000 #rb none #tests compile run ps4 #ROBOMERGE-SOURCE: CL 3021805 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021663 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - CancelFindSessions() didn't null out search result - future FindSession() calls would fail with "search in progress" #rb joe.wilcox #tests UT matchmaking #ROBOMERGE-SOURCE: CL 3021655 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021508 on 2016/06/21 by Marcus.Wassmer Remove anti-ghosting AA for now. Causes dithered transparency to be very wrong (Dekker shoulders) And also a border around all characters of 'noisy fuzz' even when they are not moving #rb none #test PC/PS4 #codereview Brian.Karis,Jordan.Walker Change 3021475 on 2016/06/21 by Marcus.Wassmer Duplicate fix for subsurface spec in prep for PS4 optimization. (DevRendering 3018664) unified some code for easier maintainance, fixed missing multiply from former change #rb none #test PS4/PC agora Change 3021468 on 2016/06/21 by Michael.Noland Physics: Added more information when convex cooking partially succeeds (fails initially but succeeds with inflation) indicating the full path of the mesh that failed #rb ori.cohen #tests Compiled changes, will provide more information when issue reoccurs in build machine cooks #jira OR-24082 Change 3021460 on 2016/06/21 by Michael.Noland Engine: Added time spent in each hitch bucket to FPS chart .log output and analytics output #rb bob.tellez #tests Tested a match in Paragon #codereview dmitry.rekman Change 3021368 on 2016/06/21 by Marcus.Wassmer Create Tonemapper configuration with no ColorFringe to save .15ms on PS4 when colorfringe is not used. #rb rolando.caloca #test agora with/wo new config #codereview brian.karis Change 3021119 on 2016/06/21 by David.Ratti Make -notimeouts work during initial connecting phase #codereview John.Pollard #rb none #tests pie agora Change 3021048 on 2016/06/21 by David.Ratti minor tweaks to gameplay cues: -Descriptions of engine GC notify classes -Added 'auto attach to owner' flag on actor notify class. #rb none #test ability system sample project Change 3020694 on 2016/06/20 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3020301 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3020674 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #CodeReview: cody.haskell Change 3020624 on 2016/06/20 by Michael.Noland Engine: Pushing more fps chart analytics up to engine level code from Paragon Engine: Pushing benchmark config vars up to engine level code from Paragon, and added records of individual sub-steps of benchmarks #rb Bob.Tellez #tests Golden path Solo VS AI in Paragon and forced a match #codereview bob.tellez, peter.knepley Change 3020181 on 2016/06/20 by Dmitry.Rekman Re-do allowing allocations in NullRHI (OR-24029). - Originally CL 2990582 by MarcusW, stomped during merge by CL 3006926. #rb none #codereview Marcus.Wassmer, Andrew.Grant #tests none Change 3020139 on 2016/06/20 by Ryan.Gerleve Added ability to pause replay recording while keeping the current replay open. #rb john.pollard #tests paused deathcam recording while disabled Change 3019817 on 2016/06/20 by Dmitry.Rekman Poison allocated/freed memory in Debug and Development (non-editor) configs. - With this Paragon client may be more likely to crash on start. #rb Steve.Robb #codereview Robert.Manuszewski, Michael.Noland, Andrew.Grant, Gil.Gribb, Steve.Robb #tests Built Linux server and Windows client, ran them, also built Windows Orion editor. Change 3019599 on 2016/06/20 by Rolando.Caloca O - Fix flickering on heroes with morph targets #rb Marcus.Wassmer #tests Load Agora_P #jira OR-23866 Change 3019581 on 2016/06/20 by Wes.Hunt Fix crash reporter client analytics for internal builds. (Pushing critical fix immediately from //UE4/Orion-Staging) #rb Chris.Wood #tests none Change 3019524 on 2016/06/20 by David.Ratti call APawn::OnRep_Controller when ClientRetryClientRestart sets the pawn directly #rb none #tests golden path Change 3019406 on 2016/06/20 by Marcus.Wassmer Duplicate 3014956 from Dev-Rendering Fixed HLOD and mesh LODs getting hit by Lightmass ray traces that didn't originate from a mesh Volume lighting samples and precomputed visibility cells are now only placed on LOD0 (of both mesh LODs and HLOD) #rb none #test none #codereview Jordan.Walker Change 3019371 on 2016/06/20 by Graeme.Thornton Optimize cooked asset registry dependency node data structures. Saves ~10mb on Paragon. #rb robert.manuszewski #tests tested with cooked pc client + server Change 3018492 on 2016/06/17 by Laurent.Delayen FBoneReferenceCustomization: support editing properties in AnimBP defaults. #rb none #tests: Sword. Change 3017974 on 2016/06/17 by Ryan.Gerleve Add an option to toggle deathcam in the gameplay settings UI if the OrionRuntimeOption for deathcam is enabled. #rb cody.haskell #tests settings menu, enabled and disabled deathcam Change 3017913 on 2016/06/17 by Robert.Manuszewski Fixing leaked log archive. #rb Steve.Robb #tests Cooked Win64 client + server Change 3017873 on 2016/06/17 by Daniel.Lamb Fix warning in diff cooked build. #test none #rb none Change 3017676 on 2016/06/17 by Sam.Zamani #online,identity,mcp fix for uninitialized variable #rb dmitry.rekman #tests none Change 3017671 on 2016/06/17 by Robert.Manuszewski Fxied and improved log message when cluster assumptions are violated. #rb Steve.Robb #tests Win64 client + server (cooked) golden path Change 3017358 on 2016/06/16 by Nick.Atamas Checking in Darnell's change that adds correct geometry to widgets inside retainer widgets. #rb none #test PIE Change 3017242 on 2016/06/16 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3017179 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3017233 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/UI/Tooltips/Hero/AbilityTooltip.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3017237 on 2016/06/16 by Dmitry.Rekman Fix accessing uninitialized field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant, Ori.Cohen #tests Compiled and ran Linux server. Change 3017236 on 2016/06/16 by Dmitry.Rekman Initialize missed field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant #tests Compiled and ran Linux server. Change 3017186 on 2016/06/16 by Dmitry.Rekman Linux: Add hooks for libcrypto memory functions. - Libcurl uses OpenSSL, which allocates memory using libcrypto's CRYPTO_malloc() and apparently on purpose does not initialize it. - This change a) redirects these allocations to use UE's malloc b) initializes it with zeros, avoiding valgrind's warnings. - This behavior is not used on Shipping configurations because the impact on entropy is not understood (TBD later). #rb Michael.Noland, Rob.Cannaday (original version) #codereview Michael.Noland, Rob.Cannaday, Alex.Fennel, Chris.Babcock, Sam.Zamani #tests Compiled Linux server and ran it. Change 3017037 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Merging content fix for driver crash from Release-27 #ROBOMERGE-SOURCE: CL 3017036 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016838 on 2016/06/16 by Alexis.Matte #jira UE-31901 fix to export all blueprint component to obj #rb uriel.doyon #codereview matt.kuhlenschmidt #test export a blueprint containing multiple staticmesh component to obj Change 3016629 on 2016/06/16 by Dmitry.Rekman Make Binned default on Linux non-editor builds. #codereview Andrew.Grant #rb none #tests none Change 3016615 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Temporarily disabling jemalloc for Linux #rb #tests none [CodeReviewed] Dmitry.Rekman #ROBOMERGE-SOURCE: CL 3016612 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016566 on 2016/06/16 by Michael.Noland Engine: Fixed a regression that broke safe zone debugging features in Windows by reintroducing code from CL# 2861030 that was accidentally deleted in a merge #codereview andrew.grant #rb dan.hertzka #tests Tested r.DebugSafeZone.Mode 1 with r.DebugSafeZone.TitleRatio 0.9 in PIE and confirmed that SSafeZone obeyed it and the red overlay appeared Change 3016521 on 2016/06/16 by Ryan.Gerleve Client recoreded replay fixes and optimizations from Dev-Networking (and one from //UE4/Main), for deathcam. Includes the following CLs from Dev-Networking: 2997908 2998001 2998832 2999054 2999057 2999749 3000051 3001361 3001365 3004958 3009972 3009973 And this CL from //UE4/Main: 3015528 #tests golden path, replays #rb john.pollard Change 3016503 on 2016/06/16 by Brian.Karis Fixed uninitialized variables on particle lights. Fixes hair shading. #rb none #tests editor Change 3016429 on 2016/06/16 by Max.Chen Sequencer: Fix StartTime when clamping start offset 0. Follow up to CL #3009386. #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3016356 on 2016/06/16 by Lina.Halper - Fix crash on rampage morphtarget Merging using //UE4/Dev-Framework_to_//Orion/Dev-General - this is dupe change from Dev-Framework #jira: https://jira.ol.epicgames.net/browse/OR-23194 #rb: Ori.Cohen #tests: editor/pie spawn as rampage's alt skin Change 3015696 on 2016/06/15 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3015646 This re-unifies our build pipeline. Fingers crossed. (only 6 files are actually different) #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3015672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3015642 on 2016/06/15 by Mieszko.Zielinski Fixes to multiple reasons AI bots were getting stuck #Orion #rb Lukasz.Furman #test golden path Change 3015622 on 2016/06/15 by Mieszko.Zielinski fixed FMetaNavMeshPath doing navmesh path update without checking nav agent if pathfinding should be postponed #UE4 #rb Lukasz.Furman #test golden path Change 3015514 on 2016/06/15 by Uriel.Doyon Fixed GlobalMipBias not affecting max texture resolution. This fix is implemented differently in Dev-Rendering in CL 301498. #jira OR-23511 #rb marcus.wassmer #test played game with different quality settings Change 3015258 on 2016/06/15 by Lina.Halper Fix crash with recursive reference between two assets #rb: Ori.Cohen #tests: Sword Change 3014988 on 2016/06/15 by Wes.Hunt Fix Cook Analytics to correctly use the Legacy provider since it sends to a local data collector. #rb daniel.lamb #tests compile Orion Change 3014962 on 2016/06/15 by Olaf.Piesche Replicating CL 3013696 from Dev-Rendering; making quality level spawn rate scale work for GPU emitters. #rb simon.tovey #tests PC editor game Change 3014958 on 2016/06/15 by Laurent.Delayen Added SkeletalMeshComponent::bIncludeComponentLocationIntoBounds to help in cases where SMU_OnlyTickPoseWhenRendered is set, and an animation pushed the mesh beyond the capsule. This ensures that when the capsule is in view, the mesh will remain updated. #rb Michael.Noland #test Sword ultimate from another player's view. Change 3014833 on 2016/06/15 by Laurent.Delayen Fix for Base Heroes having their locomotion blendspace broken. #rb Thomas.Sarkanen #codereview Thomas.Sarkanen #tests Gadget networked PIE Change 3014688 on 2016/06/15 by Nick.Darnell UMG - Fixing IsHovered on UUserWidgets. SObjectWidget did not properly call the super for MouseEnter/MouseLeave allowing SWidget's implementation to set and unset the bool. #rb none #tests PIE Change 3014325 on 2016/06/15 by Marcus.Wassmer Duplicate 3012706: Scalability CVAR for ContactShadows #rb john.billon #test flip cvar in editor. Change 3014230 on 2016/06/15 by Robert.Manuszewski Fix potentially missing log output when serializing text of length equal to the async log writer buffer size. #rb Steve.Robb #tests Tested in editor build (client + server) Change 3013913 on 2016/06/14 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Updating from DMM (updated from 27.1MM) #RB:none #Tests:compiled #ROBOMERGE-SOURCE: CL 3013912 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3013437 on 2016/06/14 by Simon.Tovey Speculative fix for OR-23158 Couldnt' repro NANs but did see it reading garbage. Reinstated the check that direct accesses for particles in a zero size emitter will return null. Altered selection code to reselect when partilce is dead or returns null and to not allow new selection on zero size emitters. #tests GoldenPath, No broken fx and no more reading garbage. #rb Olaf.Piesche Change 3013063 on 2016/06/14 by Jason.Bestimt #ORION_DG - Unclog robomerge from DMM Merge #RB:none #tests:none Change 3012936 on 2016/06/14 by Rob.Cannaday Fix for multiple account login not kicking previous logins Client was not parsing response from backend. Client was expecting content-type to be "application/json" (using FString::Equals). Backend was returning "application/json;charset=UTF-8". Changed usage from FString::Equals to FString::StartsWith #jira FORT-25452 #rb sam.zamani #tests multiple account login, frontend only Merge from FN CL 3011647, plus fixing one other location expecting "application/json" Change 3012696 on 2016/06/14 by Max.Chen Sequencer: Select actors for corresponding selected keys or sections. Copy from Dev-Sequencer #jira UE-30727 #tests Load up AnnounceMaster and select keyframes #rb none Change 3012691 on 2016/06/14 by Max.Chen Sequencer: Fix dragging the leading edge of a skeletal animation section so that it adjusts the start offset of the animation clip. Copy from Dev-Sequencer #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3012690 on 2016/06/14 by Andrew.Grant Removed Linux work-around for memory stomp alignment #rb none #tests compiled Change 3012687 on 2016/06/14 by Max.Chen Sequencer: Fix lower bound when doing post render tick so that the start of a shot doesn't render with the previous shot's time. Copy from Dev-Sequencer #rb none #tests Load up AnnounceMaster and played through sequence Change 3012627 on 2016/06/14 by Mieszko.Zielinski Added logging of current MoveID to PathfollowingComponent's vlog snapshot #UE4 #rb none #test golden path Change 3012615 on 2016/06/14 by Mieszko.Zielinski Improved fix to BTDecorator_Blackboard's latent tasks aborting #UE4 #rb Lukasz.Furman #test golden path Change 3012572 on 2016/06/14 by Dmitry.Rekman Fix realloc with non-default alignment in jemalloc (OR-23541). - Removed obsolete check(), the code was already there since CL 1834526. #rb none #codereview Andrew.Grant, Robert.Manuszewski #tests none Change 3012481 on 2016/06/14 by David.Ratti ability system #include fixups and move orion attribute capture marcros into base engine ability system execution class #rb none #tests ability system sample project Change 3012457 on 2016/06/14 by Andrew.Grant Un-fix misaligned memory-stomp fix for Linux #rb none #tests compiled Change 3012320 on 2016/06/14 by Graeme.Thornton Fixes for MemoryAnalyser2 solution - Upgraded to VS 2015 - Clean up solution configurations. Only leave "Any CPU" - Switch project to build with "Any CPU" rather than "x64". Reimplementation of CL 3012221 from Dev-Core #rb robert.manuszewski #tests opened the main window form correctly in visual studio Change 3012316 on 2016/06/14 by Thomas.Sarkanen Fix copying non-POD structs in the fast path Prevents double-deletions of TArrays etc. #jira UE-31394 - Fix problems with non-POD UStructs using the anim BP fast-path #tests Played PIE & died as Sword in OrionEntry, Exited PIE. #rb Martin.Wilson Change 3012187 on 2016/06/14 by Graeme.Thornton Corrected error message when not specifying linux server device command line correctly in UAT #rb Dmitry.Rekman #tests Checked error message was useful when wrong command line was specified Change 3012026 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3011936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3011996 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/oriongame/Content/Characters/Heroes/Hammer/Abilities/Subjugate/FX/P_SubjugateSwirls.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3011969 on 2016/06/13 by Brian.Karis Tweaks for hair Change 3011638 on 2016/06/13 by Andrew.Grant Fixed issue where RepLayout could use unaligned memoryfor property construction if allocator did not use a suitable default (fixes crash when running with MemStomp). Also added sanity check in UScriptStruct::InitializeStruct that memory is correctly aligned before calling constructor #codereview Dave.Ratti, John.Pollard #rb none #tests Ran with/without memstomp Change 3011575 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3011414 NOTE - Card data was altered. Shame shame shame. Not authoritative in DUI #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith, sammy.james, matt.kuhlenschmidt #ROBOMERGE-SOURCE: CL 3011552 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3011462 on 2016/06/13 by Alexis.Matte #jira UE-31901 The outputdevice is adding 2 uninitialize character at the end of any log, this is cause by the terminator logic. The fix is to not add those characters when no terminator should be add. #rb nick.darnell #codereview Robert.Manuszewski #test export a obj file and verify all object are exported in maya or max Change 3011424 on 2016/06/13 by Martin.Wilson Hack out fastpath anim bp code until heap corruption issue can be fixed. #rb Laurent.Delayen #tests Persona + PIE Change 3011191 on 2016/06/13 by Mieszko.Zielinski Added missing initialization of PathFollowingComponent::CurrentMoveInput #UE4 #rb none #test golden path Change 3011138 on 2016/06/13 by Mieszko.Zielinski Switched bots over from travel mode to sprinting #Orion #rb Lukasz.Furman #test golden path Change 3011075 on 2016/06/13 by David.Ratti Default GameplayAbility instancing policy to InstancePerExecution #rb BenZ #tests compile Change 3011051 on 2016/06/13 by David.Ratti Add missing include so GameplayAbilitySet.h can be included on its own. #rb none #tests compile Change 3010968 on 2016/06/13 by Mieszko.Zielinski Fixed console variables crashing on "" string #UE4 #rb Lukasz.Furman #codereview Martin.Mittring #test PIE Change 3010888 on 2016/06/13 by Alexis.Matte #jira OR-23301 Close the OS handle when closing the FAsyncWriter. #rb Robert.Manuszewski #codereview Robert.Manuszewski #test try to export a obj file Change 3010239 on 2016/06/11 by Michael.Noland UMG - Adding back the logic to use the normal WidgetTree when the DesignerWidgetTree is not defined. [duplicated fix from CL# 2998267] #jira UE-31570 #tests Compiled some blueprints #rb none Change 3009870 on 2016/06/10 by Wes.Hunt Remove logging of analytics payloads from dedicated servers #jira UE-31858 #codereview:dmitry.rekman #rb none #tests All testing was done in Dev-Framework. This change was redone in this branch to get it here faster. Change 3009599 on 2016/06/10 by Michael.Noland Rendering: Corrected a misleading help comment on r.StaticMeshLODDistanceScale, explaining how it affects LOD calculations (it multiplies the effective distance, so larger numbers make transitions happen sooner) #tests Verified in the output of the help command #rb none #rn Change 3009559 on 2016/06/10 by Marcus.Wassmer Fix 11/11/10 SceneColorFormat option, enable AntiGhosting on TemporalAA, ensure TemporalAA output is the correct format for accumulating results. Set SceneColorFormat to 2 on PS4 and lowspec PC. All in all saves .3-.5ms on PS4 and improves temporalAA ghosting. #rb Brian.Karis #test Agora PS4 / PC Change 3009525 on 2016/06/10 by David.Ratti Fix case where ObjectLIbrary would not be able to find classes when searching "/Game" path. #rb none #tests object libraries in paragon Change 3009228 on 2016/06/10 by David.Ratti remove world check. Can be triggered in editor with PIE #rb none #tests pie Change 3009050 on 2016/06/10 by Dmitry.Rekman Fix LinuxClient platform not being built on Windows, and not instantiating a target platform instance. - Fixes by BenM. #rb none #codereview Ben.Marsh #tests Compiled OrionEditor on Linux. Change 3008973 on 2016/06/10 by Marcus.Wassmer Fix Windualshock on VS2015 #rb Rolando.Caloca #test PS4 controller on VS2015 build Change 3008970 on 2016/06/10 by David.Ratti Fix warning about minimal replication tag count -Made bit count a config setting. Bumped to 5 -Minor optimization to UAbilitySystemGlobals::Get() #rb none #tests goldne path, pie Change 3008478 on 2016/06/09 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3008469 #RB:none #Tests:none Change 3008416 on 2016/06/09 by Andrew.Grant Adding 'config' as an option to set both clientconfig / serverconfig when using BuildCookRun #review-3008417 Ben.Marsh, Justin.Sargent #rb none #tests BuildCookRun with config Change 3008286 on 2016/06/09 by Dmitry.Rekman Add LinuxClient target platform. #rb none #tests Compile OrionEditor on Linux. #codereview Brad.Angelcyk, Ben.Marsh Change 3007978 on 2016/06/09 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3007507 #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith #ROBOMERGE-SOURCE: CL 3007968 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3007771 on 2016/06/09 by Laurent.Delayen Fixed GetIntFromComp breaking with INDEX_NONE. Fixes crash in OrientationWarping node. #rb martin.wilson #codereview martin.wilson #tests Sword Leap. Change 3007436 on 2016/06/09 by David.Ratti change designer facing parameter name #rb none #test compile Change 3007408 on 2016/06/09 by David.Ratti WaitGameplayEffectBlockedImmunity - ability task for listening to immunity events #rb danY #tests pie Change 3007250 on 2016/06/09 by bruce.nesbit Banner impact location fix. (OR-23179) #rb none #tests Game+PIE Change 3007228 on 2016/06/09 by Ben.Marsh BuildGraph: Rename -SkipNodesWithoutTickets parameter to -SkipTargetsWithoutTickets, to reflect that it's filtering the list of targets rather than the full graph. #rb none #tests none Change 3007225 on 2016/06/09 by Ben.Marsh EC: Set the -TicketSignature=... parameter for all BuildGraph jobs started by EC to the URL of the current job. Change 3006985 on 2016/06/08 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3006936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3006978 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3006926 on 2016/06/08 by Andrew.Grant Merging //UE4/Main @ 300872 via //UE4/Orion-Staging #rb none #tests engine QA, orion qa smoke Change 3006444 on 2016/06/08 by Ben.Marsh BuildGraph: Add mechanism to specify that nodes can only be built once for a given changelist. Nodes can have an associated ticket file, and they are only permitted to build if the ticket is assigned to the current job. Tickets are created if they don't exist, and written with a signature specific to the job specified via the -TicketSignature="..." parameter. By default, builds will fail if a ticket has been already granted to another job, but the -SkipNodesWithoutTickets parameter instructs the graph to skip affected nodes instead. #rb none #tests none Change 3006389 on 2016/06/08 by Daniel.Lamb Delay the processing of packages which aren't ready till the end of the cook. This allows other packages to be processed sooner. #rb Peter.Sauerbrei #test cook orion. Change 3006306 on 2016/06/08 by Michael.Noland Rendering: Added FreezeRendering to the console autocomplete list #rn Change 3006305 on 2016/06/08 by Michael.Noland HLOD: Added a way to control how far down the HLOD hierarchy to allow showing (can be used to limit quality loss and streaming texture memory usage on high scalability settings for example) Controlled by the new cvar r.HLOD.MaximumLevel, which can be set to the following values: -1: No maximum level (default) 0: Prevent ever showing a HLOD cluster instead of individual meshes 1: Allow only the first level of HLOD clusters to be shown 2+: Allow up to the Nth level of HLOD clusters to be shown Note: This does not affect the memory used by the HLOD meshes itself or their always loaded low mip levels, it will only save the memory associated with streaming in the higher mip levels HLOD: Allowed r.HLOD console command to be used in Test configurations HLOD: Removed some dead code in ALODActor and scene view / scene proxy relating to a different way to force visualization that has no trigger HLOD: Fixed an uninitialized memory bug in the static mesh scene proxy HLODcoloration visualization code #rn #codereview jurre.debaare #rb marc.audy #tests Tested with various settings in Paragon and tried creating some new clusters in the editor Change 3006304 on 2016/06/08 by Michael.Noland Engine: Changed the code in AActor::IncrementalRegisterComponents to obey bAutoRegister for the root component rather than asserting that it is true. Note: If children components have bAutoRegister=true, they will still pull the root component into the fray and cause it to be registered first #rb marc.audy #tests Tested with code that registers or unregisters HLOD clusters at varying levels in Paragon Change 3006041 on 2016/06/08 by Andrew.Grant Added buildidoverride to shipping whitelist #rb none #tests compiled and used param in shipping Change 3005678 on 2016/06/08 by Ben.Marsh Back out changelist 3004395 #rb none #tests none Change 3005265 on 2016/06/07 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3005120 #RB: none #Tests: none #ROBOMERGE-SOURCE: CL 3005250 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3005081 on 2016/06/07 by Daniel.Lamb Reworked the way packages which are renamed on load are added to the cooked package list. Cooker now has options for MaxMemoryAllowance as a percentage and also MinFreeMemory (which takes into account used system memory not just total system memory). #rb Andrew.Grant, Marcus.Wasmer #test cook orion Change 3004752 on 2016/06/07 by Daniel.Lamb Requeue packages to the next package on the list instead of to the end of the list. #rb Andrew.Grant #test cook orion Change 3004560 on 2016/06/07 by David.Ratti Kill timelines, latent actions, timer when recycling gameplay cues #rb danY #tests pie Change 3004559 on 2016/06/07 by David.Ratti Object Library: -Added bool bIncludeOnlyOnDiskAssets that can be set by owner. Passed on to the AR filter when gathering assets. GameplayCue Editor: -Fix issue with new notifies not showing up after being created through the GC Editor (until restart). -Fix issue for new projects, that don't have gameplayclue tags defined, not being able to add gameplay cue tags through the editor without restarting once. #rb none #tests editor Change 3004395 on 2016/06/07 by Ben.Marsh BuildGraph: Add a script function to ensure exclusive access to a given resource. The AcquireLockFile() function takes two arguments; a path to a text file, and the name of an owner. The file is created and the owner name written to it if it doesn't already exist, otherwise the contents of it are compared against the given owner string. The operation happens transactionally, and the function returns true if file contains the given owner string on exit. Logical and/or conditions are now also short-circuited, so the result of the AcquireLockFile() function can be used to control derived property definitions within an executing job. #rb none #tests none Change 3004164 on 2016/06/07 by David.Ratti Ability system: use player controller netmode over avatar actor when possible. Fixes issue if torn off, authority, client side actor tries to activate an ability. #rb danY #tests multi pie Change 3003837 on 2016/06/07 by David.Ratti Ability system engine work -Default to /Game as search path for gameplay cues, if no explicit paths are set in the config. #rb none #tests ability sample project Change 3002800 on 2016/06/06 by Marcus.Wassmer Fix shader crash in PIE #rb none #test PIE Change 3002657 on 2016/06/06 by Dmitry.Rekman Do not copy to clipboard on crash if headless or on the wrong thread. - Could result in crash handler crashing itself in some circumstances. #rb none #codereveiw Brad.Angelcyk #tests Compiled Linux dedicated server and CrashReportClient. Change 3002546 on 2016/06/06 by Daniel.Lamb Improve cooking performance. Allow cooker to save other packages opportunistically if main package is compiling shaders. Allow cooker to load more packages if there aren't many packages to save. #rb Josh.Adams #test cook orion Change 3002369 on 2016/06/06 by Marcus.Wassmer Project setting for optional rendering features to reduce shader compile times. # of shaders per material is reduced by ~30-40% depending on material #rb Daniel.Wright #test Editor with/without all options, cooked ps4. Change 3002142 on 2016/06/06 by David.Ratti Ability system engine level: -Fix crash when gameplay cue editor starts if there are no gameplay cue paths specified -Fix crash when GameplayCue tag is not specified #rb none #tests sample ability system project, paragon Change 3002106 on 2016/06/06 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #orion - add support for code tokens which can be shared/redeemed - refactor of existing friend founder's pack codes to be displayed in a generic way using code token info - added CodeToken.FounderFriendInviteT0 for new paragon tier 0 code which grants access to game without also giving a Founder's pack - added CodeToken.FounderFriendInviteT1 to replace existing CodeToken.FriendPC and CodeToken.FriendPS4 Founder's pack codes. Existing codes aliased to the new CodeToken.FounderFriendInviteT1 code - No longer differentiation between PC/PS4 friend codes - "Share Friend Code" button will now process all available codes that can be issued instead of just 1 - updated Orion service Mcp call for getUnredeemedCodes() to ignore the code template id and return all available codes. Each returned code will also include the type [CodeReviewed]: david.nikdel, jason.bestimt #rb david.nikdel #tests PC PIE using localhost and profile proxy for granting codes, also existing account with legacy codes #ROBOMERGE-SOURCE: CL 3002104 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3001218 on 2016/06/05 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3001162 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3001200 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 2999508 on 2016/06/03 by jason.bestimt #ORION_MAIN - Merge 27 @ CL 2999463 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 2999498 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Audio/ClassesAndMixes/Classes/Master.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 2999465 on 2016/06/03 by Robert.Manuszewski Whitelisting more DLLs for injection. #rb none #tests none Change 2999455 on 2016/06/03 by Lukasz.Furman disabled path invalidation events for minions #orion #rb Mieszko.Zielinski #tests PIE with additional debug logging Change 2998488 on 2016/06/02 by Michael.Noland Engine: Prevent forced drawing of spline components in Test configuration #codereview james.golding #tests Ran a cooked Test build on a map with splines in it #rb david.ratti #robomerge: main Change 2997954 on 2016/06/02 by Jason.Bestimt #ROBOMERGE-AUTHOR: jon.lietz OR-22425 no longer try to updat the tag map and modifiers when the gameplay effect that is being removed was not active. #RB Dave.Ratti #Tests golden path #ROBOMERGE-SOURCE: CL 2997940 in //Orion/Release-0.27/... via CL 2997943 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 2997750 on 2016/06/02 by Graeme.Thornton Add FPakFile::Check() that attempts to open and read the data out of every file in a pak, to check for corruption Added -checkpak option for force a check of every mounted pak file #rb robert.manuszewski #tests tested against cooked pc client. made sure my data succeeded. made sure corrupted data throws an error. [CL 3031715 by Andrew Grant in Main branch]
2016-06-28 17:59:42 -04:00
float CosThetaD = cos( 0.5 * abs( asinFast( SinThetaV ) - asinFast( SinThetaL ) ) );
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
//CosThetaD = abs( CosThetaD ) < 0.01 ? 0.01 : CosThetaD;
const float3 Lp = L - SinThetaL * N;
const float3 Vp = V - SinThetaV * N;
const float CosPhi = dot(Lp,Vp) * rsqrt( dot(Lp,Lp) * dot(Vp,Vp) + 1e-4 );
const float CosHalfPhi = sqrt( saturate( 0.5 + 0.5 * CosPhi ) );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//const float Phi = acosFast( CosPhi );
float n = 1.55;
//float n_prime = sqrt( n*n - 1 + Pow2( CosThetaD ) ) / CosThetaD;
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
float n_prime = 1.19 / CosThetaD + 0.36 * CosThetaD;
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
float Shift = 0.035;
float Alpha[] =
{
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
-Shift * 2,
Shift,
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
Shift * 4,
};
float B[] =
{
Copying //UE4/Orion-Staging to //UE4/Main (Source //Orion/Dev-General @ 2927258) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2927181 on 2016/03/29 by Dmitry.Rekman (Optionally) exclude idle time from server FPS charts. - Time spent waiting for the next frame in order to hit capped FPS can be optionally excluded by using t.FPSChart.ExcludeIdleTime (set to 1 for servers). - Server FPS charts analytics events and log output will include the information if idle time was excluded. - Also: added a log line each time we detect a server hitch for easier pin-pointing them in the log. #rb Paul.Moore #codereview Paul.Moore, Michael.Noland #tests Ran Linux server and Windows client on compatible content. Change 2927084 on 2016/03/29 by Ben.Marsh BuildGraph: Don't allow triggers to run until all their order dependencies are complete. Just because a downstream node doesn't have a dependency on an upstream node via temp storage doesn't mean it can run immediately. #rb none #tests none Change 2927060 on 2016/03/29 by Michael.Noland Renamed GPU analytics event from GPU to DesktopGPU to reflect that it is the default desktop adapter and not the one we initialized (which is GPUAdapter) Updated text/log based FPS chart events to print out GPUAdapter instead (with DesktopGPU in parens if they differ, e.g., in an optimus setup) #rb marcus.wassmer #tests Ran and did some fps charts Change 2927048 on 2016/03/29 by Michael.Noland HLOD: Removed an unused cvar r.HLODEnabled (everything is done thru r.HLOD) #tests Compiled and ran Paragon #rb marcus.wassmer Change 2926920 on 2016/03/29 by Ben.Marsh BuildGraph: Update schema with Rename task. Change 2926911 on 2016/03/29 by Ben.Marsh BuildGraph: Add a task which can rename files matching a given wildcard. Syntax is: <Rename Files="*.txt" To="*.md"> or <Rename Files="Engine/Build/..." From="*.txt" To="*.md"/> #rb none #tests none Change 2926908 on 2016/03/29 by Andrew.Grant Fix for CDO properties of renamed blueprints not being applied #rb none #tests loaded Origin map (renamed from Playgo3) and verified properties are applied. Change 2926799 on 2016/03/29 by Jason.Bestimt #ORION_DG - Merge MAIN (23) @ CL# 2926780 #RB:none #Tests:none Change 2926663 on 2016/03/29 by david.nikdel #ROBOMERGE-OBO: jason.bestimt #ROBOMERGE-SOURCE: CL 2926660 in //Orion/Release-0.23/... via CL 2926662 #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ORION_23 - Potential fix for Cook failures "Fix shelved in 2926635, tested in Dev-Blueprints. Could not run any GEditor related logic safely in ShutdownModule because of the same destruction issue orders that caused the bug in the first place. I will chat with Editor team about nulling out GEditor the same way we null out GUnrealEd." #RB:none #Tests: none [CodeReviewed]: andrew.grant, dan.oconnor Change 2926510 on 2016/03/29 by Andrew.Grant Potential fix for OR-18207 - editor becomes unresponsive (audio deadlock) #rb none #tests compiled Change 2926495 on 2016/03/29 by Rob.Cannaday Change storing HTTP requests as raw pointers to weak pointers with validity being checked via Pinning it #jira FORT-18947 #jira OR-17695 #tests golden path #rb eric.newman Change 2926427 on 2016/03/29 by Josh.Markiewicz #UE4 - fixed typo #rb none #tests none Change 2926250 on 2016/03/29 by Martin.Mittring fixed OR-18489 HERO: IGGY: RMB on E ability causes blinding hair effect #rb:Chris.Bunner #codereview:Brian.Karis Change 2926224 on 2016/03/29 by Daniel.Lamb Fix for potenital threading issue with Console manager removing vars which could cause double free. #rb Robert.Manuszewski #test Orion cook Change 2926174 on 2016/03/29 by Gareth.Martin Cloned fix for bUseMaterialPositionOffsetInStaticLighting crashing across from //UE4/Dev-Landscape/ to unblock people #rb #tests editor Change 2925968 on 2016/03/29 by David.Nikdel #MCP #OSS - Read RedirectUrl from ini #RB: Eric.Newman #TESTS: compiled in another branch (merge over) #ROBOMERGE: Main [CL 2929424 by Andrew Grant in Main branch]
2016-03-31 15:18:30 -04:00
Area + Pow2( ClampedRoughness ),
Area + Pow2( ClampedRoughness ) / 2,
Area + Pow2( ClampedRoughness ) * 2,
};
float3 S = 0;
// R
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
if(1)
{
const float sa = sin( Alpha[0] );
const float ca = cos( Alpha[0] );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
float Shift = 2*sa* ( ca * CosHalfPhi * sqrt( 1 - SinThetaV * SinThetaV ) + sa * SinThetaV );
float Mp = Hair_g( B[0] * sqrt(2.0) * CosHalfPhi, SinThetaL + SinThetaV - Shift );
float Np = 0.25 * CosHalfPhi;
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
float Fp = Hair_F( sqrt( saturate( 0.5 + 0.5 * VoL ) ) );
S += Mp * Np * Fp * ( GBuffer.Specular * 2 ) * lerp( 1, Backlit, saturate(-VoL) );
}
// TT
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
if(1)
{
float Mp = Hair_g( B[1], SinThetaL + SinThetaV - Alpha[1] );
float a = 1 / n_prime;
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float h = CosHalfPhi * rsqrt( 1 + a*a - 2*a * sqrt( 0.5 - 0.5 * CosPhi ) );
//float h = CosHalfPhi * ( ( 1 - Pow2( CosHalfPhi ) ) * a + 1 );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
float h = CosHalfPhi * ( 1 + a * ( 0.6 - 0.8 * CosPhi ) );
//float h = 0.4;
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float yi = asinFast(h);
//float yt = asinFast(h / n_prime);
float f = Hair_F( CosThetaD * sqrt( saturate( 1 - h*h ) ) );
float Fp = Pow2(1 - f);
//float3 Tp = pow( GBuffer.BaseColor, 0.5 * ( 1 + cos(2*yt) ) / CosThetaD );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float3 Tp = pow( GBuffer.BaseColor, 0.5 * cos(yt) / CosThetaD );
float3 Tp = pow( GBuffer.BaseColor, 0.5 * sqrt( 1 - Pow2(h * a) ) / CosThetaD );
//float t = asin( 1 / n_prime );
//float d = ( sqrt(2) - t ) / ( 1 - t );
//float s = -0.5 * PI * (1 - 1 / n_prime) * log( 2*d - 1 - 2 * sqrt( d * (d - 1) ) );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float s = 0.35;
Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3028454) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3028439 on 2016/06/27 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28 @ CL 3028090 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3028437 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3027952 on 2016/06/26 by Jurre.deBaare - Integrating code fixes/changes from Simplygon for Normals issue on Simplygon Swarm + landscape culling - Readded landscape/volume culling for in-engine static mesh merging path - Fixed issue with r.HLOD force -1 (now stops forcing hlods) - Marked hlodcullingvolume as experimental - Added Landscape culling flag + precision level #codereview Michael.Noland #rb Michael.Noland #tests build clusters locally/cloud + landscape culling tests Change 3027702 on 2016/06/25 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3027698 #RB:none #Tests:none Change 3027312 on 2016/06/24 by Daniel.Lamb Changed the way reentry data is stored in the cooker, reduce work load by main thread, also fix issue with reentry data being used from incorrect packages. #rb Peter.Sauerbrei #test QA game launch on and cook by the book + cook on the fly paragon Change 3027165 on 2016/06/24 by Daniel.Lamb Fix compiler warnings from cvars changes. #rb none #test cook paragon Change 3026900 on 2016/06/24 by Daniel.Lamb Change the way low quality lightmap shaders are enabled / disabled as the engine can't be used in the should cache function. #rb Marcus.Wasmer #test Cook on the fly paragon #codereview Rolando.Caloca Change 3026874 on 2016/06/24 by Olaf.Piesche #jira OR-18363 fix distortion in particle macro UVs with camera movement #rb frank.fella #tests PC Editor/Game Change 3026494 on 2016/06/24 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3026460 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3026476 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3026381 on 2016/06/24 by Graeme.Thornton Strip particle modules, emitters and lodlevels from cooked server data. Saves ~10mb of runtime memory on Paragon #rb simon.tovey #codereview dmitry.rekman #tests pc cooked client/server, golden path Change 3025760 on 2016/06/23 by jason.bestimt #ORION_MAIN - Merge 28 @ CL 3025687 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3025709 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword.uasset - can't integrate exclusive file already opened //Orion/Dev-General/OrionGame/Content/Characters/Heroes/Sword/Meshes/sword_Skeleton.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3025661 on 2016/06/23 by Mieszko.Zielinski Added a feature to PathfollowingComponent allowing it to identify when it starts following a navigation link #UE4 #rb Lukasz.Furman #test golden path Change 3025359 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #online,externalui,ps4 - expose access to reset cookies before invoking embedded web browser - fixed not capturing resulting Url when PS4 browser is closed #rb none #tests ps4 #ROBOMERGE-SOURCE: CL 3025356 in //Orion/Release-28/... via CL 3025358 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3025184 on 2016/06/23 by Lina.Halper Fix crash with morphtargets #jira: OR-24257 #rb: Rolando.Caloca #tests: switching mesh with different morphtargets in editor Change 3024714 on 2016/06/23 by Lukasz.Furman added vlog extension to visual debugger tool, added object whitelist to vlog to include selected minion data in games started with -LogBotGame param #rb Mieszko.Zielinski #tests server game with and without LogBotGame cmdline Change 3024709 on 2016/06/23 by Daniel.Lamb Added support for async save when saving seperate bulk data file. Added mb saved to cooking package stats. #rb Andrew.Grant,Wes.Hunt #test Cook Paragon Change 3024674 on 2016/06/23 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani Merging //Orion/Release-28 to Main (//Orion/Main) #online,identity,ps4 - add psplus flag to online account after privilege check #rb none #tests ps4 login flow #ROBOMERGE-SOURCE: CL 3024672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3024510 on 2016/06/23 by Graeme.Thornton Added more info to the dumpparticlesystems exec command output #rb simon.tovey #tests cooked pc client, golden path Change 3024504 on 2016/06/23 by Graeme.Thornton Asset registry memory optimisation - make sure all dependency node link arrays are sized exactly as they need to be (saves ~1mb) #rb robert.manuszewski #tests windows cooked client, golden path Change 3024213 on 2016/06/22 by Ryan.Gerleve Handle a rare case in replays where the spectator controller is null but we still find a valid NetGUID for it. Added an ensure before a check that would fail in this case so we'll know if it happens again. #tests replays #rb john.pollard Change 3024127 on 2016/06/22 by John.Pollard Bulk merge using Dev-Networking_->_Dev-General_(Orion) 3002989 Add ability to skip missing/changed properties in FFastArraySerializer 3003072 Fix crash related to new replay backwards compatibility changes 3008097 Renaming CompatibleReplayout to NetFieldExportGroup preparing to unify ability to use FNetFieldExportGroup for both RepLayout and FClassNetCache 3009684 Added ability to use FNetFieldExportGroups for FClassNetCache as well as FRepLayout * Adds ability to track missing/changed custom delta properties names * Adds ability to track missing/changed RPC's 3013455 Add ability to skip over RPC parameters that have changes/missing in replays for backwards compatibility * We now mark FClassNetCache properties as bIncompatible so we don't spam forever when they are out of date * No longer factor in parameters when building checksum for RPC's * Save FNetFieldExport handle for FClassNetCache fields * Use WriteIntWrapped when saving FClassNetCache fields FNetFieldExport handles (and use NetFieldExportGroup->NetFieldExports.Num() to determine max value) * Lots of cleanup and sanity checking improvements 3018078 Optimize replay checkpoints * Share work that was already done during normal replication, and re-use this data to remove the need to compare any checkpoint properties * When saving a checkpoint, we no longer create a new connection and new channels, instead we re-use the existing channels, and added the ability to make this a transient operation * To make custom delta serialize properties work, we compare against the CDO state instead of current state when saving out a checkpoint 3021196 Fix issue with Fast tarray exporting package map info during checkpoints * Add ability to save and restore package map ack status * Save package map ack status before saving checkpoint, and then restore it back afterwards, this will then allow the stream that writes afterward to re-export anything that was new in the checkpoint * No longer queue up reliable bunches on ack list for internal ack connections 3024033 Prune the cached change list before using when saving out checkpoints * Fixes issues when saving checkpoint, and the live properties change array size, which throws everything off when it comes time to use the LifetimeChangelist 3024034 Don't close channels when saving checkpoints, fixes issue where it creates a bunch with bOpen/bClose (because we're forcing all SendBunches to re-open channels), which throws off the stream #rb RyanG #tests Replays Change 3024021 on 2016/06/22 by Dmitry.Rekman Fix PS4 build. #rb Michael.Noland #tests none #codereview Michael.Noland, Dan.Youhon, Sammy.James Change 3023734 on 2016/06/22 by Lukasz.Furman added replication for input events and tool state for both gameplay debugger categories and extensions #ue4 #rb Mieszko.Zielinski #tests PIE, server game Change 3023708 on 2016/06/22 by Dmitry.Rekman Add a separate macro for a poison malloc proxy usage. #rb Michael.Noland #codereview Michael.Noland, Gil.Gribb #tests Compiled OrionServer-Linux-Debug, ran it Change 3023670 on 2016/06/22 by Nick.Darnell Home screen - Fixing safezones on the homescreen. Adding a scale option to the XP_Fill widget. Adding better animations to the tiles. Showing subtitles again. Hero XP summary widget now takes you to that hero. #rb none #tests PIE Change 3023632 on 2016/06/22 by Dmitry.Rekman Fix incorrect matching condition in comments. #rb none #tests Compiled OrionServer-Linux-Debug #codereview Michael.Noland Change 3023475 on 2016/06/22 by Rolando.Caloca O - Back out changelist 3022847 as it broke SSS on PC #rb none #tests re-run editor on PC Change 3023178 on 2016/06/22 by Michael.Noland Engine: Added system memory and % of time spent hitching to analytics #rb bob.tellez #tests Tested a match in Paragon Change 3022963 on 2016/06/22 by Mieszko.Zielinski Fixed a subtle navigation repathing bug #UE4 While repathing to a location, rather than an actor, the navigation query used path's end while it should be using the original query's EndLocation. #rb Lukasz.Furman #test golden path Change 3022865 on 2016/06/22 by David.Ratti gameplay cue editor: remove "GameplayCue_" prefix from default GameplayCueNotify filename in default ability system projects #rb none #tests ability system sample project Change 3022847 on 2016/06/22 by Rolando.Caloca O - Remove checkerboard SSS rendering and recombine post process pass when SSS not enabled #rb Marcus.Wassmer #codereview Marcus.Wassmer, Brian.Karis #tests Load Agora_P, check perf, toggle r.SSS.Quality 1/0, check characters with skin Change 3022804 on 2016/06/22 by Mieszko.Zielinski Fixed AIController clearing out CachedGameplayTasksComponent on UnPosses, even if Pawn was not the CachedGameplayTasksComponent's owner #UE4 Also, made running BT not clearing info in BB if AI's current BB is compatible with the one required by BT #rb Lukasz.Furman #test golden path Change 3022674 on 2016/06/22 by Robert.Manuszewski Reimplementing CL #2993969 (Dev-Blueprints) by Maciej.Mroz: UE-30729 Crash in Native Orion when selecting Sword or Tomahawk Clear AsyncLoading in subobjects. #jira OR-23997 #rb me #tests Golden path in editor build, selecting Venus Change 3022405 on 2016/06/21 by Ryan.Gerleve Fix for OR-23948, crash with death cam enabled. Use a weak pointer to store the viewer on the DemoNetDriver and update it when the game player controller is received. #rb john.pollard #tests bug repro Change 3022387 on 2016/06/21 by Ryan.Gerleve Added the ability to disable ticking of individual worlds. #tests golden path #rb john.pollard #codereview marc.audy Change 3022312 on 2016/06/21 by Nick.Darnell Home Screen - Adding a max aspect ratio lock to SBox, may need some more fine tuning math may still be a bit pants in some cases. The XP ovewview panels now have a basic support for account and hero progression. Hero one shows the last hero you played, widget is invisibile until you play your first game. The tiles now use the Max Aspect Ratio to prevent stretching forever on 21:9 monitors causing them to just look crazy. Weekly quests now show the weekly quests screen when clicked. OrionUserWidgetBase no longer prevents blueprints from running code in reponse to mouse down/up actions if the userwidget consumes input - it always calls the blueprint code first, and always returns handled if it consumes input. #rb none #tests PIE Change 3022207 on 2016/06/21 by Wes.Hunt Fix Analytics provider to retain passed in AppVersion string instead of using default %VERSION%. #rb none #tests run windows server with one bot connecting and checking analytics version is what is expected. Change 3021808 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - call GetTotalMicroseconds instead of GetTotalMilliseconds * 1000 #rb none #tests compile run ps4 #ROBOMERGE-SOURCE: CL 3021805 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021663 on 2016/06/21 by Jason.Bestimt #ROBOMERGE-AUTHOR: josh.markiewicz #UE4 - CancelFindSessions() didn't null out search result - future FindSession() calls would fail with "search in progress" #rb joe.wilcox #tests UT matchmaking #ROBOMERGE-SOURCE: CL 3021655 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3021508 on 2016/06/21 by Marcus.Wassmer Remove anti-ghosting AA for now. Causes dithered transparency to be very wrong (Dekker shoulders) And also a border around all characters of 'noisy fuzz' even when they are not moving #rb none #test PC/PS4 #codereview Brian.Karis,Jordan.Walker Change 3021475 on 2016/06/21 by Marcus.Wassmer Duplicate fix for subsurface spec in prep for PS4 optimization. (DevRendering 3018664) unified some code for easier maintainance, fixed missing multiply from former change #rb none #test PS4/PC agora Change 3021468 on 2016/06/21 by Michael.Noland Physics: Added more information when convex cooking partially succeeds (fails initially but succeeds with inflation) indicating the full path of the mesh that failed #rb ori.cohen #tests Compiled changes, will provide more information when issue reoccurs in build machine cooks #jira OR-24082 Change 3021460 on 2016/06/21 by Michael.Noland Engine: Added time spent in each hitch bucket to FPS chart .log output and analytics output #rb bob.tellez #tests Tested a match in Paragon #codereview dmitry.rekman Change 3021368 on 2016/06/21 by Marcus.Wassmer Create Tonemapper configuration with no ColorFringe to save .15ms on PS4 when colorfringe is not used. #rb rolando.caloca #test agora with/wo new config #codereview brian.karis Change 3021119 on 2016/06/21 by David.Ratti Make -notimeouts work during initial connecting phase #codereview John.Pollard #rb none #tests pie agora Change 3021048 on 2016/06/21 by David.Ratti minor tweaks to gameplay cues: -Descriptions of engine GC notify classes -Added 'auto attach to owner' flag on actor notify class. #rb none #test ability system sample project Change 3020694 on 2016/06/20 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3020301 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3020674 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #CodeReview: cody.haskell Change 3020624 on 2016/06/20 by Michael.Noland Engine: Pushing more fps chart analytics up to engine level code from Paragon Engine: Pushing benchmark config vars up to engine level code from Paragon, and added records of individual sub-steps of benchmarks #rb Bob.Tellez #tests Golden path Solo VS AI in Paragon and forced a match #codereview bob.tellez, peter.knepley Change 3020181 on 2016/06/20 by Dmitry.Rekman Re-do allowing allocations in NullRHI (OR-24029). - Originally CL 2990582 by MarcusW, stomped during merge by CL 3006926. #rb none #codereview Marcus.Wassmer, Andrew.Grant #tests none Change 3020139 on 2016/06/20 by Ryan.Gerleve Added ability to pause replay recording while keeping the current replay open. #rb john.pollard #tests paused deathcam recording while disabled Change 3019817 on 2016/06/20 by Dmitry.Rekman Poison allocated/freed memory in Debug and Development (non-editor) configs. - With this Paragon client may be more likely to crash on start. #rb Steve.Robb #codereview Robert.Manuszewski, Michael.Noland, Andrew.Grant, Gil.Gribb, Steve.Robb #tests Built Linux server and Windows client, ran them, also built Windows Orion editor. Change 3019599 on 2016/06/20 by Rolando.Caloca O - Fix flickering on heroes with morph targets #rb Marcus.Wassmer #tests Load Agora_P #jira OR-23866 Change 3019581 on 2016/06/20 by Wes.Hunt Fix crash reporter client analytics for internal builds. (Pushing critical fix immediately from //UE4/Orion-Staging) #rb Chris.Wood #tests none Change 3019524 on 2016/06/20 by David.Ratti call APawn::OnRep_Controller when ClientRetryClientRestart sets the pawn directly #rb none #tests golden path Change 3019406 on 2016/06/20 by Marcus.Wassmer Duplicate 3014956 from Dev-Rendering Fixed HLOD and mesh LODs getting hit by Lightmass ray traces that didn't originate from a mesh Volume lighting samples and precomputed visibility cells are now only placed on LOD0 (of both mesh LODs and HLOD) #rb none #test none #codereview Jordan.Walker Change 3019371 on 2016/06/20 by Graeme.Thornton Optimize cooked asset registry dependency node data structures. Saves ~10mb on Paragon. #rb robert.manuszewski #tests tested with cooked pc client + server Change 3018492 on 2016/06/17 by Laurent.Delayen FBoneReferenceCustomization: support editing properties in AnimBP defaults. #rb none #tests: Sword. Change 3017974 on 2016/06/17 by Ryan.Gerleve Add an option to toggle deathcam in the gameplay settings UI if the OrionRuntimeOption for deathcam is enabled. #rb cody.haskell #tests settings menu, enabled and disabled deathcam Change 3017913 on 2016/06/17 by Robert.Manuszewski Fixing leaked log archive. #rb Steve.Robb #tests Cooked Win64 client + server Change 3017873 on 2016/06/17 by Daniel.Lamb Fix warning in diff cooked build. #test none #rb none Change 3017676 on 2016/06/17 by Sam.Zamani #online,identity,mcp fix for uninitialized variable #rb dmitry.rekman #tests none Change 3017671 on 2016/06/17 by Robert.Manuszewski Fxied and improved log message when cluster assumptions are violated. #rb Steve.Robb #tests Win64 client + server (cooked) golden path Change 3017358 on 2016/06/16 by Nick.Atamas Checking in Darnell's change that adds correct geometry to widgets inside retainer widgets. #rb none #test PIE Change 3017242 on 2016/06/16 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3017179 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3017233 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/UI/Tooltips/Hero/AbilityTooltip.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3017237 on 2016/06/16 by Dmitry.Rekman Fix accessing uninitialized field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant, Ori.Cohen #tests Compiled and ran Linux server. Change 3017236 on 2016/06/16 by Dmitry.Rekman Initialize missed field (kills valgrind warnings). #rb none #codereview Michael.Noland, Andrew.Grant #tests Compiled and ran Linux server. Change 3017186 on 2016/06/16 by Dmitry.Rekman Linux: Add hooks for libcrypto memory functions. - Libcurl uses OpenSSL, which allocates memory using libcrypto's CRYPTO_malloc() and apparently on purpose does not initialize it. - This change a) redirects these allocations to use UE's malloc b) initializes it with zeros, avoiding valgrind's warnings. - This behavior is not used on Shipping configurations because the impact on entropy is not understood (TBD later). #rb Michael.Noland, Rob.Cannaday (original version) #codereview Michael.Noland, Rob.Cannaday, Alex.Fennel, Chris.Babcock, Sam.Zamani #tests Compiled Linux server and ran it. Change 3017037 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Merging content fix for driver crash from Release-27 #ROBOMERGE-SOURCE: CL 3017036 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016838 on 2016/06/16 by Alexis.Matte #jira UE-31901 fix to export all blueprint component to obj #rb uriel.doyon #codereview matt.kuhlenschmidt #test export a blueprint containing multiple staticmesh component to obj Change 3016629 on 2016/06/16 by Dmitry.Rekman Make Binned default on Linux non-editor builds. #codereview Andrew.Grant #rb none #tests none Change 3016615 on 2016/06/16 by Jason.Bestimt #ROBOMERGE-AUTHOR: andrew.grant Temporarily disabling jemalloc for Linux #rb #tests none [CodeReviewed] Dmitry.Rekman #ROBOMERGE-SOURCE: CL 3016612 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3016566 on 2016/06/16 by Michael.Noland Engine: Fixed a regression that broke safe zone debugging features in Windows by reintroducing code from CL# 2861030 that was accidentally deleted in a merge #codereview andrew.grant #rb dan.hertzka #tests Tested r.DebugSafeZone.Mode 1 with r.DebugSafeZone.TitleRatio 0.9 in PIE and confirmed that SSafeZone obeyed it and the red overlay appeared Change 3016521 on 2016/06/16 by Ryan.Gerleve Client recoreded replay fixes and optimizations from Dev-Networking (and one from //UE4/Main), for deathcam. Includes the following CLs from Dev-Networking: 2997908 2998001 2998832 2999054 2999057 2999749 3000051 3001361 3001365 3004958 3009972 3009973 And this CL from //UE4/Main: 3015528 #tests golden path, replays #rb john.pollard Change 3016503 on 2016/06/16 by Brian.Karis Fixed uninitialized variables on particle lights. Fixes hair shading. #rb none #tests editor Change 3016429 on 2016/06/16 by Max.Chen Sequencer: Fix StartTime when clamping start offset 0. Follow up to CL #3009386. #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3016356 on 2016/06/16 by Lina.Halper - Fix crash on rampage morphtarget Merging using //UE4/Dev-Framework_to_//Orion/Dev-General - this is dupe change from Dev-Framework #jira: https://jira.ol.epicgames.net/browse/OR-23194 #rb: Ori.Cohen #tests: editor/pie spawn as rampage's alt skin Change 3015696 on 2016/06/15 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3015646 This re-unifies our build pipeline. Fingers crossed. (only 6 files are actually different) #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3015672 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3015642 on 2016/06/15 by Mieszko.Zielinski Fixes to multiple reasons AI bots were getting stuck #Orion #rb Lukasz.Furman #test golden path Change 3015622 on 2016/06/15 by Mieszko.Zielinski fixed FMetaNavMeshPath doing navmesh path update without checking nav agent if pathfinding should be postponed #UE4 #rb Lukasz.Furman #test golden path Change 3015514 on 2016/06/15 by Uriel.Doyon Fixed GlobalMipBias not affecting max texture resolution. This fix is implemented differently in Dev-Rendering in CL 301498. #jira OR-23511 #rb marcus.wassmer #test played game with different quality settings Change 3015258 on 2016/06/15 by Lina.Halper Fix crash with recursive reference between two assets #rb: Ori.Cohen #tests: Sword Change 3014988 on 2016/06/15 by Wes.Hunt Fix Cook Analytics to correctly use the Legacy provider since it sends to a local data collector. #rb daniel.lamb #tests compile Orion Change 3014962 on 2016/06/15 by Olaf.Piesche Replicating CL 3013696 from Dev-Rendering; making quality level spawn rate scale work for GPU emitters. #rb simon.tovey #tests PC editor game Change 3014958 on 2016/06/15 by Laurent.Delayen Added SkeletalMeshComponent::bIncludeComponentLocationIntoBounds to help in cases where SMU_OnlyTickPoseWhenRendered is set, and an animation pushed the mesh beyond the capsule. This ensures that when the capsule is in view, the mesh will remain updated. #rb Michael.Noland #test Sword ultimate from another player's view. Change 3014833 on 2016/06/15 by Laurent.Delayen Fix for Base Heroes having their locomotion blendspace broken. #rb Thomas.Sarkanen #codereview Thomas.Sarkanen #tests Gadget networked PIE Change 3014688 on 2016/06/15 by Nick.Darnell UMG - Fixing IsHovered on UUserWidgets. SObjectWidget did not properly call the super for MouseEnter/MouseLeave allowing SWidget's implementation to set and unset the bool. #rb none #tests PIE Change 3014325 on 2016/06/15 by Marcus.Wassmer Duplicate 3012706: Scalability CVAR for ContactShadows #rb john.billon #test flip cvar in editor. Change 3014230 on 2016/06/15 by Robert.Manuszewski Fix potentially missing log output when serializing text of length equal to the async log writer buffer size. #rb Steve.Robb #tests Tested in editor build (client + server) Change 3013913 on 2016/06/14 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Updating from DMM (updated from 27.1MM) #RB:none #Tests:compiled #ROBOMERGE-SOURCE: CL 3013912 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3013437 on 2016/06/14 by Simon.Tovey Speculative fix for OR-23158 Couldnt' repro NANs but did see it reading garbage. Reinstated the check that direct accesses for particles in a zero size emitter will return null. Altered selection code to reselect when partilce is dead or returns null and to not allow new selection on zero size emitters. #tests GoldenPath, No broken fx and no more reading garbage. #rb Olaf.Piesche Change 3013063 on 2016/06/14 by Jason.Bestimt #ORION_DG - Unclog robomerge from DMM Merge #RB:none #tests:none Change 3012936 on 2016/06/14 by Rob.Cannaday Fix for multiple account login not kicking previous logins Client was not parsing response from backend. Client was expecting content-type to be "application/json" (using FString::Equals). Backend was returning "application/json;charset=UTF-8". Changed usage from FString::Equals to FString::StartsWith #jira FORT-25452 #rb sam.zamani #tests multiple account login, frontend only Merge from FN CL 3011647, plus fixing one other location expecting "application/json" Change 3012696 on 2016/06/14 by Max.Chen Sequencer: Select actors for corresponding selected keys or sections. Copy from Dev-Sequencer #jira UE-30727 #tests Load up AnnounceMaster and select keyframes #rb none Change 3012691 on 2016/06/14 by Max.Chen Sequencer: Fix dragging the leading edge of a skeletal animation section so that it adjusts the start offset of the animation clip. Copy from Dev-Sequencer #jira UE-29167 #tests Load up AnnounceMaster and adjust leading edge of animation clips #rb Frank.Fella Change 3012690 on 2016/06/14 by Andrew.Grant Removed Linux work-around for memory stomp alignment #rb none #tests compiled Change 3012687 on 2016/06/14 by Max.Chen Sequencer: Fix lower bound when doing post render tick so that the start of a shot doesn't render with the previous shot's time. Copy from Dev-Sequencer #rb none #tests Load up AnnounceMaster and played through sequence Change 3012627 on 2016/06/14 by Mieszko.Zielinski Added logging of current MoveID to PathfollowingComponent's vlog snapshot #UE4 #rb none #test golden path Change 3012615 on 2016/06/14 by Mieszko.Zielinski Improved fix to BTDecorator_Blackboard's latent tasks aborting #UE4 #rb Lukasz.Furman #test golden path Change 3012572 on 2016/06/14 by Dmitry.Rekman Fix realloc with non-default alignment in jemalloc (OR-23541). - Removed obsolete check(), the code was already there since CL 1834526. #rb none #codereview Andrew.Grant, Robert.Manuszewski #tests none Change 3012481 on 2016/06/14 by David.Ratti ability system #include fixups and move orion attribute capture marcros into base engine ability system execution class #rb none #tests ability system sample project Change 3012457 on 2016/06/14 by Andrew.Grant Un-fix misaligned memory-stomp fix for Linux #rb none #tests compiled Change 3012320 on 2016/06/14 by Graeme.Thornton Fixes for MemoryAnalyser2 solution - Upgraded to VS 2015 - Clean up solution configurations. Only leave "Any CPU" - Switch project to build with "Any CPU" rather than "x64". Reimplementation of CL 3012221 from Dev-Core #rb robert.manuszewski #tests opened the main window form correctly in visual studio Change 3012316 on 2016/06/14 by Thomas.Sarkanen Fix copying non-POD structs in the fast path Prevents double-deletions of TArrays etc. #jira UE-31394 - Fix problems with non-POD UStructs using the anim BP fast-path #tests Played PIE & died as Sword in OrionEntry, Exited PIE. #rb Martin.Wilson Change 3012187 on 2016/06/14 by Graeme.Thornton Corrected error message when not specifying linux server device command line correctly in UAT #rb Dmitry.Rekman #tests Checked error message was useful when wrong command line was specified Change 3012026 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3011936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3011996 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/oriongame/Content/Characters/Heroes/Hammer/Abilities/Subjugate/FX/P_SubjugateSwirls.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 3011969 on 2016/06/13 by Brian.Karis Tweaks for hair Change 3011638 on 2016/06/13 by Andrew.Grant Fixed issue where RepLayout could use unaligned memoryfor property construction if allocator did not use a suitable default (fixes crash when running with MemStomp). Also added sanity check in UScriptStruct::InitializeStruct that memory is correctly aligned before calling constructor #codereview Dave.Ratti, John.Pollard #rb none #tests Ran with/without memstomp Change 3011575 on 2016/06/13 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3011414 NOTE - Card data was altered. Shame shame shame. Not authoritative in DUI #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith, sammy.james, matt.kuhlenschmidt #ROBOMERGE-SOURCE: CL 3011552 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3011462 on 2016/06/13 by Alexis.Matte #jira UE-31901 The outputdevice is adding 2 uninitialize character at the end of any log, this is cause by the terminator logic. The fix is to not add those characters when no terminator should be add. #rb nick.darnell #codereview Robert.Manuszewski #test export a obj file and verify all object are exported in maya or max Change 3011424 on 2016/06/13 by Martin.Wilson Hack out fastpath anim bp code until heap corruption issue can be fixed. #rb Laurent.Delayen #tests Persona + PIE Change 3011191 on 2016/06/13 by Mieszko.Zielinski Added missing initialization of PathFollowingComponent::CurrentMoveInput #UE4 #rb none #test golden path Change 3011138 on 2016/06/13 by Mieszko.Zielinski Switched bots over from travel mode to sprinting #Orion #rb Lukasz.Furman #test golden path Change 3011075 on 2016/06/13 by David.Ratti Default GameplayAbility instancing policy to InstancePerExecution #rb BenZ #tests compile Change 3011051 on 2016/06/13 by David.Ratti Add missing include so GameplayAbilitySet.h can be included on its own. #rb none #tests compile Change 3010968 on 2016/06/13 by Mieszko.Zielinski Fixed console variables crashing on "" string #UE4 #rb Lukasz.Furman #codereview Martin.Mittring #test PIE Change 3010888 on 2016/06/13 by Alexis.Matte #jira OR-23301 Close the OS handle when closing the FAsyncWriter. #rb Robert.Manuszewski #codereview Robert.Manuszewski #test try to export a obj file Change 3010239 on 2016/06/11 by Michael.Noland UMG - Adding back the logic to use the normal WidgetTree when the DesignerWidgetTree is not defined. [duplicated fix from CL# 2998267] #jira UE-31570 #tests Compiled some blueprints #rb none Change 3009870 on 2016/06/10 by Wes.Hunt Remove logging of analytics payloads from dedicated servers #jira UE-31858 #codereview:dmitry.rekman #rb none #tests All testing was done in Dev-Framework. This change was redone in this branch to get it here faster. Change 3009599 on 2016/06/10 by Michael.Noland Rendering: Corrected a misleading help comment on r.StaticMeshLODDistanceScale, explaining how it affects LOD calculations (it multiplies the effective distance, so larger numbers make transitions happen sooner) #tests Verified in the output of the help command #rb none #rn Change 3009559 on 2016/06/10 by Marcus.Wassmer Fix 11/11/10 SceneColorFormat option, enable AntiGhosting on TemporalAA, ensure TemporalAA output is the correct format for accumulating results. Set SceneColorFormat to 2 on PS4 and lowspec PC. All in all saves .3-.5ms on PS4 and improves temporalAA ghosting. #rb Brian.Karis #test Agora PS4 / PC Change 3009525 on 2016/06/10 by David.Ratti Fix case where ObjectLIbrary would not be able to find classes when searching "/Game" path. #rb none #tests object libraries in paragon Change 3009228 on 2016/06/10 by David.Ratti remove world check. Can be triggered in editor with PIE #rb none #tests pie Change 3009050 on 2016/06/10 by Dmitry.Rekman Fix LinuxClient platform not being built on Windows, and not instantiating a target platform instance. - Fixes by BenM. #rb none #codereview Ben.Marsh #tests Compiled OrionEditor on Linux. Change 3008973 on 2016/06/10 by Marcus.Wassmer Fix Windualshock on VS2015 #rb Rolando.Caloca #test PS4 controller on VS2015 build Change 3008970 on 2016/06/10 by David.Ratti Fix warning about minimal replication tag count -Made bit count a config setting. Bumped to 5 -Minor optimization to UAbilitySystemGlobals::Get() #rb none #tests goldne path, pie Change 3008478 on 2016/06/09 by Jason.Bestimt #ORION_DG - Merge MAIN @ CL 3008469 #RB:none #Tests:none Change 3008416 on 2016/06/09 by Andrew.Grant Adding 'config' as an option to set both clientconfig / serverconfig when using BuildCookRun #review-3008417 Ben.Marsh, Justin.Sargent #rb none #tests BuildCookRun with config Change 3008286 on 2016/06/09 by Dmitry.Rekman Add LinuxClient target platform. #rb none #tests Compile OrionEditor on Linux. #codereview Brad.Angelcyk, Ben.Marsh Change 3007978 on 2016/06/09 by jason.bestimt #ORION_MAIN - Merge DUI @ CL 3007507 #RB:none #Tests:none [CodeReviewed]: matt.schembari, kerrington.smith #ROBOMERGE-SOURCE: CL 3007968 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3007771 on 2016/06/09 by Laurent.Delayen Fixed GetIntFromComp breaking with INDEX_NONE. Fixes crash in OrientationWarping node. #rb martin.wilson #codereview martin.wilson #tests Sword Leap. Change 3007436 on 2016/06/09 by David.Ratti change designer facing parameter name #rb none #test compile Change 3007408 on 2016/06/09 by David.Ratti WaitGameplayEffectBlockedImmunity - ability task for listening to immunity events #rb danY #tests pie Change 3007250 on 2016/06/09 by bruce.nesbit Banner impact location fix. (OR-23179) #rb none #tests Game+PIE Change 3007228 on 2016/06/09 by Ben.Marsh BuildGraph: Rename -SkipNodesWithoutTickets parameter to -SkipTargetsWithoutTickets, to reflect that it's filtering the list of targets rather than the full graph. #rb none #tests none Change 3007225 on 2016/06/09 by Ben.Marsh EC: Set the -TicketSignature=... parameter for all BuildGraph jobs started by EC to the URL of the current job. Change 3006985 on 2016/06/08 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3006936 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3006978 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3006926 on 2016/06/08 by Andrew.Grant Merging //UE4/Main @ 300872 via //UE4/Orion-Staging #rb none #tests engine QA, orion qa smoke Change 3006444 on 2016/06/08 by Ben.Marsh BuildGraph: Add mechanism to specify that nodes can only be built once for a given changelist. Nodes can have an associated ticket file, and they are only permitted to build if the ticket is assigned to the current job. Tickets are created if they don't exist, and written with a signature specific to the job specified via the -TicketSignature="..." parameter. By default, builds will fail if a ticket has been already granted to another job, but the -SkipNodesWithoutTickets parameter instructs the graph to skip affected nodes instead. #rb none #tests none Change 3006389 on 2016/06/08 by Daniel.Lamb Delay the processing of packages which aren't ready till the end of the cook. This allows other packages to be processed sooner. #rb Peter.Sauerbrei #test cook orion. Change 3006306 on 2016/06/08 by Michael.Noland Rendering: Added FreezeRendering to the console autocomplete list #rn Change 3006305 on 2016/06/08 by Michael.Noland HLOD: Added a way to control how far down the HLOD hierarchy to allow showing (can be used to limit quality loss and streaming texture memory usage on high scalability settings for example) Controlled by the new cvar r.HLOD.MaximumLevel, which can be set to the following values: -1: No maximum level (default) 0: Prevent ever showing a HLOD cluster instead of individual meshes 1: Allow only the first level of HLOD clusters to be shown 2+: Allow up to the Nth level of HLOD clusters to be shown Note: This does not affect the memory used by the HLOD meshes itself or their always loaded low mip levels, it will only save the memory associated with streaming in the higher mip levels HLOD: Allowed r.HLOD console command to be used in Test configurations HLOD: Removed some dead code in ALODActor and scene view / scene proxy relating to a different way to force visualization that has no trigger HLOD: Fixed an uninitialized memory bug in the static mesh scene proxy HLODcoloration visualization code #rn #codereview jurre.debaare #rb marc.audy #tests Tested with various settings in Paragon and tried creating some new clusters in the editor Change 3006304 on 2016/06/08 by Michael.Noland Engine: Changed the code in AActor::IncrementalRegisterComponents to obey bAutoRegister for the root component rather than asserting that it is true. Note: If children components have bAutoRegister=true, they will still pull the root component into the fray and cause it to be registered first #rb marc.audy #tests Tested with code that registers or unregisters HLOD clusters at varying levels in Paragon Change 3006041 on 2016/06/08 by Andrew.Grant Added buildidoverride to shipping whitelist #rb none #tests compiled and used param in shipping Change 3005678 on 2016/06/08 by Ben.Marsh Back out changelist 3004395 #rb none #tests none Change 3005265 on 2016/06/07 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3005120 #RB: none #Tests: none #ROBOMERGE-SOURCE: CL 3005250 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 3005081 on 2016/06/07 by Daniel.Lamb Reworked the way packages which are renamed on load are added to the cooked package list. Cooker now has options for MaxMemoryAllowance as a percentage and also MinFreeMemory (which takes into account used system memory not just total system memory). #rb Andrew.Grant, Marcus.Wasmer #test cook orion Change 3004752 on 2016/06/07 by Daniel.Lamb Requeue packages to the next package on the list instead of to the end of the list. #rb Andrew.Grant #test cook orion Change 3004560 on 2016/06/07 by David.Ratti Kill timelines, latent actions, timer when recycling gameplay cues #rb danY #tests pie Change 3004559 on 2016/06/07 by David.Ratti Object Library: -Added bool bIncludeOnlyOnDiskAssets that can be set by owner. Passed on to the AR filter when gathering assets. GameplayCue Editor: -Fix issue with new notifies not showing up after being created through the GC Editor (until restart). -Fix issue for new projects, that don't have gameplayclue tags defined, not being able to add gameplay cue tags through the editor without restarting once. #rb none #tests editor Change 3004395 on 2016/06/07 by Ben.Marsh BuildGraph: Add a script function to ensure exclusive access to a given resource. The AcquireLockFile() function takes two arguments; a path to a text file, and the name of an owner. The file is created and the owner name written to it if it doesn't already exist, otherwise the contents of it are compared against the given owner string. The operation happens transactionally, and the function returns true if file contains the given owner string on exit. Logical and/or conditions are now also short-circuited, so the result of the AcquireLockFile() function can be used to control derived property definitions within an executing job. #rb none #tests none Change 3004164 on 2016/06/07 by David.Ratti Ability system: use player controller netmode over avatar actor when possible. Fixes issue if torn off, authority, client side actor tries to activate an ability. #rb danY #tests multi pie Change 3003837 on 2016/06/07 by David.Ratti Ability system engine work -Default to /Game as search path for gameplay cues, if no explicit paths are set in the config. #rb none #tests ability sample project Change 3002800 on 2016/06/06 by Marcus.Wassmer Fix shader crash in PIE #rb none #test PIE Change 3002657 on 2016/06/06 by Dmitry.Rekman Do not copy to clipboard on crash if headless or on the wrong thread. - Could result in crash handler crashing itself in some circumstances. #rb none #codereveiw Brad.Angelcyk #tests Compiled Linux dedicated server and CrashReportClient. Change 3002546 on 2016/06/06 by Daniel.Lamb Improve cooking performance. Allow cooker to save other packages opportunistically if main package is compiling shaders. Allow cooker to load more packages if there aren't many packages to save. #rb Josh.Adams #test cook orion Change 3002369 on 2016/06/06 by Marcus.Wassmer Project setting for optional rendering features to reduce shader compile times. # of shaders per material is reduced by ~30-40% depending on material #rb Daniel.Wright #test Editor with/without all options, cooked ps4. Change 3002142 on 2016/06/06 by David.Ratti Ability system engine level: -Fix crash when gameplay cue editor starts if there are no gameplay cue paths specified -Fix crash when GameplayCue tag is not specified #rb none #tests sample ability system project, paragon Change 3002106 on 2016/06/06 by Jason.Bestimt #ROBOMERGE-AUTHOR: sam.zamani #orion - add support for code tokens which can be shared/redeemed - refactor of existing friend founder's pack codes to be displayed in a generic way using code token info - added CodeToken.FounderFriendInviteT0 for new paragon tier 0 code which grants access to game without also giving a Founder's pack - added CodeToken.FounderFriendInviteT1 to replace existing CodeToken.FriendPC and CodeToken.FriendPS4 Founder's pack codes. Existing codes aliased to the new CodeToken.FounderFriendInviteT1 code - No longer differentiation between PC/PS4 friend codes - "Share Friend Code" button will now process all available codes that can be issued instead of just 1 - updated Orion service Mcp call for getUnredeemedCodes() to ignore the code template id and return all available codes. Each returned code will also include the type [CodeReviewed]: david.nikdel, jason.bestimt #rb david.nikdel #tests PC PIE using localhost and profile proxy for granting codes, also existing account with legacy codes #ROBOMERGE-SOURCE: CL 3002104 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3001218 on 2016/06/05 by jason.bestimt #ORION_MAIN - Merge 27.2 @ CL 3001162 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3001200 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. #CodeReview: jason.bestimt Change 2999508 on 2016/06/03 by jason.bestimt #ORION_MAIN - Merge 27 @ CL 2999463 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 2999498 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) #ROBOMERGE-SAYS: Beep boop! I couldn't merge this change. Please do it yourself, human. //Orion/Dev-General/OrionGame/Content/Audio/ClassesAndMixes/Classes/Master.uasset - can't integrate exclusive file already opened #CodeReview: jason.bestimt Change 2999465 on 2016/06/03 by Robert.Manuszewski Whitelisting more DLLs for injection. #rb none #tests none Change 2999455 on 2016/06/03 by Lukasz.Furman disabled path invalidation events for minions #orion #rb Mieszko.Zielinski #tests PIE with additional debug logging Change 2998488 on 2016/06/02 by Michael.Noland Engine: Prevent forced drawing of spline components in Test configuration #codereview james.golding #tests Ran a cooked Test build on a map with splines in it #rb david.ratti #robomerge: main Change 2997954 on 2016/06/02 by Jason.Bestimt #ROBOMERGE-AUTHOR: jon.lietz OR-22425 no longer try to updat the tag map and modifiers when the gameplay effect that is being removed was not active. #RB Dave.Ratti #Tests golden path #ROBOMERGE-SOURCE: CL 2997940 in //Orion/Release-0.27/... via CL 2997943 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 2997750 on 2016/06/02 by Graeme.Thornton Add FPakFile::Check() that attempts to open and read the data out of every file in a pak, to check for corruption Added -checkpak option for force a check of every mounted pak file #rb robert.manuszewski #tests tested against cooked pc client. made sure my data succeeded. made sure corrupted data throws an error. [CL 3031715 by Andrew Grant in Main branch]
2016-06-28 17:59:42 -04:00
//float Np = exp( (Phi - PI) / s ) / ( s * Pow2( 1 + exp( (Phi - PI) / s ) ) );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float Np = 0.71 * exp( -1.65 * Pow2(Phi - PI) );
float Np = exp( -3.65 * CosPhi - 3.98 );
S += Mp * Np * Fp * Tp * Backlit;
}
// TRT
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
if(1)
{
float Mp = Hair_g( B[2], SinThetaL + SinThetaV - Alpha[2] );
//float h = 0.75;
float f = Hair_F( CosThetaD * 0.5 );
float Fp = Pow2(1 - f) * f;
//float3 Tp = pow( GBuffer.BaseColor, 1.6 / CosThetaD );
float3 Tp = pow( GBuffer.BaseColor, 0.8 / CosThetaD );
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
//float s = 0.15;
//float Np = 0.75 * exp( Phi / s ) / ( s * Pow2( 1 + exp( Phi / s ) ) );
float Np = exp( 17 * CosPhi - 16.78 );
S += Mp * Np * Fp * Tp;
}
#endif
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
if(1)
{
float3 FakeNormal = normalize( V - N * dot(V,N) );
//N = normalize( DiffuseN + FakeNormal * 2 );
N = FakeNormal;
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 2981742) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2967522 on 2016/05/05 by Martin.Mittring fixed UE-30208 Ensure taking high resolution screenshot renamed cvar from r.SaveUncompressedEXRFrame to r.SaveEXR.CompressionQuality and change meaning Change 2967541 on 2016/05/05 by Martin.Mittring added cvar help entry to the editor menu Change 2967544 on 2016/05/05 by Martin.Mittring * added ensures to track down UE-22073 [CrashReport] Crash when changing Editor Window Size - FDeferredShadingSceneRenderer::ClearTranslucentVolumeLighting() * fixed typo * improved r.DisplayInternals Change 2967685 on 2016/05/05 by Rolando.Caloca DR - Fix 2013 compile #jira UE-30369 Change 2967883 on 2016/05/05 by Olaf.Piesche Making inherit rotation work for mesh particles #jira UE-30153 Change 2967948 on 2016/05/05 by Daniel.Wright MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) Change 2967954 on 2016/05/05 by Daniel.Wright New refraction mode 'Pixel Normal Offset', which uses the difference between the per-pixel normal and the per-vertex normal to compute the refraction offset. This is useful for refraction from large water surfaces without reading outside of screen bounds as much. Change 2967970 on 2016/05/05 by Olaf.Piesche Improvement for depth buffer collision; reduce tunneling by sampling midpoint instead of predicted position. #jira UE-27297 Change 2968125 on 2016/05/05 by Daniel.Wright Hopeful fix for mac compile error with enum Change 2968126 on 2016/05/05 by Daniel.Wright Forward declare to fix compile error Change 2969070 on 2016/05/06 by Martin.Mittring fixed Clang Compile error Change 2969224 on 2016/05/06 by Martin.Mittring fixed Clang Change 2969275 on 2016/05/06 by Rolando.Caloca DR - Fix for simulation time from BP not matching material editor expression time #jira UE-26431 Change 2969413 on 2016/05/06 by Daniel.Wright Simple forward shading path * Support for a directional light in the base pass, which can be shadowed either by distance field shadowmaps or a single shadow factor from the Indirect Lighting Cache * Binding and outputting to GBuffers is disabled when using simple forward shading, along with dependencies of the GBuffers * Specular, normal maps and the 3rd SH band of skylighting are all hardcoded off. Materials are forced fully rough. * Enabled with 'r.SimpleForwardShading 1', which can be changed at runtime * Added r.SupportSimpleForwardShading, which determines if the necessary shaders are compiled * Removed r.SimpleDynamicLighting, whose functionality (unshadowed directional light in the base pass) is a subset of simple forward shading, and was unused Change 2969414 on 2016/05/06 by Daniel.Wright Added cvar 'r.Fog' for scalability Change 2969415 on 2016/05/06 by Daniel.Wright Low end scalability setup for Paragon Change 2969583 on 2016/05/06 by Daniel.Wright Effectively disabled the WRITES_PRECSHADOWFACTOR_TO_GBUFFER optimization, as all combinations use the GBuffer target * This fixes bSingleSampleShadowFromStationaryLights which was broken in cl 2863775 when selective GBuffer outputs was enabled Change 2969597 on 2016/05/06 by Olaf.Piesche Adding emitter tick times to Cascade viewport overlays #jira UE-25172 Change 2969599 on 2016/05/06 by Daniel.Wright Added r.Shadow.ForceSingleSampleShadowingFromStationary for scalability Change 2969795 on 2016/05/06 by Daniel.Wright Made r.SimpleForwardShading a scalability cvar Change 2969796 on 2016/05/06 by Daniel.Wright Enabled simple forward shading for the lowest shadow quality in Paragon * Moved Orion.Character.NonLocalHeroPreshadows to be under shadow quality * Enabling r.Shadow.ForceSingleSampleShadowingFromStationary when shadows are disabled through r.ShadowQuality Change 2972338 on 2016/05/10 by Martin.Mittring Added ImageValidator V0.11 to Perforce (for automated screenshot comparison) Change 2972450 on 2016/05/10 by Martin.Mittring fixed sorting issues, added column sort Change 2972564 on 2016/05/10 by Martin.Mittring fixed PixelCountToFail Change 2972572 on 2016/05/10 by Martin.Mittring added color Change 2972667 on 2016/05/10 by Daniel.Wright Capsule shadows support an off-center projection - fixes stereo rendering Indirect lighting cache is updated for primitives with a visible indirect capsule shadow - fixes indirect shadows disappearing when the caster is off-screen in the Static skylight case Change 2972687 on 2016/05/10 by Martin.Mittring split data from view Change 2972713 on 2016/05/10 by Martin.Mittring background validation Change 2972742 on 2016/05/10 by Martin.Mittring do not lock files in folder Change 2972837 on 2016/05/10 by Daniel.Wright Comment for tiled reflection culling edge failure case Change 2972891 on 2016/05/10 by Daniel.Wright Simple forward shading only supported on PC now Change 2972927 on 2016/05/10 by Martin.Mittring fixed comparison, added directory watcher Change 2972952 on 2016/05/10 by Martin.Mittring tooltips Change 2972965 on 2016/05/10 by Martin.Mittring readme Change 2972986 on 2016/05/10 by Martin.Mittring polish Change 2973015 on 2016/05/10 by Zabir.Hoque Clamp max cubemap resolutions for reflection capture component. Change 2973067 on 2016/05/10 by Uriel.Doyon Removed temporary streaming data from ULevel. Now the data goes directly in FStreamingManagerTexture. Removed deprecated classes and structures associated with old data. Uniformized dynamic primitives and static primitives streaming logic. Static primitive instances are now bound to level component and have visibility information. MeshTexCoordSize Debug now shows live update when tweaking "StreamingDistanceMultiplier" Change 2973129 on 2016/05/10 by Martin.Mittring fixed crash (uninit var) Change 2973167 on 2016/05/10 by Olaf.Piesche Fixing mac compiler warnings; removed beam tangent from particle source and target, as it's treated separately anyway. Change 2973654 on 2016/05/11 by Gil.Gribb FIxed bad resolve from main merge Change 2973787 on 2016/05/11 by Simon.Tovey PR #2080: Added 7 additional blueprint nodes and assoicated functions to Particle System Compoenent (Contributed by alwintom) #2080 Change 2973794 on 2016/05/11 by Simon.Tovey GitHub 1646 : Increase Wireframe Linear Color Value for Particles in Cascade Preview viewport #1646 Change 2973814 on 2016/05/11 by Chris.Bunner Fixed D3D warning. Change 2973868 on 2016/05/11 by Martin.Mittring fixed compiler warning Change 2974104 on 2016/05/11 by Uriel.Doyon Optimized TextureStreaming ASync task by improving cache efficency. Removed ForcedFullyLoad texture sets and merged them with the other entries (to prevent checking in two data structures). Change 2974163 on 2016/05/11 by Uriel.Doyon Fixed Editor Build Change 2974263 on 2016/05/11 by Olaf.Piesche Fix for particle beam source/target selection Change 2974313 on 2016/05/11 by Martin.Mittring nicer icon Change 2974632 on 2016/05/11 by Martin.Mittring zoom (mouse wheel) and pan support Change 2974651 on 2016/05/11 by Martin.Mittring UE-30565 Blend Radius does not override Priority for blendable post process material array #test:PC Change 2974994 on 2016/05/12 by Uriel.Doyon Fixed uninitialized members in texture streaming when updating dynamic primitives. #jira UE-30632 Change 2975514 on 2016/05/12 by Olaf.Piesche Getting mesh particle transform down to pixel shader, making available in TransformVector/TransformPosition nodes #udn 288158, and requests from several artists Change 2975970 on 2016/05/12 by Zabir.Hoque Enable setting high precision normals/tangets as a part of static mesh import. Change 2976134 on 2016/05/12 by Daniel.Wright Moved RHI prefix out of command list macros so you can find callers in a Find in Files for RHIBlendState, etc Change 2976135 on 2016/05/12 by Daniel.Wright Added material property bAllowNegativeEmissiveColor which is useful when rendering to an offscreen render target Change 2976139 on 2016/05/12 by Daniel.Wright Blueprint can now be used to draw to a TextureRenderTarget2D with DrawMaterialToRenderTarget Canvas can now draw to a TextureRenderTarget2D in a Blueprint with BeginDrawCanvasToRenderTarget / EndDrawCanvasToRenderTarget Change 2976199 on 2016/05/12 by Brian.Karis Improved screen space ray cast intersection heuristic. Change 2976203 on 2016/05/12 by Brian.Karis Fixed hair NaNs Change 2976214 on 2016/05/12 by Zabir.Hoque Fix compiler error on Clang Change 2976239 on 2016/05/12 by Brian.Karis Improved hair shadows Change 2976240 on 2016/05/12 by Brian.Karis Made recompileshaders specific file work again. Kind of hacky but better than nothing Change 2976290 on 2016/05/12 by Zabir.Hoque Few more clang compiler fixes. #jira UE-30713 Change 2976517 on 2016/05/13 by Zabir.Hoque Final set of fixes for compile breaks. Change 2976535 on 2016/05/13 by Zabir.Hoque Fix mono builds Change 2977270 on 2016/05/13 by Zabir.Hoque Incorrectly used 7 as max texcoords. Corrected to #define MAX_TEX_COORDS #lockdown gil.gribb Change 2980140 on 2016/05/17 by Gil.Gribb Merging //UE4/Dev-Main@2980127 to Dev-Rendering (//UE4/Dev-Rendering) #lockdown nick.penwarden Change 2980211 on 2016/05/17 by Ben.Marsh EC: Build DDC in Dev-Rendering every 3 hours. #lockdown Gil.Gribb Change 2980876 on 2016/05/17 by Michael.Trepka Metal shader compile fix #lockdown gil.gribb [CL 2981788 by Gil Gribb in Main branch]
2016-05-18 09:31:59 -04:00
// Hack approximation for multiple scattering.
float Wrap = 1;
float NoL = saturate( ( dot(N, L) + Wrap ) / Square( 1 + Wrap ) );
float DiffuseScatter = (1 / PI) * NoL * GBuffer.Metallic;
float Luma = Luminance( GBuffer.BaseColor );
float3 ScatterTint = pow( GBuffer.BaseColor / Luma, 1 - Shadow );
S += sqrt( GBuffer.BaseColor ) * DiffuseScatter * ScatterTint;
}
S = -min(-S, 0.0);
return S;
}
float3 SubsurfaceShadingSubsurface( FGBufferData GBuffer, float3 L, float3 V, half3 N )
{
float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
float Opacity = GBuffer.CustomData.a;
float3 H = normalize(V + L);
// to get an effect when you see through the material
// hard coded pow constant
float InScatter = pow(saturate(dot(L, -V)), 12) * lerp(3, .1f, Opacity);
// wrap around lighting, /(PI*2) to be energy consistent (hack do get some view dependnt and light dependent effect)
// Opacity of 0 gives no normal dependent lighting, Opacity of 1 gives strong normal contribution
float NormalContribution = saturate(dot(N, H) * Opacity + 1 - Opacity);
float BackScatter = GBuffer.GBufferAO * NormalContribution / (PI * 2);
// lerp to never exceed 1 (energy conserving)
return SubsurfaceColor * lerp(BackScatter, 1, InScatter);
}
float3 SubsurfaceShadingTwoSided( float3 SubsurfaceColor, float3 L, float3 V, half3 N )
{
// http://blog.stevemcauley.com/2011/12/03/energy-conserving-wrapped-diffuse/
float Wrap = 0.5;
float NoL = saturate( ( dot(-N, L) + Wrap ) / Square( 1 + Wrap ) );
// GGX scatter distribution
float VoL = saturate( dot(V, -L) );
float a = 0.6;
float a2 = a * a;
float d = ( VoL * a2 - VoL ) * VoL + 1; // 2 mad
float GGX = (a2 / PI) / (d * d); // 2 mul, 1 rcp
return NoL * GGX * SubsurfaceColor;
}
float3 EyeShading( FGBufferData GBuffer, float3 LobeRoughness, float3 LobeEnergy, float3 L, float3 V, half3 N )
{
float3 H = normalize(V + L);
float NoL = saturate( dot(N, L) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
float NoH = saturate( dot(N, H) );
float VoH = saturate( dot(V, H) );
// Generalized microfacet specular
float D = D_GGX( LobeRoughness[1], NoH ) * LobeEnergy[1];
float Vis = Vis_SmithJointApprox( LobeRoughness[1], NoV, NoL );
float3 F = F_Schlick( GBuffer.SpecularColor, VoH );
return D * Vis * F;
}
float3 EyeSubsurfaceShading( FGBufferData GBuffer, float3 L, float3 V, half3 N )
{
float3 H = normalize(V + L);
float VoH = saturate( dot(V, H) );
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) (Source: //UE4/Dev-Rendering @ 2943238) #lockdown nick.penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2932679 on 2016/04/04 by Martin.Mittring remove hack/cvar that is not longer needed as we fixed the bug #rb:Bob.Tellez #code_review:Bob.Tellez Change 2932681 on 2016/04/04 by Martin.Mittring fixed cvars in consolevariables.ini can affect engine even if marked with cheat (no longer load consolevariables.ini in shipping and test), unified 3 code path, added testcase, cvars with cheat in ini file other than consolevariables.ini now trigger ensure, =on/off/true/false/.. works in all ini files, added enure if non scalability setting are used in ScalabilityIni (get now ignored) #rb:David.Hill #code_review:Marcus.Wassmer, Michael.Noland Change 2932719 on 2016/04/04 by Marcus.Wassmer Merge 3 band SH back to DevRendering #rb Daniel.Wright Change 2932760 on 2016/04/04 by Zabir.Hoque Migrating high resolution cubemaps for skylight and reflection probes. #rb: Daniel.Wright Change 2933121 on 2016/04/05 by Rolando.Caloca DR - vk - Fix free blocks not getting joined - Fix compile issue Change 2933122 on 2016/04/05 by Rolando.Caloca DR - Do not shorten dumped shaders path Change 2933126 on 2016/04/05 by Rolando.Caloca DR - vk - Index Buffers using new resource management Change 2933127 on 2016/04/05 by Rolando.Caloca DR - vk - Extract multibuffer off index buffer Change 2933131 on 2016/04/05 by Rolando.Caloca DR - vk - Transition to vb's using mutlibuffer Change 2933136 on 2016/04/05 by Rolando.Caloca DR - vk - Change staging buffers to use resource allocation system - Fix free block not getting joined - Remove define Change 2933140 on 2016/04/05 by Rolando.Caloca DR - vk - 'static' textures now use resource mgmt - Release free pages back to the OS - Remove ensure Change 2933152 on 2016/04/05 by Rolando.Caloca DR - vk - Fix aliasing granularity - Fix renderpass end/copy buffer ensure Change 2933155 on 2016/04/05 by Rolando.Caloca DR - SCW - Fix for -directcompile to directly load file for preprocessor Change 2933158 on 2016/04/05 by Rolando.Caloca DR - hlslcc - Error on Metal if trying to R & W on RWTextures - Fix indices on RW reads to be unsigned #codereview Mark.Satterthwaite, Michael.Trepka Change 2933169 on 2016/04/05 by Rolando.Caloca DR - vk - Move header to public to match changes on DevMobile Change 2933173 on 2016/04/05 by David.Hill Deferred decal rendering with negative scale #rb:Matrin.Mittring #jira:UE-27389 Change 2933273 on 2016/04/05 by Rolando.Caloca DR - vk - Fix renderdoc markers Change 2933274 on 2016/04/05 by Rolando.Caloca DR - Support for -AttachDebugger Change 2933316 on 2016/04/05 by Rolando.Caloca DR - vk - Compile fix whene enabling define Change 2933334 on 2016/04/05 by Rolando.Caloca DR - Compile fix #codereview Martin.Mittring Change 2933805 on 2016/04/05 by Brian.Karis Temporal AA dynamic antighosting. Fixed DOF Change 2933811 on 2016/04/05 by Brian.Karis Fixed area light NaNs. Improvements to area lights. Horizen handling for wrap around. Change 2933812 on 2016/04/05 by Brian.Karis Fixed fresnel on SSS skin. Change 2933813 on 2016/04/05 by Brian.Karis Tessellation fix Change 2933816 on 2016/04/05 by Brian.Karis Improved forward shading support [CL 2943241 by Gil Gribb in Main branch]
2016-04-13 21:24:38 -04:00
float NoV = saturate( abs( dot(N, V) ) + 1e-5 );
// F_Schlick
Copying //UE4/Orion-Staging to //UE4/Dev-Main (Source: //UE4/Orion-Staging @ 3134206) #lockdown Nick.Penwarden #rb none #codereview Andrew.Grant ========================== MAJOR FEATURES + CHANGES ========================== Change 2845744 on 2016/01/27 by Andrew.Grant Merging from //Orion/Dev-General @ 2845681 Change 2849210 on 2016/01/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2854307 on 2016/02/03 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 2880059 on 2016/02/24 by Andrew.Grant Merging //Orion/Dev-General @ 2879808 Change 2891205 on 2016/03/02 by Andrew.Grant Merging //Orion/Dev-General @ 2889885 Change 2904080 on 2016/03/10 by Andrew.Grant Merging using //Orion/Dev-General @ 2902652 Change 2950235 on 2016/04/20 by Andrew.Grant Automerged files from Dev-General Change 2976227 on 2016/05/12 by Andrew.Grant Autoresolved files from using //Orion/Dev-General Change 3016193 on 2016/06/16 by Andrew.Grant Merging //Orion/Dev-General @ 3015761 Change 3033336 on 2016/06/29 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3037514 on 2016/07/05 by Andrew.Grant Merging from //Orion/Dev-General @ 3037465 Change 3091216 on 2016/08/16 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3107127 on 2016/08/30 by Andrew.Grant Merging using //Orion/Dev-General/_To_//UE4/Orion-Stating Change 3129090 on 2016/09/16 by Andrew.Grant Autoresolved files from Dev-Gen @ 3130045 Change 3130536 on 2016/09/19 by Andrew.Grant To Resolve Change 3130537 on 2016/09/19 by Andrew.Grant Tricky merges? Change 3130810 on 2016/09/19 by Andrew.Grant Merging from //Orion/Dev-General @ 3130045 Change 3130880 on 2016/09/19 by Andrew.Grant Blueprint fix Change 3131009 on 2016/09/19 by Andrew.Grant removed spammy warning Change 3131216 on 2016/09/19 by Andrew.Grant Content fixes for Orion-Staging Change 3131700 on 2016/09/19 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) Change 3132144 on 2016/09/20 by Andrew.Grant Merging test framework work from Dev-General Change 3132154 on 2016/09/20 by Andrew.Grant Fix for linux client Change 3132179 on 2016/09/20 by Andrew.Grant Fixed breakages due to latest //UE4/Main Change 3132948 on 2016/09/20 by Andrew.Grant Fix for UE-36216 (replicating 3125764 from ForniteMain) Change 3133103 on 2016/09/20 by Andrew.Grant Added EpicCMSUIFramework and CommonUI to Fortnite plugin Change 3133327 on 2016/09/20 by Andrew.Grant Orion automation improvements Change 3133555 on 2016/09/20 by Andrew.Grant FIx for UE-36226 Change 3133996 on 2016/09/21 by Andrew.Grant REbuilt texture streaming Change 3134204 on 2016/09/21 by Andrew.Grant Merging audio files from Orion with correct compression settings Change 3134205 on 2016/09/21 by Andrew.Grant Fix for gameplay tag ordering from Orion, and fix for soak test report numbers Change 3134206 on 2016/09/21 by Andrew.Grant Merging //UE4/Dev-Main to Orion-Staging (//UE4/Orion-Staging) [CL 3135156 by Marc Audy in Main branch]
2016-09-21 18:16:12 -04:00
float F0 = GBuffer.Specular * 0.08;
float Fc = Pow5( 1 - VoH );
float F = Fc + (1 - Fc) * F0;
float IrisDistance = GBuffer.CustomData.w;
float IrisMask = GBuffer.CustomData.z;
float3 IrisNormal;
IrisNormal = OctahedronToUnitVector( GBuffer.CustomData.xy * 2 - 1 );
// Blend in the negative intersection normal to create some concavity
// Not great as it ties the concavity to the convexity of the cornea surface
// No good justification for that. On the other hand, if we're just looking to
// introduce some concavity, this does the job.
float3 CausticNormal = normalize(lerp(IrisNormal, -N, IrisMask*IrisDistance));
float NoL = saturate( dot( IrisNormal, L ) );
float Power = lerp( 12, 1, NoL );
float Caustic = 0.6 + 0.2 * ( Power + 1 ) * pow( saturate( dot( CausticNormal, L ) ), Power );
float Iris = NoL * Caustic;
// http://blog.stevemcauley.com/2011/12/03/energy-conserving-wrapped-diffuse/
float Wrap = 0.15;
float Sclera = saturate( ( dot(N, L) + Wrap ) / Square( 1 + Wrap ) );
return (1 - F) * lerp( Sclera, Iris, IrisMask ) * GBuffer.DiffuseColor / PI;
}
Texture2D PreIntegratedBRDF;
SamplerState PreIntegratedBRDFSampler;
float3 SubsurfaceShadingPreintegratedSkin( FGBufferData GBuffer, float3 L, float3 V, half3 N )
{
float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
float Opacity = GBuffer.CustomData.a;
float3 PreintegratedBRDF = Texture2DSampleLevel(PreIntegratedBRDF, PreIntegratedBRDFSampler, float2(saturate(dot(N, L) * .5 + .5), 1 - Opacity), 0).rgb;
return PreintegratedBRDF * SubsurfaceColor;
}
// @param DiffSpecMask .r: diffuse, .g:specular e.g. float2(1,1) for both, float2(1,0) for diffuse only
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3122278) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3109545 on 2016/09/01 by Zabir.Hoque Merging DX12 RHIs stage 1. #Tests Ran InfiltratorDemo, ElementalDemo, ShooterGame Change 3109580 on 2016/09/01 by Zabir.Hoque Merging DX12 RHI. Stage 2: Moving XB and Windows APIs to a common location. This will cause a build break, but will allow us to preserve history. Change 3109632 on 2016/09/01 by Zabir.Hoque Merge DX12 RHI. Stage 3. Ported all changes and merged RHI into common and Win and XB1 specialized folder. Current with MS partners branch and Release 4.13. Change 3109690 on 2016/09/01 by Zabir.Hoque Fixing build break after large merge from partners branch and syncing to latest Dev-Rendering. Change 3109716 on 2016/09/01 by Zabir.Hoque Fix build warnings after merge. Change 3109733 on 2016/09/01 by Zabir.Hoque More build fixes for things pointing from XboxOneD3D12RHI to D3D12RHI Change 3109773 on 2016/09/01 by Zabir.Hoque Fixing code analysis warnings. Change 3109870 on 2016/09/01 by Rolando.Caloca DR - Simple clear mode Change 3110066 on 2016/09/01 by Zabir.Hoque Remove C++11 feature so VS2013 can compile for Fortnite. Change 3110335 on 2016/09/01 by Brian.Karis Fixed double lighting of clear coat, cloth, and eyes #review-3108222 @Ben.Woodhouse Change 3110411 on 2016/09/01 by Rolando.Caloca DR - vk - Fix bogus assert - Fix pipeline barrier with levelCount=0 Change 3110573 on 2016/09/01 by Zabir.Hoque Exclude D3D12 merged RHI from Mac Builds. Change 3110681 on 2016/09/01 by Rolando.Caloca DR - vk - Swapchain fix for drivers returning infinite swapchain images Change 3110936 on 2016/09/01 by Rolando.Caloca DR - vk - Fix crash when dumping unused heaps - Show file/line if enabled Change 3111034 on 2016/09/01 by Rolando.Caloca DR - vk - Fix exclude rect clear Change 3111139 on 2016/09/01 by Rolando.Caloca DR - Automatically enable capturing mode if running under RenderDoc Change 3111170 on 2016/09/01 by Rolando.Caloca DR - vk - Store max info per descriptor set pool Change 3111234 on 2016/09/01 by Zabir.Hoque XB1 compiler warnings. Change 3111763 on 2016/09/02 by Rolando.Caloca DR - Fix typo in shader PR #2759 #jira UE-35496 Change 3111846 on 2016/09/02 by Rolando.Caloca DR - vk - Update to SDK 1.0.24.0 (including glslang) Change 3111916 on 2016/09/02 by Ben.Woodhouse Fix for timestamp query results being broken in the XB1 DX11 RHI (caused by a merge issue with dev-platform) Also clarify some variable naming Change 3112048 on 2016/09/02 by Rolando.Caloca DR - vk - Compile fix for build machines Change 3112315 on 2016/09/02 by Rolando.Caloca DR - vk - Added peak usage to mem dump Change 3112791 on 2016/09/02 by Daniel.Wright FD3D12PipelineStateCache debug fix Change 3113483 on 2016/09/05 by Ben.Woodhouse Fix potential issue with timestamp and occlusion queries overlapping with new query packing optimisation. We may want to put these into separate buffers to avoid reduce the padding with timestamp queries (timestamp queries currently use 4x the memory they actually need due to additional padding) Change 3113488 on 2016/09/05 by Ben.Woodhouse GPu profiler : fix for render thread performance issues, enable GPU profiler by default Avoids RHIThread stalls in query creation by reusing queries via a pool. A FRenderQueryPool class already existed for doing this, so this was moved into the engine to make it accessible from both the engine and renderer modules Tested on XB1,PS4,PC dx11 Change 3114286 on 2016/09/06 by Chris.Bunner Copying CL 3114173 from 4.13 - Better enforce render resource limits on widget draw size.Jira UE-26375. Change 3114883 on 2016/09/06 by Rolando.Caloca DR - vk - Delete resources on the RHI thread - Set blend factor to 1 - Added num mips & num layers to RT views - Added missing destructors - Fix for crash on rhi thread Change 3116308 on 2016/09/07 by Rolando.Caloca DR - vk - New renderpass/transition/barrier rewrite for sm4 (disabled) - Fixes for 3d texture RTs Change 3117409 on 2016/09/08 by Gil.Gribb Merging //UE4/Dev-Main@3117389 to Dev-Rendering (//UE4/Dev-Rendering) Change 3117445 on 2016/09/08 by Gil.Gribb Fix merge fallout Change 3117555 on 2016/09/08 by Rolando.Caloca DR - Fix merge issue Change 3117687 on 2016/09/08 by Marc.Olano Create new Vector Noise material node, and *3DDeriv numerical derivative material functions Vector Noise node has noise functions with 3D output, including cellnoise (random color per cell), computed noise with vector output, gradient of 3D noise, curl of 3D noise, and version of Voronoi noise returning seed position in the closest Voronoi cell. 3DDeriv functions compute gradient and curl on any expression using centered differences from four samples offset in a tetrahedral pattern (two fewer than the common axis-aligned offset method) Change 3117696 on 2016/09/08 by Rolando.Caloca DR - Replicate 4.13.1 fix from 3117678 UE4.13 - Better error reporting when SCW fails/crashes jira UE-17227 Change 3117720 on 2016/09/08 by Rolando.Caloca DR - vk - Fix for static analysis Change 3117786 on 2016/09/08 by Rolando.Caloca DR - vk - Use new alignment Change 3118145 on 2016/09/08 by Marcus.Wassmer Fix async compute clear not waiting for the gfx pipe properly. Also appears to fix a rare PS4 gpu hang. Change 3118329 on 2016/09/08 by Brian.Karis Fix screen size calculations for LOD Change 3118351 on 2016/09/08 by Brian.Karis Quadric mesh simplifier! In and working for the first time. ScreenSize is now correctly calculated from MaxDeviation Pixel Error now a reduction setting in LOD group. Binary Heap is fixed and functional. Still needs to play better with 3rd party reduction. Change 3118457 on 2016/09/08 by Rolando.Caloca DR - vk - Fix cube & 3d texture transitions & copies Change 3118540 on 2016/09/08 by Benjamin.Hyder Re-Submitting Noise assets to get engine version Change 3119438 on 2016/09/09 by Rolando.Caloca DR - vk - Added barrier & cache flushes when reading back GPU memory - Added cubemap & 3d texture barriers - Added cubemap & 3d texture copy image Change 3119518 on 2016/09/09 by Brian.Karis Fixed compile error Change 3119580 on 2016/09/09 by Marc.Olano Documentation for Vector noise Change 3119710 on 2016/09/09 by Rolando.Caloca DR - vk - Fix read stencil mask & front/back Change 3119865 on 2016/09/09 by Rolando.Caloca DR - vk - RHIReadSurfaceFloatData - Fix redundant write transitions - Simplify copy and transition code Change 3120059 on 2016/09/09 by Rolando.Caloca DR - vk - Static analysis warnings Change 3120413 on 2016/09/09 by Mark.Satterthwaite Fix AVFMedia plugin failing when a movie has captions. #jira UE-35828 Change 3120936 on 2016/09/12 by Ben.Woodhouse Add slate rendering to the GPU stats Change 3121204 on 2016/09/12 by Rolando.Caloca DR - vk - Fix geometry shaders position - Revert translucent workaround Change 3121467 on 2016/09/12 by Rolando.Caloca DR - Fix integration issue (lost some shader defines) Change 3121862 on 2016/09/12 by Zabir.Hoque Fixing Code Analysis warnings. #jira: UE-35860 Change 3122139 on 2016/09/12 by Ben.Woodhouse Re-enable the checkerboard lighting by default to workaround skin lighting issue in fortnite (again) #jira UE-35886 Change 3122278 on 2016/09/12 by Zabir.Hoque 2nd Attempt at Code Analysis warnings [CL 3122339 by Marcus Wassmer in Main branch]
2016-09-12 22:23:27 -04:00
float3 SurfaceShading( FGBufferData GBuffer, float3 LobeRoughness, float3 LobeEnergy, float3 L, float3 V, half3 N, uint2 Random )
{
switch( GBuffer.ShadingModelID )
{
case SHADINGMODELID_UNLIT:
case SHADINGMODELID_DEFAULT_LIT:
case SHADINGMODELID_SUBSURFACE:
case SHADINGMODELID_PREINTEGRATED_SKIN:
case SHADINGMODELID_SUBSURFACE_PROFILE:
case SHADINGMODELID_TWOSIDED_FOLIAGE:
Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3122278) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3109545 on 2016/09/01 by Zabir.Hoque Merging DX12 RHIs stage 1. #Tests Ran InfiltratorDemo, ElementalDemo, ShooterGame Change 3109580 on 2016/09/01 by Zabir.Hoque Merging DX12 RHI. Stage 2: Moving XB and Windows APIs to a common location. This will cause a build break, but will allow us to preserve history. Change 3109632 on 2016/09/01 by Zabir.Hoque Merge DX12 RHI. Stage 3. Ported all changes and merged RHI into common and Win and XB1 specialized folder. Current with MS partners branch and Release 4.13. Change 3109690 on 2016/09/01 by Zabir.Hoque Fixing build break after large merge from partners branch and syncing to latest Dev-Rendering. Change 3109716 on 2016/09/01 by Zabir.Hoque Fix build warnings after merge. Change 3109733 on 2016/09/01 by Zabir.Hoque More build fixes for things pointing from XboxOneD3D12RHI to D3D12RHI Change 3109773 on 2016/09/01 by Zabir.Hoque Fixing code analysis warnings. Change 3109870 on 2016/09/01 by Rolando.Caloca DR - Simple clear mode Change 3110066 on 2016/09/01 by Zabir.Hoque Remove C++11 feature so VS2013 can compile for Fortnite. Change 3110335 on 2016/09/01 by Brian.Karis Fixed double lighting of clear coat, cloth, and eyes #review-3108222 @Ben.Woodhouse Change 3110411 on 2016/09/01 by Rolando.Caloca DR - vk - Fix bogus assert - Fix pipeline barrier with levelCount=0 Change 3110573 on 2016/09/01 by Zabir.Hoque Exclude D3D12 merged RHI from Mac Builds. Change 3110681 on 2016/09/01 by Rolando.Caloca DR - vk - Swapchain fix for drivers returning infinite swapchain images Change 3110936 on 2016/09/01 by Rolando.Caloca DR - vk - Fix crash when dumping unused heaps - Show file/line if enabled Change 3111034 on 2016/09/01 by Rolando.Caloca DR - vk - Fix exclude rect clear Change 3111139 on 2016/09/01 by Rolando.Caloca DR - Automatically enable capturing mode if running under RenderDoc Change 3111170 on 2016/09/01 by Rolando.Caloca DR - vk - Store max info per descriptor set pool Change 3111234 on 2016/09/01 by Zabir.Hoque XB1 compiler warnings. Change 3111763 on 2016/09/02 by Rolando.Caloca DR - Fix typo in shader PR #2759 #jira UE-35496 Change 3111846 on 2016/09/02 by Rolando.Caloca DR - vk - Update to SDK 1.0.24.0 (including glslang) Change 3111916 on 2016/09/02 by Ben.Woodhouse Fix for timestamp query results being broken in the XB1 DX11 RHI (caused by a merge issue with dev-platform) Also clarify some variable naming Change 3112048 on 2016/09/02 by Rolando.Caloca DR - vk - Compile fix for build machines Change 3112315 on 2016/09/02 by Rolando.Caloca DR - vk - Added peak usage to mem dump Change 3112791 on 2016/09/02 by Daniel.Wright FD3D12PipelineStateCache debug fix Change 3113483 on 2016/09/05 by Ben.Woodhouse Fix potential issue with timestamp and occlusion queries overlapping with new query packing optimisation. We may want to put these into separate buffers to avoid reduce the padding with timestamp queries (timestamp queries currently use 4x the memory they actually need due to additional padding) Change 3113488 on 2016/09/05 by Ben.Woodhouse GPu profiler : fix for render thread performance issues, enable GPU profiler by default Avoids RHIThread stalls in query creation by reusing queries via a pool. A FRenderQueryPool class already existed for doing this, so this was moved into the engine to make it accessible from both the engine and renderer modules Tested on XB1,PS4,PC dx11 Change 3114286 on 2016/09/06 by Chris.Bunner Copying CL 3114173 from 4.13 - Better enforce render resource limits on widget draw size.Jira UE-26375. Change 3114883 on 2016/09/06 by Rolando.Caloca DR - vk - Delete resources on the RHI thread - Set blend factor to 1 - Added num mips & num layers to RT views - Added missing destructors - Fix for crash on rhi thread Change 3116308 on 2016/09/07 by Rolando.Caloca DR - vk - New renderpass/transition/barrier rewrite for sm4 (disabled) - Fixes for 3d texture RTs Change 3117409 on 2016/09/08 by Gil.Gribb Merging //UE4/Dev-Main@3117389 to Dev-Rendering (//UE4/Dev-Rendering) Change 3117445 on 2016/09/08 by Gil.Gribb Fix merge fallout Change 3117555 on 2016/09/08 by Rolando.Caloca DR - Fix merge issue Change 3117687 on 2016/09/08 by Marc.Olano Create new Vector Noise material node, and *3DDeriv numerical derivative material functions Vector Noise node has noise functions with 3D output, including cellnoise (random color per cell), computed noise with vector output, gradient of 3D noise, curl of 3D noise, and version of Voronoi noise returning seed position in the closest Voronoi cell. 3DDeriv functions compute gradient and curl on any expression using centered differences from four samples offset in a tetrahedral pattern (two fewer than the common axis-aligned offset method) Change 3117696 on 2016/09/08 by Rolando.Caloca DR - Replicate 4.13.1 fix from 3117678 UE4.13 - Better error reporting when SCW fails/crashes jira UE-17227 Change 3117720 on 2016/09/08 by Rolando.Caloca DR - vk - Fix for static analysis Change 3117786 on 2016/09/08 by Rolando.Caloca DR - vk - Use new alignment Change 3118145 on 2016/09/08 by Marcus.Wassmer Fix async compute clear not waiting for the gfx pipe properly. Also appears to fix a rare PS4 gpu hang. Change 3118329 on 2016/09/08 by Brian.Karis Fix screen size calculations for LOD Change 3118351 on 2016/09/08 by Brian.Karis Quadric mesh simplifier! In and working for the first time. ScreenSize is now correctly calculated from MaxDeviation Pixel Error now a reduction setting in LOD group. Binary Heap is fixed and functional. Still needs to play better with 3rd party reduction. Change 3118457 on 2016/09/08 by Rolando.Caloca DR - vk - Fix cube & 3d texture transitions & copies Change 3118540 on 2016/09/08 by Benjamin.Hyder Re-Submitting Noise assets to get engine version Change 3119438 on 2016/09/09 by Rolando.Caloca DR - vk - Added barrier & cache flushes when reading back GPU memory - Added cubemap & 3d texture barriers - Added cubemap & 3d texture copy image Change 3119518 on 2016/09/09 by Brian.Karis Fixed compile error Change 3119580 on 2016/09/09 by Marc.Olano Documentation for Vector noise Change 3119710 on 2016/09/09 by Rolando.Caloca DR - vk - Fix read stencil mask & front/back Change 3119865 on 2016/09/09 by Rolando.Caloca DR - vk - RHIReadSurfaceFloatData - Fix redundant write transitions - Simplify copy and transition code Change 3120059 on 2016/09/09 by Rolando.Caloca DR - vk - Static analysis warnings Change 3120413 on 2016/09/09 by Mark.Satterthwaite Fix AVFMedia plugin failing when a movie has captions. #jira UE-35828 Change 3120936 on 2016/09/12 by Ben.Woodhouse Add slate rendering to the GPU stats Change 3121204 on 2016/09/12 by Rolando.Caloca DR - vk - Fix geometry shaders position - Revert translucent workaround Change 3121467 on 2016/09/12 by Rolando.Caloca DR - Fix integration issue (lost some shader defines) Change 3121862 on 2016/09/12 by Zabir.Hoque Fixing Code Analysis warnings. #jira: UE-35860 Change 3122139 on 2016/09/12 by Ben.Woodhouse Re-enable the checkerboard lighting by default to workaround skin lighting issue in fortnite (again) #jira UE-35886 Change 3122278 on 2016/09/12 by Zabir.Hoque 2nd Attempt at Code Analysis warnings [CL 3122339 by Marcus Wassmer in Main branch]
2016-09-12 22:23:27 -04:00
return StandardShading( GBuffer.DiffuseColor, GBuffer.SpecularColor, LobeRoughness, LobeEnergy, L, V, N );
case SHADINGMODELID_CLEAR_COAT:
return ClearCoatShading( GBuffer, LobeRoughness, LobeEnergy, L, V, N );
case SHADINGMODELID_CLOTH:
return ClothShading( GBuffer, LobeRoughness, LobeEnergy, L, V, N );
case SHADINGMODELID_EYE:
return EyeShading( GBuffer, LobeRoughness, LobeEnergy, L, V, N );
default:
return 0;
}
}
float3 SubsurfaceShading( FGBufferData GBuffer, float3 L, float3 V, half3 N, float Shadow, uint2 Random )
{
float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
switch( GBuffer.ShadingModelID )
{
case SHADINGMODELID_SUBSURFACE:
return SubsurfaceShadingSubsurface( GBuffer, L, V, N );
case SHADINGMODELID_PREINTEGRATED_SKIN:
return SubsurfaceShadingPreintegratedSkin( GBuffer, L, V, N );
case SHADINGMODELID_TWOSIDED_FOLIAGE:
return SubsurfaceShadingTwoSided( SubsurfaceColor, L, V, N );
case SHADINGMODELID_HAIR:
Copying //UE4/Orion-Staging to Dev-Main (Originating from //Orion/Main at CL-2777663) #lockdown Nick.Penwarden Change 2777555 on 2015/11/23 by Antony.Carter Friend List Sub Menu restyling to new designs #RB Nicholas.Davies #TESTS Check 3 sub menus of friends list (Online Status, Friends List, Settings) still function correctly with new styling. Change 2777506 on 2015/11/23 by Andrew.Rodham Sequencer: Copy/Paste command binding is no longer active if the seuqnece widget is not focused This addresses UE-23423 #tests Tested copy/paste inside and outside of sequencer #codereview Max.Chen #rb Max.Chen Change 2777505 on 2015/11/23 by Andrew.Rodham Sequencer: Undoing the addition of a spawnable now ensures its actor instance is deleted correctly This addresses UE-23450 #tests tested the repro steps on the bug #codereview Max.Chen #rb Max.Chen Change 2777489 on 2015/11/23 by Andrew.Rodham Sequencer: Workflow optimizations for spawnables - Editing a property on an instance of a spawnable now automatically propagates to the spawnable defaults, provided the property is not keyed - Fixed a few cases where spawnables were left lingering around while scrubbing or switching between sub-sequences - Fixed the root sequence instance being evaluated when there was a sub-sequence focused. - Selection states are now remembered for spawnable objects when they are destroyed/re-spawned #codereview Max.Chen #tests tested loks of object types as spawnables in PIE and in editor #rb Max.Chen Change 2777321 on 2015/11/23 by Terence.Burns Updated the usage of World->UpdateStreamingLevels to FlushStreaming levels on the advice of Dmitriy. Need this to ensure that the streaming is completed before we send it off to lightmass. #rb Dmitriy.Dyomin #Tests Run the RebuildLightmaps UAT script. Change 2777091 on 2015/11/22 by Andrew.Grant Changed "inappropriate outmost" warning on package load to an error. At the very least we want this for a day or two on Orion to surface errors quickly, but may be a good thing to make a standard error since it indicates something that's likely broken. #rb none #tests Golden path in game, cooked content #codereview Nick.Penwarden, Michael.Noland Change 2777037 on 2015/11/22 by Laurent.Delayen Additional debug info to track down https://jira.ol.epicgames.net/browse/OR-9675 #rb martin.wilson #codereview martin.wilson #tests Golden path (PIE) + compiled for PS4 Change 2777030 on 2015/11/22 by Sam.Zamani #online,externalui,ps4 - added footer option for closing the embedded web browser #rb none #tests exec command to try on ps4 Change 2777019 on 2015/11/22 by Marcus.Wassmer Possible fix for OR-9851 #rb none #test GoldenPath, PS4 #codereview Nick.Darnell,Matt.Kuhlenschmidt Change 2776932 on 2015/11/22 by Max.Chen Sequencer: Fix editor selection so that it's not modified in response to the sequencer outliner tree node changing selection if the user is not explicitly selecting in the tree. #RB none #tests Select an actor that Sequencer doesn't control and it shouldn't deselect. Change 2776900 on 2015/11/21 by Marcus.Wassmer HighQuality particle lights. #rb Brian.Karis #test GoldenPath, HQ Particles w/wo ShadowCasting. #codereview Olaf.Piesche, Simon.Tovey, Tim.Elek Change 2776868 on 2015/11/21 by Brian.Karis Reduced temporal aa responsiveness back where it was. Change 2776867 on 2015/11/21 by Brian.Karis Removed shading terminator bias meant for shadow map acne but it made character faces look worse. Change 2776840 on 2015/11/21 by Brian.Karis Hair indirect lighting implemented. Improvements to hair shading model. No longer uses backlit parameter. #rb marcus.wassmer #tests editor Change 2776748 on 2015/11/21 by Max.Preussner Sequencer: Continued to implement track label editor Note: still disabled, because there are a couple remaining issues #codereview: max.chen #rb: max.chen #test: Editor, Runtime Change 2776493 on 2015/11/20 by Max.Preussner Sequencer: Wrapped the node tree context menu actions for editing in an 'Edit' section #codereview: max.chen #rb: max.chen
2015-11-24 16:45:24 -05:00
return HairShading( GBuffer, L, V, N, Shadow, 1, 0, Random );
case SHADINGMODELID_EYE:
return EyeSubsurfaceShading( GBuffer, L, V, N );
default:
return 0;
}
}