birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Terrain/sphrose/surface materials component (#4541)

Browse Source 
* wip

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* wip

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Terrain Surface Materials List Component.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* fix erroneous commit

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Added some comments.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Surface Materials list unit tests

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Missing shape test

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Compile fix.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Fix case issue in include path.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* replaced reverted test.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

Co-authored-by: Ken Pruiksma <pruiksma@amazon.com>
This commit is contained in:
sphrose
2021-10-18 15:37:07 +01:00
committed by GitHub
parent d0f18eefb3
commit bcc186f87f
13 changed files with 642 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Terrain/Code/Source/EditorTerrainModule.cpp
+2
View File
@@ -14,6 +14,7 @@
#include <EditorComponents/EditorTerrainWorldComponent.h>
#include <EditorComponents/EditorTerrainWorldDebuggerComponent.h>
#include <EditorComponents/EditorTerrainWorldRendererComponent.h>
#include <TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h>
#include <TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h>
namespace Terrain
@@ -28,6 +29,7 @@ namespace Terrain
Terrain::EditorTerrainMacroMaterialComponent::CreateDescriptor(),
Terrain::EditorTerrainSurfaceGradientListComponent::CreateDescriptor(),
Terrain::EditorTerrainSystemComponent::CreateDescriptor(),
Terrain::EditorTerrainSurfaceMaterialsListComponent::CreateDescriptor(),
Terrain::EditorTerrainWorldComponent::CreateDescriptor(),
Terrain::EditorTerrainWorldDebuggerComponent::CreateDescriptor(),
Terrain::EditorTerrainWorldRendererComponent::CreateDescriptor(),