Commit Graph

83 Commits

Author SHA1 Message Date
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Alexis Matte
907a88c608 Add an option to allow compute normals to use weight by area and angle.
#jira UE-79195
#rb jimmy.andrews
#rn Add an fbx option to allow compute normals to use weight by area and angle for both staticmesh and skeletalmesh. Add also a staticmesh build options for the feature.

[CL 8364158 by Alexis Matte in Dev-Editor branch]
2019-08-28 15:15:21 -04:00
sebastien lussier
9462f6b7ac HLOD building crashes when building
Cherrypicked CL8214461 from Dev-Enterprise
#jira UE-79203


#ROBOMERGE-SOURCE: CL 8224679 via CL 8230150
#ROBOMERGE-BOT: (v401-8057353)

[CL 8230887 by sebastien lussier in Main branch]
2019-08-23 12:08:39 -04:00
sebastien lussier
c5d90f6078 HLOD - Allow merging of HISM to the resulting mesh
Also allow merging of H(ISM) from the mesh merging tool
#jira UE-79239
jeanfrancois.dube


#ROBOMERGE-SOURCE: CL 8220928 via CL 8221461 via CL 8229897
#ROBOMERGE-BOT: (v401-8057353)

[CL 8230715 by sebastien lussier in Main branch]
2019-08-23 12:04:04 -04:00
sebastien lussier
0f9bcd5fda Fix crash when building HLODs
Interated from main
#jira UE-79211
#lockdown cristina.riveron
#rb none

#ROBOMERGE-SOURCE: CL 8219953 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8220049 by sebastien lussier in Main branch]
2019-08-22 22:43:55 -04:00
sebastien lussier
29d148d4c2 GenerateProxyMesh causes incorrect transform in ISM using Scale
#jira UE-79140
jeanfrancois.dube


#ROBOMERGE-SOURCE: CL 8210627 via CL 8211744
#ROBOMERGE-BOT: (v401-8057353)

[CL 8211754 by sebastien lussier in Main branch]
2019-08-22 10:48:59 -04:00
sebastien lussier
30effd5e1c Crash building HLOD with imposters only
#jira UE-77796
#rb none
[FYI] bryce.lumpkin, stuart.fitzsimmons


#ROBOMERGE-SOURCE: CL 8150397 via CL 8150412 via CL 8153526
#ROBOMERGE-BOT: (v401-8057353)

[CL 8161581 by sebastien lussier in Main branch]
2019-08-21 09:52:37 -04:00
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
Benn Gallagher
3a4873ef60 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 7703071
#rb
#rnx

[CL 7705805 by Benn Gallagher in Main branch]
2019-08-02 09:01:58 -04:00
Richard TalbotWatkin
7252700c79 Integrated from Main CL 7668565.
Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

[CL 7668661 by Richard TalbotWatkin in Dev-Editor branch]
2019-07-31 05:35:17 -04:00
richard talbotwatkin
c0ef3053d2 Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7668562 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7668565 by richard talbotwatkin in Main branch]
2019-07-31 03:40:45 -04:00
sebastien lussier
4f1a715182 Added the option "Create Merged Material" to mesh merging settings
* Option is disabled by default
* When enabled, the resulting merged mesh will have:
** An additional unused material which is created from the merge of all meshes materials
** An additional set of UV coordinates that can be used to apply the merged material to any section of the mesh
** Added additional static switch params to BaseFlattenMaterials to allow specifying UV channel
[FYI] jurre.debaare
#rnx


#ROBOMERGE-SOURCE: CL 7473968 via CL 7474018
#ROBOMERGE-BOT: (v372-7473910)

[CL 7474030 by sebastien lussier in Main branch]
2019-07-22 08:22:52 -04:00
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Richard TalbotWatkin
1ca56fc5b2 MeshDescription now uses triangles as its primary face representation. They can and should be used in preference to polygons when a mesh is known to be entirely triangulated, as they are quicker, and can be used in exactly the same way.
Creating a triangle will also create a 'shadow' polygon for backward compatibility, although this is omitted when serializing.
As with polygons, any missing edges are created when creating a new triangle, and operations such as adjacency are available to triangles, just as for polygons.
The native serialization format for MeshDescription is now based around triangles.
Polygons of arbitrary number of edges may still be represented, and when created, will automatically generate the appropriate number of triangles.  Polygons of more than three sides automatically generate 'internal edges', which are owned by the polygon, and which will be regenerated if the polygon is retriangulated. Internal edges are otherwise not distinct from other edges, and can be used to determine connected triangles or vertices.
Direct access to public members of mesh element classes (FMeshVertex, etc) is now deprecated. In particular, vertex instances and edges now hold a list of connected triangles, and the ConnectedPolygons member is deprecated and will be removed (as this data can be derived from the ConnectedTriangles list).
Improved the MeshDescription API, providing more operations, and allowing arrays with different allocators to be provided as results containers.
Fixed several MeshEditing operations.
Added MeshDescription unit tests.
#rb none

[CL 7099758 by Richard TalbotWatkin in Dev-Editor branch]
2019-06-20 08:20:20 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Chris Gagnon
0a9f86357f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
sebastien lussier
44edaff438 HLOD Imposters
* Now extracted from sub levels and brought in the main map to be rendered as instanced static meshes.
* Impostors meshes created during proxy creation.

#rb jeanfrancois.dube, jurre.debaare


#ROBOMERGE-SOURCE: CL 6675359 via CL 6675861
#ROBOMERGE-BOT: (vundefined-6665479)

[CL 6675880 by sebastien lussier in Main branch]
2019-05-30 10:37:45 -04:00
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -04:00
alexis matte
90a4a518da Force automation process to not use the ddc when executing merge actor test for staticmesh
#rb jurre.debaare
#jira UE-72667


#ROBOMERGE-SOURCE: CL 6476239 via CL 6476594

[CL 6476626 by alexis matte in Main branch]
2019-05-15 09:30:49 -04:00
JeanFrancois Dube
c9e1dd55d4 Fixed crash when generating HLOD proxy meshes with instanced actors.
#rb richard.malo, patrick.enfadeque
#fyi alexis.matte
#rnx

[CL 6371094 by JeanFrancois Dube in Dev-Editor branch]
2019-05-08 13:24:56 -04:00
alexis matte
93de9edd67 Tentative, fix crash when generating HLOD with impostor
#jira UE-73420
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 6256521 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317323 by alexis matte in Main branch]
2019-05-06 11:32:24 -04:00
sebastien lussier
c545e330ef Merging negative-scaled actors breaks materials
#fix No need to reverse the section indices when a static mesh has a mirrored transform as TransformRawMeshVertexData() is now calling ReverseAllPolygonFacing() in this specific case
#jira UE-56953
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 6252335 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317322 by sebastien lussier in Main branch]
2019-05-06 11:32:22 -04:00
marc audy
08a23d34db HLOD with imposter section not assign to the correct material ID, and the proxy material is added for each imposter section.
#jira UE-70972
#rb none
#lockdown nick.penwarden
#fyi Alexis.Matte

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6190448 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317275 by marc audy in Main branch]
2019-05-06 11:31:48 -04:00
Matt Kuhlenschmidt
fddbe0a896 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -04:00