Skip to content

Commit

Permalink
Merge pull request #12 from o3de/proc-wrlds-update
Browse files Browse the repository at this point in the history
adding emfx workshop
  • Loading branch information
Jonny Galloway authored Oct 16, 2022
2 parents f04e615 + c58baee commit d5e5cff
Show file tree
Hide file tree
Showing 67 changed files with 629 additions and 45 deletions.
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Backpack_WF3.fbx
Git LFS file not shown
19 changes: 19 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Backpack_WF3_BackPackMat.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"propertyValues": {
"baseColor.color": [
0.5,
0.5,
0.5,
1.0
],
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Jerry Run.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Jerry.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/JerryTextures/Paper_Kid_AO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Jerry_Walk.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Jerry_Walk_Strafe_Leftt.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/Jerry/Jerry_Walk_Strafe_Right.fbx
Git LFS file not shown
20 changes: 20 additions & 0 deletions Projects/EmFX_Workflow/Jerry/YelloBag.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"propertyValues": {
"baseColor.color": [
0.5,
0.5,
0.5,
1.0
],
"baseColor.textureMap": "Assets/PC/Jerry/backpack_textures/BackPack_Low_BaseColor.png",
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Actors/Y Bot.fbx
Git LFS file not shown
204 changes: 204 additions & 0 deletions Projects/EmFX_Workflow/YBot/Actors/Y Bot.fbx.assetinfo

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/EMFX/ybot_loco.animgraph
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/EMFX/ybot_loco.motionset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/EMFX/ybot_ws.emfxworkspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[General]
version=1
startScript=ImportActor -filename \"animationsamples/ybot/actors/y bot.actor\"\nLoadMotionSet -filename \"@products@/animationSamples/YBot/EMFX/ybot_loco.motionset\"\nLoadAnimGraph -filename \"@products@/animationSamples/YBot/EMFX/ybot_loco.animgraph\"\nActivateAnimGraph -actorInstanceID -1 -animGraphID %LASTRESULT1% -motionSetID %LASTRESULT2% -visualizeScale 1.000000\n
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/idle.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/jump.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/left turn.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/right turn.fbx
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/running.fbx
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"values": [
{
"$type": "MotionGroup",
"name": "running",
"selectedRootBone": "RootNode",
"id": "{44BE888C-1634-5672-B4E6-3F2330DC1426}",
"rules": {
"rules": [
{
"$type": "MotionSamplingRule"
},
{
"$type": "EMotionFX::Pipeline::Rule::RootMotionExtractionRule",
"data": {
"sampleJoint": "RootNode.mixamorig:Hips",
"transitionZeroX": true
}
},
{
"$type": "MotionRangeRule",
"endFrame": 20
},
{
"$type": "EMotionFX::Pipeline::Rule::MotionMetaDataRule",
"data": {
"motionEventTable": {
"tracks": [
{
"$type": "AnimGraphSyncTrack",
"name": "Sync",
"deletable": false
}
]
}
}
}
]
}
}
]
}
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Locomotion/walking.fbx
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"values": [
{
"$type": "MotionGroup",
"name": "walking",
"selectedRootBone": "RootNode",
"id": "{70EB0B9F-5C12-5976-A0FB-214AB34DD3C8}",
"rules": {
"rules": [
{
"$type": "MotionSamplingRule"
},
{
"$type": "EMotionFX::Pipeline::Rule::RootMotionExtractionRule",
"data": {
"sampleJoint": "RootNode.mixamorig:Hips",
"transitionZeroX": true
}
}
]
}
}
]
}
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol idle.fbx
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol jump.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol run arc.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol run.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol strafe.fbx
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Projects/EmFX_Workflow/YBot/Motions/Pistal/pistol walk.fbx
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"materialTypeVersion": 1,
"propertyValues": {
"baseColor.color": [
0.4800030589103699,
0.381994366645813,
0.24480049312114716,
0.11546501517295837,
0.09198138117790222,
0.05906767398118973,
1.0
],
"baseColor.textureBlendMode": "LinearLight",
Expand All @@ -22,6 +22,8 @@
"parallax.textureMap": "Dirt_On_Sandy_Ground_Height.png",
"roughness.textureMap": "Dirt_On_Sandy_Ground_Roughness.png",
"specularF0.textureMap": "Dirt_On_Sandy_Ground_SpecularLevel.png",
"terrain.heightOffset": 0.3400000035762787,
"terrain.heightScale": 0.6399999856948853,
"terrain.overrideParallaxSettings": true,
"uv.scale": 0.25
}
Expand Down
Git LFS file not shown
Loading

0 comments on commit d5e5cff

Please sign in to comment.