Commit Graph

6029 Commits

Author SHA1 Message Date
AMZN-stankowi b98a67e836 Better error reporting on mixing skinned and unskinned meshes. (#3158)
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-08-17 08:21:40 -07:00
Guthrie Adams c95f491635 Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter
AtomTools: restoring log message filter to ignore source control spam
2021-08-17 10:11:54 -05:00
Guthrie Adams 2cfbaa956a Merge pull request #3098 from aws-lumberyard-dev/Atom/guthadam/atomtools_refactor_document_system
AtomTools: Unified ME and SMC document system into AtomToolsFramework shared classes and buses
2021-08-17 10:11:21 -05:00
amzn-victor eb1593a19c Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)
These changes allow for usage of different asset import SDKs to process scene files.

    Move AssImp specific code out of node, scene & material wrapper parent classes and into child wrapper classes (AssImpNodeWrapper, etc.), allowing child classes to expose import SDK code. Allows for more convenient implementation of other import SDK's elsewhere (such as in a gem).
    Add a loadingComponentUuid parameter to LoadSceneFromVerifiedPath to allow for usage of different loading components. Changed tests and all calls to this function accordingly.


* Move AssImp specific code out of wrapper parent classes and into child classes for gem usage

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Add loadingComponentUuid parameter to LoadSceneFromVerifiedPath function

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Make wrapper members protected, change pointer cast

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Adding spaces to fix style

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Fix for pointer cast causing test failures

