Commit Graph

997 Commits

Author SHA1 Message Date
John Jones-Steele be535172b5 Merge branch 'development' into UsingCommaAsDecimalSeperator
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-08-10 09:31:50 +01:00
John Jones-Steele 12505da6fc Changed locale handling and added tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-08-09 16:01:18 +01:00
AMZN-ScottR 2f5927f1ac [redcode/crythread-2nd-pass] remove dependency on cry threads in the remote console runtime
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-06 17:45:54 -07:00
John 7b0118268c Remove missing header from cmake.
Signed-off-by: John <jonawals@amazon.com>
2021-08-06 20:40:37 +01:00
John d7c1185dc2 Add previously approved changes.
Signed-off-by: John <jonawals@amazon.com>
2021-08-06 20:09:53 +01:00
Esteban Papp f4164ef3a3 Merge branch 'development' into cmake/SPEC-2513_w4018 2021-08-06 11:57:55 -07:00
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
2021-08-06 10:08:37 -07:00
AMZN-nggieber 2c7f6f9742 Adds Links to Gem Directory and Documentation for Gems (#2922)
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link

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

* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable

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

* Fixed a couple of the documentation links

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

* Added documentation url to edit gem properties script and updated unit tests

Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-06 10:19:35 -05:00
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-05 20:05:25 -07:00
Esteban Papp 9f18b6f1be fixes for new code
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:58:46 -07:00
pappeste eb3e0b0998 updates after merging development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:44:03 -07:00
pappeste 10f950b726 fix w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:43:56 -07:00
Esteban Papp 4358b6eb27 runtime fixes (Editor running)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:31:12 -07:00
Esteban Papp 895dc09176 addressing PR comments/suggestions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:30:09 -07:00
Esteban Papp 84623dfb66 FixedMaxPathString replacement
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:25:26 -07:00
Artur K 6c22e92db6 Use lambda instead of AZStd::bind (#2658)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 20:10:26 -05:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Esteban Papp 0dc829891a fixing build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 14:30:04 -07:00
Esteban Papp aa12434728 removing some dead code, commented code referring old types, static AZStd::strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 12:47:36 -07:00
nggieber 1768dc5980 Reenabled focusing of tab but removed focus rect
Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-05 09:29:48 -07:00
nggieber 39907f4ca1 Removes focus from tabs in o3de.exe
Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-05 09:12:52 -07:00
evanchia e9ef0a02ec minor fixes for c++ retry command
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-04 11:17:38 -07:00
Esteban Papp 9bab676109 enabling test impact framework tool build and fixed it
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-03 20:25:21 -07:00
Esteban Papp e28602dbbb linux fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-03 17:59:35 -07:00
evanchia a92ed42829 minor fixes for c++ retry command
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-03 16:51:19 -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
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
Esteban Papp dd3f0b86e0 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ToolBox.cpp
2021-08-02 18:45:25 -07:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
Chris Santora 36abde95a9 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 ScenePI 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 registery 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 switcihng the material conversion registry setting from true to false. (Details below)
- TODO: Will merge this change to a customer's fork and test 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

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-02 16:09:11 -07:00
Esteban Papp db7536acda Gems/Maestro
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-02 11:44:34 -07:00
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>
2021-08-02 10:57:57 -07:00
Esteban Papp f665f572f3 Gems/Atom builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-30 18:53:50 -07:00
Esteban Papp 99bf5e54c4 More string fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-29 15:53:32 -07:00
pappeste 95914e3fd6 merging from development + fixing linux
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 19:32:07 -07:00
pappeste f301c3b43a Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 19:31:55 -07:00
pappeste ceab4a794c CryEngine compiles
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 19:28:56 -07:00
Benjamin Jillich a3712b5564 TSpace setting for MikkT tangent generation (#2386)
* Added TSpace method setting which is only visible for MikkT generation.
* Fixed a bug with generating tangents for blend shapes.
* Renamed tangent space into generation method.
* Some code cleaning

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-27 09:15:26 +02:00
Esteban Papp da474357f3 Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

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

* handling case where a parameter can be empty

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

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-26 14:14:56 -07:00
AMZN-nggieber d5b9d203ea Check for minimum VS subversion and link to workload install instructions for VS (#2398)
Signed-off-by: nggieber <nggieber@amazon.com>
2021-07-26 20:09:32 +02:00
Benjamin Jillich 8f35def25b AssImp skeleton import improvements (#2348)
* Disabled to skip exporting a node in case there are child bones underneath, this broke motion extraction as we skipped the motion extraction node.
* Added several helper methods for getting the local space bind pose transform, finding all bones, getting the first bone for a given node name and a recursive has child bones.
* Unified the cloned get all bone methods.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-26 08:39:02 +02:00
AMZN-Phil fccb86d5c0 Check for build process exit status and display log link in more cases.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-07-23 13:58:58 -07:00
Chris Galvan edbe05bd81 Fixed Project Manager to enable save/restore of the window geometry so its window position/sizing will be restored after it is closed/re-launched. Also improved WindowDecorationWrapper logic to center by default when using the showFromSettings API for first time launch.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-22 11:57:40 -05:00
Benjamin Jillich dbe6bb673e Merge pull request #2277 from aws-lumberyard-dev/burelc/LYN-4490
[MeshOptimizer] Weld nearby vertices when optimizing meshes
2021-07-22 09:42:30 -07:00
Esteban Papp de54731282 fix reference to temporary (#2312)
* fix reference to temporary

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

* Non-unity fixes for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-21 11:00:45 -07:00
Benjamin Jillich 001aa96fae Merge pull request #2299 from aws-lumberyard-dev/jillich/TangentsGeneration
MikkT tangent generation support
2021-07-21 05:12:29 -07:00
Benjamin Jillich d987c45072 MikkT tangent generation support
* Default setting when no tangents rule: MikkT tangents.
* Calculates tangents/bitangents for all available uv sets.
* Creates tangent/bitangent data in in case they are not existing yet (as in: the source scene contains tangents/bitangents)
* Overwrites the tangent/bitangent data from the source scene in case MikkT is wished.
* Added helper functions to create tangent/bitangent scene nodes, finding tangent/bitangent data for a given uv layer and calculating the number of uv layers provided by the mesh scene node.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-21 13:23:07 +02:00
lumberyard-employee-dm 92571c2ae4 Merge pull request #2250 from aws-lumberyard-dev/SettingsRegistryBuilderGemRegistryFix
Fixed the SettingsRegistryBuilder not merging the Registry directories within Gems
2021-07-20 15:41:42 -05:00
Esteban Papp a08f850766 Merge pull request #2284 from nemerle/header_inclution_reductions_pt1
Reduce inclusion overhead a little bit
2021-07-20 10:51:25 -07:00
AMZN-stankowi 69b5c04b7f Cleared m_scriptFilename between scene files. (#2278)
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>
2021-07-20 10:11:09 -07:00