Commit Graph

2557 Commits (0750dd59cac2a417f9975c8f6898b8df4976e8bc)

Author SHA1 Message Date
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha d5ee6fb36f
Expose camera settings to the Editor UI (#3442)
* expose camera settings to the ui

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* improve naming of visibility functions, remove duplication

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Chris Galvan 486157f89b
Merge pull request #3428 from aws-lumberyard-dev/cgalvan/FixedTrackViewNodeCrash
Fixed memory stomping leading to Track View nodes with invalid labels and crash.
4 years ago
Esteban Papp e5e271f45a One more fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 8d2383e408
Merge pull request #3493 from aws-lumberyard-dev/windowsdecls
Move undefs of problematic Windows defines to PlatformIncl_Windows.h
4 years ago
amzn-phist db1a89a492
Fix level creation on Linux (#3488)
* Fix level creation on Linux

Creating a new level on linux would fail due to backslashes being used in mkdir.
Fixed the slashes to use the AZ_CORRECT_FILESYSTEM_SEPARATOR.

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

* Removed extra line that wasn't needed

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
4 years ago
Esteban Papp b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have 4 years ago
Esteban Papp fded2bafad More PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 032366f9c9 Move undefs of problematic Windows defines to PlatformIncl_Windows.h
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
4 years ago
Chris Galvan 4b672a0a32 Fixed merge conflict.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp 058f6e0f22 PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K 45b2336dce
Legacy cleanup (#3383)
* WIP - small legacy cleanup

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* More cleanups + build fixes

Use AZstd instead of std types in a few places.
Remove m_nameTable.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Legacy code cleanups

Remove unused methods using legacy functionality

* EditorViewportWidget::AdjustObjectPosition
* DisplayContext - remove `renderer` pointer
* DisplayContext - log errors when functions using `renderer` are called
* CTrackGizmo::DrawAxis - log errors when function uses `renderer`.
* Legacy CCamera - remove Project, Unproject and CalcScreenBounds
* Remove all unused methods from Cry_GeoDistance.h/Cry_GeoIntersect.h
* Remove Lineseg_Triangle from Cry_GeoOverlap.h
* IEntityRenderState.h - remove unused types
* SMeshColor remove Lerp method and associated constructor.
* IMaterial.h - remove unused types and a few methods
* IRenderMesh.h - remove a few unused methods and use int8 instead of
byte
* IRender.h - remove almost all of the contents
* IShader.h - remove unused types and a few methods
* IStatObj.h - remove unused types and a few methods
* SSystemGlobalEnvironment - remove `renderer` pointer
* IRenderGraph - remove 2 unused methods
* physinterface.h - remove almost all of the contents
* CXmlUtils no longer inherits ISystemEventListener
* CXmlNode no longer has custom new/delete
* Remove IRenderer from some test mocks.

Removed files:
* CryName.h
* Cry_MatrixDiag.h
* Cry_XOptimise.h
* HeapAllocator.h
* IRendererMock.h
* PoolAllocator.h

Things to consider:
* Remove GetMemoryUsage & friends.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review suggestions

IMovieSystem.h - remove unused includes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Move unreachable code to `#if 0` block

This is hopefully temporary measure until the original functionality is
re-implemented

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix bad merge I messed up.

Fix bad merge I messed up, by re-removing FrameProfiler.h from crycommon_files.cmake (this was removed in an earlier commit this morning: https://github.com/o3de/o3de/pull/3394).

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

* Update Code/Framework/AzCore/AzCore/std/string/string_view.h

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

* implement review suggestion

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* following review, using LYSHINE_ATOM_TODO to guard

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove commented out include

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* EditorViewportWidget.cpp: Convert commented out code to  guarded one

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: bosnichd <bosnichd@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Chris Galvan d211771253 Updating PR to change lower API to return AZStd::string instead of const char* for safety.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
4 years ago
Esteban Papp e2acd66c46 Fixes Guid formatting
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan d64c034fee Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixedTrackViewNodeCrash 4 years ago
Jeremy Ong e091450e80
Merge pull request #3394 from aws-lumberyard-dev/Budgets
Add budget registration/tracking system and prepare driller redcode
4 years ago
hultonha 7fbfda0371
Fix mouse capture behavior for Editor Viewport (#3417)
* first pass of fixes for cursor capture and context menu

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* restore previous behavior of HandleMouseMoveEvent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* tidy-up from previous cursor/input changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing casts

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates to support tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* additional tests and some tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates before publishing PR (comment/naming updates)

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing parameter to MouseInteractionEvent constructor

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Jeremy Ong c3e83387db Address additional PR feedback
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp cd5df6b372 Some more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov bb90c4ddfe
Disabling RootSpawnable warning (#3427)
* Disabling RootSpawnable warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Revert "Disabling RootSpawnable warning"

This reverts commit c14e8d93945043498ab494bf608312cf5e1ad50d.

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* commenting out warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Jeremy Ong a9b4ad3486 Compile out tracker in release mode
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp f94043dc83
Adds functions so targets can define install directories/files 4 years ago
Chris Burel 86770deefa
Add linux equivalents for all the places that enumerate platforms (#3325)
* Add linux equivalents for all the places that enumerate platforms

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

* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Jeremy Ong c37c0cab08 Refactor budget definitions as named functions instead of template specializations
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 5e04c3737f Add preliminary budget tracking system and remove driller integration
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 07a14bdce1 Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
NOTE: The memory driller is still intact for now to avoid needing to
modify allocators, but the frame/cpu portions of driller and the
standalone executable are now gone.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Steve Pham b31d673de0
Fix the Editor launcher for LuaIDE on Linux (#3407)
Root Cause:
On Linux, there is no need to wrap paths with double quotes for an executable
when spawning a process with execve (or in this case QProcess::startDetached).
Having the double quotes will result in an underlying "path not found"

Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
Chris Galvan 306a7a622d Fixed memory stomping leading to Track View nodes with invalid labels and crash.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
JSON serialization of SC Editor Assets
4 years ago
Sean Sweeney f9c2dd62f7
Merge pull request #3363 from aws-lumberyard-dev/remote_console_fix
Adds a verification response for the remote console connecting
4 years ago
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
AMZN-koppersr 0d74d3ed5d
Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539
Allowing prefabs with missing components to load, and clarifying error message
4 years ago
Esteban Papp cd9621f16e
Remove unnecessary ALIGN macros 4 years ago
SergeyAMZN de4f2fc629
Merge pull request #3411 from aws-lumberyard-dev/MPWeaponSQ2
Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
4 years ago
Mikhail Naumov 6c1ae1e618 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha 8c573979a9
Updates to camera tests to support different delta times and some further tidy-up (#3324)
* updates to camera tests to support different delta times and some further tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* support variable delta time in mouse move test

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
pereslav 21605f15cc CR Feedback addressing
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
pereslav 7d4f8e4281 Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
Esteban Papp b609d5e2cb supporting multiple directories
automatically excluding obvious things
cleanup and verification

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a2cab41cdc trying a better fix for winioctl issue
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 07ea4edbc2 Fixes for Mac/iOS
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 63a2925720 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago