Commit Graph

76 Commits

Author SHA1 Message Date
ryan bickell
84cd91e250 Fix VT update to happen with rest of landscape painting tools (smooth, flatten, noise)
#rb jeremy.moore
#fyi jonathan.bard

[CL 16694008 by ryan bickell in ue5-main branch]
2021-06-16 15:06:37 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
patrick enfedaque
eb96e7a435 Add LandscapeToolsLog to debug Shift+Paint
Add LogLandscapeTools=VeryVerbose to DefaultEngine.ini to enable

#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11575168 via CL 11575193 via CL 11575195 via CL 11575200
#ROBOMERGE-BOT: (v654-11333218)

[CL 11575205 by patrick enfedaque in Main branch]
2020-02-21 07:12:12 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
jeremy moore
0e1455505d Runtime virtual texture flush per VT and region instead of flushing everything
#ROBOMERGE-SOURCE: CL 7882089 via CL 7914929
#ROBOMERGE-BOT: (v389-7813075)

[CL 7915095 by jeremy moore in Main branch]
2019-08-08 23:35:07 -04:00
patrick enfedaque
8e82d7b956 Fix from 4.23 CL 7660764
#jira UE-78073
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 7681242 via CL 7688722
#ROBOMERGE-BOT: (v383-7686620)

[CL 7688986 by patrick enfedaque in Main branch]
2019-08-01 13:00:59 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
richard malo
c600d8c5dd Optimized landscape painting: avoid recomputing normals, caching original data when not necessary
#rb patrick.enfedaque
#rnx


#ROBOMERGE-SOURCE: CL 6915067 via CL 6919084
#ROBOMERGE-BOT: (v366-6836689)

[CL 6919175 by richard malo in Main branch]
2019-06-10 18:07:40 -04:00
patrick enfedaque
62824fbfe5 - Landscape Layer System: Erosion & Hydra Erosion now can work on Combined Layer Result
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6859302 via CL 6859461
#ROBOMERGE-BOT: (v366-6836689)

[CL 6859479 by patrick enfedaque in Main branch]
2019-06-06 08:22:39 -04:00
richard malo
a1e490a32f Fixed Mac compilation
#rnx


#ROBOMERGE-SOURCE: CL 6857549 via CL 6857981
#ROBOMERGE-BOT: (v366-6836689)

[CL 6858062 by richard malo in Main branch]
2019-06-05 21:04:03 -04:00
patrick enfedaque
159c846375 - Landscape Layer System: Fix some crashes when going out of landscape in a specific tool and deleting the last landscape in the scene and going back into landscape
[FYI] richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6851551 via CL 6853336
#ROBOMERGE-BOT: (v366-6836689)

[CL 6853404 by patrick enfedaque in Main branch]
2019-06-05 14:40:27 -04:00
richard malo
cb9b966e4f - Landscape Smooth Tool now supports also working on combined layers (new option bCombinedLayersOperation)
- Added class FLandscapeLayerDataCache to handle caching combined layers data and compute delta when writing
- Refactored Flatten Tool to use new FLandscapeLayerDataCache
- Optimized greatly performance of Flatten Tool in CombinedLayers mode
#rb patrick.enfedaque
#rnx


#ROBOMERGE-SOURCE: CL 6847951 via CL 6848202
#ROBOMERGE-BOT: (v366-6836689)

[CL 6849050 by richard malo in Main branch]
2019-06-05 11:09:49 -04:00
patrick enfedaque
9700821df9 Fix Compile EngineTestEditor Mac
[FYI] richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6618155 via CL 6619136
#ROBOMERGE-BOT: (v358-6608238)

[CL 6619139 by patrick enfedaque in Main branch]
2019-05-23 12:43:04 -04:00
richard malo
b5ec0447bc - Landscape Layer System : Added Flatten Tool support on all layers
- Set Terrace Interval/Smooth init value to valid ones and added clamping to avoid invalid results
- Avoid flattening in Paint mode when using Terrace or Interval Flatten mode
- Avoid using Flatten slope if use Flatten Target because no normal is provided
#rb patrick.enfedaque
#rnx


#ROBOMERGE-SOURCE: CL 6617072 via CL 6617187
#ROBOMERGE-BOT: (v358-6608238)

[CL 6617197 by richard malo in Main branch]
2019-05-23 01:03:04 -04:00
michael dupuis
3b1cd2344b - 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-SOURCE: CL 6537091 via CL 6538617

[CL 6538697 by michael dupuis in Main branch]
2019-05-16 16:14:30 -04:00
patrick enfedaque
a0938f07f8 - Landscape Layer System: New Heightmap Erase Tool (in sculpt mode)
#rb richard.malo
[FYI] michael.dupuis
#rnx


#ROBOMERGE-SOURCE: CL 6339992 via CL 6340091

[CL 6340095 by patrick enfedaque in Main branch]
2019-05-07 07:29:12 -04:00
richard malo
6d50a78ae6 - Limited support of Flatten & Ramp Tool for Landscape Layer System (limited to first layer)
- Disabled Retopologize Landscape Tool for Landscape Layer System
- Erosion & HydroErosion Tool now supported Landscape Layer System
- Added message tip to show warnings of unsupported edition cases in the Landscape Layer System
- Fixed bug in Renaming of a Landscape Layer
#rb michael.dupuis
[CODEREVIEW] michael.dupuis
[FYI] patrick.enfedaque


#ROBOMERGE-SOURCE: CL 5743264 via CL 5745866

[CL 5746001 by richard malo in Main branch]
2019-04-04 14:05:33 -04:00
Michael Dupuis
1b4f8cbbf5 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: Michael.Dupuis
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5629413 via CL 5631899

[CL 5632451 by Michael Dupuis in Main branch]
2019-03-28 13:48:03 -04:00
richard malo
be327ea444 Added basic Procedural Layer management (Create New Layer, Delete Layer, Lock/Unlock Layers, Toggle/Isolate Layer Visibility)
[CODEREVIEW] michael.dupuis
#rb michael.dupuis


#ROBOMERGE-SOURCE: CL 5491687 via CL 5491921

[CL 5491930 by richard malo in Main branch]
2019-03-21 09:05:32 -04:00
michael dupuis
a16e0aef6d 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-SOURCE: CL 5433816 via CL 5437700

[CL 5437807 by michael dupuis in Main branch]
2019-03-18 18:04:55 -04:00
robert osborne
66043a94cd #ROBOMERGE-SOURCE: CL 5399925 via CL 5401157
[CL 5402217 by robert osborne in Main branch]
2019-03-14 17:20:06 -04:00
michael dupuis
ea63325af5 #rb none
[CODEREVIEW] jack.porter


#ROBOMERGE-SOURCE: CL 4935720 via CL 4940201

[CL 4941477 by michael dupuis in Main branch]
2019-02-07 20:56:17 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -05:00