Commit Graph

23 Commits

Author SHA1 Message Date
Daniel Wright
ea1d38c1c3 FPrimitiveSceneProxy::PreRenderView / DrawDynamicElements refactored into GetDynamicMeshElements
* Both paths still exist in code during this transition.  The GetDynamicMeshElements path is currently disabled, enable with 'r.UseGetDynamicMeshElements 1'.
* DrawDynamicElements was called once per pass, all sorts of pass-specific cruft had leaked in along with short-term modifications of shared structures (vertex factories and material proxies).  DrawDynamicElements was not const, so a bunch of 'update' type work had leaked in.  Various PreRenderView implementations relied on the view being in the view family.
* GetDynamicMeshElements is called once in InitViews, and the resulting meshes are used in various passes.  GetDynamicMeshElements is const and must not modify the proxy, update work should be pushed to the proxy from the game thread.  GetDynamicMeshElements can be called on views that are not in the view family, which allows a proper view for shadow depth passes.
* View mode override functionality moved out of the individual proxies into a centralized place, ApplyViewModeOverrides
* GPU particles not working yet, FRecastRenderingSceneProxy not implemented

[CL 2253795 by Daniel Wright in Main branch]
2014-08-12 18:24:52 -04:00
Mikolaj Sieluzycki
1b17a83b4c CIS fixes.
[CL 2251396 by Mikolaj Sieluzycki in Main branch]
2014-08-11 10:10:24 -04:00
Josh Markiewicz
c18a424666 Weekly Fort Dev -> Main integration from UE4-Fortnite-CL-2245134
MCP
 "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "build" : "306",
  "cln" : "2245028",
  "version" : "UNKNOWN"

[CL 2247600 by Josh Markiewicz in Main branch]
2014-08-07 17:34:29 -04:00
Mikolaj Sieluzycki
873208f648 Header cleanup: Engine module, public headers.
[CL 2246892 by Mikolaj Sieluzycki in Main branch]
2014-08-07 08:36:40 -04:00
sebastian kowalczyk
8016db3dd5 Fixed TTP #342981 "CRITICAL: REGRESSION: CRASH: QAGame -game -featureleveles2 Assertion failed: (Index >= 0) & (Index < ArrayNum)"
[CL 2242235 by sebastian kowalczyk in Main branch]
2014-08-04 08:10:19 -04:00
Fred Kimberley
739ee0d8e9 Merging using UE4-Fortnite-To-UE4
Merged from CL 221481.

[CL 2227500 by Fred Kimberley in Main branch]
2014-07-22 16:23:09 -04:00
Michael Trepka
f4438a0e55 Separate Control and Command keys on Mac; some editor shortcuts remapped to use Ctrl to free Cmd for Mac-specific shortcuts (Cmd+W, Cmd+M and Cmd+H)
[CL 2225709 by Michael Trepka in Main branch]
2014-07-21 13:10:16 -04:00
Bob Tellez
a399d885b6 Merging CL#2188206 using UE4-Fortnite-To-UE4
MCPInfo:
  "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "build" : "240",
  "cln" : "2172251",
  "version" : "UNKNOWN"

[CL 2215307 by Bob Tellez in Main branch]
2014-07-14 19:41:38 -04:00
Bob Tellez
94d3fd1d1e UE4: Wrapping many editor-only UEngine events in #if WITH_EDITOR to prevent them from being subscribed to in non-editor builds under the impression that they would actually get fired.
[CL 2181667 by Bob Tellez in Main branch]
2014-07-09 13:07:54 -04:00
sebastian kowalczyk
d04afefeb4 Fixed warning about using wrong precompiled header #UE4
[CL 2117723 by sebastian kowalczyk in Main branch]
2014-06-26 03:54:40 -04:00
sebastian kowalczyk
3fede789df Fixed build error. #Fortnite
[CL 2116840 by sebastian kowalczyk in Main branch]
2014-06-25 12:59:54 -04:00
sebastian kowalczyk
fd585d3d24 Added correct multi-client support for GameplayDebugger. #UE4
Removed some header dependencies from GameplayDebugger (GameplayDebugger's pch no longer including editor headers, etc.) #UE4

[CL 2116658 by sebastian kowalczyk in Main branch]
2014-06-25 09:28:40 -04:00
James Golding
830a3f3634 Move FShadow/LightMapRef into SceneTypes.h, stop including LightMap.h/ShadowMap.h everywhere
Add explicit constructor to UStaticMeshComponent, ULandscapeComponent and FModelElement so they can be implmented in cpp file, which includes LightMap/ShadowMap.h
Rename PackedNormal.inl to PackedNormal.h and move rest of declaration, so it can be included independent of RenderUtils.h
Move FMaterialRelevance definition from PrimitiveComponent.h to MaterialInterface.h
Move FExpressionInput/FExpressionOutput/FMaterialInput etc. from MaterialShared.h into new MaterialExpressionIO.h, to avoid Material.h pulling in RHI includes
Other required includes added
#codereview rolando.caloca

[CL 2113877 by James Golding in Main branch]
2014-06-23 07:12:12 -04:00
Robert Manuszewski
e2bb29b5fa Fixing PCH warnings in GameplayDebugger and AIModule
#codereview mieszko.zielinski

[CL 2109143 by Robert Manuszewski in Main branch]
2014-06-18 08:25:46 -04:00
Ben Marsh
3cbfc44bfe Remove SharedPCH settings from AIModule and GameplayDebugger. It doesn't make sense to create a shared PCH from a private header file (because you can't/shouldn't share private headers), and it breaks compiling any project under Rocket where private headers aren't distributed.
#codereview Mieszko.Zielinski, sebastian.kowalczyk

[CL 2108066 by Ben Marsh in Main branch]
2014-06-17 09:26:17 -04:00
Daniel Lamb
810784fb4e Fixed compiler error for WITH_EDITOR_ONLY_DATA.
[CL 2104852 by Daniel Lamb in Main branch]
2014-06-13 14:50:38 -04:00
sebastian kowalczyk
67a9595594 Fixed TTP #338489 "[Editor] GameplayDebuggingReplicator visible in new Worlds"
[CL 2104620 by sebastian kowalczyk in Main branch]
2014-06-13 11:09:59 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Mieszko Zielinski
b8035d53ef Made GameDebugger module not include Engine.h #UE4
[CL 2101769 by Mieszko Zielinski in Main branch]
2014-06-11 09:53:20 -04:00
sebastian kowalczyk
11f70e150d Fixed differen issues for GameplayDebugger and fixed missing features we had before moving to separate module.
[CL 2101734 by sebastian kowalczyk in Main branch]
2014-06-11 09:13:09 -04:00
Eric Newman
d1edcf5f62 Resolved several merge conflicts caused by premature commit of integration from UE4-Fortnite
[CL 2101076 by Eric Newman in Main branch]
2014-06-10 18:20:00 -04:00
Eric Newman
43162b12dc Weekly UE4-Fortnite=>UE4 merge using UE4-Fortnite-To-UE4 of approved cl# 2098745
[CL 2100757 by Eric Newman in Main branch]
2014-06-10 16:45:28 -04:00
sebastian kowalczyk
bcf63d6e0f Moved Gameplay Debugging Tool to separate module. It's GameplayDebugger module now. Will have to bring back some functionality later (connection with BT debugger, etc.) #ue4
[CL 2100589 by sebastian kowalczyk in Main branch]
2014-06-10 13:56:35 -04:00