Commit Graph

64 Commits

Author SHA1 Message Date
patrick enfedaque
aba529cbe6 - Landscape Layer System: Fix Timing issue between Landscape Import and Texture DDC. Add a check in FLandscapeTextureDataInfo to flag any remaining/future cases.
#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6544532 via CL 6544751 via CL 6544765
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v350-6578747)

[CL 6579028 by patrick enfedaque in Dev-VR branch]
2019-05-20 14:24:04 -04:00
michael dupuis
e1da757f07 - Change the way the Experimental flag was used, we only rely on the flag to allow enabling/disabling the landscape layers feature
- Enabling/Disabling the layer system is per world settings now
- Changed most of the layer code to either rely on the feature being enabled in the level or be data driven, which is we pass through the layer code path if we have layer content
#rb Patrick.Enfedaque
[FYI] Richard.Malo

#ROBOMERGE-VERSION: 348-6547088
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 6537091 via CL 6538617 via CL 6538697
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6577263 by michael dupuis in Dev-VR branch]
2019-05-20 13:42:24 -04:00
richard malo
167de127b6 Fixed static analysis
#jira UE-74696
#rb patrick.enfedaque, jeanfrancois.dube
#rnx

#ROBOMERGE-VERSION: 348-6547088
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6535585 via CL 6535929 via CL 6535935
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6563924 by richard malo in Dev-VR branch]
2019-05-18 10:39:01 -04:00
richard malo
f705234756 Resubmit of 6480930 : Added Landscape Layer contribution debug display
(Back out changelist 6491271 which was a back out of 6480930)
#rb patrick.enfedaque
[FYI] michael.dupuis
#rnx

#ROBOMERGE-VERSION: 348-6547088
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6507641 via CL 6513629 via CL 6513777
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6553038 by richard malo in Dev-VR branch]
2019-05-18 09:49:44 -04:00
bob tellez
46d87e5bc2 Back out changelist 6480930. Likely cause of editor crash
[FYI] Richard.Malo

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 6491271 via CL 6501084 via CL 6501206
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6532019 by bob tellez in Dev-VR branch]
2019-05-16 03:37:36 -04:00
richard malo
e6547b04be Added Landscape Layer contribution debug display
#rb patrick.enfedaque
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6480930 via CL 6499574 via CL 6499829
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6530419 by richard malo in Dev-VR branch]
2019-05-16 03:26:52 -04:00
patrick enfedaque
6160ae41f1 - Landscape Layer System:
Fix Undo/Redo weightmap rare bug
Fix Undo/Redo of use cases where RequestLayersContentUpdateForceAll was undone.
Force Update now just propagates to components instead of maintaining a flag in the Proxy

#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6445987 via CL 6447681 via CL 6447719
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6508253 by patrick enfedaque in Dev-VR branch]
2019-05-15 15:37:04 -04:00
michael dupuis
534941e852 Added support for the layer system into Change Component Size tool
Changed the ALandscapeProxy::Import function to support import of multiple layers as the function is used during the New Landscape with/without Import, World Composition Import/Add and Change Component Size.
The order of operations was changed to prevent having to call multiple times CreateLandscapeInfo, as the 1st few times, the content is not all ready.

#rb Richard.Malo, Patrick.Enfedaque

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 6401763 via CL 6403790 via CL 6403900
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6488793 by michael dupuis in Dev-VR branch]
2019-05-15 13:04:07 -04:00
richard malo
a9fe5e3e0c Optimized erasing weightmap data (avoid reallocating weightmaps and updating material instances twice if no data)
#rb patrick.enfedaque
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6345404 via CL 6352706 via CL 6352919
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6358668 by richard malo in Dev-VR branch]
2019-05-07 21:14:56 -04:00
patrick enfedaque
f9932c5072 - Landscape Layer System: Component partial update support for Collision and Clients (Foliage, Grass, Nav)
#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6318826 via CL 6320723 via CL 6320799
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6350678 by patrick enfedaque in Dev-VR branch]
2019-05-07 18:09:34 -04:00
patrick enfedaque
badc856f38 - Landscape Layer System: Re-add invalidation of component data while editing so that grass dissapears immediatly and not on stroke end.
#rb richard.malo
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6271330 via CL 6274605 via CL 6274715
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6293606 by patrick enfedaque in Dev-VR branch]
2019-05-03 18:15:14 -04:00
patrick enfedaque
d403ca33c3 - Lanscape Layer System: Make sure we only do Collision Updates in the TickLayers when using Layers
#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6252785 via CL 6253151 via CL 6253170
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6255614 by patrick enfedaque in Dev-VR branch]
2019-05-02 13:05:57 -04:00
richard malo
6811bde7ec - Fixed Collision used by Landscape Add Component Tool not properly computed when using Landscape Layer System (now deffered in TickLayers)
- Painting height in Landscape Layer System now only updates edition heightfield collision of dirty landscape components
- Fixed CachedBounds of LandscapeComponent that was sometimes computing bounds based on editing layer instead of the final layer in Landscape Layer System mode.
- Fixed random crash caused by missing FlushRenderingCommands when re-creating CPU Readback resources and using theses resources in the same frame
#rb patrick.enfedaque, michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6189690 via CL 6192390 via CL 6192458
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6230714 by richard malo in Dev-VR branch]
2019-05-01 20:04:08 -04:00
richard malo
3ba584d6b0 Fixed Landscape height sculpting brush not targetting right location in Layer System Mode
#jira UE-73425
#rb patrick.enfedaque
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6140358 via CL 6140894 via CL 6175546
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6203916 by richard malo in Dev-VR branch]
2019-05-01 17:45:40 -04:00
michael dupuis
f569901b72 Data structure change to the Landscape Layers system to be component based instead of storing the info into the landscape actor/proxy
Change how the Setup fonction work to split each behavior into seperate function and calling each one in the correct code path
Fixed some bugs in the shaders

