birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,382 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4721ef8298'
${ noResults }
Commit Graph

81 Commits (4721ef829835e1d15e413c41cc410ccfa5200ed8)

Author SHA1 Message Date
rhhong bfa600ede4 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 32833c68c7 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 13781a759f Add toolbar for anim viewport and some more camera controls. 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
Roman 129d249cb4
Do not delete the actor instance if it's belong to an entity. (#4624) 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 38efd58173 Fix merging issue with camera input 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 4d2f65c4d8 code review feedback 2 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong a448caea7c fix broken build 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 265d3792f0 fix broken build 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 5fca7ffd86 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 646369c1b5 update camera naming and behavior after the merge in 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 10febe2a4b Move some utility class and settings to a setting file. 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong ffa637d115 Code cleanup 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 47a2240fc3 Using modular camera system to replace the camera entity. 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 09f9e5c6c3 CR feedback 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong 82bfbd5c98 Add ability to load actor from the ui 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong b7900bf646 render an actor 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong d185338978 Code clean 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong cda2bb9d4d Add anim viewport renderer 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong c4a3162c85 CR feedback - code cleaning 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong af9448d4ea delete auto moc header 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
rhhong f2b449c4b9 Registering an empty atom render plugin in the emfxatom gem. 
Signed-off-by: rhhong <rhhong@amazon.com>
 4 years ago
Esteban Papp a7780b6dbe Gems/Atom* 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Steve Pham fa0f2a1007
Fix unused warnings release (#3677) 
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.com>
 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
Esteban Papp 804d833bb9 Gems/Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Kyle Birnbaum 2b1f4c2fc0
Merge branch 'development' into ExposeLodControls 4 years ago
Kyle B b53a085700 Merge branch 'development' into ExposeLodControls 4 years ago
pappeste 33cbc2db21 AtomLyIntegration 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Chris Burel 1837d05169 Rename EMotionFX class members to follow the `m_` naming convention 
Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
Chris Burel 2cfee517a0 Adjust EMotionFXAtom to work with the new EMotionFX size_t API 
Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
Benjamin Jillich 868d718a18
Added automatic bounding box expansion, fixed several bugs in the aabb calculations and removed node OBBs (#2871) 
Merge pull request #2871 from aws-lumberyard-dev/jillich/EmfxAabbImprovements
 4 years ago
Kyle B 51271fa15b Created group for Lod component data 
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
 4 years ago
Benjamin Jillich 8a47476498 Merge branch 'development' into jillich/EmfxAabbImprovements 4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Kyle B 5b88d96eec Exposed fields to the mesh component giving greater Lod control from the editor 
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
 4 years ago
Benjamin Jillich b840b24de2 Ported the actor and a few other places 
* Fixed a bug with updating the static aabb for actors. It called that before the mesh was loaded resulting in an invalid aabb.
* Ported a few more places to AZ::Aabb from MCore::AABB

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 4 years ago
santorac b407e501e3 Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion 4 years ago
Chris Santora fec79a7d53 Moved the material slot list from ModelLodAsset to ModelAsset, so all the slots live in one main list. This removes data duplication between LODs and cleans up the code a bit. 
I had to update the ModelLod class to take in both the ModelLodAsset and ModelAsset for initialization so it can fetch the slots for each mesh.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
Chris Santora 3daf3f7d7a Fixed an issue with Actors where the material slot IDs were incorrect, and caused the displayed slot labels to be all "<unknown>" (and likely other issues). 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
Chris Santora 14d2e38b90 Refactored how model material slots work in preparation to support more flexible material conversion options for the scene asset pipeline. The material slot IDs are based on the MaterialUid that come from SceneAPI. Since these IDs are also used as the AssetId sub-ID for the converted material assets, the system was just checking the material asset sub-ID to determine the material slot ID. But in order to support certain FBX material conversion options, we needed to break this tie, so the slot ID is separate from the AssetId of the material in that slot. This will allow some other material to be used in the slot, instead of being forced to use one that was generated from the FBX. 
Here we inttroduce a new struct ModelMaterialSlot which formalizes the concept of material slot, with an ID, display name, and default material assignment. The ID still comes from the MaterialUid like before. The display name is built-in, rather than being parsed out from the asset file name. And the default material assignment can be any material asset, it doesn't have to come from the FBX (or other scene file).

This commit is just the preliminary set of changes. Cursory testing shows that it works pretty well but more testing is needed (and likely some fixes) before merging.

Here is what's left to do...
Add serialization version converters to preserve prior prefab data.
See if we can get rid of GetLabelByAssetId function only rely on the display name inside ModelMaterialSlot.
I'm not sure if the condition for enabling the "Edit Material Instance..." context menu item is correct.
Test actors
Lots more testing in general

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
Guthrie Adams ffbeb903c1 Material Component: Add functions to lookup material ids by name 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
pappeste eb2da69e6e AtomLyIntegration 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Terry Michaels d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de 
Gitflow 7/16/21 - O3DE
 4 years ago
Steve Pham 38261d0800
Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 4 years ago
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
 4 years ago
lumberyard-employee-dm 6b747cf1e0
Added missing EMotionFX.Editor target as a runtime dependency of the EMotionFXAtom.Editor target to fix launching of the Editor when the EMotionFX gem isn't explictly enabled. (#2228) 
Filled the dependencies of the AtomContent.Builders gem with the AtomConent_ReferenceMaterial and AtomContent_Sponza gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 5 years ago
AMZN-stankowi 4c4be73bd5
First pass FBX -> Scene File conversion. (#1699) 
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago