birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,152 Commits 3 Branches 3 Tags
83d1bc0fbf60a26ee8cfcd7b0f1af97eb76675f9
Commit Graph

4152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 2021-07-08 10:19:11 +01:00
Jon B e8cc6a86ed Merge pull request #1944 from aws-lumberyard-dev/pruiksma/LYN-3913 
[LYN-3913] Fix conversion to unsupported photometric unit on light type change
 2021-07-07 19:09:18 -07:00
Jon B 1d14d95be8 Merge pull request #1939 from aws-lumberyard-dev/pruiksma/ltc_fix_fix 
Undoing change from review feedback as it led to an incorrect result in some cases
 2021-07-07 19:08:14 -07:00
Chris Galvan adb300b586 Merge pull request #1695 from aws-lumberyard-dev/cgalvan/FixLCGraphNotOpeningOnEdit 
[LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created
 2021-07-07 20:18:09 -05:00
Shirang Jia 55a3b41222 Fix unmounting error (#1940) 2021-07-07 16:44:42 -07:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
SJ 9ca7a698df Fix Mac Editor crash when adding PhysX Collider component to an entity. (#1930) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-07-07 18:17:40 -05:00
Ken Pruiksma d5fdd1035f Merge branch 'stabilization/2106' into pruiksma/ltc_fix_fix 2021-07-07 18:07:19 -05:00
Ken Pruiksma 6c0264862e Removing unnecessary code 
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-07-07 18:05:36 -05:00
Ken Pruiksma a75b8eb636 [LYN-3913] Fix conversion to unsupported photometric unit on light type change. 
When converting to a light type that doesn't support the currently used photometric unit, the editor component will convert the photometric unit to the universally supported lumen.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-07-07 18:00:40 -05:00
Twolewis b9964bbb5a Fixed Material Editor not launching (#1920) 
* Fixed Material Editor not launching

Explicitly providing project-path as part of launch parameters.

Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

* Update Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

* Minor - adding whitespace for consistency

Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

Co-authored-by: Lloyd Tullues <lloyd@carbonated.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-07 15:16:09 -07:00
Ken Pruiksma 5e98eefcc2 Undoing change from review feedback as it led to an incorrect result in some cases. 
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-07-07 17:13:43 -05:00
Shirang Jia 992f5aab1b Convert Incremental scripts to Python3 (#1934) 
Convert incremental build script to Python3
 2021-07-07 15:12:10 -07:00
Tommy Walton f177f671ac Fix for LYN-4594: [Atom][EMFX] Loading a saved level with entity and an actor component causes the editor to freeze. (DCO fixup) (#1878) 
* Queue shader loads and register with the dynamic draw context after the shader is loaded to avoid a deadlock when there are multiple scenes processing at the same time.

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

* Fixed AzCore case in AtomFont.h and two other files I found while searching

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

* Switched to a utility that will both get the assetId and create the Asset, without calling GetAsset explicitely

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

* Fixing typos in error message

Signed-off-by: amzn-tommy <waltont@amazon.com>
 2021-07-07 15:09:14 -07:00
Tommy Walton 5b9647c11b Fix for ATOM-15923 : Editor Spends Several Minutes Entering/Ending Play Game Mode (#1846) 
* Cut off kd-tree generation if more than 10 percent of triangles straddle split axis

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

* Switched to aznumeric_cast and added a comment with a JIRA to follow up on

Signed-off-by: amzn-tommy <waltont@amazon.com>
 2021-07-07 15:08:57 -07:00
Qing Tao 1b474afdb0 ATOM-14322 Random crashes when exist RHI/Raytracing sample running __fullTestSuite__ (#1926) 
Signed-off-by: Tao <qingtao@amazon.com>
 2021-07-07 14:55:36 -07:00
Chris Galvan 30f8c75613 Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons 
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
 2021-07-07 16:39:46 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 16:37:25 -05:00
Chris Burel 80bdd4e17b Clang compile fixes (#1876) 
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-07-07 14:34:45 -07:00
Alex Peterson af8e6afc6a Update README LFS instructions (#1925) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-07-07 14:31:45 -07:00
Mike Balfour 274669a1b4 Fixed Vegetation Debugger to work with Atom rendering and AZ::Console. (#1924) 
The previous implementation used Cry rendering and CVars and had been left in a commented-out state. These changes restore it back to full functionality.

Signed-off-by: mbalfour <mbalfour@amazon.com>
 2021-07-07 16:05:38 -05:00
Terry Michaels 24d21cadae Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling 
Make IMGUI & viewport info scale with DPI
 2021-07-07 15:55:46 -05:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911) 
* fix for [LYN-4828], message box style changes

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-07 13:49:55 -07:00
Ken Pruiksma 4c12e9c5ab Refactoring the LTC quad and polygon lights (#1881) 
* Refactoring the LTC quad and polygon lights to clip the light to the normal hemisphere before applying the LTC matrix. This prevents specular light leaking from behind the surface. Diffuse and specular contribution are now calculated at the same time to avoid clipping the polygon twice. Added a cheaper diffuse integration function that's accurate enough for diffuse. Also added a commented out alternate specular integration for platforms with poor acos() accuracy.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* PR review feedback - typo and some saturate() protection

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Making branch more explicit from review feedback.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-07-07 16:37:49 -04:00
nvsickle 14cab097c7 Fix DPI change callback not being wired up correctly. 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:19:51 -07:00
Chris Galvan ca4156e1c0 Fixed template.json file name replacements. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 14:02:46 -05:00
nvsickle dee591921e Fix exception bubble-up 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:25 -07:00
nvsickle 3549e5b946 More fussing with logs 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:24 -07:00
nvsickle 3ee15f1912 Try to get some actual log output out of this 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:22 -07:00
nvsickle 0b3dab1cf8 Use DPI scaling for viewport info padding 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:20 -07:00
nvsickle 2fefa80937 Use AZ::DynamicModuleHandle 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:18 -07:00
nvsickle 21dbe8b48f Address review feedback 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:16 -07:00
nvsickle dd20a598b2 Add DPI scaling to IMGUI 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:15 -07:00
nvsickle 0c97888d0f Revert accidental change 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:13 -07:00
nvsickle 9e4d6a1d85 Scale the viewport debug info overlay by the DPI scale factor 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:11 -07:00
nvsickle b328cdf11d Make the launcher's lack of DPI awareness on Windows explicit 
This will enable per-screen DPI awareness to be turned on later

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:10 -07:00
nvsickle 6b76eceb1f Add GetDpiScaleFactor to native window API 
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:08 -07:00
nvsickle da529edfb5 Fix ImGui not rendering correctly at resolutions greater than 1080p 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:06 -07:00
Chris Galvan 26d8a62074 Merge pull request #1914 from aws-lumberyard-dev/cgalvan/FixLuaEditorSettings 
Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
 2021-07-07 13:41:25 -05:00
lumberyard-employee-dm 02922806a5 Updated gem.json for all top-level Gems. (#1715) (#1917) 
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.

Signed-off-by: Cronin <mikecro@amazon.com>

* Fixed minor formatting issues with RADTelemetry gem.json

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

* Adding newline to QtForPython gem.json

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

* Adding newline to the Twitch gem.json

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

* Adding newline to AWSCore gem.json

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

* Adding newline to the AtomTressFX gem.json

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

* Adding newline to the end of the AudioEngineWwise gem.json

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

* Adding newline to the end of the CertificateManager gem.json

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

* Removing extra whitespace in summary of CrashReporting gem.json

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

* Adding newline to the end of the CustomAssetExample gem.json

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

* Removing extra whitespace in editorPythonBindings gem summary

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

* Adding newline to the end of the ScriptedEntityTweener gem.json

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

* Adding newline to the end of the Gestures gem.json

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

* Removing extra whitetspace in the summary of the GameStateSamples gem

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

* Adding newline to the end of the ExpressionEvaluation gem.json

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

* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files

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

* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.

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

* Updated the default "requirments" field value to be empty string instead
of "None"

This works better with the ProjectManager GemInfoFromPath function.

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

* Correcting "summary" field name

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

* Added the requirements text to the AudioEngineWwise Gem

This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website

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

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

Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com>
 2021-07-07 13:29:33 -05:00
sharmajs-amzn b9f70412c4 Moving flaky test test_WindowsAndMac_ComparisonOperations_Success to sandbox test suite (#1750) 
Signed-off-by: sharmajs <sharmajs@amazon.com>
 2021-07-07 11:16:14 -07:00
Chris Galvan cc437d7370 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 12:58:28 -05:00
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:58:41 -05:00
Chris Galvan 635473e5cf [LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 11:29:18 -05:00
Jon B da26231a65 Merge pull request #1882 from aws-lumberyard-dev/pruiksma/fix_punctual_light_unhiding_transform 
Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
 2021-07-07 09:13:51 -07:00
Benjamin Jillich 2ab2503337 Revert "[MeshOptimizer] Determine the original vertex index based on the position (#1562)" (#1902) 
This reverts commit ef1f95f1d0.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-07-07 14:28:53 +02:00
amzn-sean 23c0440371 tick system while in track view batch render. (#1899) 
As the batch render will disable Editor idle processing which handles the tick.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-07-07 12:39:01 +01:00
SergeyAMZN e9ceee9b32 Merge pull request #1879 from aws-lumberyard-dev/MultiplayerPlayerPrefabBug_LYN-4989 
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem…
 2021-07-07 10:31:45 +01:00
Chris Burel ef1f95f1d0 [MeshOptimizer] Determine the original vertex index based on the position (#1562) 
* Determine the original vertex index based on the position

The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a filter view instead of reimplementing a filter view

Signed-off-by: Chris Burel <burelc@amazon.com>

* Don't attempt to weld similar vertices if there's blendshapes

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add test for the mesh optimizer's ability to weld nearby vertices

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add logging call to show mesh optimizer effect on vertex count

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a bunch of temporaries in order to make `position` `const`

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-07-07 11:21:09 +02:00
lumberyard-employee-dm 8592e4fbbe Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880) 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-06 20:42:09 -05:00