#rb Richard.Malo
[FYI] Patrick.Enfedaque

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5899368 via CL 5899649 via CL 5899658
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5904278 by michael dupuis in Dev-VR branch]
2019-04-15 17:02:39 -04:00
patrick enfedaque
9a2fb30c14 - Landscape Layer System: Fixes
Subtractive Flag Undo/Redo support
LayerInfo NoWeightBlend properly reflected in details panel
Missing fixup in ReplaceLayer for Subtractive Flag

#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 5898025 via CL 5898582 via CL 5898691
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5900206 by patrick enfedaque in Dev-VR branch]
2019-04-15 13:00:06 -04:00
patrick enfedaque
8cab9bcc15 - Landscape Layer System: Replace Layer Info now propagated to all layers
#rb richard.malo
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 5831805 via CL 5835903 via CL 5836637
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5878902 by patrick enfedaque in Dev-VR branch]
2019-04-12 21:22:50 -04:00
bob tellez
e627841607 #UE4 Fix shadowed variable
[FYI] Richard.Malo

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5805295 via CL 5805360 via CL 5805361
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5806030 by bob tellez in Dev-VR branch]
2019-04-09 01:03:51 -04:00
richard malo
df1ebd6f32 - Fixed physic material update when changing Physic Material on a LayerInfo.
- Fixed missing physic material update when Clearing, Filling and Replacing a Layer.
#jira UE-72474
[CODEREVIEW] patrick.enfedaque
[FYI] michael.dupuis

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 5776037 via CL 5785762 via CL 5785826
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5795892 by richard malo in Dev-VR branch]
2019-04-08 17:01:21 -04:00
patrick enfedaque
e503212068 Fixes for Landscape Layer System
- Proper updating of Heightmap Colllision
- Multiple Undo/Redo fixes
#rb richard.malo
[FYI] michael.dupuis
#jira UE-72277: Fixes Undo/Redo of weight maps when not using the new Layer System

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 5766185 via CL 5766372 via CL 5766405
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5780675 by patrick enfedaque in Dev-VR branch]
2019-04-08 13:24:14 -04:00
richard malo
501be88c8d - Landscape Splines can now reserve a Landscape Layer (using the Landscape Layer System). In that use-case, their terraforming/terrapainting becomes non-destructive.
- Added automatic update of landscape deformation when landscape splines are modified (only in Landscape Layer System Mode)
- Added a new blend mode (alpha blend) to allow landscape splines to blend with previous landscape layers (blending and raise/lower flags is handled by GPU)
#rb michael.dupuis
[CODEREVIEW] michael.dupuis
[FYI] patrick.enfedaque

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 5734202 via CL 5736580 via CL 5736607
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5742867 by richard malo in Dev-VR branch]
2019-04-04 13:02:53 -04:00
michael dupuis
6e92acef2a Changed the name from Landscape Procedural to Landscape Layers
Moved some function from LandscapeEdMode to LandscapeEditLayers

#jira UE-61718
#rb none
[CODEREVIEW] Richard.Malo

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5629413 via CL 5631899 via CL 5632451
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5635740 by michael dupuis in Dev-VR branch]
2019-03-28 17:01:28 -04:00
michael dupuis
96b753a33f Fixed WeightmapUsage crash caused by doing an Undo and using a newed ptr in a TMap that was transacted
#rb Richad.Malo
[CODEREVIEW] Richard.Malo

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5488124 via CL 5489740 via CL 5489807
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5512914 by michael dupuis in Dev-VR branch]
2019-03-22 17:42:54 -04:00
michael dupuis
3ba8436d50 When SetParentEditorOnly is called we no longer recompute shader in most case as we will call UpdateStaticPermutation that will do so.
Add Procedural Layer support for Weightmaps, including Brush support that affect Weightmap and/or Heightmap.

#jira UE-61718:
#rb Jack.Porter
[FYI] Jeremy.Moore, Richard.Malo

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5433816 via CL 5437700 via CL 5437807
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5440751 by michael dupuis in Dev-VR branch]
2019-03-18 21:02:06 -04:00
michael dupuis
5b18511239 When Calling GetWeightmapData() it will try interpolating the missing component data, but there was an error and would also try interpolating missing/not allocated allocation. For example, if in a component you had no "grass" painted, but got some painted in the whole landscape. It would try to set some grass even if there was none before. We only want to perform this behavior on missing component, not existing one.
#rb Jeremy.Moore
[FYI] Jack.Porter

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5038773 via CL 5043387 via CL 5045665
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5133866 by michael dupuis in Dev-VR branch]
2019-02-22 02:57:41 -05:00