Commit Graph

6417 Commits (cd5df6b372e6c60d9fc270d618f708049d9bc86d)
 

Author SHA1 Message Date
Esteban Papp cd5df6b372 Some more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d513307023 another warn fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
JSON serialization of SC Editor Assets
4 years ago
Mike Balfour 40f41689ee
Initial Terrain System (#3401)
This represents the very beginnings of the Terrain System presented in Sig-Content RFC 4 ( https://github.com/o3de/sig-content/blob/main/rfcs/rfc-4-terrain-system.md ). There is some basic working functionality in this PR, but the system as a whole should not be considered working yet. The gem is disabled by default in all projects.

All of the code below is contained in the Terrain Gem, which is disabled by default. The following components exist and can be experimented with, but should not be expected to be functionally complete yet:

Terrain World - level component for enabling terrain
Terrain World Debugger - level component for enabling terrain debugging features
Terrain Layer Spawner - component for defining a region of terrain
Terrain Height Gradient List - component for defining a list of gradients to use as terrain heights

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Sean Sweeney f9c2dd62f7
Merge pull request #3363 from aws-lumberyard-dev/remote_console_fix
Adds a verification response for the remote console connecting
4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
Shirang Jia ce85bb3b7d
Add awsi deployment as a non-blocking step in nightly pipeline (#3397)
* Add awsi deployment as a non-blocking step in nightly pipeline

* Make step fail if it's not a non-blocking step
4 years ago
AMZN-koppersr 0d74d3ed5d
Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539
Allowing prefabs with missing components to load, and clarifying error message
4 years ago
Esteban Papp cd9621f16e
Remove unnecessary ALIGN macros 4 years ago
SergeyAMZN de4f2fc629
Merge pull request #3411 from aws-lumberyard-dev/MPWeaponSQ2
Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
4 years ago
Mikhail Naumov 6c1ae1e618 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Guthrie Adams 6bb29f9715
Merge pull request #3125 from ppinfel/development
Corrected audio component links to documentation
4 years ago
Guthrie Adams 701e36f493
Merge pull request #2752 from greenrazer/ExposeLodControls
Expose lod controls
4 years ago
Guthrie Adams 660caf6557
Merge pull request #3381 from aws-lumberyard-dev/Atom/guthadam/atomtools_document_main_window_base_class
AtomTools: moved remaining document and window common code from ME and SMC to base class
4 years ago
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha 8c573979a9
Updates to camera tests to support different delta times and some further tidy-up (#3324)
* updates to camera tests to support different delta times and some further tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* support variable delta time in mouse move test

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
pereslav 21605f15cc CR Feedback addressing
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
amzn-sean ef9666cb10
fixed case where the Physics Asset could not be set correctly (#3390)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
pereslav 7d4f8e4281 Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
Esteban Papp 91077b0dcd small fix from previous commit
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 07ea4edbc2 Fixes for Mac/iOS
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp b820c36c80 clang is more specific where the modifier should be
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mike Chang a92684c0b8
Jenkinsfile LFS fix for iOS/Mac pulls (#3396)
* Add git lfs install and pull into Jenkins Git pull stage

Signed-off-by: Mike Chang <changml@amazon.com>
4 years ago
chcurran 794c22c02e merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
evanchia eabd963e28 Fixed comment in remote console unit test
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
chcurran 13188f8958 Simplify codegen of baseclass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
AMZN-Phil 5a3c289fac
Merge pull request #2882 from aws-lumberyard-dev/Prism/RemoveTabFocus
Change Focus From Tabs in o3de.exe, Refactor Project Page Create, Sort Projects Alphabetically
4 years ago
santorac 60d137c5b6
Merge pull request #2746 from aws-lumberyard-dev/Atom/santorac/OptionalSceneApiMaterialConversion3
Made Model Material Conversion Optional

Added a new registry setting that disables automatic conversion of materials from model files like FBX.

By default, processing of model files (like FBX) automatically convert the included materials to Atom materials, using StandardPBR. This adds a job dependency on StandardPBR.materialtype, which propagates to any related azsl files as well. Thus any change to azsl code will cause all model files in the project to rebuild.

Some game teams have no interest in using the auto-converted materials; they always use a Material Component to apply material overrides for every mesh. This new setting allows teams to disable material auto-conversion for the entire project, thus removing the job dependency on StandardPBR.materialtype. Instead, every mesh will be assigned the same default material. Any change to azsl code will cause that one default material to rebuild, but this will not trigger any models to rebuild.

Details:
- Added /O3DE/SceneAPI/MaterialConverter registry settings for configuring the scene material converter. It includes an enable flag, and a default material to use when conversion is disabled.
- Added SceneBuilderDependencyRequests::AddFingerprintInfo which allows SceneAPI components to modify the scene builder analysis fingerprint. We use this to reprocess scene files when the material converter settings change.
- Updated SceneAPI's material asset builder to skip the StandardPBR dependency when material conversion is disabled.
- Added some code to MaterialComponentController to handle an edge case that may when disabling material conversion on an existing project, and assigned materials disappear.

Testing:
- Changing the registry setting does trigger a rebuild of the fbx files.
- When material conversion is disabled, changing an azsl file does not cause fbx files to rebuild, but the shader still reloads as expected.
- Made a test level using multiple models with multiple meshes, made various adjustments to the material slots for each mesh, and tried switching the material conversion registry setting from true to false. (Details below)
- Merged this change to a customer's fork and tested on their existing content.

Details about my test level:
- Made a new test level AtomTest project
- Added two entities, both using multi-mat_mesh-groups_1m_cubes.fbx
- Added a material component to both entities
  - Entity 1 material assignments
    - Blue_Zaxis: left as-is
    - Green_Yaxis: exported the material
    - Red_Xaxis: exported the material, and changed the material instance color to pink
    - StingrayPBS1: exported the material, scaled the UVs in the exported material source, and changed the material instance color to green.
    - With_Texture: selected an existing brick material, changed the material instance color to red.
  - Entity 2 material assignments
    - Default Material: set to an existing brick material
    - Blue_Zaxis: manually assigned built-in material that was converted from fbx
    - Green_Yaxis: manually assigned built-in material that was converted from fbx, and changed the material instance color to orange
4 years ago
Esteban Papp a75994e0b9 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Luis Sempé 6ab776a3a6
Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes
Fixed categories not being properly applied for Nodeables & removed old code generator tags

> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?

correct
4 years ago
chcurran 95a812b238 fixup codegen, remove android errors
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 31addc43dc Windows and Linux compiling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mike Balfour 97a053a540
Initial stub terrain gem (#3368)
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.

Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)

This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Mikhail Naumov f7eaa4490f fixing syntax errors
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
AMZN-Phil ea5bfe0269
Merge pull request #3389 from aws-lumberyard-dev/Prism/UseGemDisplayNames
Improves Gem Catalog Search, Gem Display Names now used in Gem Catalog
4 years ago
William Hayward d45ec58cd7
Merge pull request #3323 from aws-lumberyard-dev/readme-updates
Readme updates
4 years ago
Jacob Hilliard 246621fda5
Visualizer: finish deserialization of captures (#3293)
* Visualizer: Initial capture loading support

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Deserialize thread id

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Quality of life improvements throughout

- Decrease row size for more information onscreen
- Remove fudge factors in drawing logic
- Add comments to deserialization logic
- Fix Editor text scaling bug
- Early out for data culling to avoid erase_if call

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
michabr 89cc27fdef
Fix input priority conflict with LyShine and ImGuiPass (#3329)
* Fix input priority conflict with LyShine and ImGuiPass

Signed-off-by: abrmich <abrmich@amazon.com>

* Add GetPriorityDebugUI() input listener priority

Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
Esteban Papp 23f99aeb94 more gems changes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov f224d657be Ronald's feedback
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp 804d833bb9 Gems/Atom
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 1f44b7a328 Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp cb7b084e6b Code/Legacy
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 6bdef50444 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 7d71e3dc07 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
santorac b6dfb86007 Removed unnecessary #include
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac de932c62b3 Reverted changes in MaterialComponentController for an obsucre edge case. We'll handle the case of missing material assets more generally as a separate task.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago