Commit Graph

5416 Commits (f85e8124a9ee10e2e337877d2f67e9033fa8eff4)
 

Author SHA1 Message Date
kberg-amzn f85e8124a9 Fixes and cleanup for recent correction changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn d0394ec3fc Merging latest dev changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 699e8edb36 Corrects math computing blend factors to interpolate state between received network updates
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 976654e809 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn e0d0bbfdae Changes to desync debug output to make it less stressful on bandwidth and the server, as well as some fixes to corrections on the local client
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
sharmajs-amzn 69bde80de3
Nighly build test fixes (#2727)
Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
4 years ago
Alex Peterson 38fd92a15a
Always display all gems in Gem Catalog (#2341)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Chris Galvan dae081ba7d
Merge pull request #2741 from aws-lumberyard-dev/nvsickle/FixOrthoCameraBuild
Fix release build error.
4 years ago
Chris Galvan eb94d5b7a0
Merge pull request #2717 from aws-lumberyard-dev/nvsickle/EditorCameraFOV
Ensure Editor FOV corrects on viewport resize
4 years ago
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>
4 years ago
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
4 years ago
hultonha 0ecac108f7
Documentation pass for modular viewport camera controller
Merge pull request #2769 from aws-lumberyard-dev/hultonha_GH-2266_camera-raycast-2
4 years ago
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.
4 years ago
AMZN-stankowi 6520c347e4
Disabling a flaky test (#2749) ContainerFilterTest_ContainersWithAndWithoutFiltering_Success
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
hultonha 7393c86416 some formatting and naming changes after PR feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
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>
4 years ago
hultonha 71a299d739 minor comment grammar fix
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 86758fda35 documentation pass for modular viewport camera controller
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
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.
4 years ago
Jeremy Ong 2491620826
Merge pull request #2681 from aws-lumberyard-dev/rgba16f/UnInlineAzCoreJob
Move most AZ::Job function bodies out of the header
4 years ago
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>
4 years ago
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>
4 years ago
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
4 years ago
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.
4 years ago
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.
4 years ago
Guthrie Adams 9e74ae007e
Merge pull request #2665 from aws-lumberyard-dev/pruiksma/SPEC-7794
[SPEC-7794] Removing references to alembic in cmake & asset processor.
4 years ago
Chris Galvan ed8227f47a Updated new project template .gitignore files so that temporary level saves in _savebackup files will be ignored as untracked files.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 6b7f8e3878
Merge pull request #2716 from aws-lumberyard-dev/cgalvan/FixVegetationLayerSpawnerDocLink
Fixed Vegetation Layer Spawner documentation link.
4 years ago
santorac 8542de8c32 Fixed a link error on android (clang) 4 years ago
Chris Galvan 24607df8f3 Added .gitignore so that Script Canvas debug logs don't get picked up as untracked files.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 8f6fd3a327
Merge pull request #2713 from aws-lumberyard-dev/cgalvan/RemovedLegacyEditorIcons
Removed legacy ObjectIcons and shelve icons from Editor.
4 years ago
Chris Burel 3a95243df5 Allow special characters in Actor node group names
Relying on the command system's string processing syntax prevents certain
names from being used. This converts the AdjustNodeGroup command to be
directly invokable, so that arguments can be passed directly, instead of
going through the CommandLine string parsing.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 02c16a318e Prefer `unique_ptr` to a raw pointer for `CommandAdjustNodeGroup`'s members
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 9e6832c6a9 Remove `BaseObject` as a base class from `NodeGroup`
Nothing uses the use count that the `BaseObject` base class provides, so
there's no reason to keep it.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 8730d5657f Allow special characters in AnimGraph node group names
Relying on the command system's string processing syntax prevents certain
names from being used. This converts the AnimGraphAdjustNodeGroup command
to be directly invokable, so that arguments can be passed directly, instead
of going through the CommandLine string parsing.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
nvsickle 74498089c3 Ensure Editor FOV corrects on resize
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Chris Galvan cc57ee7d20 Fixed Vegetation Layer Spawner documentation link.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
santorac afe5398f0f Fixed model unit tests 4 years ago
AMZN-stankowi 9ee9730294
Automated test for scene files with and without python scripts running python incorrectly (#2373)
* Cleared m_scriptFilename between scene files.
This fixes a bug where a Python script file would be run on a scene file
that didn't have a script file set.
Added a general case version to SceneBuilderWorker.cpp, to make it easy
to mark all scene files as dirty.
Automated tests for this will come in a separate pull request.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Work in progress automated tests

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Python test done

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Sorted jobs work now. This may sort too aggressively, I'll remove the additional sorting after some testing.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Cleaned up test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed stray '

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed temp code from test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Command line help options for AP
Removed job sorting that wasn't actually sorting jobs

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed constant variable names to match coding standards

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
santorac 7d84a005c0 Updated unit tests and fixed build failures. 4 years ago
puvvadar e22820e08b
Merge pull request #2146 from aws-lumberyard-dev/mp_lerp_jitter
Fix inconsistent client lerp and account for blend factor on server
4 years ago
Chris Galvan 37c3f01771 Removed legacy ObjectIcons and shelve icons from Editor.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Jeremy Ong 4407c28b03
Merge pull request #2680 from aws-lumberyard-dev/Atom/RenderDoc
Add runtime RenderDoc support for Windows dx12/vulkan via --enableRenderDoc option
4 years ago
lumberyard-employee-dm 8014475abf
Adding newline to the end of the new Job.cpp file
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
rgba16f 8088e6662a modify new jobs.cpp file to match AzCore standard of opening namespace AZ rather than prepend AZ:: to every function
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
santorac 9e6eadd9a9 Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion 4 years ago
Jeremy Ong af0d757556 Remove CMake status message when not compiling with RenderDoc
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 9b0db508c9
Merge pull request #2554 from aws-lumberyard-dev/Atom/IndexedDataVector
Promote IndexedDataVector to public Feature/Utils header
4 years ago
Jeremy Ong 06cef942a9 PALify RenderDoc module name
Signed-off-by: Jeremy Ong <jcong@amazon.com>
5 years ago
rgba16f b5895bc09b Move most AZ::Job function bodies out of the header
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
5 years ago