New geometry and texture replacement for the Standford Lucy assets.

5 years ago · 42d47ca5fc
parent 06682d66c1
commit 42d47ca5fc
31 changed files with 109 additions and 39 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -119,3 +119,9 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.tbscene filter=lfs diff=lfs merge=lfs -text
 *.spp filter=lfs diff=lfs merge=lfs -text
+Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Hermanubis.fbx filter=lfs diff=lfs merge=lfs -text
+Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_High.fbx filter=lfs diff=lfs merge=lfs -text
+Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx filter=lfs diff=lfs merge=lfs -text
+Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene filter=lfs diff=lfs merge=lfs -text
+Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp filter=lfs diff=lfs merge=lfs -text
+Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp filter=lfs diff=lfs merge=lfs -text
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb8c1839f46df4623818bc1b02f626d85d8f83d77cbeabd0d56c6a5c997c3ab3
+size 495250984
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_BaseColor.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_BaseColor.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bb547a502aa028624e3f95491d2e459860db5fdc5551eece757c271362c902d
+size 42981863
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_Metallic.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_Metallic.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:962248929564f7a3a2a25813ba8ab83d72f2f4d8db71eb495bd650ad4eca5c25
+size 8681159
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_Roughness.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/low_Default_Roughness.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c5998edda6eb34ace8b7a5f63e72f922e0daebb6aeb453142b31e605157736d
+size 17366289
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/bake_channels.psd
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/bake_channels.psd
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a79b82df3f6f908b2ed31f9247d9befde7daf0ff53c87479920c0463cc12d437
+size 1308624196
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/high.fbx
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/high.fbx
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9892d5de71db58217f9c942f542c058891ab2f0949443c48111aa71fe621cae
+size 128078160
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/low.fbx
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/low.fbx
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:353ff22364447796ec01799a16e6ee39fbcde337a5fee4de409069316eccbb8f
+size 6942256
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e934a8772f33e6c7bc11e70071c5d14147d01d123a5bed3bd51fc861047f17cb
+size 305364828
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/low_Default_BaseColor.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/low_Default_BaseColor.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247402172cb0539faaae937659507bd72087e629004e3eb2e8f67df97063a92f
+size 70531613
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa4f9fbb9fc332fa0fb3f35df3b21ef72439073a854ad55d637efbed89ad3b3c
+size 562609478
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Curvature.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Curvature.tif
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f5a6f8d7abb7c7283c921d884be51addd99526fefd8c12c733d2e955b2f09f5
+size 26738740
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_High.fbx
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_High.fbx
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3309c06243a350db3d7c014199febe13738d1b6bdc317ad39b0da3bff6a3e0e
-size 80075536
+oid sha256:00e19e317613be5420fd78bac1159e66d1c4deeb1f32cd4fc8c20b1ea3a5ead1
+size 153114272
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Normal.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Normal.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3546ce54290269e76d0badfbf950416267681e50f215a2e32304bc2f18a1bed
+size 50268306
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Stone_BaseColor.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_Stone_BaseColor.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fb55f2aafa1a9fe59a57f29d8b932903b23d3e3f5aec85ed7e15e27c25372e1
+size 70201185
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_ao.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_ao.tif
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef602929d38aab39bba40219bd91648525859e305fc18081ebed6e47827bc08e
-size 8566220
+oid sha256:73d77c42b909ac5e604e132b563d30f137c9f37ec3911ea6bc6620e7d7c2e0f9
+size 18394400
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_baseColor.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_baseColor.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:672847ea616ac03f6d379abfe95ffc798a15afe28f8f4a8ae35b65b3de5ffed0
-size 263620560
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_cavity.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_cavity.tif
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aa6aa6585dd07ac400bb14555761af5ba9491bf23a55dde3b3326ab92e306d1
+size 11185760
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_metalness.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_metalness.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:297146c0e20e8ab3c4c97be033fd67bc73a859a5fc999510ea615cc0512a0bb2
-size 246503792
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_roughness.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_brass_roughness.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dfa09806f9cdf5da07d517f2a3b779bfc8455fab98663ba8b414aed42869f81
-size 13010716
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_BaseColor.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_BaseColor.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4999b4a1e5067d336e08c37e4e5033cca6f1f18a7497ae5dc192572a543006c9
+size 36345892
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_Metallic.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_Metallic.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1205e13d63f9d9b23b145eaac8d3ee7dce661dad200a6a1d49202f3794f0245a
+size 8265775
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_Roughness.png
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_bronze_Roughness.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:334196335ea72ea1ded2f5bf0741707b528cc9a168ff0a5a3d9afe14323a9f9b
+size 15127806
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_convexity.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_convexity.tif
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:978d846de424f74ad76a89c005a91780afe5bdda1b4995567b1459e23627b6f2
+size 19169668
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c14e8abce725d8b3e1c5e2d5b2583b25eefe2a89193bce1e79b52b9f9ba8f328
-size 10921360
+oid sha256:6a4a65d139a6088dd4ac34f3ba3f6a7a98b8fe9545150ee7d9879fbc2a55d8d4
+size 9022128
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_normal.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_normal.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:943db0650738003073c37fd0f89863e513d4db87b958b444afafa3d229c4fa19
-size 38474832
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_stone_baseColor.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_stone_baseColor.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03b50a97b91659b9b667ad1978d52b936425e41be1556f995a27cc695487b998
-size 21857796
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_stone_roughness.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_stone_roughness.tif
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:577e06f57c691f9c3be38c7430ef3f4a37a183e6a1e2086e2a6aefffc7c045a2
-size 12055428
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_thickness.tif
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_thickness.tif
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fb9d31cbee218d59f27c1e71c2e44f1316e6876ec327aa4971694eec3b82b8c
-size 18596496
+oid sha256:5ba4c5e434d121d517605cdff972bfba024cf4b3065bc753bb46c7be33dcd67f
+size 28629316
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/lucy_brass.material
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/lucy_brass.material
@ -5,7 +5,8 @@
    "propertyLayoutVersion": 3,
    "properties": {
        "occlusion": {
-            "diffuseTextureMap": "Objects/Lucy/Lucy_ao.tif"
+            "textureMap": "Objects/Lucy/Lucy_ao.tif"
+            "textureMapUv": "Unwrapped"
        },
        "baseColor": {
            "color": [
@ -16,18 +17,25 @@
            ],
            "factor": 1.0,
            "textureBlendMode": "Lerp",
-            "textureMap": "Objects/Lucy/Lucy_brass_baseColor.tif"
+            "textureMap": "Objects/Lucy/Lucy_bronzet_BaseColor.png",
+            "textureMapUv": "Unwrapped"
+        },
+        "general": {
+            "applySpecularAA": true
        },
        "metallic": {
-            "textureMap": "Objects/Lucy/Lucy_brass_metalness.tif"
+            "textureMap": "Objects/Lucy/Lucy_bronze_Metallic.png",
+            "textureMapUv": "Unwrapped"
        },
        "normal": {
            "flipY": true,
-            "textureMap": "Objects/Lucy/Lucy_normal.tif"
+            "textureMap": "Objects/Lucy/Lucy_Normal.png",
+            "textureMapUv": "Unwrapped"
        },
        "roughness": {
-            "upperBound": 0.6767677068710327,
-            "textureMap": "Objects/Lucy/Lucy_brass_roughness.tif"
+            "textureMap": "Objects/Lucy/Lucy_bronze_Roughness.png",
+            "textureMapUv": "Unwrapped",
+            "upperBound": 0.6767677068710327
        }
    }
 }
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/lucy_stone.material
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/lucy_stone.material
@ -5,29 +5,49 @@
    "propertyLayoutVersion": 3,
    "properties": {
        "occlusion": {
-            "diffuseTextureMap": "Objects/Lucy/Lucy_ao.tif"
+            "textureMap": "Objects/Lucy/Lucy_ao.tif"
+            "textureMapUv": "Unwrapped"
        },
        "baseColor": {
            "color": [
-                0.6745098233222961,
-                0.48627451062202456,
-                0.19607843458652497,
+                1.0,
+                1.0,
+                1.0,
                1.0
            ],
            "factor": 1.0,
            "textureBlendMode": "Lerp",
-            "textureMap": "Objects/Lucy/Lucy_stone_baseColor.tif"
+            "textureMap": "Objects/Lucy/Lucy_Stone_BaseColor.png",
+            "textureMapUv": "Unwrapped"
+        },
+        "clearCoat": {
+            "roughness": 0.10000000149011612
+        },
+        "general": {
+            "applySpecularAA": true
+        },
+        "irradiance": {
+            "color": [
+                0.7304646372795105,
+                0.6938735246658325,
+                0.6866865158081055,
+                1.0
+            ]
        },
        "metallic": {
            "factor": 0.0
        },
        "normal": {
            "flipY": true,
-            "textureMap": "Objects/Lucy/Lucy_normal.tif"
+            "textureMap": "Objects/Lucy/Lucy_Normal.png",
+            "textureMapUv": "Unwrapped"
        },
        "roughness": {
            "factor": 1.0,
-            "textureMap": "Objects/Lucy/Lucy_stone_roughness.tif"
+            "lowerBound": 0.15000000596046449,
+            "textureMap": "Objects/Lucy/Lucy_bronze_Roughness.png",
+            "textureMapUv": "Unwrapped",
+            "upperBound": 0.7300000190734863
        }
    }
 }