Signed-off-by: Victor Huang <huavicto@amazon.com>
2021-08-17 06:52:20 -07:00
galibzon 4cac875589 [ATOM-15058] Remove Automatic Entry Point Detection (#3150)
.shader files must declare at least  one entry function.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-08-17 08:21:39 -05:00
Nicholas Van Sickle d1cedba042 Fix NativeWindow_Windows returning the wrong size. (#3153)
Make sure WM_WINDOWPOSCHANGED bubbles up so that we can see WM_SIZE.

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-08-17 08:20:33 -05:00
amzn-sean d9ea329cbd Fixes #2796 Collider retains phys mesh asset reference after changing to shape (#3162)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-08-17 13:48:51 +01:00
Guthrie Adams 5169e98826 Merge branch 'development' into Atom/guthadam/atomtools_refactor_document_system 2021-08-16 18:30:49 -05:00
Guthrie Adams ae4ad7dcac fixed formatting
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-16 18:29:16 -05:00
Guthrie Adams ff4d65dc2d added functions to remove and clear trace logger filters
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-16 18:22:37 -05:00
Chris Galvan 3fb903b03b Merge pull request #3151 from aws-lumberyard-dev/cgalvan/ReplaceLumberyardReferences
Replaced some Lumberyard references with O3DE.
2021-08-16 17:58:18 -05:00
mgwynn a461a82030 Remove non-existant files from icon contents.json files (#3148)
Signed-off-by: mgwynn <mgwynn@amazon.com>
2021-08-16 15:13:35 -07:00
kberg-amzn 109ce65c7d Merge pull request #2993 from aws-lumberyard-dev/MultiplayerDesyncsAndCorrectionFixes
Multiplayer desyncs and correction fixes
2021-08-16 14:53:55 -07:00
Chris Galvan 88bef1074b Replaced some Lumberyard references with O3DE.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-16 15:43:01 -05:00
Guthrie Adams 11ac57d86f Merge pull request #3123 from aws-lumberyard-dev/Atom/guthadam/atomtools_prepend_star_on_modified_tabs
AtomTools: prepend asterisk to denote modified document tabs
2021-08-16 15:16:34 -05:00
Guthrie Adams fe7d953568 Merge pull request #3124 from aws-lumberyard-dev/Atom/guthadam/ATOM-16242_fix_python_terminal_help_crash
AtomTools: Fix python terminal help crash ATOM-16242
2021-08-16 15:15:57 -05:00
Chris Galvan 669f9893ad Merge pull request #3147 from aws-lumberyard-dev/cgalvan/RenameRadiusWeightModifier
Updated Radius Weight Modifier component name for consistency.
2021-08-16 13:57:08 -05:00
Chris Galvan aff3b93297 Merge pull request #3023 from aws-lumberyard-dev/daimini/settings-registry-origin-tracking
Add Pre and Post merge handlers to Settings Registry
2021-08-16 12:53:49 -05:00
amzn-phist d6b268e84e Remove ResourceSelectorHost and clean up/refactor related bits (#3050)
* Sever dependency on legacy resource selector host

Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system.  Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Hook up legacy audio control selector to new EBus

Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes ResourceSelectorHost and legacy selectors

This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File.  Removes the
ResourceSelectorHost completely.  The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture.  Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Make the default audio selector return old value

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix some signed/unsigned comparison warnings

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove deleted function from Editor Mock

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change audio selector api to use string_view

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-16 12:41:24 -05:00
AMZN-stankowi b88a7faf64 Fixed issues with blend shape animations (#3080)
Duplicate blend shape animations are now handled correctly.
Invalid animation targets are now an error instead of a crash in the builder.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-08-16 10:18:45 -07:00
Chris Galvan 1c7f71f93a Updated Atom automated test that uses the PostFX Radius Weight Modifier.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-16 12:13:32 -05:00
Jacob Hilliard e2b4d8e502 Profiler: Runtime region name support (#2924)
* Profiler: add support for runtime region names
* Profiler: fix group name collisions
* Profiler: use set of GroupRegionNames
* Profiler: add comments + named constant

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-16 10:13:24 -07:00
Chris Galvan 994403bfa0 Updated Radius Weight Modifier component name for consistency.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-16 11:56:50 -05:00
Danilo Aimini 577c75d68d Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 2021-08-16 09:43:10 -07:00
Esteban Papp 4f2d4d00ec Auto-completing the inserted text by pressing TAB within Editor's Console results in a silent crash
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 08:40:27 -07:00
jonawals 252c268ffd Fix corrupt merge. (#3142)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
2021-08-16 16:09:36 +01:00
amzn-sean e630e3324d fixed joint crash when no lead entity is selected (#2867)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-08-16 15:46:46 +01:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
2021-08-16 14:15:02 +01:00
sphrose f7e536bfb1 compile fix - signed/unsigned mismatch (#3139)
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-08-16 12:37:12 +01:00
sphrose 181698b950 LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List (#3013)
* LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List

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

* Changes as per reviews.

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

* Additional review changes.

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

* review change

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-08-16 10:54:15 +01:00
Guthrie Adams 885357a6b5 AtomTools: restoring log message filter to ignore source control spam
Added message filter support to TraceLogger

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 16:58:31 -05:00
Guthrie Adams d6c5f1444b fixing hidden variable warning
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 14:30:54 -05:00
Guthrie Adams fe3b30e42c AtomTools: Fix python terminal help crash ATOM-16242
Checking EditorWindowRequests::GetAppMainWindow before searching for main window

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-14 14:07:36 -05:00
Steve Pham 83f6cb813a Fix Non-Unity compile error with Atom Sample Viewer and the Atom Gem (#3119)
Signed-off-by: spham-amzn <spham@amazon.com>
2021-08-13 18:38:48 -07:00
Guthrie Adams 2fa9a831b3 AtomTools: prepend asterisk to denote modified document tabs
Appending is standard and preferred but the tabs elide from the end (instead of middle) and cut it off

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-13 20:26:49 -05:00
Steve Pham 87ae7e8653 Fix android gradle scripts to prevent cmake_dependencies.<game>.<game>_gamelauncher from being wiped out of the APK
Update gradle script generation to correct task dependencies (#3120)
- copyNativeArtifacts must run after syncLYLayoutMode
- syncLYLayoutMode must must after externalNativeBuild

Signed-off-by: Steve Pham <spham@amazon.com>
2021-08-13 18:22:40 -07:00
kberg-amzn 693b205747 Removing debug code, and fixing vector/array not respecting replication record dirty bits
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-13 16:56:27 -07:00
Esteban Papp 093a03cfbc fix for non-unity mac build (#3118)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-13 15:58:01 -07:00
Danilo Aimini 564981ab0f Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking
# Conflicts:
#	Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
2021-08-13 15:04:47 -07:00
lumberyard-employee-dm 9060423592 Settings registry notification deadlock fix (#3065)
* Added a StealHandlers function to AZ Event

The StealHandlers function is able to take all the handlers from an AZ
Event parameter and register them with the current AZ Event

This allows stealing handlers from expiring AZ Events, which is useful
for a lock and swap algorithm for thread safety.
1. Lock persistent AZ::Event
2. Swap persistent AZ::Event with local AZ::Event
3. Unlock persistent AZ::Event - Other threads can now add to this
   AZ::Event
4. Invoke handlers from local AZ::Event
5. Relock persistent AZ::Event
5. Swap local AZ::Event with persistent AZ::Event
6. Local AZ::Event now contains handlers that were added when the lock
   was free
7. Persistent AZ::Event now steals from local AZ::Event
8. Unlock persistent AZ::Event

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

* Separated SettingRegistry update/query mutex from Notifier update mutex

The Settings Registry update/query mutex is also better scoped to reduce
the amount of lock time.

The Notifier mutex being separate allows the Settings Registry to signal
a notification event without being under any mutex, by locking and
swapping the notifier event with a local instance

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

* Renamed StealHandlers function to ClaimHandlers
Replaced decltype keywords in ClaimHandlers to auto

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-13 16:20:08 -05:00
jromnoa 63a78b906a fixes light component GPU test AttributeError (I forgot to update atom_component_helper to atom_constants since constants were split from hydra functions into a new module) (#3115)
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-08-13 14:16:34 -07:00
evanchia-ly-sdets 80aa4c42ce moving smoke test to sandbox suite to investigate failures (#3109)
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-13 15:41:56 -05:00
michabr cd5081a7c3 Fix byte alignment issue for index/vertex buffers (#3110)
* Fix byte alignment issue for index/vertex buffers
* Remove default alignment value when getting dynamic buffer

Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-13 13:31:46 -07:00
kberg-amzn 5050a03c5a Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 12:00:23 -07:00
antonmic 7d4022fbdf Merge pull request #3035 from aws-lumberyard-dev/Atom/antonmic/PassBuilder
Changing pass builder to declare job dependencies on referenced .shader files and consequently removing the critical flag from the shader builder.
2021-08-13 11:50:51 -07:00
mrieggeramzn 9571a15769 Atom/mriegger/explicit set pcf address mode (#3061)
* Explicit setting the addressing mode for the pcf shadowing

* Explicitly setting addressing mode for sampler
2021-08-13 11:36:58 -07:00
kberg-amzn 6518cf82d6 Merge remote-tracking branch 'origin/development' into MultiplayerDesyncsAndCorrectionFixes 2021-08-13 09:58:21 -07:00
kberg-amzn 716089e803 More fixes and some temp debugging logs
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-08-13 09:57:40 -07:00
Alex Peterson a55cb3e35f Fixed white-bar at bottom of Project Manager screen (#3091)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-08-13 09:09:55 -07:00
Kevin Y 99b369198b Typo fix in duplicate project progress window (#2969)
Signed-off-by: Kevin Yu <kevinjoeyu@gmail.com>
2021-08-13 14:59:38 +02:00