Commit Graph

5440 Commits

Author SHA1 Message Date
srikappa-amzn 7404622b48 Clear prefab templates on new level creations and loads (#2842)
* Clear prefab templates on new level creations and loads

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Fixed failing prefab unit tests after change to clear templates

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-08-04 16:54:40 -07:00
Royal OBrien fa3b309c67 Merge pull request #2836 from o3de/update-language
Update language
2021-08-04 16:36:54 -07:00
Chris Galvan 44593e5ea5 Merge pull request #2849 from aws-lumberyard-dev/cgalvan/FixDefaultGroundPlaneAssetName
Fixed asset name for default groundplane.
2021-08-04 17:48:50 -05:00
Chris Galvan 1e4c147e0b Fixed asset name for default groundplane.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-04 15:34:22 -05:00
jackalbe b7e69a1d1d turning off editor.blast.tests due to AR failures on suite shutdown (#2837)
removed unused code

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-08-04 14:11:10 -05:00
lumberyard-employee-dm 21ca3a4aea The enable-gem command registers gem with project if not registered (#2817)
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json

Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding quoting around the invocation of the OpenProjectManager command

The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-04 13:13:28 -05:00
Luis Sempé 52e9083b9d Merge pull request #2812 from aws-lumberyard-dev/scripting/vector_direction_nodes
Added Get Direction Vector node for Vector2,3 and 4
2021-08-04 10:49:05 -07:00
Chris Aniszczyk b3901b3251 fix space
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2021-08-04 12:27:19 -05:00
Jacob Hilliard 6d345512c1 Visualizer: switch to erase_if to improve performance (#2779)
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-04 10:26:06 -07:00
moraaar dbb6c1ae46 Fixed EntitySpawnTicket move constructor (#2832)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-08-04 17:57:48 +01:00
Chris Aniszczyk 26c6d41e63 Update language
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2021-08-04 11:14:25 -05:00
lsemp3d 2c96556576 Removed unnecessary argument in node generic macro
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:47:37 -07:00
lsemp3d 1f0fcf2aa2 Updates GetDirectionVector nodes to also return the distance between the points
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:42:26 -07:00
Guthrie Adams 531a801d91 Merge pull request #2810 from aws-lumberyard-dev/Atom/guthadam/fixing_material_editor_and_smc_startup_and_scripts
Fixing issues with shader management console startup
2021-08-04 10:38:17 -05:00
lsemp3d 760acdcdcc Updated DirectionTo tooltips in the translation file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:21:41 -07:00
lsemp3d 20515c46be Updated DirectionTo node's tooltips to match the translation file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:20:41 -07:00
amzn-sean 6d2765ef42 moved default location of surfacetypemateriallibrary.physmaterial (#2786)
from 'project root' to 'project root/Assets/Physics'

The functionality of creating / using the default physmaterial file has only change in related to the file location, other functionality is unchanged.

The following situations can occur:
    This will not affect have any project that uses a custom physmaterial file.
    This will not affect have any project that uses the default from the old location, as the configuration will still point there.
    New projects created will get the default physmaterial file at the new location.
    A Project that fails to load (or deletes) the selected physmaterial file, will get the default physmaterial file at the new location (this happens only on startup of the editor).

Issue: #2765

Signed-off-by: amzn-sean 75276488+amzn-sean@users.noreply.github.com
2021-08-04 13:10:17 +01:00
AMZN-AlexOteiza 45ebf57d3f Fixed bug in hash_table that made rehash() function run forever (#2745)
* Fixed bug in hash_table that made rehash() function to run infinitely on specific conditions when inserting an already existing element

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Replaced erasing to happen in the source list instead

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* minor comment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small commment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small comment fix

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Added assert and fixed code with incorrect hashing

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* .

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments, reverted to void* as it size_t hash is different

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Fixed build on linux

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-08-03 20:38:18 -05:00
lsemp3d 6188df4b49 Added Get Direction Vector node for Vector2,3 and 4
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-03 15:36:56 -07:00
Guthrie Adams b594132a47 using command line parameter instead of member
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-03 17:19:30 -05:00
Guthrie Adams f269d222b7 Fixing issues with shader management console startup
Updating test scripts

Synchronizing SMC and ME application classes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-03 17:07:03 -05:00
Chris Burel 24740b3f86 Update the cloth rule to look for optimized meshes (#2737)
The cloth rule stores the name of a mesh node that is used to retrieve
cloth data from. However, at asset processing time, the model builder
switches things to look for the optimized version of a mesh. The cloth
rule was not doing this, so it would return the cloth data for the
unoptimized mesh. This resulted in the final mesh having some data from
the optimized mesh and cloth data from the non-optimized mesh.

This changes the cloth rule to use the optimized version of a mesh, if
it exists, and fall back to the unoptimized mesh when it does not exist.

This closes issue 2454.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-03 14:52:53 -07:00
jromnoa a0f3379999 Adds Light component tests (non-GPU portion) to AutomatedTesting from AtomTest (#2758)
* Fixed Vegetation Layer Spawner documentation link.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
Signed-off-by: jromnoa <jromnoa@amazon.com>

* add remaining non-GPU test portions for Light component test

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

* make non-GPU light component test more robust

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

* remove redundant logging, convert LIGHT_TYPES from list to dict, remove redundant f-string

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

Co-authored-by: Chris Galvan <chgalvan@amazon.com>
2021-08-03 14:08:59 -07:00
puvvadar 1e94bb8a76 Merge pull request #2754 from aws-lumberyard-dev/mp_connectionset_timeout
Add connection interface timeout config and remove Ctrl+G timer
2021-08-03 13:47:52 -07:00
sharmajs-amzn 69bde80de3 Nighly build test fixes (#2727)
Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
2021-08-03 11:15:23 -07:00
Alex Peterson 38fd92a15a Always display all gems in Gem Catalog (#2341)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-08-03 10:48:57 -07:00
Chris Galvan dae081ba7d Merge pull request #2741 from aws-lumberyard-dev/nvsickle/FixOrthoCameraBuild
Fix release build error.
2021-08-03 12:41:32 -05:00
Chris Galvan eb94d5b7a0 Merge pull request #2717 from aws-lumberyard-dev/nvsickle/EditorCameraFOV
Ensure Editor FOV corrects on viewport resize
2021-08-03 12:41:22 -05:00
michabr 3a689aa319 Reenable support for UI Elements that use Render Targets (#2352)
* Re-add support for UI Elements that use Render Targets
* Move LyShine pass request from Atom's MainPipeline.pass to project's
* Make all dynamic draw contexts in LyShine draw to pass directly without the need of draw list tags
* Remove local RPI changes that are no longer needed
* Prevent crash if LyShine gem is enabled but its custom pass hasn't been added to the main render pipeline
* Revert to default UI pass if the LyShine pass has not been added to project's main render pipeline

Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-03 10:14:09 -07:00
Benjamin Jillich 03722789cf Allow users to rename AnimGraph and Actor node groups to contain any string #2309
Allow users to rename AnimGraph and Actor node groups to contain any string
2021-08-03 09:58:28 -07:00
hultonha 0ecac108f7 Documentation pass for modular viewport camera controller
Merge pull request #2769 from aws-lumberyard-dev/hultonha_GH-2266_camera-raycast-2
2021-08-03 17:43:59 +01:00
puvvadar 00470acc1c Add const to timeout enabled getter
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-03 09:36:39 -07:00
AMZN-Phil 149833af56 Merge pull request #2401 from aws-lumberyard-dev/PM-logs-and-processcheck
Check for build process exit status and display log link in more cases.
2021-08-03 09:32:56 -07:00
AMZN-stankowi 6520c347e4 Disabling a flaky test (#2749) ContainerFilterTest_ContainersWithAndWithoutFiltering_Success
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-08-03 08:00:39 -07:00
hultonha 7393c86416 some formatting and naming changes after PR feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-03 15:24:54 +01:00
jackalbe be5a7f821c {LYN-4514} Re-factored Blast gem's python asset builder (#2143)
* {LYN-4514} Re-factored Blast gem's python asset builder

* Re-factored Blast gem's python asset builder so that the .blast file creates an asset info scene manifest
* Added a python script to act as a SceneAPI script + Python Asset Builder (blast_asset_builder.py)
* renaming types from "Slice" to "Chunk"

Tests: Re-enabled Gems/Blast/Code/Tests/Editor/EditorBlastSliceAssetHandlerTest.cpp

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* renaming from Slice to Chunks

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* updated the Copyright


Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* Removing StdAfx.h includes

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* null check added m_blastChunksAsset.Get()
removing 'slice' like EditorBlastSliceAssetHandlerTestFixture
delete old asset builder blast file


Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* adding source deps for FBX -> BLAST file

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* removing slice name

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* Adding error message and updates from PR

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-08-03 09:21:36 -05:00
hultonha 71a299d739 minor comment grammar fix
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-03 13:53:34 +01:00
hultonha 86758fda35 documentation pass for modular viewport camera controller
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-03 13:44:21 +01:00
puvvadar 6964e4f7e9 Missed one variable rename
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-02 20:35:44 -07:00
puvvadar 573fe425d7 Also rename some variables to match renamed timeout funcs
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-02 20:34:39 -07:00
puvvadar 115f669679 Rename timeout functions for readability
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-02 20:31:02 -07:00
puvvadar 07e2bea1fe Add connection interface timeout config and remove Ctrl+G timer
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-02 17:41:09 -07:00
santorac fa52124f9c Formalized the concept of an model's material slots
Formalized the concept of an model's material slots

Before, the ModelAsset and MaterialComponent code was conflating the idea of a material slot ID and a default material assignment. The default material asset's sub-ID was being used to uniquely identify the material slot as well. This blocks our ability to use other materials as the default assignment for individual meshes; we are forced to use whatever material that was generated from the source model file (like FBX). 

With these changes, we separate the concept of a material AssetId and a material slot ID, and store them separately. There is a new ModelMaterialSlot struct to describe each slot, including a unique "StableId". The ModelAsset stores a map of the slots, and each mesh refers to a slot by its StableId.

This is a precursor to another task that will optionally disable the auto-conversion of materials from source model files.

Also:
- These changes also enable material property overrides without having to make an editable material first, which I don't think was supported before.
- Removed unused Default.materialtype from the RPI Assets folder.
- Encapsulated members in EditorMaterialComponentExporter::ExportItem for better maintainability.

See also https://github.com/o3de/o3de-atom-sampleviewer/pull/175 

Testing:
- Took screenshots of several AtomTest levels with material overrides before making any changes. Compared these after the changes. Test levels included ActorTest_SingleActor, ActorTest_MultipleActors, and two custom levels that used shaderball and multi-mat_mesh-groups_1m_cubes.
- Lots of manual fiddling with material component.
- Created a white box component and saw that it rendered correctly.
- Cherry-picked these changes into Apocalypse's code base and verified with one of their levels.
- Ran AtomSampleViewer automated test suite. Some tests failed, but these were failing before my changes.
2021-08-02 15:56:28 -07:00
Jeremy Ong 2491620826 Merge pull request #2681 from aws-lumberyard-dev/rgba16f/UnInlineAzCoreJob
Move most AZ::Job function bodies out of the header
2021-08-02 16:22:09 -06:00
nvsickle c3103a3fe7 Fix release build error.
Atom's DebugCamera SetOrthographic was only using a parameter during an assert, leading to a release compile error, this fixes that

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-08-02 14:25:53 -07:00
Esteban Papp d03c2c9977 Copy jinja/py files to the install folder (#2643)
* Copy jinja/py files to the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* code review comment

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* moving AzAutoGen to cmake folder and removing the header-only project

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-02 13:53:13 -07:00
Chris Galvan 32542fd84b Merge pull request #1927 from aws-lumberyard-dev/GroupToggleSwitch
Created a toggle switch to enable and disable groups through the Edit Context
2021-08-02 15:46:45 -05:00
Chris Galvan d50f367c43 Merge pull request #2726 from aws-lumberyard-dev/cgalvan/IgnoreTempLevelSavesInGit
Updated new project template .gitignore files so that temporary level saves in _savebackup files will be ignored as untracked files.
2021-08-02 15:37:50 -05:00
Chris Galvan 40deefe54b Merge pull request #2721 from aws-lumberyard-dev/cgalvan/GitIgnoreScriptCanvasLogFiles
Added .gitignore so that Script Canvas debug logs don't get picked up as untracked files.
2021-08-02 15:14:58 -05:00
Guthrie Adams 9e74ae007e Merge pull request #2665 from aws-lumberyard-dev/pruiksma/SPEC-7794
[SPEC-7794] Removing references to alembic in cmake & asset processor.
2021-08-02 15:10:46 -05:00