diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/.collect.mapping.json b/Articulated_objects/household_items/basket/Blue shopping basket02/.collect.mapping.json new file mode 100755 index 0000000000000000000000000000000000000000..5b88cce93d8f5285958eadbe248f06a86134ad7c --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/.collect.mapping.json @@ -0,0 +1,35 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_D.png", + "source_hash": "d810601c6e9d70be309015f8181df566d47bdf86", + "target_url": "./AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_D.png", + "target_hash": "d810601c6e9d70be309015f8181df566d47bdf86" + }, + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_N.jpg", + "source_hash": "7d312e6471e3472ea34516703cf9b6f7e2b8fa69", + "target_url": "./AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_N.jpg", + "target_hash": "7d312e6471e3472ea34516703cf9b6f7e2b8fa69" + }, + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_02.jpg", + "source_hash": "f31e853dde6855c2ebd9498664d7c510113edcaa", + "target_url": "./AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_02.jpg", + "target_hash": "f31e853dde6855c2ebd9498664d7c510113edcaa" + }, + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_03.png", + "source_hash": "8b12e2909f369b40b24b50a9ea204d7584f7ad13", + "target_url": "./AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_03.png", + "target_hash": "8b12e2909f369b40b24b50a9ea204d7584f7ad13" + }, + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_04.jpg", + "source_hash": "8568c8dd1edd88888446b564a0b839051c1f7542", + "target_url": "./AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_04.jpg", + "target_hash": "8568c8dd1edd88888446b564a0b839051c1f7542" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/.thumbs/256x256/Blue shopping basket02.usd.png b/Articulated_objects/household_items/basket/Blue shopping basket02/.thumbs/256x256/Blue shopping basket02.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..98370aca0444383086fb8195df87749b52f6b910 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/.thumbs/256x256/Blue shopping basket02.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464141ac99ab614660800a30af7e3f1ce4abaad0b46638c07b1fe69d16415d5e +size 41095 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_D.png b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_D.png new file mode 100755 index 0000000000000000000000000000000000000000..fbff9e541df92c5ab71080a2e72f17ecd282f2f6 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f8be6eea1d11903d9dbef33b0cc3a6b3334f61313d0a3e364a7035256992cf0 +size 624841 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_N.jpg b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_N.jpg new file mode 100755 index 0000000000000000000000000000000000000000..96e35d5a379865e807c09b1d8ad1026b98fccbf3 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_01_N.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6af4792f2f281b2cdcfa7682df553af3e212a3c3afcee9d2492710cb6de01d4d +size 110619 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_02.jpg b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_02.jpg new file mode 100755 index 0000000000000000000000000000000000000000..5e122cb9a33381ef86e7a429f3bcddf589fb8bb0 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_02.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27df7d73c0296fad9da3ba8878f7c660237e5ce0442803965c92d8215a4570d3 +size 278251 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_03.png b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_03.png new file mode 100755 index 0000000000000000000000000000000000000000..7ed08ec2024368d22e73de51ce2f525c916300e1 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26c8e8ef065aa74ba680a8c54a798a35eb5c03619a1aa06f284112ac8ad4fb99 +size 1644845 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_04.jpg b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_04.jpg new file mode 100755 index 0000000000000000000000000000000000000000..c8641ef46a4bf0c6af7cd5bb78003065a2b2f333 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/AppData/Local/Temp/b6e76c4db7ae92d3/textures/Blue shopping basket_04.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e03e76ed8720342f58835a472450a035fc4888848243ffa706498760ddc9315f +size 45777 diff --git a/Articulated_objects/household_items/basket/Blue shopping basket02/Blue shopping basket02.usd b/Articulated_objects/household_items/basket/Blue shopping basket02/Blue shopping basket02.usd new file mode 100755 index 0000000000000000000000000000000000000000..d563b1f9d1fe0809eadefef30e7819ed3deb05e0 --- /dev/null +++ b/Articulated_objects/household_items/basket/Blue shopping basket02/Blue shopping basket02.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3dd3ea4eb96df575bc3c613c687d179918c266d79bcc9a1a42e3765f6941f25 +size 1368709 diff --git a/Articulated_objects/household_items/basket/Shopping basket_03/.collect.mapping.json b/Articulated_objects/household_items/basket/Shopping basket_03/.collect.mapping.json new file mode 100755 index 0000000000000000000000000000000000000000..18894b7ad62cf94060789c01a32236c743f0aa60 --- /dev/null +++ b/Articulated_objects/household_items/basket/Shopping basket_03/.collect.mapping.json @@ -0,0 +1,11 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/894f91d146804686/textures/Shopping basket_D_03.png", + "source_hash": "3d4ba734e3b8dfd1b53289cae133347dcf9b9eb5", + "target_url": "./AppData/Local/Temp/894f91d146804686/textures/Shopping basket_D_03.png", + "target_hash": "3d4ba734e3b8dfd1b53289cae133347dcf9b9eb5" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/household_items/basket/Shopping basket_03/.thumbs/256x256/Shopping basket_03.usd.png b/Articulated_objects/household_items/basket/Shopping basket_03/.thumbs/256x256/Shopping basket_03.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..a9b38c31b4cd3260880771ce480224e2b2eaafc1 --- /dev/null +++ b/Articulated_objects/household_items/basket/Shopping basket_03/.thumbs/256x256/Shopping basket_03.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8555acf973509468efa4c4892a98fd7db751b969bc23bcc26a0507599f1762d4 +size 76047 diff --git a/Articulated_objects/household_items/basket/Shopping basket_03/AppData/Local/Temp/894f91d146804686/textures/Shopping basket_D_03.png b/Articulated_objects/household_items/basket/Shopping basket_03/AppData/Local/Temp/894f91d146804686/textures/Shopping basket_D_03.png new file mode 100755 index 0000000000000000000000000000000000000000..47ce9a7121bd6733a1327ad0578405280e5c456b --- /dev/null +++ b/Articulated_objects/household_items/basket/Shopping basket_03/AppData/Local/Temp/894f91d146804686/textures/Shopping basket_D_03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93afd98920b01970e4716d66a6f97fef4184ca691e3a7828b884d16ad7a6c9e2 +size 3291004 diff --git a/Articulated_objects/household_items/basket/Shopping basket_03/Shopping basket_03.usd b/Articulated_objects/household_items/basket/Shopping basket_03/Shopping basket_03.usd new file mode 100755 index 0000000000000000000000000000000000000000..2dce3bb637f3468d663b385fbd9d0f8d7a5ec046 --- /dev/null +++ b/Articulated_objects/household_items/basket/Shopping basket_03/Shopping basket_03.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:053304f5471f3df6371adc638508db36ef669062c61de2b2c9c96e9192b8b5c2 +size 7769837 diff --git a/Articulated_objects/household_items/basket/basket_1/model_basket_1.usda b/Articulated_objects/household_items/basket/basket_1/model_basket_1.usda index 1eec38199eb832fd41f9b73d11aa2456cfcd8140..98f957a5064e9b1e467560895cd2ed24be61590b 100644 --- a/Articulated_objects/household_items/basket/basket_1/model_basket_1.usda +++ b/Articulated_objects/household_items/basket/basket_1/model_basket_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd33d980bfc0e21b2cd574a078a8089fdbfa1e7a2c2bd3c1088ccb63770dfb1f -size 14597724 +oid sha256:4b98de442b01e69bdded6fde2767ddacf9308075a7ae48fa6a8e13a173d7bd91 +size 14597434 diff --git a/Articulated_objects/household_items/basket/basket_20/model_basket_20.usd b/Articulated_objects/household_items/basket/basket_20/model_basket_20.usd index 063bc11137720f8c21dc2958e9e2d4e894f222fd..0a235e54aeb2d88dfaa34d94d77dd9674d025bf2 100644 --- a/Articulated_objects/household_items/basket/basket_20/model_basket_20.usd +++ b/Articulated_objects/household_items/basket/basket_20/model_basket_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f7f0117f49dfc499950693745192452df0e25888c20edc4fb394ee8a0418af2 -size 17036 +oid sha256:1331985f978ffe102a70474c92e78816c302bec3903b858c0dbd6ba48366f821 +size 17522 diff --git a/Articulated_objects/household_items/basket/basket_21/model_basket_21.usd b/Articulated_objects/household_items/basket/basket_21/model_basket_21.usd index 65267dc36aad8ff7dedd8c63614399ce441f6d86..b020b356e93502535c02e080c3054159df0b4e03 100644 --- a/Articulated_objects/household_items/basket/basket_21/model_basket_21.usd +++ b/Articulated_objects/household_items/basket/basket_21/model_basket_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed80459233870cd8b537d8a4df0b989af59dd4829fd85a639a6b9bfc442c83e7 -size 14654 +oid sha256:0e1087487eb73e878397425a5fb2525b889ac9a391721995257aa228c34be8aa +size 15032 diff --git a/Articulated_objects/household_items/basket/basket_22/model_basket_22.usd b/Articulated_objects/household_items/basket/basket_22/model_basket_22.usd index 46495711dc34add876e88e473184c790d6da2e6c..8dba49b021d4003021b5900797c67735027a4983 100644 --- a/Articulated_objects/household_items/basket/basket_22/model_basket_22.usd +++ b/Articulated_objects/household_items/basket/basket_22/model_basket_22.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02d6f29e2b8b0b5b2e6ed7011c78dd14d7bba278a69fd2be6559129ca783ab72 -size 11014 +oid sha256:36136fad09c95ac8d20495f074fa972c6063a623c544fcde6efc5d1ed1ce5a97 +size 11386 diff --git a/Articulated_objects/household_items/basket/basket_23/model_basket_23.usd b/Articulated_objects/household_items/basket/basket_23/model_basket_23.usd index 881e5e3931709f1852ac6bcfc43a2546089aa5a7..08a03e04a5e1b66655111a92875f7f372eb79fd0 100644 --- a/Articulated_objects/household_items/basket/basket_23/model_basket_23.usd +++ b/Articulated_objects/household_items/basket/basket_23/model_basket_23.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a91868133e6610a4ce84106642c7739d0d18f7c3c5b70c503099a5512e8eb4d9 -size 10718 +oid sha256:d733e238df48f3298b58e00e0d40e3e3e8a264943991f633213dde172dc6cdf1 +size 11087 diff --git a/Articulated_objects/household_items/basket/basket_7/model_basket_7.usda b/Articulated_objects/household_items/basket/basket_7/model_basket_7.usda index 819d47ee18f9b74179d787b83eac49486ee7ba3b..7f7c2a310497f4f91b2fa0a2987528c795013728 100644 --- a/Articulated_objects/household_items/basket/basket_7/model_basket_7.usda +++ b/Articulated_objects/household_items/basket/basket_7/model_basket_7.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6491781f65970eb721228f872c41c4747e9d8d9a6baacfd033efa31be80efaf4 -size 81262805 +oid sha256:976da6f702925d93c4c96275a8c6262788a6a3e2a8136df288ea36601a9a0f7d +size 81262515 diff --git a/Articulated_objects/household_items/cardboard_box/carton_1/model_carton_1.usda b/Articulated_objects/household_items/cardboard_box/carton_1/model_carton_1.usda index a83f2e117fd69523cb1c64842cbe2005fbae2f18..09fc494c443a4d67d011b68c808f9fca1e5cd436 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_1/model_carton_1.usda +++ b/Articulated_objects/household_items/cardboard_box/carton_1/model_carton_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c0d91fb845595edf638fff869f105ad9daf3f5246e2da4427938a9ed9f639d6 -size 10362 +oid sha256:c4a20ac1a5bdb0b4444a3b97f12a123419eedc9ac303d70604ef4e66ca03937b +size 9876 diff --git a/Articulated_objects/household_items/cardboard_box/carton_10/model_carton_10.usd b/Articulated_objects/household_items/cardboard_box/carton_10/model_carton_10.usd index ac603a8f5704716caaace160586f0523a7c83917..cdfa267693e52419f4bfb3ce5f8abc3b4c615032 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_10/model_carton_10.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_10/model_carton_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a71ca69fe222b6371a42d664a0ccb9b1d654fafb2a35b7bf8b660bab5c02383c -size 40344 +oid sha256:1476b5bbcf1cfa5ed179a1b48e483c50cf2c2762da8df225c33f602e44c096f6 +size 40765 diff --git a/Articulated_objects/household_items/cardboard_box/carton_2/model_carton_2.usd b/Articulated_objects/household_items/cardboard_box/carton_2/model_carton_2.usd index e24b5f61a03ce56333de6efc8740ea1319efb5f1..855b7147e734c8ecabad94c9e96486a0df7412d5 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_2/model_carton_2.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_2/model_carton_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03d2245b91c2fb4e04688664f1ac003eb6ca9c3620ee3ac9819b99d48f2b097a -size 19626 +oid sha256:fe6e1ef44fb3f082ad9956339dc248b7eb5953003c8a304da0bec5c57a3b70db +size 20131 diff --git a/Articulated_objects/household_items/cardboard_box/carton_3/model_carton_3.usd b/Articulated_objects/household_items/cardboard_box/carton_3/model_carton_3.usd index 4bd850e7de9cdea416257fa649a093521b803c49..050f272f1ebf0f9ca6d8654bf0f4b9f09c1ded95 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_3/model_carton_3.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_3/model_carton_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d52a49ded64f9420c4b6dc0a52fceddb5f7defd702400f85eca2222f967878d7 -size 20890 +oid sha256:cd5028934a0e738a8aedd50f78130afcb88c8521b1271c8110753d16f8b284b3 +size 21444 diff --git a/Articulated_objects/household_items/cardboard_box/carton_4/model_carton_4.usd b/Articulated_objects/household_items/cardboard_box/carton_4/model_carton_4.usd index 8585309c8f692b236e6710d6e4d8d359ecdb1203..f157dc544fc8cd812750d2df721e4eae4dc663a5 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_4/model_carton_4.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_4/model_carton_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f8926c8f87f5fafa3960f555a7ba0309e452aa8ab5eec009711195444308d6e -size 16308 +oid sha256:a2e6898b8914af730e6bf77adc52fc2ccfdb951c86528db27c7ec87f70dafd1b +size 16715 diff --git a/Articulated_objects/household_items/cardboard_box/carton_5/model_carton_5.usd b/Articulated_objects/household_items/cardboard_box/carton_5/model_carton_5.usd index 3c693491f56f2f25753ec02c8ee0a877380dfc38..6739fb2d7ad85951b7cf9f197ae8a24bbd40d318 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_5/model_carton_5.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_5/model_carton_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b06e5be507cc50023a354d67e801022e0b0c7fd57912a8d550f99b1dbd20bbe -size 17386 +oid sha256:163adc81ed7af060032ccb460e6b2b4e23cead52222398bed6211e779f9b7b22 +size 17952 diff --git a/Articulated_objects/household_items/cardboard_box/carton_6/model_carton_6.usda b/Articulated_objects/household_items/cardboard_box/carton_6/model_carton_6.usda index a5e862fe117e3b1f2b70c6c1f071332d2d35bdca..961644f59ebd1f1a22cf0f0d395178fe1224be63 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_6/model_carton_6.usda +++ b/Articulated_objects/household_items/cardboard_box/carton_6/model_carton_6.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8628e63d2713014aeab9ed5b8a7ac038d6b0f7dc798eb154151724c1c794e056 -size 10588 +oid sha256:f942ba14e9a2c3fda460e54718866a198eadaffcdfebd914d155628bdc58b304 +size 10102 diff --git a/Articulated_objects/household_items/cardboard_box/carton_7/model_carton_7.usd b/Articulated_objects/household_items/cardboard_box/carton_7/model_carton_7.usd index accada0918f58c03efda3703ce6b1da96a960d0d..bcbde4784164e686ee613e1254b4cd653c9216ab 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_7/model_carton_7.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_7/model_carton_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d0f2753da2e8c8555b646b5cc1d293b497560273407499fdcb7db21c05d6a72 -size 12972 +oid sha256:4c46cf6fa10d3be7a61603ea228b8291285c9ace8314fad5abfa0e8d79dbf6a4 +size 13350 diff --git a/Articulated_objects/household_items/cardboard_box/carton_8/model_carton_8.usd b/Articulated_objects/household_items/cardboard_box/carton_8/model_carton_8.usd index 03edb604d78d9e239c57b46e11995cca3ba67890..466b04ab2df4a29c7f2bd164c872f0619cb63699 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_8/model_carton_8.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_8/model_carton_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75d99625abb11a81b706ecdbc1cddaa71d1fabd48375737568c93b870d41b91e -size 10619 +oid sha256:94fd157cc6214ecdc54701c9a6475e9cc4868c4e2f91a7c3e3bd286eba9e3f92 +size 11012 diff --git a/Articulated_objects/household_items/cardboard_box/carton_9/model_carton_9.usd b/Articulated_objects/household_items/cardboard_box/carton_9/model_carton_9.usd index 72c4958e8ef7360a6aa8c8bb107bb7d2d596d356..af13f303e6d9fd7f2bf54cbea67ac0fd14628aa9 100644 --- a/Articulated_objects/household_items/cardboard_box/carton_9/model_carton_9.usd +++ b/Articulated_objects/household_items/cardboard_box/carton_9/model_carton_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f5aa144d4274f2f823f0d4219108eaa58545e7a2358600580e503fc4115b493 -size 10705 +oid sha256:79e48dfb5e96a6da7f267770c56d6ad12337f65a8ec41e540baf752263c7816b +size 11078 diff --git a/Articulated_objects/household_items/holder/Collected_Computer stand/.collect.mapping.json b/Articulated_objects/household_items/holder/Collected_Computer stand/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..a8f0346834278939ee03002cd761b2825a7c1039 --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_Computer stand/.collect.mapping.json @@ -0,0 +1,4 @@ +{ + "version": "1.0", + "file_records": [] +} \ No newline at end of file diff --git a/Articulated_objects/household_items/holder/Collected_Computer stand/.thumbs/256x256/Computer stand.usd.png b/Articulated_objects/household_items/holder/Collected_Computer stand/.thumbs/256x256/Computer stand.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee4e4784746376a29939a67c16051116581ac53 --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_Computer stand/.thumbs/256x256/Computer stand.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:494671f9eb83ec73b2514123388a51a0733291f2270ee4989e08d8e19cc2290c +size 15478 diff --git a/Articulated_objects/household_items/holder/Collected_Computer stand/Computer stand.usd b/Articulated_objects/household_items/holder/Collected_Computer stand/Computer stand.usd new file mode 100644 index 0000000000000000000000000000000000000000..bdb0f693cad635485b9e26de041100c3c33b1b97 --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_Computer stand/Computer stand.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9419a98be07438bfac726919f95aebbfff0d666a2301fb91bfcf2ef1c0cbf366 +size 226214 diff --git a/Articulated_objects/household_items/holder/Collected_phone holder/.collect.mapping.json b/Articulated_objects/household_items/holder/Collected_phone holder/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..a8f0346834278939ee03002cd761b2825a7c1039 --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_phone holder/.collect.mapping.json @@ -0,0 +1,4 @@ +{ + "version": "1.0", + "file_records": [] +} \ No newline at end of file diff --git a/Articulated_objects/household_items/holder/Collected_phone holder/.thumbs/256x256/phone holder.usd.png b/Articulated_objects/household_items/holder/Collected_phone holder/.thumbs/256x256/phone holder.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..8864b80775b179d8d95e793e51a12b3eafc6de6d --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_phone holder/.thumbs/256x256/phone holder.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0d64e36771b0e2c1c60cf995e6f193187ba57b940334987765666fe7785a7f5 +size 21379 diff --git a/Articulated_objects/household_items/holder/Collected_phone holder/phone holder.usd b/Articulated_objects/household_items/holder/Collected_phone holder/phone holder.usd new file mode 100644 index 0000000000000000000000000000000000000000..74dc00d0f73ed896e7d754967c4616a4a8e218a2 --- /dev/null +++ b/Articulated_objects/household_items/holder/Collected_phone holder/phone holder.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb5b308ffde46d057d8281eaf0f53c542ee3bb1b820bb1f67c872db7fa3e3f0b +size 451793 diff --git a/Articulated_objects/household_items/mop/mop_10/model_mop_10.usd b/Articulated_objects/household_items/mop/mop_10/model_mop_10.usd index 9a205746774b59884cf4714749b6c0c30e55350c..9b8e428ca7a42b573ecc1b9bcf47f5d7d865cb2b 100644 --- a/Articulated_objects/household_items/mop/mop_10/model_mop_10.usd +++ b/Articulated_objects/household_items/mop/mop_10/model_mop_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:731240997f2495f80dab8ed5d4430901d0b6594f36fb51e59436a6daa2f39c1a -size 217780 +oid sha256:0dda725df0edb350763aeeee1f9b9dcbb0164da578efa707c00b7464dbdf40c8 +size 218536 diff --git a/Articulated_objects/household_items/mop/mop_11/model_mop_11.usd b/Articulated_objects/household_items/mop/mop_11/model_mop_11.usd index b383e679de69b354a73cfec2e298c930ccd41265..fce22f9fb0a70b42e349aba416dcc4400d8c6f42 100644 --- a/Articulated_objects/household_items/mop/mop_11/model_mop_11.usd +++ b/Articulated_objects/household_items/mop/mop_11/model_mop_11.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5872cc4c483ab02d2a24e6804aca22680167daa2c25208b3a4e80ae9351cdfc -size 5724227 +oid sha256:40e92e9bc3cea4a215daf8a55318a6bb87e5596933d290fdd9f8f19fa4db8041 +size 5725388 diff --git a/Articulated_objects/household_items/mop/mop_9/model_mop_9.usd b/Articulated_objects/household_items/mop/mop_9/model_mop_9.usd index 1c9be3a9a38f3b7d73c04c6cb39812faa65d0ed3..ae90884639c9f70360cea3e1de4023f2aecb1074 100644 --- a/Articulated_objects/household_items/mop/mop_9/model_mop_9.usd +++ b/Articulated_objects/household_items/mop/mop_9/model_mop_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c49daac30ba6a6b55342eed94e49dea107c675916bfa77496c696928ffd19a40 -size 9983 +oid sha256:281d233235d5d5119f45be234cf86794d58c6b0353804b386d01b4af88841ea8 +size 10652 diff --git a/Articulated_objects/household_items/pump_bottle/pressure_pump_13/model_pressure_pump_13.usd b/Articulated_objects/household_items/pump_bottle/pressure_pump_13/model_pressure_pump_13.usd index 84a41b942194db0fbfea468c6fe0d06ec0dfa613..dd977ca85533d22caabe52de7a814465c328848c 100644 --- a/Articulated_objects/household_items/pump_bottle/pressure_pump_13/model_pressure_pump_13.usd +++ b/Articulated_objects/household_items/pump_bottle/pressure_pump_13/model_pressure_pump_13.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0cd95032864c49882b64cae42f61a938520a35c9e436a1bf6c5c9c6afcd42ce -size 365881 +oid sha256:8ed754fd3b260ad6b4853553542112fb7758894426cad5761076bbafcf49e7b1 +size 366417 diff --git a/Articulated_objects/household_items/pump_bottle/pressure_pump_14/model_pressure_pump_14.usd b/Articulated_objects/household_items/pump_bottle/pressure_pump_14/model_pressure_pump_14.usd index b654298f90eab3fca40fbf8973728ba4ee9203ff..e0ca942aa83945e3053a92ac08b125100f6950cb 100644 --- a/Articulated_objects/household_items/pump_bottle/pressure_pump_14/model_pressure_pump_14.usd +++ b/Articulated_objects/household_items/pump_bottle/pressure_pump_14/model_pressure_pump_14.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c25f0d60909d7e65e473a1eca41d9aceb21f5e77d6539b20c46f6bf5cc3beb6d -size 488412 +oid sha256:baa7dea9135d3a5fea0c0e4fb25647302fd7732dcb47d467c4fbc0cc836e3a83 +size 488952 diff --git a/Articulated_objects/household_items/pump_bottle/pressure_pump_15/model_pressure_pump_15.usd b/Articulated_objects/household_items/pump_bottle/pressure_pump_15/model_pressure_pump_15.usd index 4b16d49eaff4ad39e355721c185d83bfe8f15929..776fdbe361b65d3998076ff3a903d7ba3be0eb63 100644 --- a/Articulated_objects/household_items/pump_bottle/pressure_pump_15/model_pressure_pump_15.usd +++ b/Articulated_objects/household_items/pump_bottle/pressure_pump_15/model_pressure_pump_15.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5585bc401c9c6ba62a3888c781042514cbb27c51a6eff2669c1d37a1896d045a -size 483233 +oid sha256:6c166e82a5ef79d02e3a59d110d1faf5a45432e1b642bcb35e7e32a66604e694 +size 483768 diff --git a/Articulated_objects/household_items/pump_bottle/pressure_pump_2/model_pressure_pump_2.usd b/Articulated_objects/household_items/pump_bottle/pressure_pump_2/model_pressure_pump_2.usd index e93fb2834a21e7e310cf89a7c2ffda9d6a62ca06..1cd71beb4b7de21787948032ae03505bb32aaca5 100644 --- a/Articulated_objects/household_items/pump_bottle/pressure_pump_2/model_pressure_pump_2.usd +++ b/Articulated_objects/household_items/pump_bottle/pressure_pump_2/model_pressure_pump_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfc9b2982334a600efcb2141f9dd6b6d8595ad1cc0cc69b3a144f28b024595b -size 1117208 +oid sha256:f4676ca7e2f6d631afe58268acb11a5ea9770a3259f7414e13c7c5bb205f7e34 +size 1117812 diff --git a/Articulated_objects/household_items/pump_bottle/pressure_pump_3/model_pressure_pump_3.usd b/Articulated_objects/household_items/pump_bottle/pressure_pump_3/model_pressure_pump_3.usd index 1f3d5c6ce0c62da07c6c057dc812e2786feac500..5fdead1ed1fc84d852adc635c1d7a6debcf9723b 100644 --- a/Articulated_objects/household_items/pump_bottle/pressure_pump_3/model_pressure_pump_3.usd +++ b/Articulated_objects/household_items/pump_bottle/pressure_pump_3/model_pressure_pump_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef13b252d614ab6559f8217f8eb91fde46d0cdee0ce50ffb4cb229abf14894d0 -size 306756 +oid sha256:04bf3ed9c279fb5b24e5eceef2cac1bbb3c15d21b7010967acae31aa5f186e3e +size 307302 diff --git a/Articulated_objects/household_items/stationery/folder/file_12/model_file_12.usd b/Articulated_objects/household_items/stationery/folder/file_12/model_file_12.usd index d13002a0ffb47006ebc6c724384ae583d2d21447..48c03ca29770b3714d6dd3c099ef87814304da0b 100644 --- a/Articulated_objects/household_items/stationery/folder/file_12/model_file_12.usd +++ b/Articulated_objects/household_items/stationery/folder/file_12/model_file_12.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89ee55d0179e5f366120aca22aad92bcdfc3eb470b8977a8e1f9f4756d8ac595 -size 9371 +oid sha256:346d6f88339099d02b512c7ba26c8956cfcee9eda7c395005e52c3ec9354bc9e +size 9752 diff --git a/Articulated_objects/household_items/stationery/folder/file_7/model_file_7.usd b/Articulated_objects/household_items/stationery/folder/file_7/model_file_7.usd index d81d87818a6acf29836fead5ee7a39b43138cdec..2990d6200707f350e2ac235b2ac1e1ef38a308f6 100644 --- a/Articulated_objects/household_items/stationery/folder/file_7/model_file_7.usd +++ b/Articulated_objects/household_items/stationery/folder/file_7/model_file_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca3d9a74e766cabe143ba2d6291e6628032f0557e58872f8a0d35167e49c394 -size 8056 +oid sha256:fecc302a2eeace195e46a2b400bc7c36ca6b62d04755c47c36a37eab8d5d49f5 +size 8439 diff --git a/Articulated_objects/household_items/stationery/folder/file_9/model_file_9.usd b/Articulated_objects/household_items/stationery/folder/file_9/model_file_9.usd index fea3cf67bfd8a07403e625b3b09e6fd20cd4f2d6..265836ae3de15511ff0d42bb6b24013f19713dee 100644 --- a/Articulated_objects/household_items/stationery/folder/file_9/model_file_9.usd +++ b/Articulated_objects/household_items/stationery/folder/file_9/model_file_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:672d19db2a0eab370308f099bc885d068f5a9c571f99ec0afd4d299b9e05d1f8 -size 8369 +oid sha256:e6b34cb7fbc64f29e1e7645b8de2dc6bb4af3730c8786af19ccfe8bebae83daf +size 8740 diff --git a/Articulated_objects/household_items/stationery/folder/folder_2/model_folder_2.usd b/Articulated_objects/household_items/stationery/folder/folder_2/model_folder_2.usd index 43d4a658530dce935f106055bd1c1701a9730319..43f2da58ed4277a08501d19b6518a4ae3d60b543 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_2/model_folder_2.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_2/model_folder_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bde853d3abc96e10866241209fc7d1f2e518bdb71915a7456c9899cc711e54a2 -size 54541 +oid sha256:72d9c91f6ce351f6650b735928ab1ff203835993d2bd17e455d018d6771482ca +size 55241 diff --git a/Articulated_objects/household_items/stationery/folder/folder_20/model_folder_20.usd b/Articulated_objects/household_items/stationery/folder/folder_20/model_folder_20.usd index bbcb2164364af8161ab08ceb1d1ef7894b4d18c8..798fa28065c8ed0fcf5cf0dc47d9fae8ba07ac95 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_20/model_folder_20.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_20/model_folder_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5121dd486a9c823019cd1a1963c4960a94b951c558119cc03aaf1006c9d73852 -size 845470 +oid sha256:b4bb8df5012e7d4cbfaa6459abbd966d95689660eeec33b292bb7d7033d735a2 +size 846080 diff --git a/Articulated_objects/household_items/stationery/folder/folder_21/model_folder_21.usd b/Articulated_objects/household_items/stationery/folder/folder_21/model_folder_21.usd index b8c77f7f1d37ba04f996bf51f671bbdd3ab1f9f8..a38e8c24cc75658d7f4bb1fcd83aca49467bd93d 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_21/model_folder_21.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_21/model_folder_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a13400c51074b798392df5260c0ad298caeef9051b7ed346af94cc882bd3ed56 -size 100227 +oid sha256:dbd384ead9b6bea9a099daf76b190114e93262dc2640cc0e181fc9fcae1b050d +size 100724 diff --git a/Articulated_objects/household_items/stationery/folder/folder_22/model_folder_22.usd b/Articulated_objects/household_items/stationery/folder/folder_22/model_folder_22.usd index 1858d0264d0402b2f4507d410d1db048210c4be1..15f8a76fab96acd859337e01c8ac6ccd645294e2 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_22/model_folder_22.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_22/model_folder_22.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc3b9736d2b4a4458ba11f64d1c3849238bf0b5baeb0fe6de3cf2123ac6b0a47 -size 5781626 +oid sha256:c75538687a7ff6a81e07d9c4911930992f30cf0db1827162918c8207c2368963 +size 5782432 diff --git a/Articulated_objects/household_items/stationery/folder/folder_23/model_folder_23.usd b/Articulated_objects/household_items/stationery/folder/folder_23/model_folder_23.usd index 13dd08cab3e60e29aab70d94a03425714bcb8202..7e641a31fb2fc68f4695d52d2a65735eeda65de8 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_23/model_folder_23.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_23/model_folder_23.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd7928540d5022d039481ed1c33ea1aee29fde093845795d5226a502d54e2ad9 -size 447835 +oid sha256:5cf60dca2a41eb63fefb28e987d1a713e5b9287ab1e49296106f65881a7fa848 +size 448560 diff --git a/Articulated_objects/household_items/stationery/folder/folder_24/model_folder_24.usd b/Articulated_objects/household_items/stationery/folder/folder_24/model_folder_24.usd index 83e6ff06db753ef68cad9b3d66a07f0f2d07671d..19db34424d11db06e60acede9a0d659748d88787 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_24/model_folder_24.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_24/model_folder_24.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88ab365e00e3798af09aeb4ff94105aae6e33c6baa0eb37cda7d171017c7c899 -size 34371 +oid sha256:3fdb8360fa6c61eb0c2a97494121dd876fc2aca3b5492c19d803526fc6440a6e +size 34912 diff --git a/Articulated_objects/household_items/stationery/folder/folder_25/model_folder_25.usd b/Articulated_objects/household_items/stationery/folder/folder_25/model_folder_25.usd index 67f5cb8edf50e4eb57fc1847dc3f360eb45babed..0c27ff7202ae078caba30f256bbb804ac357f7a5 100644 --- a/Articulated_objects/household_items/stationery/folder/folder_25/model_folder_25.usd +++ b/Articulated_objects/household_items/stationery/folder/folder_25/model_folder_25.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb4d1d2b54c02adaa20e2a16bc8a679e83e8fe413f7bb00ed0edde961ccfc2e4 -size 17622073 +oid sha256:c17b5d1494b9e356a6ad427715b16135a90c691d80acf01ec4d2a87542e6fd33 +size 17622771 diff --git a/Articulated_objects/household_items/stationery/knife/utility_knife_2/model_utility_knife_2.usda b/Articulated_objects/household_items/stationery/knife/utility_knife_2/model_utility_knife_2.usda index 064698198cce59d00878caa59e478c503497bc8a..b6e4f82772155e1a56f46d68d01a36605b3836f5 100644 --- a/Articulated_objects/household_items/stationery/knife/utility_knife_2/model_utility_knife_2.usda +++ b/Articulated_objects/household_items/stationery/knife/utility_knife_2/model_utility_knife_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760dd04e8f84e1d2d3b7a9b052139231e3b7dd38625bce427a241c3cd8e30e48 -size 8414 +oid sha256:46ae31d4436be2893e38ccfc92704a5e0a4d6a5759458c5deb1284a2e3771050 +size 8116 diff --git a/Articulated_objects/household_items/stationery/knife/utility_knife_3/model_utility_knife_3.usd b/Articulated_objects/household_items/stationery/knife/utility_knife_3/model_utility_knife_3.usd index 45304048e21c8fac940bad078df0bfdcaf6da065..2ce0a904ccf8ebd31c173f35ee5e8a32cb661fd6 100644 --- a/Articulated_objects/household_items/stationery/knife/utility_knife_3/model_utility_knife_3.usd +++ b/Articulated_objects/household_items/stationery/knife/utility_knife_3/model_utility_knife_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b82e04b4bf3dec708e75c925ef1df36245bacc22ea8a7f6dfec8c43fe9964a47 -size 8291 +oid sha256:daac7d6509bb79f63eff8474c57b6aa3c444f87fb73e43e0bc315591ea11db41 +size 8667 diff --git a/Articulated_objects/household_items/stationery/knife/utility_knife_6/model_utility_knife_6.usd b/Articulated_objects/household_items/stationery/knife/utility_knife_6/model_utility_knife_6.usd index 016d50458fbf5bd61bb24ce64d2e9decbc7e7c6c..8ba63ba56fc18bcc7ed6ed839b6030be7fa290ec 100644 --- a/Articulated_objects/household_items/stationery/knife/utility_knife_6/model_utility_knife_6.usd +++ b/Articulated_objects/household_items/stationery/knife/utility_knife_6/model_utility_knife_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7742bb9bcc0f975d1f5db78b957c4a3eece93c3857fa8f090c867f334a8d1c59 -size 8212 +oid sha256:0f0d96fffb527c23c6912ed90f8944b03113dda36dcd9e45e43de597928c282e +size 8607 diff --git a/Articulated_objects/household_items/stationery/knife/utility_knife_7/model_utility_knife_7.usd b/Articulated_objects/household_items/stationery/knife/utility_knife_7/model_utility_knife_7.usd index d3d0656ed79d2bab508b4cdf84505e4f0a088741..d48e70eee281145fc1c1c29a6521f8d5860f07a9 100644 --- a/Articulated_objects/household_items/stationery/knife/utility_knife_7/model_utility_knife_7.usd +++ b/Articulated_objects/household_items/stationery/knife/utility_knife_7/model_utility_knife_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a95ec4228052accb114cea0a995ec5f234a337c15a22e868528ea9c6af60c500 -size 8572 +oid sha256:28c91ec6010965531d54866e59c290a4f5eb8ca8d92981c99adb236b9d32c680 +size 8942 diff --git a/Articulated_objects/household_items/stationery/knife/utility_knife_8/model_utility_knife_8.usd b/Articulated_objects/household_items/stationery/knife/utility_knife_8/model_utility_knife_8.usd index 0140d53e19363491bc741695a5583266c9c765ed..c15e218ff0138471ebe87213797fc6be86643623 100644 --- a/Articulated_objects/household_items/stationery/knife/utility_knife_8/model_utility_knife_8.usd +++ b/Articulated_objects/household_items/stationery/knife/utility_knife_8/model_utility_knife_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:009b09b87ff13736abb981e06a8d28953b38e3de577c4d433b8cbbec5daf210f -size 8664 +oid sha256:8800d6634cef2bbb5b9b8c7afa236b3bde7d9c2a3322a58efe54bc5f008db0de +size 9062 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.collect.mapping.json b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..a4fa93ddb23b0c6bf13619b1e2c719ef05c8098a --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.collect.mapping.json @@ -0,0 +1,11 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_shelf/Users/jujux/AppData/Local/Temp/647eb8bbfa03a82e/textures/T_BR_01_YRZ_HTT_XP01_01.png", + "source_hash": "2c0094930e9a7931caa95cee9b861ce5fceba6f9", + "target_url": "./Users/jujux/AppData/Local/Temp/647eb8bbfa03a82e/textures/T_BR_01_YRZ_HTT_XP01_01.png", + "target_hash": "2c0094930e9a7931caa95cee9b861ce5fceba6f9" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.thumbs/256x256/shelf.usd.png b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.thumbs/256x256/shelf.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..2983b559132e9e7cdea58d0f41295e841bc57fdf --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/.thumbs/256x256/shelf.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:359573821d1c9f41eddb09fd21960e1d177f9315ded73260a7c129a964cd21e9 +size 35310 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/Users/jujux/AppData/Local/Temp/647eb8bbfa03a82e/textures/T_BR_01_YRZ_HTT_XP01_01.png b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/Users/jujux/AppData/Local/Temp/647eb8bbfa03a82e/textures/T_BR_01_YRZ_HTT_XP01_01.png new file mode 100644 index 0000000000000000000000000000000000000000..a683433baa106bb34a084b04b9cf0f902f8c06ee --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/Users/jujux/AppData/Local/Temp/647eb8bbfa03a82e/textures/T_BR_01_YRZ_HTT_XP01_01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:344112ac0e554318d78232e561b8799eb84bb84fbf7bcd514388ee57ccf76533 +size 2380 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/shelf.usd b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/shelf.usd new file mode 100644 index 0000000000000000000000000000000000000000..ff5ef355c80e033988abe4fa770395317d310aa0 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Collected_shelf/shelf.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3133148d6defeee811ba14e43d71eca12cfc42ed06ba4bef6d71829c6ad6e185 +size 101029 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/.thumbs/256x256/model_Letter disk.usd.png b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/.thumbs/256x256/model_Letter disk.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..ea06b514b2958cfa63e0e9c09bbb4655e56f91b6 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/.thumbs/256x256/model_Letter disk.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2267df44e429bf0f7a35b244c77c7102da4127e0bbd7377a0568474b8e01b45e +size 31680 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/model_Letter disk.usd b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/model_Letter disk.usd new file mode 100755 index 0000000000000000000000000000000000000000..9d985a22e1c35ed04930ef67d07fef5b6e407296 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/model_Letter disk.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6a8c8fd7eba64f7957d946701ca8e31c1f934d5f6a505249e26368ac23053f9 +size 7985 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/img/7df90e190f37b7bdde73e9329f1c9ecd.png b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/img/7df90e190f37b7bdde73e9329f1c9ecd.png new file mode 100755 index 0000000000000000000000000000000000000000..a3f81b238afdd5e3fe600d590277e75db1cb4e30 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/img/7df90e190f37b7bdde73e9329f1c9ecd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:936e9f4441b68e6dae0e25b2abe0caff084da9072dbf6ff91337d39aa1cea675 +size 18411807 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/material.usd b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/material.usd new file mode 100755 index 0000000000000000000000000000000000000000..d96d2aceb3f9433aab206c0f69d34d08abfd7c43 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae648cb145c89a5a12750d70c6a76b5b8c7e5ad90d514137987fca0b6f021780 +size 2141 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/element_path.json b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/element_path.json new file mode 100755 index 0000000000000000000000000000000000000000..519b3a5eed7a3c3a206538e443a7f3706526e464 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/element_path.json @@ -0,0 +1,7 @@ +{ + "4": "/root/E_body_4", + "72": "/root/E_tray001_72", + "80": "/root/E_tray002_80", + "81": "/root/E_tray003_81", + "82": "/root/E_tray004_82" +} \ No newline at end of file diff --git a/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/link_0_0.usd b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/link_0_0.usd new file mode 100755 index 0000000000000000000000000000000000000000..19fc9c9b9dd4ece43eae8590dc437f5b1bf06865 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Letter disk/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4b33ed55ae1f3f0e021e1415a9702cca4378d2367221325060e8f3550997775 +size 2047755 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/.thumbs/256x256/model_Storage box01.usd.png b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/.thumbs/256x256/model_Storage box01.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..742a907106afb038b124fad54eedbe5cf94d82ca --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/.thumbs/256x256/model_Storage box01.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d657f0812a91a6615779f4c511e78816dada0162ac7c4347e5bec034065a4a +size 35080 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/model_Storage box01.usd b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/model_Storage box01.usd new file mode 100755 index 0000000000000000000000000000000000000000..e3f61f848cda72fcfb1df0b741b3efe84d03b583 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/model_Storage box01.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:467156cbb584ce51434ff417b23ee347f00f0525cee762b1d98feb80e0e4afc2 +size 11381 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/73ecb122bf1bd59f21b0d82b76fada1c.png b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/73ecb122bf1bd59f21b0d82b76fada1c.png new file mode 100755 index 0000000000000000000000000000000000000000..96e366dfe9e7bd18a4a96ea9c0dc53ee569fa4f2 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/73ecb122bf1bd59f21b0d82b76fada1c.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5097b16f17f34a5fc34845f2d6054cc9f0e9f5041b75718ee76734838a9f3749 +size 202311 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/ebeca3735fd69c802c885c1df6ab1590.png b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/ebeca3735fd69c802c885c1df6ab1590.png new file mode 100755 index 0000000000000000000000000000000000000000..a4581717c3323d6d1b1ccf93b956d3a926e14273 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/img/ebeca3735fd69c802c885c1df6ab1590.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a013497afa4cb40ac120ca6df5f6272933e97ff0c785180fa3e55479922d0b1 +size 18389 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/material.usd b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/material.usd new file mode 100755 index 0000000000000000000000000000000000000000..86d4fc938e0b5bb09d4b337a1e4a14445aa85161 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12605896492d355357742904a605c72154b1cb53c3dbd783720e28d6857626e1 +size 2291 diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/element_path.json b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/element_path.json new file mode 100755 index 0000000000000000000000000000000000000000..46563ccc293906ee04b82a3b5e0ba63c06b78ac2 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/element_path.json @@ -0,0 +1,8 @@ +{ + "12": "/root/E_body_12", + "16": "/root/E_body_12/E_parts01_16", + "58": "/root/E_tray01_58", + "71": "/root/E_tray02_71", + "72": "/root/E_tray03_72", + "73": "/root/E_tray04_73" +} \ No newline at end of file diff --git a/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/link_0_0.usd b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/link_0_0.usd new file mode 100755 index 0000000000000000000000000000000000000000..56c134d1363d098cfdadebeb8d242ede8dd6b995 --- /dev/null +++ b/Articulated_objects/household_items/stationery/letter_tray/Storage box01/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23bdc27bff45c92d4ce2d57ac045145d391f703558dfecaa63e47abbbb028b98 +size 5132197 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_16/model_scissors_16.usd b/Articulated_objects/household_items/stationery/scissors/scissors_16/model_scissors_16.usd index c16aecb52abef820462297d50fc0542902ceca4d..d0d2b10a0573be613187d4af98f587fed8c9acbe 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_16/model_scissors_16.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_16/model_scissors_16.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:586ae2c1f83a4c8b9b1299db1135a88e1198d782940d386306f71cc305125172 -size 275036 +oid sha256:00439cc2330ef934254f265338bf99a50a4c8f08ff1a18dc3ed0c097cbcf2912 +size 275672 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_17/model_scissors_17.usd b/Articulated_objects/household_items/stationery/scissors/scissors_17/model_scissors_17.usd index 029a61876db191b85135b08a331e66379e52e8d7..04721aac3a018cc676a8aacdca14e8494ae95105 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_17/model_scissors_17.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_17/model_scissors_17.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31b7f4065880651b0822db0e15180f12730a16c429b5a7c221fb651fc80c87d2 -size 12028 +oid sha256:01957ff671a1378be887457506aa6e563bcca3652608c8a7e20d4cad81fbab7b +size 12436 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_18/model_scissors_18.usd b/Articulated_objects/household_items/stationery/scissors/scissors_18/model_scissors_18.usd index 155dd5c6ded0e795f541a0fd2bc092dc486db643..169a7dc1ec9b24add9ae632b7ae8a12038cd808d 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_18/model_scissors_18.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_18/model_scissors_18.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca02dfab3cf2d22b1c86e7ae025317e236fdcf9c7c45d347a708b8ddae509a4 -size 11231 +oid sha256:7e2cec914272c2238772511190d4ca8ef1dec2714f69ab2e8f33650813fdcc8d +size 11712 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_19/model_scissors_19.usd b/Articulated_objects/household_items/stationery/scissors/scissors_19/model_scissors_19.usd index e87f542f0fbea0e7a969e887a820cdc1fb5532ff..2274413febb20cf4c2e56d523c8afcb3b2f946f1 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_19/model_scissors_19.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_19/model_scissors_19.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf283f61bcd5d94e8277e355db007192c38240eecd8e2eeb63240b2b0339d94d -size 11685 +oid sha256:89a98a3bb5b8eee303a0683106dc3af051a90311e7edf5bc91f21a4c37de1169 +size 12081 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_2/model_scissors_2.usd b/Articulated_objects/household_items/stationery/scissors/scissors_2/model_scissors_2.usd index 4626c5819e8d76a4125395113e204e008596c0fc..5b3ba667d3de16bde91d17667c90894471ce36d3 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_2/model_scissors_2.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_2/model_scissors_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb8aec70d8b136cdf3b86171c0243c416c5603eefc7ccc5472bf7bf72130fd1d -size 9528179 +oid sha256:7b11500e746425dfbf8a3d5b264dcb382819ee1981c03be483bbd67507c8932f +size 9528760 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_20/model_scissors_20.usd b/Articulated_objects/household_items/stationery/scissors/scissors_20/model_scissors_20.usd index 037e3882db9e5af7a1aebe489cb4795c09add98e..50e818c1a39ecc9ef7d75b4af7604c7581ddee61 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_20/model_scissors_20.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_20/model_scissors_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d52207d7a138366a943fbfe7ac23847d6b27824cf890f9de4e6e42eb3fa56992 -size 10715 +oid sha256:351cdba8fee36a8ea1876e57228e5ae27522a0e4f713567e87a1cb6e6f737c4a +size 11122 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_21/model_scissors_21.usd b/Articulated_objects/household_items/stationery/scissors/scissors_21/model_scissors_21.usd index 393c5f80871a5667fbc5f1afbed91113434eb4b7..3807fb64cde01686ea232bd1c004f6e0f18d2674 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_21/model_scissors_21.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_21/model_scissors_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f438bcffcbb3e0515542b39e5d4dd7953557eabac49ffe747f6bfeac2a4ad24c -size 9194 +oid sha256:f1afc3d94b8844ec21788d1052a1e6a9e2d0ded5045c5ef936399fb4193a5566 +size 9602 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_22/model_scissors_22.usd b/Articulated_objects/household_items/stationery/scissors/scissors_22/model_scissors_22.usd index de9d22069fb94371535bb5755fde2321c7c1c45d..176d5ccc3a222fed407ad77e55a12d45a704a9a8 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_22/model_scissors_22.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_22/model_scissors_22.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9b41f3c35e9b57c32a54a17c3a106204394a0ca8081015b873f4213d04d976c -size 10458 +oid sha256:59ca292f0104c4c1689f1d29bd0b2d123d2539344524c96f06620cb744918693 +size 10891 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_23/model_scissors_23.usd b/Articulated_objects/household_items/stationery/scissors/scissors_23/model_scissors_23.usd index 4fb080bf6a23f3483b751418a2675373ed20e7a5..8cdf6e0f96e99aeb2a06fc4b95a300e222a0bfcb 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_23/model_scissors_23.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_23/model_scissors_23.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8f06b6c0e8cf68e40227ce4f4ddf5d020eff844db7b24079be1f54f090c87ed -size 9610 +oid sha256:b24bd3a2437ab64840ae246c449c6429c63cf6ea9f3292ab7e64ee0ef0d1ca98 +size 10103 diff --git a/Articulated_objects/household_items/stationery/scissors/scissors_3/model_scissors_3.usd b/Articulated_objects/household_items/stationery/scissors/scissors_3/model_scissors_3.usd index e4427fa01338a9829cc375304472dfadd9d91df5..101454f4d5d9da83ed405c0262e21d3920589f2c 100644 --- a/Articulated_objects/household_items/stationery/scissors/scissors_3/model_scissors_3.usd +++ b/Articulated_objects/household_items/stationery/scissors/scissors_3/model_scissors_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c38be2bc91239e2bc3d2a4a83a54fd5283ce0598b9c83af0b1a08c4776e3cbd -size 759667 +oid sha256:9091eab25ddf711e02895fcdcd79382d063e550d3a22b4b747445db42e038112 +size 760202 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_1/model_stapler_1.usd b/Articulated_objects/household_items/stationery/stapler/stapler_1/model_stapler_1.usd index 2d3646b24aa84d597104b37ea69bea2c3665a2b8..5e66e5d337cd94481d94fccc395d04a8152419bd 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_1/model_stapler_1.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_1/model_stapler_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:708579cbdc8ebd55d5e59e0b2be301c7085234e4c41c1a5b51e55beae4b6409f -size 12435 +oid sha256:4fbd0ec4b41c3887a38613b5858a9e666d201d1bdddd6cf7bf710c240d1ac5fe +size 13122 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_1/resource/v_0/link_default_0.usd b/Articulated_objects/household_items/stationery/stapler/stapler_1/resource/v_0/link_default_0.usd index 8c276f2e064e41a0e0297e348a6143dd4bb36b92..0d19cfe45d4af961e600d0e67543e10eee66dd96 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_1/resource/v_0/link_default_0.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_1/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d3074d8fab7ea894f826e8db537f4ca18957211c679432f72642a3ede62ba0 -size 11420028 +oid sha256:647bf40952ca98aea26de7bd59ddbd2a9e0f62fdc28e4ca5bf2d7c606b16a244 +size 11420473 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_21/model_stapler_21.usd b/Articulated_objects/household_items/stationery/stapler/stapler_21/model_stapler_21.usd index 4a8eef913fa35dc1b7b560b91727a0f347461d40..e88ce93517f679d968853ad5addbd6b6987584dd 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_21/model_stapler_21.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_21/model_stapler_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5ee845397a6bab20570a32b7c933505ffb1df659ed8a8509626c73cf2915ae7 -size 2615211 +oid sha256:72cf1c23a4e81cc22489cc021a0f0bdca322dfbc1fea2d89027fb50b57b7fa25 +size 2616565 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_21/resource/v_69323/link_0_0.usd b/Articulated_objects/household_items/stationery/stapler/stapler_21/resource/v_69323/link_0_0.usd index 34b78f77043aa90d409f7b6418daa4a25838a094..3e37176926e65531079b081e9db35cbcf563236f 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_21/resource/v_69323/link_0_0.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_21/resource/v_69323/link_0_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e86b96ea77269a92fb322068943b73e0daa0575e31b5acf7c6fc76d0083feb -size 3610998 +oid sha256:835e6ffd87cbae14ad629b4ea2e0f3dc925b2bab298635bbeec85b4b5d0e9b04 +size 3612181 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_4/model_stapler_4.usd b/Articulated_objects/household_items/stationery/stapler/stapler_4/model_stapler_4.usd index bea1d7187a91a3a80d95592854c259391abb5d9a..4e54cae09dcaf804a910029c11ca5b5c2439c868 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_4/model_stapler_4.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_4/model_stapler_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db7a98ff11d431c644824b8df0d6d0f371183422423463b3b3f5f4785fe333a3 -size 18770 +oid sha256:72787fad8ed7015927fa04fde08e4d0ed2c004d9a84afed2879a752fca2faae7 +size 19558 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_4/resource/v_0/link_default_0.usd b/Articulated_objects/household_items/stationery/stapler/stapler_4/resource/v_0/link_default_0.usd index e0f4496726b596c203e47ea532d4278abb9d47a5..f0f11afb8a1c9d9c0962ebe8c3db0c0b0eeec8c7 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_4/resource/v_0/link_default_0.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_4/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:592837bcc46f56b216e9559885b69a02070cc7931bf1752964b310d893418e3e -size 16472134 +oid sha256:d487deefb79814cacc5ab17f8411eadcbe2e94b5d4a09354deb1fef2144f5397 +size 16472554 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_5/model_stapler_5.usd b/Articulated_objects/household_items/stationery/stapler/stapler_5/model_stapler_5.usd index 5d0d9a4d8d727800895cb3ea5ba6c0b6e66639c0..49ec7389408e52a50242d20df092ea7187dd7f01 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_5/model_stapler_5.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_5/model_stapler_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f133ab8d2e04fd3b0ff31a6001d183371907bcae82705950bdb0b6e919de3800 -size 15953 +oid sha256:89ace42f31b79e0f5ee6a3a70c97894d8ea42ba433cc39aa1e018f888d91100a +size 17070 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_5/resource/v_0/link_default_0.usd b/Articulated_objects/household_items/stationery/stapler/stapler_5/resource/v_0/link_default_0.usd index ba5c4dad7c7f8b0c2e1ba19d1be63331df06e7e5..1f15ddbff0dd6ed3a66ee426c1681998edb71ad6 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_5/resource/v_0/link_default_0.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_5/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2859d208f7ab48656a561cf5bc1d80fe99d4ed4f1bd6c7b1bbe6d2e64df05790 -size 31201100 +oid sha256:de49e5932d24c0ff36ec9a6ff77b94b7c9bad3ac730870c85184ce346b86bcd7 +size 31202990 diff --git a/Articulated_objects/household_items/stationery/stapler/stapler_6/model_stapler_6.usd b/Articulated_objects/household_items/stationery/stapler/stapler_6/model_stapler_6.usd index 0a48fbffd31d0aa26914b5a48c2c4d89426cf0a9..6034caae14c7a2553990d9da415c1d2a05617048 100644 --- a/Articulated_objects/household_items/stationery/stapler/stapler_6/model_stapler_6.usd +++ b/Articulated_objects/household_items/stationery/stapler/stapler_6/model_stapler_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5d8121cf6f23f52e00bb00c7aa2e9de74f64dbcf703ebf9db780297ff94484c -size 12849 +oid sha256:6e68a9988db184ef5ec7b6fd10b39bd390cc6483aeda956f07a414689ea97bef +size 13518 diff --git a/Articulated_objects/household_items/tongs/tongs_10/model_tongs_10.usd b/Articulated_objects/household_items/tongs/tongs_10/model_tongs_10.usd index ca77227f135c739e3a1c07ce6e2e733cfcce3a1c..327c2a4c47a4a7a5b9b9fb5c773270ec217c7a04 100644 --- a/Articulated_objects/household_items/tongs/tongs_10/model_tongs_10.usd +++ b/Articulated_objects/household_items/tongs/tongs_10/model_tongs_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3545f36b0995f18e765404bfda84979139b04a11a1386c15b2c2cb76dce48087 -size 12363 +oid sha256:f9765967069c2b5b0ec661c0e23cb836a767f670154428805ff1a0305271af8f +size 12806 diff --git a/Articulated_objects/household_items/tongs/tongs_2/model_tongs_2.usd b/Articulated_objects/household_items/tongs/tongs_2/model_tongs_2.usd index a6c910fcf91d49bd5734009f89d0005650c858bb..9b22b1d92e8b5f0e59f48c0412b3bcd232e9d3dc 100644 --- a/Articulated_objects/household_items/tongs/tongs_2/model_tongs_2.usd +++ b/Articulated_objects/household_items/tongs/tongs_2/model_tongs_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6294713117b9b618ccfb1bacd48c050d338a203da98a753f55496bdb91bfbe8b -size 13349 +oid sha256:acff6021e53e5bd0dd64b161048bbd4709f5be40d27e359781526e23d1431a6b +size 13806 diff --git a/Articulated_objects/household_items/tongs/tongs_20/model_tongs_20.usd b/Articulated_objects/household_items/tongs/tongs_20/model_tongs_20.usd index 7cbc93a2ae6a9c1823ed323b79235c8a91c0b06e..c9326721d87f5a7c3860ff50f55cbdbfa3c6d839 100644 --- a/Articulated_objects/household_items/tongs/tongs_20/model_tongs_20.usd +++ b/Articulated_objects/household_items/tongs/tongs_20/model_tongs_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fbb19f0991effc3e5c9cde0c86fe55ed2da5668fd46c5d3a75c569590be91d7 -size 2554675 +oid sha256:f83903b089b476d4e26c55ec1ce89f38c8c4426712001a7cfb3ea7f1ab79f366 +size 2555543 diff --git a/Articulated_objects/household_items/tongs/tongs_3/model_tongs_3.usd b/Articulated_objects/household_items/tongs/tongs_3/model_tongs_3.usd index 7850cf0cef77fff2abf1403efda0f1351b4c2ca3..69a23f4b2342ec3015c6a761db89c8d5fc644361 100644 --- a/Articulated_objects/household_items/tongs/tongs_3/model_tongs_3.usd +++ b/Articulated_objects/household_items/tongs/tongs_3/model_tongs_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3e14bf7b797749ce09168bc65a1bd2f005b4e56fd3b1d8868473c0a7174b9a2 -size 12403 +oid sha256:0bc829b1a07a354f41fba4b08d3c43e7040d0f0dcb14fd395969e8693fc72668 +size 13008 diff --git a/Articulated_objects/household_items/tongs/tongs_9/model_tongs_9.usd b/Articulated_objects/household_items/tongs/tongs_9/model_tongs_9.usd index 5f8c976128bc61c902d7c5df8c746303cee53689..8a22de2a276670f5e72e22e17413d83c418e2107 100644 --- a/Articulated_objects/household_items/tongs/tongs_9/model_tongs_9.usd +++ b/Articulated_objects/household_items/tongs/tongs_9/model_tongs_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce240500ae72508a71fcfed945e382f759b6b529b05e90da4e3be5a77dd9daae -size 10776 +oid sha256:f0fab8073938e435a1c0d3cb27ca2c8365ff1d0b699af200d8eaf168d329ea20 +size 11231 diff --git a/Articulated_objects/household_items/toolbox/clamshell _tool_box_2/model_clamshell _tool_box_2.usd b/Articulated_objects/household_items/toolbox/clamshell _tool_box_2/model_clamshell _tool_box_2.usd index fac34aa09dfd9ed07d333ddd75f764313182426b..01a20d632815d1a164b6375cab847d203d3fd74c 100644 --- a/Articulated_objects/household_items/toolbox/clamshell _tool_box_2/model_clamshell _tool_box_2.usd +++ b/Articulated_objects/household_items/toolbox/clamshell _tool_box_2/model_clamshell _tool_box_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08e21a75891a6bbd7cc040aa2f61d562c5d2df768b349e1ab9109680c67c3e5d -size 70318 +oid sha256:01d89868f1a97afcae76b967c85f8dc4404c830be85c81271b1f3e35165fe53c +size 70869 diff --git a/Articulated_objects/household_items/toolbox/clamshell _tool_box_7/model_clamshell _tool_box_7.usd b/Articulated_objects/household_items/toolbox/clamshell _tool_box_7/model_clamshell _tool_box_7.usd index f1454cfbde17b5f1d013db1428996505a20d12c3..f6ed4ac0731a81504b35e7c565195ffb314f9309 100644 --- a/Articulated_objects/household_items/toolbox/clamshell _tool_box_7/model_clamshell _tool_box_7.usd +++ b/Articulated_objects/household_items/toolbox/clamshell _tool_box_7/model_clamshell _tool_box_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b131789229c22a887a950f26c2f899b589c2bec50feedce5f5f30598c83a95e -size 147200 +oid sha256:fe17fc4198364bd3177917ab714fef6dc8204a34b139e780121e580e1c24001a +size 148050 diff --git a/Articulated_objects/household_items/toolbox/clamshell _tool_box_8/model_clamshell _tool_box_8.usd b/Articulated_objects/household_items/toolbox/clamshell _tool_box_8/model_clamshell _tool_box_8.usd index f6be8e31bfcacebb1317d959626e47752768a0dc..e6a76147a0fb8e018ebd28a964053d2ca255ca2d 100644 --- a/Articulated_objects/household_items/toolbox/clamshell _tool_box_8/model_clamshell _tool_box_8.usd +++ b/Articulated_objects/household_items/toolbox/clamshell _tool_box_8/model_clamshell _tool_box_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6a34e30a2a0e79e3533407e93ae13fa50d66fb61aa6b256ff3743195fcee508 -size 2878620 +oid sha256:8bbca78c3c3398310c85b34f8ca06dba7130dc9cfe9cfdfe0ebeba2da590195c +size 2879300 diff --git a/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/model_clamshell_tool_box_1.usd b/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/model_clamshell_tool_box_1.usd index 3e9884bfc326e57c8a8e9f2050084c77b743621e..4a20b22542b2c975841ff60e71dd3ff9daa0d1cf 100644 --- a/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/model_clamshell_tool_box_1.usd +++ b/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/model_clamshell_tool_box_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e60cfbbffb5d4fe402af8c8f8cda23567e491ba7d6c2c65247d0fc55a35bb391 -size 12512 +oid sha256:60f9d31874e506fbad3cc00627cfb391ac7cea1c2a059c414a989e33a8c41302 +size 13265 diff --git a/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/resource/v_0/link_default_0.usd b/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/resource/v_0/link_default_0.usd index 42d4feea2d2c75163b3da5ebf3a4eac53eadfb50..1066a8c20a15101154f71570c9d004b2667d67f3 100644 --- a/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/resource/v_0/link_default_0.usd +++ b/Articulated_objects/household_items/toolbox/clamshell_tool_box_1/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88796052317491ce51cbe875dfefcfe460654e330d43c4a2acee23ffae671487 -size 1081401 +oid sha256:99810d61b6dc99af83e208e454685161e99ccdf0273db86f85a349203c59b4b4 +size 1081782 diff --git a/Articulated_objects/household_items/toolbox/drawer_kit_10/model_drawer_kit_10.usd b/Articulated_objects/household_items/toolbox/drawer_kit_10/model_drawer_kit_10.usd index f7176e368557e8f55811bee43f17838bbe37a0ee..3646942978344b27ae4474f9186b08f138adbb0c 100644 --- a/Articulated_objects/household_items/toolbox/drawer_kit_10/model_drawer_kit_10.usd +++ b/Articulated_objects/household_items/toolbox/drawer_kit_10/model_drawer_kit_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1b49199b9198a2cac1a8693ff9c815d911fbc5d093f81eb858ae8ef07e3dc3b -size 78493 +oid sha256:3c08ccb7d73f4894d396fcdb14519110107bfd57300e26c95543facf8ad7a910 +size 79109 diff --git a/Articulated_objects/household_items/toolbox/drawer_kit_3/model_drawer_kit_3.usd b/Articulated_objects/household_items/toolbox/drawer_kit_3/model_drawer_kit_3.usd index cbc1ca3ddd42addb9215b54626089ab35a15bb1d..30a946ce3260c7e83fb998cd2a09bce9d0ea766e 100644 --- a/Articulated_objects/household_items/toolbox/drawer_kit_3/model_drawer_kit_3.usd +++ b/Articulated_objects/household_items/toolbox/drawer_kit_3/model_drawer_kit_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dc5f862a7567e1115cd9e9261be9fb99ac37dad959b9e1c1a231f1cbacce2e5 -size 25796077 +oid sha256:02c6efc030e62f971b706994c44dfdf92348bdc636f03a2e239852bf19b3bf3a +size 25797156 diff --git a/Articulated_objects/household_items/toolbox/drawer_kit_5/model_drawer_kit_5.usd b/Articulated_objects/household_items/toolbox/drawer_kit_5/model_drawer_kit_5.usd index 905bd853120bd3ca372be6ea0cf99da1d3d7d385..5f7aff196264290d98c9d799e00b4aeb252452f0 100644 --- a/Articulated_objects/household_items/toolbox/drawer_kit_5/model_drawer_kit_5.usd +++ b/Articulated_objects/household_items/toolbox/drawer_kit_5/model_drawer_kit_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19d1885ce77572796f07b357c8abfa652fbd2356f5059f5a4d5b0f141d9e090e -size 140194 +oid sha256:e1601f31829e68195cb702286244d4216bf96dd53d0eb126614bf02d6094eda4 +size 145220 diff --git a/Articulated_objects/household_items/toolbox/drawer_kit_5/resource/v_0/link_default_0.usd b/Articulated_objects/household_items/toolbox/drawer_kit_5/resource/v_0/link_default_0.usd index fde7ccfe95173f9f1f7e23004c8e2d86fca11532..ddd499ce249f3c02e42577340074386a1ece1597 100644 --- a/Articulated_objects/household_items/toolbox/drawer_kit_5/resource/v_0/link_default_0.usd +++ b/Articulated_objects/household_items/toolbox/drawer_kit_5/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c0b37b55272b6f2a92921947a80791cf3ad150b2d61a4325e1f149f85a41c18 -size 3825412 +oid sha256:f7b73756ab20f7336cbe7b73c1e1fd9599a9b290cc95e69f294ca40aa263de16 +size 3826352 diff --git a/Articulated_objects/household_items/toolbox/drawer_kit_7/model_drawer_kit_7.usd b/Articulated_objects/household_items/toolbox/drawer_kit_7/model_drawer_kit_7.usd index b48a215594f805dbe60b8b7ee6b20fd203b53ba7..3c4a18188d84c94972b5aa258d13b4e530d62d2c 100644 --- a/Articulated_objects/household_items/toolbox/drawer_kit_7/model_drawer_kit_7.usd +++ b/Articulated_objects/household_items/toolbox/drawer_kit_7/model_drawer_kit_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f14629d01f7869510bbd12755e66a9d315088d737a42530298b06c95e0937fd -size 1607081 +oid sha256:5d22a4497151919b76eb7c8408e8ae698381f1a68d632fedca8c7caaf13471e4 +size 1608378 diff --git a/Articulated_objects/household_items/trash_can/steping_dustbin_20/model_steping_dustbin_20.usd b/Articulated_objects/household_items/trash_can/steping_dustbin_20/model_steping_dustbin_20.usd index 70254d8e3b3e61eb5749c88ee03df4086de03f91..9792d3b5670228b8dba141aa17f3eed573253424 100644 --- a/Articulated_objects/household_items/trash_can/steping_dustbin_20/model_steping_dustbin_20.usd +++ b/Articulated_objects/household_items/trash_can/steping_dustbin_20/model_steping_dustbin_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f54270bb2d663f6fb485e801941388f2f9e26fd834d0814b2ccac68e0cfeef62 -size 3160368 +oid sha256:bbae8310cf67038e9bf0e8ecf22c1adcc6a8940a32cd2cb4a2174754cf4c8054 +size 3162670 diff --git a/Articulated_objects/household_items/trash_can/stepping_dustbin_16/model_stepping_dustbin_16.usda b/Articulated_objects/household_items/trash_can/stepping_dustbin_16/model_stepping_dustbin_16.usda index 86f0a572d25a4d0f8de2304b72e454df1584f4b9..e34dac43e285faf59d7b48d643cbdea1f88da172 100644 --- a/Articulated_objects/household_items/trash_can/stepping_dustbin_16/model_stepping_dustbin_16.usda +++ b/Articulated_objects/household_items/trash_can/stepping_dustbin_16/model_stepping_dustbin_16.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88dcd87e34954d84dcd1f736bf173885a359ab4c3fd94603f1f419a838b60d6b -size 8138 +oid sha256:3941e748147df7d3c0387ad4301a6dd7bb43f9b1376049b3dde3542844ce34a0 +size 7848 diff --git a/Articulated_objects/household_items/trash_can/stepping_dustbin_4/model_stepping_dustbin_4.usd b/Articulated_objects/household_items/trash_can/stepping_dustbin_4/model_stepping_dustbin_4.usd index 9438d65d014bea5dc1e8f92f250420db14e33c53..17edde310b9794295fa9e105902486ccab123fd4 100644 --- a/Articulated_objects/household_items/trash_can/stepping_dustbin_4/model_stepping_dustbin_4.usd +++ b/Articulated_objects/household_items/trash_can/stepping_dustbin_4/model_stepping_dustbin_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:342f1d9d5a2611e911dfbf82766084f94af7e3c2f2ad669b3855a83f704c5935 -size 8958 +oid sha256:2af252f1e95a3d0fe82f1dee8846a9ce3464442e81153deb0895aa4757a26532 +size 9433 diff --git a/Articulated_objects/household_items/trash_can/stepping_dustbin_6/model_stepping_dustbin_6.usda b/Articulated_objects/household_items/trash_can/stepping_dustbin_6/model_stepping_dustbin_6.usda index 0bc3d2d218f7fe22559da447b53ee784ffed0dbf..afd9701c37a67c33758e5bd55231ce85f884e14e 100644 --- a/Articulated_objects/household_items/trash_can/stepping_dustbin_6/model_stepping_dustbin_6.usda +++ b/Articulated_objects/household_items/trash_can/stepping_dustbin_6/model_stepping_dustbin_6.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f337abd71e88127768cb29dd2e50ad4fb51b748a623bb6ca10fb8a9d6c9fd9 -size 7411 +oid sha256:73cf110e5b5462d593a1e9854d8c52c2cbc09144065f7d648462dd48be83ca88 +size 7121 diff --git a/Articulated_objects/household_items/trash_can/stepping_dustbin_9/model_stepping_dustbin_9.usda b/Articulated_objects/household_items/trash_can/stepping_dustbin_9/model_stepping_dustbin_9.usda index 33cf74e647ed4d4d12456393398208d148ff7279..85f698395bed29d970f8ac5cdad3c5c0004efa71 100644 --- a/Articulated_objects/household_items/trash_can/stepping_dustbin_9/model_stepping_dustbin_9.usda +++ b/Articulated_objects/household_items/trash_can/stepping_dustbin_9/model_stepping_dustbin_9.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0acc33788fa47a08206b4fb4aa4eaac3c068f67f35a40255aef834e416dfe9ec -size 8956 +oid sha256:36ea79234fd4706413c91427676a92a7bacc0887dac8260bce3ad525c3cc6b2d +size 8568 diff --git a/Articulated_objects/household_items/trash_can/trash_can_1/model_trash_can_1.usda b/Articulated_objects/household_items/trash_can/trash_can_1/model_trash_can_1.usda index aae22ad6605f6c9033a9f4aa01f113858d94adf3..4df09d89afc1cbd3afb5707b335f5a373e4b5bd7 100644 --- a/Articulated_objects/household_items/trash_can/trash_can_1/model_trash_can_1.usda +++ b/Articulated_objects/household_items/trash_can/trash_can_1/model_trash_can_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3c803006f7a2e99ea32f04f77a485a5273e462497f46deba5064c52d7d3a810 -size 54361 +oid sha256:828c77184ac3e2166fd899a9bce218549e8e914b2d8f56901a99f10eb8408127 +size 54169 diff --git a/Articulated_objects/household_items/trash_can/trash_can_20/model_trash_can_20.usd b/Articulated_objects/household_items/trash_can/trash_can_20/model_trash_can_20.usd index b450811bdd1d3f5f330b2b42bb546d3d942df5ab..f5ce411e8ce9fccfc3da2c028deef4fff8d63b3b 100644 --- a/Articulated_objects/household_items/trash_can/trash_can_20/model_trash_can_20.usd +++ b/Articulated_objects/household_items/trash_can/trash_can_20/model_trash_can_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf3bdcb1315493a3ab48a84ad062b41d75f04bb6a13758eb47af8ec056251e8f -size 8856376 +oid sha256:9e8cc04aa3ca85bb81b340b9c236131901970e656f6eaf585f89bbd6ca1b6276 +size 8856880 diff --git a/Articulated_objects/household_items/trash_can/trash_can_21/model_trash_can_21.usd b/Articulated_objects/household_items/trash_can/trash_can_21/model_trash_can_21.usd index 0da9ab0dc0b98782581235a9673c1d3efa5c2464..21cf2704fb407e76ebe796552aa8127ae50100ce 100644 --- a/Articulated_objects/household_items/trash_can/trash_can_21/model_trash_can_21.usd +++ b/Articulated_objects/household_items/trash_can/trash_can_21/model_trash_can_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41c37221416b842c9a55ba944a09c6e8ccfbde99dd81a04e18a8507a8cce41fc -size 7252453 +oid sha256:4311cd0cddb72bb69704a51065dbb2f2362ac7ba1fcbb8eeec44b0bb8a50433d +size 7253020 diff --git a/Articulated_objects/household_items/trash_can/trash_can_22/model_trash_can_22.usd b/Articulated_objects/household_items/trash_can/trash_can_22/model_trash_can_22.usd index 1f5a434fe663f8c8b3b5b16db72475d0e76d86da..6111bebb095ef95e418ca79c2e5399a3ab3d9411 100644 --- a/Articulated_objects/household_items/trash_can/trash_can_22/model_trash_can_22.usd +++ b/Articulated_objects/household_items/trash_can/trash_can_22/model_trash_can_22.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f1e5d598be64ef3a3f7ffd9ea83d7ec2d0465533442f8389b2591545ef4ff8f -size 3658104 +oid sha256:cabc1d2b834fb3a83f169ddc39d3ec8994639ff8be6a51745bb19f1eb1499ee8 +size 3658706 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/.thumbs/256x256/model_pressthetrashcan1.usd.png b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/.thumbs/256x256/model_pressthetrashcan1.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..f4b9721337b83ff9512743e2624d4cec87d5eac8 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/.thumbs/256x256/model_pressthetrashcan1.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88c55f2d1d0c9be8b5d8d01d394c440010ccf362d92c81be6048671123ab7f20 +size 35185 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/img/2110c73b17f57a6f5df2d66bc2c31b44.png b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/img/2110c73b17f57a6f5df2d66bc2c31b44.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ad6af1ded9545f48da6676be138c3d27c76a23 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/img/2110c73b17f57a6f5df2d66bc2c31b44.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23c41b0321ea271c4be6ba9bc2ee237fb966dfa2bfbb8e90327fcc2563e4fca2 +size 496204 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/material.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..32b9a1c41ec5c04468d9a204eb64e8f8d93598ba --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2495949d8311a422d405fb7c91a2c48d8fc6bb636f92549643635b02252ef4d +size 2238 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/element_path.json b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/element_path.json new file mode 100644 index 0000000000000000000000000000000000000000..bb5ff8f3716d5e8b32d5524ee68ba3ed4da0f7ab --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/element_path.json @@ -0,0 +1,10 @@ +{ + "8": "/root/E_body_8", + "14": "/root/E_body_8/E_part03_14", + "19": "/root/E_body_8/E_part04_19", + "37": "/root/E_body_8/E_part01_37", + "43": "/root/E_lid_43", + "50": "/root/E_body_8/E_part05_50", + "56": "/root/E_body_8/E_part02_56", + "60": "/root/E_lid_43/E_part1_1_60" +} \ No newline at end of file diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/link_0.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/link_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..ceeb69051e6299661ec6bd82f1ecdde30c738763 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/resource/v_69323/link_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6f3143def9741740e8b11a61c27695baccef18cddebc3adebfc19f0c002c896 +size 1482511 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/trash_can_press_4f_001_T1.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/trash_can_press_4f_001_T1.usd new file mode 100644 index 0000000000000000000000000000000000000000..6c395cc32ceb0792362463f9d46983ea17f205f3 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_001_T1/trash_can_press_4f_001_T1.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25c2c4687b5b20a9a94c8e1e05378a41493d00c1966d54f24c32a96981661ba7 +size 65432 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/.thumbs/256x256/model_pressthetrashcan2.usd.png b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/.thumbs/256x256/model_pressthetrashcan2.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..78f4b7ca336a37ed22870dcfd4778646eeed9677 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/.thumbs/256x256/model_pressthetrashcan2.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2727fda814e21310823bc8617924f038b6672d8fe197e88e9a3641c6c76a00d8 +size 36688 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/img/a2c3c728209161ad8068876a27a6bbbb.png b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/img/a2c3c728209161ad8068876a27a6bbbb.png new file mode 100644 index 0000000000000000000000000000000000000000..c1ee124cb613adeca3d3f6227d30e3d3c3bfa36e --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/img/a2c3c728209161ad8068876a27a6bbbb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a5067cd9740c484288f318e485f9b8e98ef0c6500a8cda6cbb7ad4eabe9d227 +size 108934 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/material.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..d47ab5b1d4de866c897040ce506f0f0f58d4103c --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ed3624e29411aa83a886ba48fad9888d24175f8b17d9061093532e3b0e6e3cc +size 2222 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/trashcan_control.py b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/trashcan_control.py new file mode 100644 index 0000000000000000000000000000000000000000..d0ec98499b703ad45e3d33d0a259facfeb14c23d --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/trashcan_control.py @@ -0,0 +1,135 @@ +import carb +from omni.kit.scripting import BehaviorScript +from omni.isaac.dynamic_control import _dynamic_control +from enum import Enum +from pxr import Gf +from threading import Thread +import marshal,json +import omni.kit.commands +from omni.isaac.core.prims import XFormPrim +import numpy as np +from pxr import PhysxSchema, UsdGeom, UsdPhysics +import math +from omni.isaac.core import SimulationContext, World +# from isaacsim.core.prims import XFormPrim +# stiffness :0.8 Damping: 0.05 + + +def find_prim_path_by_name(prim_name: str, root_path: str = "/") -> str: + """Recursively find the full path by Prim name""" + stage = omni.usd.get_context().get_stage() + prim = stage.GetPrimAtPath(root_path) + + def _find_prim(prim): + if prim.GetName() == prim_name: + return prim.GetPath().pathString + for child in prim.GetChildren(): + result = _find_prim(child) + if result: + return result + return None + + found_path = _find_prim(prim) + if not found_path: + raise RuntimeError(f"Prim '{prim_name}' not found under {root_path}") + return found_path + + +lid_prim = XFormPrim(find_prim_path_by_name("E_lid_88")) +print("lid_prim", lid_prim.prim_path) +root_articulation_prim = find_prim_path_by_name("E_body_70") +print("root_articulation_prim", root_articulation_prim) +joint_names = ["RevoluteJoint_pressthetrashcan2_up"] +revolutejoint_path = find_prim_path_by_name("RevoluteJoint_pressthetrashcan2_up") + + +class TrashcanOverControl(BehaviorScript): + def on_init(self): + self.phsx_freq = 120 + self.joint_handles = [] + self.dc = _dynamic_control.acquire_dynamic_control_interface() + # light_scopes[0].set_visibility(False) + self.Stiffness_max = 0.8 + self.Stiffness_min = 0.08 + + self.guangai = True + self.gaodian = True + self.didian = False + + # init_pose + self.local_pose_lid, self.local_ort_lid = lid_prim.get_local_pose() + # self.local_pose_door, self.local_ort_drawer_up = door_prim.get_local_pose() + + # Find Root + self.art = self.dc.get_articulation(root_articulation_prim) + if self.art == _dynamic_control.INVALID_HANDLE: + print('the prim is not an articulation') + stage = omni.usd.get_context().get_stage() + self.revoluteJoint_drive_path = stage.GetPrimAtPath(revolutejoint_path) + self.revoluteJoint_drive = UsdPhysics.DriveAPI.Get(self.revoluteJoint_drive_path, "angular") + + + def on_destroy(self): + pass + + def on_play(self): + self.simulation_context = SimulationContext( + stage_units_in_meters=1.0, + physics_dt=1.0/120, + rendering_dt=1.0/120 + ) + + + def on_pause(self): + pass + + def on_stop(self): + self.init_start=True + + self.guangai = True + self.gaodian = True + self.didian = False + + carb.log_info(f"{type(self).__name__}.on_stop()->{self.prim_path}") + pass + + def on_update(self, current_time: float, delta_time: float): + if delta_time <= 0: + return + self.dc = _dynamic_control.acquire_dynamic_control_interface() + self.active_art() + self.apply_behavior() + + def active_art(self): + # Find Root + self.art = self.dc.get_articulation(root_articulation_prim) + if self.art == _dynamic_control.INVALID_HANDLE: + print('the prim is not an articulation') + self.dc.wake_up_articulation(self.art) + + # Find joint + self.joint_handles = [] + for joint_name in joint_names: + self.joint_handles.append( self.dc.find_articulation_dof(self.art, joint_name)) + # print("self.joint_handles",self.joint_handles) + def apply_behavior(self): + self.trashcan_control() + def trashcan_control(self): + + self.Joint0_state = self.dc.get_dof_state(self.joint_handles[0], _dynamic_control.STATE_ALL).pos + + if self.Joint0_state > math.radians(1.5): + self.didian = True + if self.didian and self.Joint0_state < math.radians(1.2): + self.guangai = not self.guangai + self.didian = False + if not self.guangai: + self.dc.set_dof_position_target(self.joint_handles[0], math.radians(-90)) + else: + self.dc.set_dof_position_target(self.joint_handles[0], math.radians(0)) + # print("关盖:",self.guangai) + + + + + diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/element_path.json b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/element_path.json new file mode 100644 index 0000000000000000000000000000000000000000..1faa0183df359116766a2f8ee5b68cd76f59a565 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/element_path.json @@ -0,0 +1,7 @@ +{ + "88": "/root/E_lid_88", + "111": "/root/E_lid_88/E_part1_1_111", + "70": "/root/E_body_70", + "73": "/root/E_body_70/E_part1_73", + "96": "/root/E_body_70/E_part2_96" +} \ No newline at end of file diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/link_0.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/link_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..073a57d7ca370af97a9c115825bb93b4d6e16538 --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/resource/v_69323/link_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29206724958a9d34a577abd69f3232fb5c239fb1658e5ba5b51f0e62adaf6f6f +size 5579494 diff --git a/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/trash_can_press_4f_002_T1.usd b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/trash_can_press_4f_002_T1.usd new file mode 100644 index 0000000000000000000000000000000000000000..09abd9503f0e9aba5733960181eb0037d7799a0f --- /dev/null +++ b/Articulated_objects/household_items/trash_can/trash_can_press_4f_002_T1/trash_can_press_4f_002_T1.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51efe3242887008b4cdab0e252d88081a05904d5b888b815e8240b82204876a6 +size 102397 diff --git a/Articulated_objects/large_furniture/cupboard/cupboard_1/model_cupboard_1.usd b/Articulated_objects/large_furniture/cupboard/cupboard_1/model_cupboard_1.usd index 6346c8e35ddf6c277766709f2f27b47c89ad0eb9..1945ac75c81c00363bdf19d719a32c44b6ab10d9 100644 --- a/Articulated_objects/large_furniture/cupboard/cupboard_1/model_cupboard_1.usd +++ b/Articulated_objects/large_furniture/cupboard/cupboard_1/model_cupboard_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4c42354aeb591b2d72e60b3c8f9bbaedbc64c3eeba5c0388dae96adbacf2e72 -size 23425691 +oid sha256:5d835c7b29828cff206014f760e50b151633a23372f3f5019cee476e90c48f3e +size 23428543 diff --git a/Articulated_objects/large_furniture/cupboard/cupboard_2/model_cupboard_2.usd b/Articulated_objects/large_furniture/cupboard/cupboard_2/model_cupboard_2.usd index 8a3a13a7dd15181fc9efec9e21386c8781741f34..40b59342ce55e83750f659b732053cdb93e935ab 100644 --- a/Articulated_objects/large_furniture/cupboard/cupboard_2/model_cupboard_2.usd +++ b/Articulated_objects/large_furniture/cupboard/cupboard_2/model_cupboard_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa4f9df021cb57790ac564ee59a167895e2c59eff9c3928461e11dca4295911d -size 219700 +oid sha256:a0f96c59c29cf018d5dacf44d296c0431376051f6730cb5f25bc8ea8384c5300 +size 222097 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_1/model_open_wardrobe_1.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_1/model_open_wardrobe_1.usd index 9e706fceea04e534edbb2cbc8376342667cd71fc..00cdf04da5fc62b1edd4fb93c79423a941720ab8 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_1/model_open_wardrobe_1.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_1/model_open_wardrobe_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52654e6f0be1bdd21f2939f027437fdb55587c99cc5193109fb22c6591b89790 -size 44328004 +oid sha256:4912055730a2560b93fe14570ca03587398f00a627d4b88d8f641204747857bf +size 44328651 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_10/model_open_wardrobe_10.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_10/model_open_wardrobe_10.usd index a204c2d944de38b633f4e532b9a57e4da5857ff3..396f1479fa75c5953228ff3c5584868c1aa846e2 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_10/model_open_wardrobe_10.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_10/model_open_wardrobe_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa947effff331200ff0460d713b317f9fb53f76ccc7a3b379b149c7f0a3e732f -size 45577350 +oid sha256:f804b1adee365d1fcf60a7a1a77c3b778f7a6fc5e8b37e0c7d7666d92ec48cd6 +size 45578140 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_2/model_open_wardrobe_2.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_2/model_open_wardrobe_2.usd index 754966d0afba1b1c1d2b6da40b10114bd2db474b..5ec0a6ec06d22fddbee5df89d3d0e8511cf546fe 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_2/model_open_wardrobe_2.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_2/model_open_wardrobe_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76dad42eb2fc64a99b95555ae28c057aa226dae19d8f150dbb75b842e31e3dab -size 7663488 +oid sha256:8c90f98988c78f33b5ae006e38fc790eb2cef0e6c983303532469162acb62fb8 +size 7664270 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_20/model_open_wardrobe_20.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_20/model_open_wardrobe_20.usd index 55b9e9c5b323acc17eb2f3266d5893e7d9bbb4e3..58fdd726777cd1534167e756add5ca552eefb6ba 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_20/model_open_wardrobe_20.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_20/model_open_wardrobe_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27cb68ccb5f2a26cb799269f923ca57704744fb7daf5698e52f4802870449652 -size 1537740 +oid sha256:fb87239459bfdc32606290f1789f3e7bec6456ece4feefe4ebe974445f549788 +size 1538463 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/open_wardrobe_21.usdc b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/open_wardrobe_21.usdc new file mode 100644 index 0000000000000000000000000000000000000000..80432c8afd0bdbd0333497cbbae915dc9afe4e20 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/open_wardrobe_21.usdc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79da7ad053f98f2c7eef785af9bc07f7e82ee8d42f7c77aa1f12e8cb7c8157af +size 2907439 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_diffuse_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_diffuse_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..42dff19e4351cbe1e4ea7d8134579f28e696ef1f --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_diffuse_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:554bb5901d906ccc8669bc7d5a497098f5e6f422637a6c27d565b9b34fa11afd +size 771509 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_metal_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_metal_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d01722c10855d155fe03910591ec45dd6b3c34ae --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_metal_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4fee041d37d31e046e38c1e778df2fde3c68c4808a3d66b5b256bd73d87871b +size 53264 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_normal_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_normal_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9320adc82bdd424078befc4017e78fdb2e534d2 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_normal_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad5baaa62c850324b11e0906f2a34386d132ce41b769a4a2c13045875eeaadc6 +size 975040 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_roughness_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_roughness_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ed7866e52cdc6a15537242a4f87e35402df7238a --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/Planks06_roughness_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe458ffb63b439eef5b075133aa56753c207d65e5cb98684aec7ab1c0af8114c +size 615639 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_diffuse_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_diffuse_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4223408c09d5e95f1609eb13090b4435c0a83f80 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_diffuse_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88fea5bb5bc3034b682f35aaa24ae93be643c80eacdb9000ed61f55d95a9224b +size 648090 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_normal_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_normal_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..591444e833d2a47fda1b95d0add5a3976822a421 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_normal_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bce5610d912dde5dd21cc356d2f0a3827eff73b577b01d5963cd164643f573aa +size 291878 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_specular_xtm.jpg b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_specular_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b356db3393c5ce464387dc59b5bb51b35e5ac500 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_21/textures/concrete_white_specular_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e34631157ed52f6a283649e32d514d6086d09ab3266f0bf9d23d9a1839c8e9b3 +size 359054 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_3/model_open_wardrobe_3.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_3/model_open_wardrobe_3.usd index 66b0cd98ac9ffe49423c372797194df99761a71b..31d767f21144ec674484a537ea81cad32f595f3b 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_3/model_open_wardrobe_3.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_3/model_open_wardrobe_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8828e6ce23f90590d6ee4e6e7811c0f7ec1d102a02e1358006647e689196213 -size 373259 +oid sha256:04757fc0e0d50ca6ee997894636e24950b077ccef2938f1462949022963c2268 +size 374092 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_4/model_open_wardrobe_4.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_4/model_open_wardrobe_4.usd index 5ad41f62cd01677515b69025c9988d002c0f24ac..615c5dad5bd4f52015b848438be0c803555caff6 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_4/model_open_wardrobe_4.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_4/model_open_wardrobe_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19609a8c0ff13c0aa528e96f8225ce15e5398ac6504fd3f856b3a6b7cd9955c8 -size 65013 +oid sha256:fef97002c0a7547eba0be7629b10cb8760d28ee9f62ede7b3d3ffabb184733a8 +size 65635 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_5/model_open_wardrobe_5.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_5/model_open_wardrobe_5.usd index 25010ea7c33cedaae0326ef8f440c6e7215bcb73..36bab8790c7bbcd7898b36fac59c1f5075790e6e 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_5/model_open_wardrobe_5.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_5/model_open_wardrobe_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5412f06d3b9895030f66a09b5802083e0fb13ead1660c3a6b79f7c2819f6183 -size 9762538 +oid sha256:4b0ffb9a500ea2f543694ea575b88dd52a17a301d497ae8be749bfac79255122 +size 9766134 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_6/model_open_wardrobe_6.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_6/model_open_wardrobe_6.usd index d1f9f629fa4c167555e0ad41e563f33eaa94082a..7467832f501f242c20e06d65126e1788e1e3d2a7 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_6/model_open_wardrobe_6.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_6/model_open_wardrobe_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21fe49dc1017fdcaddfe3433fb302cd997d661cb0329568d4ad25c0df67f0c80 -size 2855691 +oid sha256:543c764618c1ead79c426dfe7396569d3783af935fae5a4314039dd795444b03 +size 2856585 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_8/model_open_wardrobe_8.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_8/model_open_wardrobe_8.usd index 857b100b60d0aa4eb71e64f941c5e1c3bed4bb41..194109b78b8bb406700ac1a7fc2cb8f2d8f99b13 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_8/model_open_wardrobe_8.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_8/model_open_wardrobe_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c745f076ff94bb6419bcd84d1ca2c668b4d73f5499da5627a2ad2ea8740f9cea -size 76275644 +oid sha256:8083e18bfdd311624ad3ed78a5aba2b6a91d9a5350967feb546e40f5e4939771 +size 76276517 diff --git a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_9/model_open_wardrobe_9.usd b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_9/model_open_wardrobe_9.usd index 264c4d425df2c65de48ed1f94cc0a9fc04d565aa..c7d5302889034c1c6e3eaa2eb4e0d88ad5549c3a 100644 --- a/Articulated_objects/large_furniture/wardrobe/open_wardrobe_9/model_open_wardrobe_9.usd +++ b/Articulated_objects/large_furniture/wardrobe/open_wardrobe_9/model_open_wardrobe_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e0ada5c595bb28102d484f8e8c8ce668c2f7e93a8edbbcb218c4b703fc01222 -size 1609236 +oid sha256:7c209fc7a925bef53ac7a0b6ff10c579920811fc218e99f37513a676bfb501da +size 1609832 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe/model_wardrobe.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe/model_wardrobe.usd new file mode 100644 index 0000000000000000000000000000000000000000..b5ee15b650a651cc4f9faa2c4a6614c1e3a71f45 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe/model_wardrobe.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdbc69fcfc681fb3c9ae877f1e85b42e20f810ce8d526edbc98a90e25695a955 +size 1850743 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/057e30f7b19e20bb20d3a7ac2f725307.png b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/057e30f7b19e20bb20d3a7ac2f725307.png new file mode 100644 index 0000000000000000000000000000000000000000..a56eaa7b020c47cb8d1881e9246a6906e4d2d0ed --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/057e30f7b19e20bb20d3a7ac2f725307.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09b7574a5828dd9f6cce4f8e937056411a77f167a5bf3c49c4d7ffb2ec69488f +size 344967 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png new file mode 100644 index 0000000000000000000000000000000000000000..02caf2153922504cfa242c4ab69aaa7c299dabc5 --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a90e4d6696ea994d8ecbdc704576c6729187805c6d1ab4188bef72e0567a39ea +size 3361250 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/material.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..17c165cfbd1915e428e31d9f96b5b9af61f2e0dd --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da9029462cc1631397ff55e549ff7f21c609e5710caa9a668213cdcf24a32d44 +size 2408 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/v_69323/link_0_0.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..982c93f3d90dd8bb42b43d7023ad7bd5f3c773fb --- /dev/null +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f493d933bbbab16c9776299165c6ca22f088efbecd2de7506dca540cc237e2 +size 1875717 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_1/model_wardrobe_1.usda b/Articulated_objects/large_furniture/wardrobe/wardrobe_1/model_wardrobe_1.usda index fe035d1e81880094d3ac4aeb026ec40bbcaa4c2f..f8fdbb733b308c387144cef77f6ce03868511a5e 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_1/model_wardrobe_1.usda +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_1/model_wardrobe_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b520890574e8e8e69539b942d98befa3f209b49e8cc066c615c073eb74d92151 -size 3904418 +oid sha256:42cd419d845296ac7a1a2aa33021fe3227ea696751fec319235980459cd0c4bb +size 3903452 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_10/model_wardrobe_10.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_10/model_wardrobe_10.usd index 13a6b294a3fc877b8808681c4a4f1fca82db5857..b9e8398344206e0881a2307494fef436c26f16ae 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_10/model_wardrobe_10.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_10/model_wardrobe_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d079bddae53001279d1c8ddcfb890957711029b1901c295db5fde32d67ee1102 -size 1726162 +oid sha256:db40cb1c67ba6b0fac6c69e7267822e551a3ecf974b8f87e178c2a0bb10f568c +size 1726746 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_2/model_wardrobe_2.usda b/Articulated_objects/large_furniture/wardrobe/wardrobe_2/model_wardrobe_2.usda index 633e79c8468a0dacf06b1c7e9091d4506f6e5b5c..768f748146043dd487d2dd9e2fb194eafdcc2da5 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_2/model_wardrobe_2.usda +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_2/model_wardrobe_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4ff5fe658ae538e15a7056d533482b03fbae44156f245ecba13d8e23a6be6e8 -size 535416 +oid sha256:528fd71580f1dcf49b0ec9aa1ef0fbd8142ef949150166744cc8c5669ff04eba +size 535024 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_20/model_wardrobe_20.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_20/model_wardrobe_20.usd index b843b3a399b19bb9336d9b1e1df06635c965855c..c9b0684ce1031948e228244386c233c66c1c9408 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_20/model_wardrobe_20.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_20/model_wardrobe_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c455ee25bcb04790c6b73db056ba1013470aa076bfd989bb0c53f519201127b -size 1596852 +oid sha256:4dab79cf197c1b5c24edd350ae8e2947e48cd54a8f047098493c5ff7be819223 +size 1598145 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_21/model_wardrobe_21.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_21/model_wardrobe_21.usd index 5d709e126afd10d4459663c66bb90763ec41fcb3..88ed053eb0e47716d83d8711eb958781d43ab907 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_21/model_wardrobe_21.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_21/model_wardrobe_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b0fa8e3db5cd8e2ec6a988c0814a1ee782372325edb5c82d8af087ff6b3aa00 -size 677811 +oid sha256:6c12cd893f42abf499e1f8bfdc32bd18523a3958cc50e7b1e240fc4431cf0988 +size 678746 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_22/model_wardrobe_22.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_22/model_wardrobe_22.usd index cacc71793595e190b33f10c74f117d173f4acca8..4e80bf389d67fa61c12bb269a68cdffed3194548 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_22/model_wardrobe_22.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_22/model_wardrobe_22.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4de3f2e0d3b6c39f70efdd96f10c770391439c35b7d54d9b3ba96c0cd2d5cb7c -size 1387366 +oid sha256:89ef77667fe9100dd0d3bbace526175e8840c8c232260116f403c818b4d3ea82 +size 1392050 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_3/model_wardrobe_3.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_3/model_wardrobe_3.usd index a11454690bec514161e604afa20816cacfee941a..b6ff79ba3a58537cd5cc02bf31307f8d643a2951 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_3/model_wardrobe_3.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_3/model_wardrobe_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33dc3808dc0635897be9e112cc9e0a05d58088c5c3eb9c0a66294b7aa7b2f84c -size 439795 +oid sha256:7e2ef490aeefa310fdd2c03dbd1bb91a7ec02a18749578a5ccb9df8337765468 +size 440388 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_4/model_wardrobe_4.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_4/model_wardrobe_4.usd index f7690d59f7a708befd4755f856b7beb35db76109..2148caefaf73d88d965f603c431d602d74ccf263 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_4/model_wardrobe_4.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_4/model_wardrobe_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:769e60cea278dcc61a4858434c892a499e11d1c069a13c3a292c142099f84dd2 -size 154047 +oid sha256:c2c29f190a6eaff50bc0b89e4063a559d93b318c4e792df4bfa47bf49f9ed182 +size 154520 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_8/model_wardrobe_8.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_8/model_wardrobe_8.usd index bc0c12139cd3034e6f8afcf3895effc5198cf12e..3040eef7ef6a82af8a1fdae5281e259958e1a75d 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_8/model_wardrobe_8.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_8/model_wardrobe_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5b4816dc2ebdbcdc6269115b90c546f1968d3685066390ceb2c545b6c577ebd -size 59501 +oid sha256:55bc504c11771f93e59ec03d1be0127f2b18c3065f132029d0a9b9c4a4a61651 +size 59999 diff --git a/Articulated_objects/large_furniture/wardrobe/wardrobe_9/model_wardrobe_9.usd b/Articulated_objects/large_furniture/wardrobe/wardrobe_9/model_wardrobe_9.usd index bc5b7e4a65739305eef068053aa068070e70225d..82e55593bff20474b809739c4fba12bc75b8eca1 100644 --- a/Articulated_objects/large_furniture/wardrobe/wardrobe_9/model_wardrobe_9.usd +++ b/Articulated_objects/large_furniture/wardrobe/wardrobe_9/model_wardrobe_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fdd0838b30ff6f9766350f4135d452c156ed9fca112c0d9ab9adf140cb7fe9 -size 139314 +oid sha256:2b9aebb1abdf031a44bb0010a3745c572e5e3e450026c4d6db48b709d7013d1d +size 139908 diff --git a/Articulated_objects/major_appliances/built-in oven/oven_6/model_oven_6_333.usd b/Articulated_objects/major_appliances/built-in oven/oven_6/model_oven_6_333.usd index de11036a22425fd1b1f5d05eb6a0943b6456d7d3..b3b4c860f7c21ec1f2196a8833e14c5afb713a97 100644 --- a/Articulated_objects/major_appliances/built-in oven/oven_6/model_oven_6_333.usd +++ b/Articulated_objects/major_appliances/built-in oven/oven_6/model_oven_6_333.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:547959cd36db7c98e91dfde984850ab17ecfded4f4fca148886ee229744f2ebc -size 155981 +oid sha256:ec0622e39de08e16d5229097a589cfcf6c75bb1f3094d877b5adda03a3d09dad +size 157639 diff --git a/Articulated_objects/major_appliances/built-in oven/oven_7/model_oven_7.usda b/Articulated_objects/major_appliances/built-in oven/oven_7/model_oven_7.usda index af972bf84832e3bbec52008566c389bfdbbf48a0..8d9b75639420fb4ee076d101b95ef998c67af19c 100644 --- a/Articulated_objects/major_appliances/built-in oven/oven_7/model_oven_7.usda +++ b/Articulated_objects/major_appliances/built-in oven/oven_7/model_oven_7.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3d20f722ae5e8fe69bf2b02f2003d306fb8489fdf27be6d1cd0e0712ebb5220 -size 5012184 +oid sha256:c672762ce31b3f2bd32fc510d503bb48f74f8591553c3943e5b3bd4b55234063 +size 5011417 diff --git a/Articulated_objects/major_appliances/built-in oven/oven_8/model_oven_8.usd b/Articulated_objects/major_appliances/built-in oven/oven_8/model_oven_8.usd index 0a69f9c2e2ae896c4529f9e3bbc5e650b93ad8d1..66291e02a8965e0afbe82f023a96ae6448fcff0c 100644 --- a/Articulated_objects/major_appliances/built-in oven/oven_8/model_oven_8.usd +++ b/Articulated_objects/major_appliances/built-in oven/oven_8/model_oven_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d03ff14dcae88528ba7c3933438cc711e8a33a1eaac6fac5541eccf1887e48d -size 8062165 +oid sha256:3ee38f64172c4a8b944e5306cad982f0bde9a216fcfc4d664caf89381fb65cc6 +size 8063474 diff --git a/Articulated_objects/major_appliances/built-in oven/oven_8/resource/v_0/link_default_0.usd b/Articulated_objects/major_appliances/built-in oven/oven_8/resource/v_0/link_default_0.usd index 2817a6b23da01b2edb7f5ae4870940367c519006..a030b0aa1973d18b44eb4535c3c132f6a9e9dd89 100644 --- a/Articulated_objects/major_appliances/built-in oven/oven_8/resource/v_0/link_default_0.usd +++ b/Articulated_objects/major_appliances/built-in oven/oven_8/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:515d0b3f5bf6e2b46e7c4bf3b5ac94ae5c9a53c65d2ff810b4152eb95ffc7447 -size 8058311 +oid sha256:58ca74ae46c7259258c9de608fdb29cb25489adc63ec59a145d7a3b00aea325c +size 8059337 diff --git a/Articulated_objects/major_appliances/dishwasher/dishwasher_1/model_dishwasher_1.usd b/Articulated_objects/major_appliances/dishwasher/dishwasher_1/model_dishwasher_1.usd index 2e722ca161156f7b0b0dbd05b4dacc24f78f6646..941adc07976261548b50bd3963d7ef0cced2194e 100644 --- a/Articulated_objects/major_appliances/dishwasher/dishwasher_1/model_dishwasher_1.usd +++ b/Articulated_objects/major_appliances/dishwasher/dishwasher_1/model_dishwasher_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c2c076597e9c6da9d833e14ee75cc77641cb4bbab72a0c792a78f042dfb44df -size 8186754 +oid sha256:89b6fc28c9d7755949450a73172be19274faccd822f29b963526e0ee4900a240 +size 8192957 diff --git a/Articulated_objects/major_appliances/dishwasher/dishwasher_1/resource/v_0/link_default_0.usd b/Articulated_objects/major_appliances/dishwasher/dishwasher_1/resource/v_0/link_default_0.usd index b33f21f25d9b977de24d76d5ac7f5047e8a0d432..8226700b047ed0c661980422c5a81293100bbb30 100644 --- a/Articulated_objects/major_appliances/dishwasher/dishwasher_1/resource/v_0/link_default_0.usd +++ b/Articulated_objects/major_appliances/dishwasher/dishwasher_1/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdbe92b409e3197b8a626aa45dc731cb71127e36533a2c5089a21a7f25f42019 -size 11823537 +oid sha256:176ba15634b402885baca04fcb3cb297be1eb9ea7a56e227efeacee959216293 +size 11824282 diff --git a/Articulated_objects/major_appliances/dishwasher/dishwasher_2/model_dishwasher_2.usda b/Articulated_objects/major_appliances/dishwasher/dishwasher_2/model_dishwasher_2.usda index b21559b568d709c27408d5a4bdd12683a5a4dd54..e668d020d965dbf1bf153bb1c6813b30978958e5 100644 --- a/Articulated_objects/major_appliances/dishwasher/dishwasher_2/model_dishwasher_2.usda +++ b/Articulated_objects/major_appliances/dishwasher/dishwasher_2/model_dishwasher_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11a3423a3d3b5e2d848c56d72764d1b3ec428f628dc864b877054d9f6ca42486 -size 2710082 +oid sha256:705cd1fb79c5a13ab0b2300029edc7d4dcb1ff9df21ac530c4118c32de2ba522 +size 2712354 diff --git a/Articulated_objects/major_appliances/dishwasher/dishwasher_3/model_dishwasher_3.usd b/Articulated_objects/major_appliances/dishwasher/dishwasher_3/model_dishwasher_3.usd index 90ed90ad2513f00c38c1fdae6ac35fe844e5edb6..171814983363608f6f9c530203ddb8d291daa813 100644 --- a/Articulated_objects/major_appliances/dishwasher/dishwasher_3/model_dishwasher_3.usd +++ b/Articulated_objects/major_appliances/dishwasher/dishwasher_3/model_dishwasher_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f622c9874ad39f27fcabf708f414ffa240af50663a44e1b01fc710160081c980 -size 2641627 +oid sha256:77774962e9af1319cb557ae63208d4bd879d1e9e195bb941236fcd0b5232252b +size 2644174 diff --git a/Articulated_objects/major_appliances/dishwasher/dishwasher_4/model_dishwasher_4.usda b/Articulated_objects/major_appliances/dishwasher/dishwasher_4/model_dishwasher_4.usda index 1d6670529dd213f0d0f56cabe30648884569df24..4ab28a1980089783e1da40d11bae30990af7a983 100644 --- a/Articulated_objects/major_appliances/dishwasher/dishwasher_4/model_dishwasher_4.usda +++ b/Articulated_objects/major_appliances/dishwasher/dishwasher_4/model_dishwasher_4.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f54b30545a4cda4a8321fa6fd4f162857e7fee4826db708cf35b7b2cb4a4fc6 -size 14559040 +oid sha256:7fb86550a141cea7626196804b9cd039cbe2701c7eb761fa39b9f6caf883e1da +size 14558550 diff --git a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_1/model_l_dishwasher_1.usd b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_1/model_l_dishwasher_1.usd index 46252f7c75d4f23fe056f82525d8987dbd6b6310..0d61726753124018e11e5aca3c6a13c8d2a3b904 100644 --- a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_1/model_l_dishwasher_1.usd +++ b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_1/model_l_dishwasher_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:447f3cfc143c35591fc9c2e0020449f3027f6508368ab66a016d1036077207c4 -size 13827 +oid sha256:40ecc2d3c37df1e83c1bb9406512e32bdf4be6b4a5116ccbb6531b1b860d04e4 +size 14315 diff --git a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_2/model_l_dishwasher_2.usd b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_2/model_l_dishwasher_2.usd index 12951e6a2aea6cba13c18c9534d558677e53eaa6..e7a96ed3c9683c8f468f78ea6c5b6f70622c0c02 100644 --- a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_2/model_l_dishwasher_2.usd +++ b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_2/model_l_dishwasher_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a16a80c71d7717f04f3d449274bb4b44d0b9cf3121afa9eeeed3145ba0f5c4d -size 15709 +oid sha256:757aa10daa56581718af5bc6745c54080a6179f14cb28d4e22f9c249c236a897 +size 16398 diff --git a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_3/model_l_dishwasher_3.usda b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_3/model_l_dishwasher_3.usda index c0404f959eea5f41229b1fe0f0250f56abfcb3b0..c6a3315497ca18ab8c919a4981bcdb19018fe4dc 100644 --- a/Articulated_objects/major_appliances/dishwasher/l_dishwasher_3/model_l_dishwasher_3.usda +++ b/Articulated_objects/major_appliances/dishwasher/l_dishwasher_3/model_l_dishwasher_3.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcdf052bf24b028d21a97f489698d0eb249045cfe1cc20fec8c759fd0f384128 -size 418759 +oid sha256:41e118dae17f009997887972cd86f15f4465fca81c2fbee20cde57cd476d160d +size 418265 diff --git a/Articulated_objects/major_appliances/refrigerator/.thumbs/256x256/xes.usd.png b/Articulated_objects/major_appliances/refrigerator/.thumbs/256x256/xes.usd.png deleted file mode 100644 index 6eb857e2ebf6783411920714bc3b95a96706f5eb..0000000000000000000000000000000000000000 --- a/Articulated_objects/major_appliances/refrigerator/.thumbs/256x256/xes.usd.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55fa3efe2dabc23d9d5a6c814543930d866adf6e7badddf9dfb53d9454af9222 -size 36866 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_2900K.mdl b/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_2900K.mdl new file mode 100644 index 0000000000000000000000000000000000000000..3fa628b006209c46e53ffd4ed41fc4518bd2b2e9 --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_2900K.mdl @@ -0,0 +1,42 @@ +mdl 1.4; + +using ::OmniPBR import OmniPBR; +import ::tex::gamma_mode; +import ::state::normal; + +export material Light_2900K(*) + = OmniPBR( + diffuse_color_constant: color(1.0, 1.0, 1.0), + diffuse_texture: texture_2d(), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 1.0, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.0, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: false, + ORM_texture: texture_2d(), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: true, + emissive_color: color(1.0, 0.69412, 0.39608), + emissive_mask_texture: texture_2d(), + emissive_intensity: 5000.0, + bump_factor: 0.f, + normalmap_texture: texture_2d(), + detail_bump_factor: 0.3f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl b/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl new file mode 100644 index 0000000000000000000000000000000000000000..d6c08a66ec3d6465474bf1e93968a42c369059a1 --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl @@ -0,0 +1,43 @@ +mdl 1.3; + +import ::OmniGlass::OmniGlass; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = OmniGlass::OmniGlass( + absorption_coeff: color(1.f, 1.f, 1.f), + glass_color: color(1.f, 1.f, 1.f), + use_glass_color_texture: false, + glass_color_texture: texture_2d(), + frosting_roughness: 0.f, + glass_ior: 1.52f, + thin_walled: true, + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f)); + +/* +mdl 1.5; + +import ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume( + thin_walled: true, + transmission_color: color(1.f, 1.f, 1.f), + roughness_texture: texture_2d(), + ior: 1.52f, + transmission_color_texture: texture_2d(), + roughness_texture_influence: 0.f, + roughness: 0.f, + reflection_color_texture: texture_2d(), + reflection_color: color(1.f, 1.f, 1.f), + depth: 0.0001f, + normal_map_texture: texture_2d()); +*/ diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/model_fridge.usd b/Articulated_objects/major_appliances/refrigerator/fridge/model_fridge.usd new file mode 100644 index 0000000000000000000000000000000000000000..e44a80afb1cb395f43a0a17de2b9133a75ce5904 --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/model_fridge.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:051e9029cd3fbc6b9bccfe04c155f907e29d83a89835a3ca667316c7ba93e0cd +size 5699927 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/77bb7e13f95488b9bba205f61774cfac.png b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/77bb7e13f95488b9bba205f61774cfac.png new file mode 100644 index 0000000000000000000000000000000000000000..6ec446758d90977a3105f07e8dae329985b95ae1 --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/77bb7e13f95488b9bba205f61774cfac.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ffd20ccaccf4be6fc5a67ad17da285152107852dff1a3c92e1ad44ceb54d30d +size 317769 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/85e802b65576ab52c15d2ad699874710.png b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/85e802b65576ab52c15d2ad699874710.png new file mode 100644 index 0000000000000000000000000000000000000000..0e85584815c018a034b4e23831745c1f0b027f3b --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/85e802b65576ab52c15d2ad699874710.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90f3a900835f50001809b0dd910f9d82ba8b69fbd7e5a49c261932cd7b586c30 +size 442669 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/ba71f64c7269bdc410f2b92f325c6388.png b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/ba71f64c7269bdc410f2b92f325c6388.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5c5fa3553d340d55950f17e8fcdba185f3e8f5 --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/resource/img/ba71f64c7269bdc410f2b92f325c6388.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a1750ad3d039f94bd785258382a8ac731e892f20668a6af6dfec3d76f563ff +size 287881 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/resource/material.usd b/Articulated_objects/major_appliances/refrigerator/fridge/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..842b1a46fbb22f89a8c5f54fcb84d149bbb3cd6d --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb60f5a108ce8c90bd138eea22cd7720e8035a4127bf1a84d8bee5989cdb6af4 +size 3939 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge/resource/v_69323/link_0_0.usd b/Articulated_objects/major_appliances/refrigerator/fridge/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..b52cd48df6fae46e6cba89749eb084dc619644da --- /dev/null +++ b/Articulated_objects/major_appliances/refrigerator/fridge/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9154f1321b36104c43a67566426e38bb8e1a1e4884f3e139cc9f6e74beaf456 +size 1537602 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge_1/model_fridge_1.usd b/Articulated_objects/major_appliances/refrigerator/fridge_1/model_fridge_1.usd index 6ae8d69965c7ff3911246b0d03560276b2cc8abe..98afca433c3c00c750a688296eecf3865aa8c50c 100644 --- a/Articulated_objects/major_appliances/refrigerator/fridge_1/model_fridge_1.usd +++ b/Articulated_objects/major_appliances/refrigerator/fridge_1/model_fridge_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b324773016908336d1e120af072578b586e0710cdfb4acd39050432b9efd880 -size 4227299 +oid sha256:d868b731edc4def57a78b4f76d76b5cb71d99e57183df998c458b04719bb31db +size 4228507 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge_2/model_fridge_2.usd b/Articulated_objects/major_appliances/refrigerator/fridge_2/model_fridge_2.usd index 4020c97ee2d66501be7dfbd9ceb12123426a315a..15fd9562e9e05d164f054251a18067939039b13e 100644 --- a/Articulated_objects/major_appliances/refrigerator/fridge_2/model_fridge_2.usd +++ b/Articulated_objects/major_appliances/refrigerator/fridge_2/model_fridge_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d26248ed0fa9843e180562c9763b19c176381040677b1246656d8fb52fcc493e -size 4208307 +oid sha256:23f2402661656515948826824c05e2bffcf3ceef74bf0c46f0e2d1ebaaf0a549 +size 4209489 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge_3/model_fridge_3.usda b/Articulated_objects/major_appliances/refrigerator/fridge_3/model_fridge_3.usda index d2f11a1017471acca25ad9136c57ca1f4e1df41c..d5341fb0295241cea606251c02e61fc774e43ee3 100644 --- a/Articulated_objects/major_appliances/refrigerator/fridge_3/model_fridge_3.usda +++ b/Articulated_objects/major_appliances/refrigerator/fridge_3/model_fridge_3.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7b309677a2fad8c7044672a119019299aeee0912cd2a8272f6dcc16979c0c84 -size 91522678 +oid sha256:2b85e270b1283a21bed82fe624783daf11688d61b52d1e4d98204c01a7f5f71c +size 91519584 diff --git a/Articulated_objects/major_appliances/refrigerator/fridge_4/model_fridge_4.usd b/Articulated_objects/major_appliances/refrigerator/fridge_4/model_fridge_4.usd index 2ed50aef41888d44e5b7eb0633a7138a591967b9..a1e4f68d7fad3e4e573d6316eb82293bab53be8f 100644 --- a/Articulated_objects/major_appliances/refrigerator/fridge_4/model_fridge_4.usd +++ b/Articulated_objects/major_appliances/refrigerator/fridge_4/model_fridge_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3715121c97d0f9e5867bf6be43a5b677f8e98d1c57f6d30563eaa6a99ba55cf4 -size 17438335 +oid sha256:0bb429ffcd3c4f5acdb7bfc73ed91a18a3d1a0c1684d8e4adc6c7fe7bce5891a +size 17439847 diff --git a/Articulated_objects/major_appliances/refrigerator/refrigerator_1/model_refrigerator_1.usd b/Articulated_objects/major_appliances/refrigerator/refrigerator_1/model_refrigerator_1.usd index 1cf1f09a5e32b798bf02d95c468bf23b61eda05b..5630871a0d4118e2076d8f8de29b47c6e356495c 100644 --- a/Articulated_objects/major_appliances/refrigerator/refrigerator_1/model_refrigerator_1.usd +++ b/Articulated_objects/major_appliances/refrigerator/refrigerator_1/model_refrigerator_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f02a7ffd12b5a25c13f50e104240eaa0ad031dea4e2b55a7fd27416ccba4dc19 -size 4030632 +oid sha256:a1c95462e4a4e3a0cccda70256d4e7a3af6f29856739df1a13f0fdfb126e2d0b +size 4033038 diff --git a/Articulated_objects/major_appliances/refrigerator/refrigerator_6/model_refrigerator_6.usd b/Articulated_objects/major_appliances/refrigerator/refrigerator_6/model_refrigerator_6.usd index 0c19589d0de0bd3ee9d7496d9f5e9c749fd7eaa9..6a4aaf8c4dff294a199a1d0f61091c3434be6ebf 100644 --- a/Articulated_objects/major_appliances/refrigerator/refrigerator_6/model_refrigerator_6.usd +++ b/Articulated_objects/major_appliances/refrigerator/refrigerator_6/model_refrigerator_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6fe905b05115fb7ed75291a9b1eead39f9383fc96e44c6e3e7b7d80f313399a -size 6278881 +oid sha256:43e8bdecffa897ee126c50de435451ce804684e01814d6121b1fa325e83e4020 +size 6280618 diff --git a/Articulated_objects/major_appliances/refrigerator/refrigerator_7/model_refrigerator_7.usd b/Articulated_objects/major_appliances/refrigerator/refrigerator_7/model_refrigerator_7.usd index 102599abf2e1332f05471c23379b029e1875968c..a3136034d2fb122040367e45681e914eb5a3e9a6 100644 --- a/Articulated_objects/major_appliances/refrigerator/refrigerator_7/model_refrigerator_7.usd +++ b/Articulated_objects/major_appliances/refrigerator/refrigerator_7/model_refrigerator_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ee306d3fea913204e714f4860ba7544c5b766d2bf4aa50450fa18c46d813ba9 -size 5635431 +oid sha256:ef4b8060e418fde7e2b8402100cdea3d2b8c05db9a0bb8e9e02eb78dc53238a8 +size 5636978 diff --git a/Articulated_objects/major_appliances/refrigerator/refrigerator_8/model_refrigerator_8.usd b/Articulated_objects/major_appliances/refrigerator/refrigerator_8/model_refrigerator_8.usd index 5a4e4e741010e8a3d09aaac111b8f9a3ea19249f..02f28ec2296d75707edd69c6aeb82a46547f54f1 100644 --- a/Articulated_objects/major_appliances/refrigerator/refrigerator_8/model_refrigerator_8.usd +++ b/Articulated_objects/major_appliances/refrigerator/refrigerator_8/model_refrigerator_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71459da466ff34f521ec00ed7a41e7ecb84860f1a5f09208bd8d975c867db716 -size 5131083 +oid sha256:8a941218b7461d3cf424e53b60f334bee43ea6ea4068b979f65b8f9d28544799 +size 5132797 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_1/model_big_electric_fan_1.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_1/model_big_electric_fan_1.usd index 9fd948fea1f408b5a3a8c2aeeedaec76b22a2ba7..5a56bc6a5cbdd31d574de7d56a015f952c61bb2a 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_1/model_big_electric_fan_1.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_1/model_big_electric_fan_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7873bd5b2b7028ea85f6ea0b5c6a7534f99c429636577a30bfc3dd4159661005 -size 455356 +oid sha256:a6989eb09b2c5f3c6b426c58e8f01b504f566f757047fe0e0881a80af17910e6 +size 456465 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/model_big_electric_fan_3.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/model_big_electric_fan_3.usd index e71fb30541e852a9a445eed23de28ae2719e9ea4..8f04a1410db0027f3a8a1ebf2cda1cea4396bbfb 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/model_big_electric_fan_3.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/model_big_electric_fan_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:353b99ffec1538e71522d6dcba380db3a006b45daa3e4ddbb07f7061c7f0aab4 -size 33019 +oid sha256:0087f60c2bb3b25a3a7f3a0944c9dcc6709520e194681b697939002fb3f72edf +size 33984 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/resource/v_0/link_default_0.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/resource/v_0/link_default_0.usd index a436bee0094c90b18c04659df70b73caaae56fe3..09203c25d050762d56996eab8a2be3e16bd7471b 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/resource/v_0/link_default_0.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_3/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7db042b510e5388701938c3cb0ba0c14303b008e0bf743277b0b55ebbfac4213 -size 1487653 +oid sha256:7ce2af6698cc330747fff0ebc8262ada7968cce7a9e5407bbec0dced6768b341 +size 1488526 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_4/model_big_electric_fan_4.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_4/model_big_electric_fan_4.usd index 11bcffac3fc5df30d1aed66e7091bc1f5a342b63..3ab6b48c1cd09cc5c5cc4a25163fe4f5dec86a65 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_4/model_big_electric_fan_4.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_4/model_big_electric_fan_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:484e27d2a64de4f893f59416afca24b0d592a3c639085510a2b0c7ab295300ce -size 8327664 +oid sha256:54c5ac335fcb04e84db233c3bf10e74e5d92a57a96765569649082410208fae4 +size 8328630 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_8/model_big_electric_fan_8_2.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_8/model_big_electric_fan_8_2.usd index ee23a3351236422dc60a727d312d6b08494d983f..1729d520c5e2ca291d939515f63af066d4ee0839 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_8/model_big_electric_fan_8_2.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_8/model_big_electric_fan_8_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e3b6b1a519888485f734a151c3aaa767fad82d2e226229f90008d53ffb40a3f -size 75753 +oid sha256:9ed31e34e00f447824f08cbde6a87a90476849de044e8701614751d647644695 +size 79956 diff --git a/Articulated_objects/major_appliances/standing fan/big_electric_fan_9/model_big_electric_fan_9.usd b/Articulated_objects/major_appliances/standing fan/big_electric_fan_9/model_big_electric_fan_9.usd index bd23fa8fe83259539d719227ee0adee7508e4615..9350e7aa1e3755c7b8993d510decce2ff252ab0c 100644 --- a/Articulated_objects/major_appliances/standing fan/big_electric_fan_9/model_big_electric_fan_9.usd +++ b/Articulated_objects/major_appliances/standing fan/big_electric_fan_9/model_big_electric_fan_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:095fa0da0f50cca5018f85591909e3d8804aa19000898c94abc3e10b495a3a0c -size 47962 +oid sha256:3d74d80375b34b86a294349c19eacd9d195cf9e9ea8af5cb03431d4e162fd54e +size 56253 diff --git a/Articulated_objects/major_appliances/toilet/closestool_1/model_closestool_1.usda b/Articulated_objects/major_appliances/toilet/closestool_1/model_closestool_1.usda index 5423fff5b6488e25362271f62b6598ccb15027ec..f04c57d521bee9a69944004be06c125aa5818ee6 100644 --- a/Articulated_objects/major_appliances/toilet/closestool_1/model_closestool_1.usda +++ b/Articulated_objects/major_appliances/toilet/closestool_1/model_closestool_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f0d25f647054d30ff794832a375c69d1be53b87b6b97be54c5886c74cb2944 -size 59281132 +oid sha256:00f4c968df3389a5c06a694da6553b32d0fdf8bf55b6dd0253fccf087425dc9d +size 59280646 diff --git a/Articulated_objects/major_appliances/toilet/closestool_2/model_closestool_2.usd b/Articulated_objects/major_appliances/toilet/closestool_2/model_closestool_2.usd index 9dd8682f9ddb99d67e2620c0ce1652c5669eedca..6bce9ae8872f17827c0bd8ec31861de4dc3b4d43 100644 --- a/Articulated_objects/major_appliances/toilet/closestool_2/model_closestool_2.usd +++ b/Articulated_objects/major_appliances/toilet/closestool_2/model_closestool_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df6f9f02b1ae0a97f4a2f24efe2cfaf57c0a6970542a110a12bf1bb7b3144b22 -size 12494 +oid sha256:2658f216b9d15ae26647454250eee762a05761cda0e4265a6aacacee2997592c +size 13086 diff --git a/Articulated_objects/major_appliances/toilet/closestool_3/model_closestool_3.usd b/Articulated_objects/major_appliances/toilet/closestool_3/model_closestool_3.usd index 993947aea512543c71338b0815f9983d4070a034..61365c8d5de9d37e58127b45140fb724b0238d55 100644 --- a/Articulated_objects/major_appliances/toilet/closestool_3/model_closestool_3.usd +++ b/Articulated_objects/major_appliances/toilet/closestool_3/model_closestool_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9a776e02f1bf35dc7f25dc032db8b8268a57afa8fbce1d8d644c7264f45d483 -size 16745552 +oid sha256:3666d2ac3b4cfbb3775eb5a9c9804196ffd00ffb55bc335f3b5054a6e899846e +size 16746049 diff --git a/Articulated_objects/major_appliances/toilet/closestool_4/model_closestool_4.usd b/Articulated_objects/major_appliances/toilet/closestool_4/model_closestool_4.usd index 3bc5e41f2d5a6bb28daaaf9e1a8568aecfbe9cff..7f1f5ff9f14911009e9ac89625e845327df50a6a 100644 --- a/Articulated_objects/major_appliances/toilet/closestool_4/model_closestool_4.usd +++ b/Articulated_objects/major_appliances/toilet/closestool_4/model_closestool_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e3cb52f7adb151a90b65f1629253daa6fa93bd32e5d92dcd4d24a0c24f02c51 -size 11974 +oid sha256:3d1abe306b449cfe6d2cf44391ee076ae7d333b8ef9616656a200d377da77ef3 +size 12506 diff --git a/Articulated_objects/major_appliances/toilet/closestool_5/model_closestool_5.usda b/Articulated_objects/major_appliances/toilet/closestool_5/model_closestool_5.usda index 13aaab45851160a56e875079b9ea69ca9a6fe500..67dcca699a673f69552d79b4695e2cd42353e195 100644 --- a/Articulated_objects/major_appliances/toilet/closestool_5/model_closestool_5.usda +++ b/Articulated_objects/major_appliances/toilet/closestool_5/model_closestool_5.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5602c6d7da86f2e6a3f02762887ca88f8cf32ac49ba5809230b0e0b775db6ddb -size 36533543 +oid sha256:25e2889400289c7ce1c18f534f404972df7471ec48b132bee32c523c503b3d0e +size 36533057 diff --git a/Articulated_objects/major_appliances/washing_machine/WashingMachine/model_WashingMachine.usd b/Articulated_objects/major_appliances/washing_machine/WashingMachine/model_WashingMachine.usd new file mode 100644 index 0000000000000000000000000000000000000000..c594a4b5ce4bafe2081bf7647422fa3c597cce52 --- /dev/null +++ b/Articulated_objects/major_appliances/washing_machine/WashingMachine/model_WashingMachine.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:331dfc548d1f717114f9d665ccc4efcbdfb3af45ff5a1619606a4a7757400c4e +size 8923 diff --git a/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/3d2d8a1c8fae283acdac197381b58d37.png b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/3d2d8a1c8fae283acdac197381b58d37.png new file mode 100644 index 0000000000000000000000000000000000000000..844b4cc3bb04f98c8943ea1e0b4003c2755e6cf5 --- /dev/null +++ b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/3d2d8a1c8fae283acdac197381b58d37.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51901c53df7d5d8baebd13351ced81ede4f1f49db8ba5aac087938da6a0a65c4 +size 70943 diff --git a/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/b99afd5d429b11ac912a7f5d4fe9614e.png b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/b99afd5d429b11ac912a7f5d4fe9614e.png new file mode 100644 index 0000000000000000000000000000000000000000..d0cd05dd91012f988edd36872295f288cdfe89c2 --- /dev/null +++ b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/img/b99afd5d429b11ac912a7f5d4fe9614e.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b2747454458881dca5fb182fdd29290925c38c01eb81ad527ba698a0ce31451 +size 5127394 diff --git a/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/material.usd b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..0cd39439b9accce75e902f3feebc9df68579c820 --- /dev/null +++ b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cd6290d042648ed54d0c539ec6c641cc6eaecdbc03c4601534a6f2ba33b89fb +size 3316 diff --git a/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/v_69323/link_0_0.usd b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..3f87c82873e238c48c60b99c6d3bd46072b99925 --- /dev/null +++ b/Articulated_objects/major_appliances/washing_machine/WashingMachine/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed5fe278c225234075ae43e92a4651ced7267218bcc53c7de2cf39b0b1c2bc58 +size 400666 diff --git a/Articulated_objects/major_appliances/washing_machine/dryer_washer_3/model_dryer_washer_3.usd b/Articulated_objects/major_appliances/washing_machine/dryer_washer_3/model_dryer_washer_3.usd index e947dce531154ef5c98d8565344aa8d28a87c855..8b8d3605ecd4e51a7ba5cd8e89ea238a579584c6 100644 --- a/Articulated_objects/major_appliances/washing_machine/dryer_washer_3/model_dryer_washer_3.usd +++ b/Articulated_objects/major_appliances/washing_machine/dryer_washer_3/model_dryer_washer_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:837aaf1da9dfb314181aedf4309f6a41888c4002201288827e60746a00a69d96 -size 15812 +oid sha256:847939143997421d8376ef5005f11c9c23d83c0ac8b32ab599d07f8d67b00654 +size 16567 diff --git a/Articulated_objects/major_appliances/washing_machine/dryer_washer_4/model_dryer_washer_4.usd b/Articulated_objects/major_appliances/washing_machine/dryer_washer_4/model_dryer_washer_4.usd index f1d12d4c2e4e52d042ebd1301ff0321c6400427a..80da8b1092ceb4e672ef403a234a7dfb3e19035f 100644 --- a/Articulated_objects/major_appliances/washing_machine/dryer_washer_4/model_dryer_washer_4.usd +++ b/Articulated_objects/major_appliances/washing_machine/dryer_washer_4/model_dryer_washer_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd457598c6a2d488b704d2f9d7077cb20f2f888491160abe6f7e0b7eb7ecf2b8 -size 11062 +oid sha256:409bbfed65d7590c7452dd82ec96784558ecfcdc7e4325edb7193ae90848742d +size 11623 diff --git a/Articulated_objects/major_appliances/washing_machine/rolling_washer_1/model_rolling_washer_1.usd b/Articulated_objects/major_appliances/washing_machine/rolling_washer_1/model_rolling_washer_1.usd index b7defd5fef7b8e2038bb19391e38666a9dd41005..7b681b45af7eed7cd6e73f78a122cd584fdeccf1 100644 --- a/Articulated_objects/major_appliances/washing_machine/rolling_washer_1/model_rolling_washer_1.usd +++ b/Articulated_objects/major_appliances/washing_machine/rolling_washer_1/model_rolling_washer_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e536ba3b95051c3d3373008ee7ece855ea8ab1207f419a3ce54ba39d0917f83a -size 8301375 +oid sha256:955727da1ecf4a95f66b12be99b6ded8e24c7ef746b9a19949d226620f5fcf7a +size 8302021 diff --git a/Articulated_objects/major_appliances/washing_machine/rolling_washer_5/model_rolling_washer_5.usd b/Articulated_objects/major_appliances/washing_machine/rolling_washer_5/model_rolling_washer_5.usd index 725380f8794dc492c4512b579b4d684a301c2bfa..1f185017b4e55696e25caa7460fc05f3f123bb4b 100644 --- a/Articulated_objects/major_appliances/washing_machine/rolling_washer_5/model_rolling_washer_5.usd +++ b/Articulated_objects/major_appliances/washing_machine/rolling_washer_5/model_rolling_washer_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfbeac9fb1ba69fbc080f81bd85be06856d949bc0dbb46f4a7d1e8d05be3dfc1 -size 93327 +oid sha256:3b8d6f1cd53f359755700e34945fb74c84f6b808a32c4095ad08f198c5634ffc +size 94204 diff --git a/Articulated_objects/major_appliances/washing_machine/rolling_washer_6/model_rolling_washer_6.usd b/Articulated_objects/major_appliances/washing_machine/rolling_washer_6/model_rolling_washer_6.usd index 3603189f4b8d4acf958d8a596bdc3242e3209c13..453153309bd4bb661ca43a5c070a16e2c26db3b5 100644 --- a/Articulated_objects/major_appliances/washing_machine/rolling_washer_6/model_rolling_washer_6.usd +++ b/Articulated_objects/major_appliances/washing_machine/rolling_washer_6/model_rolling_washer_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee172c323041e86e63d3caf81d6b9198a8e7ebbe4cfb606c48a624857a54e7e -size 1795068 +oid sha256:11c6e73fb8d1cdafdf0e4bc597f1d7cc63016d6f7668df2326c1e3044d2a0a4a +size 1795803 diff --git a/Articulated_objects/major_appliances/washing_machine/washing_machine_2/model_washing_machine_2.usd b/Articulated_objects/major_appliances/washing_machine/washing_machine_2/model_washing_machine_2.usd index 2b3b0e3af20f998cec3cb78a12d82f9dad677d45..14efa21165f420178e480b48965dde815a9bf7ad 100644 --- a/Articulated_objects/major_appliances/washing_machine/washing_machine_2/model_washing_machine_2.usd +++ b/Articulated_objects/major_appliances/washing_machine/washing_machine_2/model_washing_machine_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:590655f65f2bdbcebb2794dd68281c313be28a64ac89905e77dae56860809acb -size 392816 +oid sha256:ee6cfe1726e333b6e4f9fe1b5257076bb24b0c0936fe6600030aced63cc62823 +size 393580 diff --git a/Articulated_objects/major_appliances/washing_machine/washing_machine_3/model_washing_machine_3.usd b/Articulated_objects/major_appliances/washing_machine/washing_machine_3/model_washing_machine_3.usd index 7b9743bfd8a3a4d0467557cc150833c83c28413f..ba1e817a92a5ff53f556ebe1897ce2454943adbb 100644 --- a/Articulated_objects/major_appliances/washing_machine/washing_machine_3/model_washing_machine_3.usd +++ b/Articulated_objects/major_appliances/washing_machine/washing_machine_3/model_washing_machine_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4af32e02891665dd6b7a01479d5572c46a753560b776326485ff8dc2216697ef -size 14928 +oid sha256:23229f365cdfe1b3a97974ce31e50e9762ab766655fb1c8d3211a32951585a2a +size 15732 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/.thumbs/256x256/model_water_dispenser.usd.png b/Articulated_objects/major_appliances/water dispenser/water_dispenser/.thumbs/256x256/model_water_dispenser.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..44cb542ab3d2695467abea14a4450483026f3b09 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/.thumbs/256x256/model_water_dispenser.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daef2389b108b4b0670e728c4a24a5b95673ab142d121252163f8f3d2befae6b +size 97276 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl new file mode 100644 index 0000000000000000000000000000000000000000..d6c08a66ec3d6465474bf1e93968a42c369059a1 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl @@ -0,0 +1,43 @@ +mdl 1.3; + +import ::OmniGlass::OmniGlass; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = OmniGlass::OmniGlass( + absorption_coeff: color(1.f, 1.f, 1.f), + glass_color: color(1.f, 1.f, 1.f), + use_glass_color_texture: false, + glass_color_texture: texture_2d(), + frosting_roughness: 0.f, + glass_ior: 1.52f, + thin_walled: true, + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f)); + +/* +mdl 1.5; + +import ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume( + thin_walled: true, + transmission_color: color(1.f, 1.f, 1.f), + roughness_texture: texture_2d(), + ior: 1.52f, + transmission_color_texture: texture_2d(), + roughness_texture_influence: 0.f, + roughness: 0.f, + reflection_color_texture: texture_2d(), + reflection_color: color(1.f, 1.f, 1.f), + depth: 0.0001f, + normal_map_texture: texture_2d()); +*/ diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Tinted_Glass_R02.mdl b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Tinted_Glass_R02.mdl new file mode 100644 index 0000000000000000000000000000000000000000..4f3e700a04e9e80b4889847f1371a960cd4ac378 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Tinted_Glass_R02.mdl @@ -0,0 +1,19 @@ +mdl 1.5; + +using ..::Templates::GlassWithVolume import GlassWithVolume; +import ::tex::gamma_mode; +import ::state::normal; + +export material Tinted_Glass_R02(*) + = GlassWithVolume( + thin_walled: true, + transmission_color: color(0.02f, 0.02f, 0.02f), + roughness_texture: texture_2d(), + ior: 1.52f, + transmission_color_texture: texture_2d(), + roughness_texture_influence: 0.f, + roughness: 0.f, + reflection_color_texture: texture_2d(), + reflection_color: color(1.f, 1.f, 1.f), + depth: 0.0001f, + normal_map_texture: texture_2d()); diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassUtils.mdl b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassUtils.mdl new file mode 100644 index 0000000000000000000000000000000000000000..e2f50be111015ab1574b46699988f75e0619d1e4 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassUtils.mdl @@ -0,0 +1,83 @@ +mdl 1.5; + +import ::tex::*; +import ::math::*; +import ::anno::*; +import ::base::*; +import ::state::*; + +export float get_float( uniform texture_2d t, float f ){ + return ::tex::texture_isvalid(t) + ? + ::base::file_texture(t, + color(0.f, 0.f, 0.f), + color(1.f, 1.f, 1.f), + ::base::mono_maximum, + ::base::texture_coordinate_info(::state::texture_coordinate(0), ::state::texture_tangent_u(0), ::state::texture_tangent_v(0)), + float2(0.f, 1.f), + float2(0.f, 1.f), + ::tex::wrap_repeat, + ::tex::wrap_repeat, + false).mono + : + f; +} + +export color get_color( uniform texture_2d t, color c ){ + return ::tex::texture_isvalid(t) + ? + ::base::file_texture(t, + color(0.f, 0.f, 0.f), + color(1.f, 1.f, 1.f), + ::base::mono_alpha, + ::base::texture_coordinate_info(::state::texture_coordinate(0), ::state::texture_tangent_u(0), ::state::texture_tangent_v(0)), + float2(0.f, 1.f), + float2(0.f, 1.f), + ::tex::wrap_repeat, + ::tex::wrap_repeat, + false).tint + : + c; +} + +export float apply_roughness_influence( uniform texture_2d t, float f, float i ){ + return ::math::lerp(f, get_float(t, f), i); +} + +export color get_volume_absorption( + + float absorption = float(0) [[ + anno::display_name("Volume Absorption"), + anno::description("Controls how much light is absorbed through the surface"), + anno::hard_range(0.0,1000.0), + anno::soft_range(0.0,1.0) + ]], + + color absorptionColor = color(1) [[ + anno::display_name("Absorption Color"), + anno::description("Simulates shifts in color when light passes through the surface") + ]] + +) [[ + anno::display_name("Absorption"), + anno::description("Provides an absorption coefficient for the volume") +]] { + return (absorption>0)? -math::log(math::clamp(absorptionColor, color(0.01), color(0.99)))*absorption*100.0 : color(0); +} + +export color volume_scattering( + + float scattering = float(0) [[ + anno::display_name("Volume Scattering"), + anno::description("Controls how much light is scattered through the surface"), + anno::hard_range(0.0,1000.0), + anno::soft_range(0.0,1.0) + + ]] + +) [[ + anno::display_name("Scattering"), + anno::description("Provides a scattering coefficient for the volume") +]] { + return (scattering>0)? -math::log(color(0.5))*scattering*100.0 : color(0); +} \ No newline at end of file diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassWithVolume.mdl b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassWithVolume.mdl new file mode 100644 index 0000000000000000000000000000000000000000..5505110726ed96f27b86ad1ceae653c5c9d9e538 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Templates/GlassWithVolume.mdl @@ -0,0 +1,106 @@ +mdl 1.5; + +import ::tex::*; + +import GlassUtils::apply_roughness_influence; +import GlassUtils::get_color; +import GlassUtils::get_volume_absorption; +import ::anno::author; +import ::anno::copyright_notice; +import ::anno::description; +import ::anno::display_name; +import ::anno::hard_range; +import ::anno::in_group; +import ::anno::key_words; +import ::anno::soft_range; +import ::anno::unused; +import ::anno::usage; +import ::base::tangent_space_normal_texture; +import ::base::texture_coordinate_info; +import ::df::fresnel_layer; +import ::df::microfacet_ggx_smith_bsdf; +import ::df::scatter_mode; +import ::state::normal; +import ::state::texture_coordinate; +import ::state::texture_tangent_u; +import ::state::texture_tangent_v; +import ::tex::gamma_mode; +import ::tex::wrap_mode; + +export material GlassWithVolume( + uniform bool thin_walled = false [[ + ::anno::in_group("Material", "", "") + ]], + uniform color transmission_color = color(1.f, 0.00609700009f, 0.00609700009f) [[ + ::anno::in_group("Transmission", "", ""), + ::anno::usage("") + ]], + uniform texture_2d roughness_texture = texture_2d() [[ + ::anno::description("The input texture"), + ::anno::in_group("Roughness", "", ""), + ::anno::usage("") + ]], + uniform float ior = 1.34100008f [[ + ::anno::in_group("Material", "", ""), + ::anno::usage("") + ]], + uniform texture_2d transmission_color_texture = texture_2d() [[ + ::anno::description("The input texture"), + ::anno::in_group("Transmission", "", "") + ]], + float roughness_texture_influence = 1.f [[ + ::anno::in_group("Roughness", "", ""), + ::anno::usage("") + ]], + float roughness = 0.f [[ + ::anno::in_group("Roughness", "", ""), + ::anno::usage("") + ]], + uniform texture_2d reflection_color_texture = texture_2d() [[ + ::anno::description("The input texture"), + ::anno::in_group("Reflection", "", ""), + ::anno::usage("") + ]], + uniform color reflection_color = color(1.f, 1.f, 1.f) [[ + ::anno::in_group("Reflection", "", ""), + ::anno::usage("") + ]], + float depth = 0.00100000005f [[ + ::anno::description("Controls how much light is absorbed through the surface"), + ::anno::display_name("Volume Absorption"), + ::anno::in_group("Volume", "", ""), + ::anno::usage(""), + ::anno::soft_range(0.f, 1.f), + ::anno::hard_range(0.f, 1000.f) + ]], + uniform texture_2d normal_map_texture = texture_2d() [[ + ::anno::description("The input texture"), + ::anno::in_group("Normal Map", "", ""), + ::anno::usage("") + ]]) + = + let { + bool tmp0 = thin_walled; + material_surface tmp1( + ::df::fresnel_layer(ior, 1.f, ::df::microfacet_ggx_smith_bsdf(GlassUtils::apply_roughness_influence(roughness_texture, roughness, roughness_texture_influence), GlassUtils::apply_roughness_influence(roughness_texture, roughness, roughness_texture_influence), GlassUtils::get_color(reflection_color_texture, reflection_color), ::state::texture_tangent_u(0), ::df::scatter_reflect, ""), ::df::microfacet_ggx_smith_bsdf(GlassUtils::apply_roughness_influence(roughness_texture, roughness, roughness_texture_influence), GlassUtils::apply_roughness_influence(roughness_texture, roughness, roughness_texture_influence), thin_walled ? GlassUtils::get_color(transmission_color_texture, transmission_color) : color(1.f, 1.f, 1.f), ::state::texture_tangent_u(0), ::df::scatter_transmit, ""), ::state::normal()), + material_emission(emission: edf(), intensity: color(0.f, 0.f, 0.f), mode: intensity_radiant_exitance)); + material_surface tmp2 = material_surface(scattering: bsdf(), emission: material_emission(emission: edf(), intensity: color(0.f, 0.f, 0.f), mode: intensity_radiant_exitance)); + color tmp3 = ior; + material_volume tmp4( + vdf(), + thin_walled ? GlassUtils::get_color(transmission_color_texture, transmission_color) : GlassUtils::get_volume_absorption(depth, GlassUtils::get_color(transmission_color_texture, transmission_color)), + color(0.f, 0.f, 0.f)); + material_geometry tmp5( + float3(0.f), + 1.f, + ::base::tangent_space_normal_texture(normal_map_texture, 1.f, false, false, ::base::texture_coordinate_info(::state::texture_coordinate(0), ::state::texture_tangent_u(0), ::state::texture_tangent_v(0)), float2(0.f, 1.f), float2(0.f, 1.f), ::tex::wrap_repeat, ::tex::wrap_repeat, false, 1.f, 0.f)); + hair_bsdf tmp6 = hair_bsdf(); + } in + material( + thin_walled: tmp0, + surface: tmp1, + backface: tmp2, + ior: tmp3, + volume: tmp4, + geometry: tmp5, + hair: tmp6); diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/model_water_dispenser.usd b/Articulated_objects/major_appliances/water dispenser/water_dispenser/model_water_dispenser.usd new file mode 100644 index 0000000000000000000000000000000000000000..8853b4fe8233f0e8dd50d18de3d14542a097fc8f --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/model_water_dispenser.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d73bc0767cfdaf28829d1f14b6696252e39ab5ecf92145ec6724912a84cb873 +size 44745021 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/img/d846fda25545cb9059aa12fed2a8373d.png b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/img/d846fda25545cb9059aa12fed2a8373d.png new file mode 100644 index 0000000000000000000000000000000000000000..aa6e0ca71ff5c40616f1ba7915e957ff706a5771 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/img/d846fda25545cb9059aa12fed2a8373d.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:159221e1757d8eca038f26c5e635bc956b9c838581fbdfc50e97e71ffe3333a5 +size 10139292 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/material.usd b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..207d355b89c93c80f2aa6d1a9235df0e1599896f --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e197b04698968a7059b2bef7ce22bb3243da5d3ac70bdb4ffbe8eccc8a118f2b +size 3138 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/v_69323/link_0_0.usd b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..a17c1c27b5063b1087e5f8d748fb597ffdaf4555 --- /dev/null +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbf6703c985e4586c7f3d781e424e02d63901714c8435ea1c009d3be1fb6b206 +size 16329603 diff --git a/Articulated_objects/major_appliances/water dispenser/water_dispenser_5/model_water_dispenser_5.usd b/Articulated_objects/major_appliances/water dispenser/water_dispenser_5/model_water_dispenser_5.usd index e96468b7e41526f8556718856ea89cbabf5badf3..ddfb4d9828a610ba5b0050413e392469b9d92858 100644 --- a/Articulated_objects/major_appliances/water dispenser/water_dispenser_5/model_water_dispenser_5.usd +++ b/Articulated_objects/major_appliances/water dispenser/water_dispenser_5/model_water_dispenser_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ee85762f950c47cee99f4e10c748dce54bc49b0c7678b0065b0468afb88dd9d -size 2928903 +oid sha256:da1241fb7e57dae4cc34081477fa6e268f70c828a3d4e24ee9b87b230f9d6d3c +size 2929930 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.collect.mapping.json b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..c9ee2591a4d7e08b372cbc7f1a55e36addd28ac0 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.collect.mapping.json @@ -0,0 +1,23 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_01.jpg", + "source_hash": "593a2cd1d0dfd7b5dd4283fc30f411bc41adbef9", + "target_url": "./Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_01.jpg", + "target_hash": "593a2cd1d0dfd7b5dd4283fc30f411bc41adbef9" + }, + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_02.jpg", + "source_hash": "5a4e1c2d36c2804e1a6ba8f520a66c88ae61727a", + "target_url": "./Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_02.jpg", + "target_hash": "5a4e1c2d36c2804e1a6ba8f520a66c88ae61727a" + }, + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_03.jpg", + "source_hash": "db1a5b83879275a5f37c8c68e1a241678a74a1ab", + "target_url": "./Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_03.jpg", + "target_hash": "db1a5b83879275a5f37c8c68e1a241678a74a1ab" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.thumbs/256x256/AirFryer1.usd.png b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.thumbs/256x256/AirFryer1.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..ddbd4a3862b9020ab19c679b93b098fb91371d20 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/.thumbs/256x256/AirFryer1.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31e64ca7415d4336dcd67d7cf54f45a730beef6943e9f5a4ecf1cf472fe7cf9d +size 23662 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/AirFryer1.usd b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/AirFryer1.usd new file mode 100644 index 0000000000000000000000000000000000000000..fe572b0ee10e24385d26243ac57e4c7f484c9236 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/AirFryer1.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cd26c2d9053dd8dfefaf607f507174b88d70d1ef1accb7de529f4c4f227106e +size 493939 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_01.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a5eec0d337a5e485a06e29242bc90c6f515962c6 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_01.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf99f7b216571212fa97982c2da701a4fddf55b23eff1db8c15addb14e7f4e87 +size 492701 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_02.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_02.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2eae240521b3d7366c5d92fa9b34b020b015f3a0 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_02.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd8fed027269fd1da4f2d8884827a72c1e27cac2b6654c603d704b7c12d79d5d +size 431951 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_03.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_03.jpg new file mode 100644 index 0000000000000000000000000000000000000000..795f1f4d18ed3ebb36231eeccf2329a90c5d8f5e --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer1/Users/jujux/AppData/Local/Temp/85feae0099d2c29c/textures/T_BR_01_YRZ_KQZG01_03.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f4b44dd0731dd1ca62451c7665a4ac79ffe90a1f882059139756f4cc395102d +size 86326 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.collect.mapping.json b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..29804eb59ce7e1bc67d6ead6d0e19c3e22b2e968 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.collect.mapping.json @@ -0,0 +1,23 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_01.jpg", + "source_hash": "f24d3c66ec1b5ebedd019c3b5d2c2fcbc2c2343b", + "target_url": "./AirFryer2.fbm/T_BR_01_YRZ_KQZG02_01.jpg", + "target_hash": "f24d3c66ec1b5ebedd019c3b5d2c2fcbc2c2343b" + }, + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_02.jpg", + "source_hash": "cd522ec06859165851f0fd90fd2a3feda7d9e8a9", + "target_url": "./AirFryer2.fbm/T_BR_01_YRZ_KQZG02_02.jpg", + "target_hash": "cd522ec06859165851f0fd90fd2a3feda7d9e8a9" + }, + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_03.jpg", + "source_hash": "a8598bf4236b5fa0f429b19e615bb5e38e0efcc7", + "target_url": "./AirFryer2.fbm/T_BR_01_YRZ_KQZG02_03.jpg", + "target_hash": "a8598bf4236b5fa0f429b19e615bb5e38e0efcc7" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.thumbs/256x256/AirFryer2.usd.png b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.thumbs/256x256/AirFryer2.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..9e93decf96d00afac7eb2ffaf732b826c5f403b7 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/.thumbs/256x256/AirFryer2.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f876de2464f0a891d37885ed427b71d2a606c059970e34e79a2ea141ad31d43 +size 21219 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_01.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..500926f90e9419760d03645e5a4e5019509024ae --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_01.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daae76741f33be5f394e6bf5738d6931c4462ff9b98488ea5237d90c28238479 +size 209128 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_02.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_02.jpg new file mode 100644 index 0000000000000000000000000000000000000000..133acd10da5f5a5a15e252c7a47098ef99362d27 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_02.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50d8c6036b8874e69f6826a9cff6ed063ba078bdaf0f1bd0faa94a4631f07a2b +size 85863 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_03.jpg b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_03.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a32624c5bd57dfa9ee090adc9173ff4a508f0c03 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.fbm/T_BR_01_YRZ_KQZG02_03.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ceaa8124c3ef65ee203329632a1c1c4cea8d1afa6d36816c84f1584d1ed5fb7 +size 458475 diff --git a/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.usd b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.usd new file mode 100644 index 0000000000000000000000000000000000000000..3e56db70002ed7462dc948ac870d0174a35c068e --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/Collected_AirFryer2/AirFryer2.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5da86bc54bb98c861080e7a9c0f52659102a1b32407ff8b84a6b29666f7d0591 +size 327172 diff --git a/Articulated_objects/small_appliances/airfryer/bakingchamber/model_bakingchamber.usd b/Articulated_objects/small_appliances/airfryer/bakingchamber/model_bakingchamber.usd new file mode 100644 index 0000000000000000000000000000000000000000..c007a20387cdcecc918cbe32472b00443c645530 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/bakingchamber/model_bakingchamber.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636109159ecf29332761eca23562ca4801694974cd43594a2ac129f0a4c4d201 +size 1034247 diff --git a/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/419aea259f6f2c988c02fb910563f422.png b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/419aea259f6f2c988c02fb910563f422.png new file mode 100644 index 0000000000000000000000000000000000000000..524202bbe9299cf0b315f45bcdadce3b351280d0 --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/419aea259f6f2c988c02fb910563f422.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2d62a2987bb87dacc4695829b4806310a97c9612c17d4fa3f85a982c6a2a8e6 +size 267709 diff --git a/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/bf896d81095621de426f0626dbd7dc4e.png b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/bf896d81095621de426f0626dbd7dc4e.png new file mode 100644 index 0000000000000000000000000000000000000000..c3122b92b2666933ea78744a096cb8d5c55c4dfa --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/img/bf896d81095621de426f0626dbd7dc4e.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e32f8d3041a9bd03efab66f41cf06df085538f0dea17d1669ecb6df0452bb77 +size 380018 diff --git a/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/material.usd b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..1bd2545ecb9195dda0cebca1e57c5718d92c2fcc --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4813f4817eb47453e1338c26d996f0a0ac96791ded2222bec4cf3b9a0555a1b +size 2493 diff --git a/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/v_69323/link_0_0.usd b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..5d33a8b318cc550b79bb425b3592c25d3743652f --- /dev/null +++ b/Articulated_objects/small_appliances/airfryer/bakingchamber/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d99948295a50a36405fbc9dca5e00c8ad6fad2c952c5159e7573b68d375b60d6 +size 563563 diff --git a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/model_capsule_coffee_maker_1.usd b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/model_capsule_coffee_maker_1.usd index f3be2ec399d666df08a5268f8e49b93bed5f7e69..8cfdf5f293a2d819002f52789fa8ce5e71e28b50 100644 --- a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/model_capsule_coffee_maker_1.usd +++ b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/model_capsule_coffee_maker_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b1200c17d01acae3e5f9f0b309e6794c4117404fefd4a4883574eb86f44450a -size 4307967 +oid sha256:ae910e956b837e064855860d2226bf180af06585b0e9b5d0796c5f9b24c68375 +size 4312158 diff --git a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/resource/v_0/link_default_0.usd b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/resource/v_0/link_default_0.usd index ce5a26d92d3c143f73e50aa7d9f504758de9c7ae..1b103e9b25f5e75a9352ddb609e5faf0cb958e28 100644 --- a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/resource/v_0/link_default_0.usd +++ b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_1/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b53e98aadb9b9fca1e7b08ecd71059eefdf93d923efd49691938174cfb2075a -size 5286756 +oid sha256:33d8701fc2882f51b2bfb76a170730fad4e40ddfa0163a30a2aabc8ce1ce6ff5 +size 5287912 diff --git a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_3/model_capsule_coffee_maker_3.usd b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_3/model_capsule_coffee_maker_3.usd index 9e75320861e1692d2e9977bb4e596c07aaa81fb7..90a9bdf7a6182093e18d5925909365945713d006 100644 --- a/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_3/model_capsule_coffee_maker_3.usd +++ b/Articulated_objects/small_appliances/coffee machine/capsule_coffee_maker_3/model_capsule_coffee_maker_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4198e456a23251bbb50ca344cbb0b2a5aea729cb140b3583715366090c7ca3c -size 9731978 +oid sha256:1e59721c2f1c4837224f53ba9ca5b75710e17cb1948652bdf3a4a547ba2c280e +size 9732948 diff --git a/Articulated_objects/small_appliances/coffee machine/coffee_machine_5/model_coffee_machine_5.usda b/Articulated_objects/small_appliances/coffee machine/coffee_machine_5/model_coffee_machine_5.usda index 0a15e30d10f141ad9f15412d0571697aa1deabf6..4c2bf5022b3a14ef1eb85b0975960412c9094583 100644 --- a/Articulated_objects/small_appliances/coffee machine/coffee_machine_5/model_coffee_machine_5.usda +++ b/Articulated_objects/small_appliances/coffee machine/coffee_machine_5/model_coffee_machine_5.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b1bb96829f58e275d2502b147af7b9d8c5fef2f0a330b022db104314fbe2d6 -size 1756303 +oid sha256:fbc0cb07a4f6f099c346fefe0b7d4e5eb9e1c7757b2554b1bce92f95f1fffd61 +size 1755112 diff --git a/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/model_coffee_machine_6.usd b/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/model_coffee_machine_6.usd index 0029251bb7450e7f447d42504d98f9796857a7c4..6f935b10b98e1efa6bb7ac982a5892cc7f7bfa42 100644 --- a/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/model_coffee_machine_6.usd +++ b/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/model_coffee_machine_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c12b0f93cdc080c71642a894e7bd52ba503683441e1caabf1f398a3dd93ae345 -size 9194161 +oid sha256:70d708b2801f6ee10b4e116e228b11d032ed12bc919e4236eaa1ab60491b7f71 +size 9195452 diff --git a/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/resource/v_0/link_default_0.usd b/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/resource/v_0/link_default_0.usd index d6cac6d8dc926e037fffe063e805eb7db9b769ff..2975963354fe369c873125a260b73fc1ea534cd1 100644 --- a/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/resource/v_0/link_default_0.usd +++ b/Articulated_objects/small_appliances/coffee machine/coffee_machine_6/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c9d11c4c05bc52319c13588ea0327f47bd4d76ac0d85e2c2d3c591f32aa83f9 -size 10768444 +oid sha256:459c427901a6cf7816f3e52f8bca33fae12b42e42fff9b58f5def212509f41e3 +size 10769557 diff --git a/Articulated_objects/small_appliances/coffee machine/coffee_machine_8/model_coffee_machine_8.usd b/Articulated_objects/small_appliances/coffee machine/coffee_machine_8/model_coffee_machine_8.usd index cc38772559617ab3f47f8d99a931a031b9c8f48a..603ba58d7e5b8e97812acf816a25d9a79117fe30 100644 --- a/Articulated_objects/small_appliances/coffee machine/coffee_machine_8/model_coffee_machine_8.usd +++ b/Articulated_objects/small_appliances/coffee machine/coffee_machine_8/model_coffee_machine_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d9cc4c9aab9cc69134df36f22111890da80a76bd6197ff9dde20e207c67024b -size 2708586 +oid sha256:c7af694e393587d43d8f7d4c592bb10a08ec8518dda5375e70b5a36662cfb474 +size 2709199 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.collect.mapping.json b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..ad4e0ccab5e9e8018fbb7aefcec0848ca1c54393 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.collect.mapping.json @@ -0,0 +1,17 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_light2/Users/jujux/AppData/Local/Temp/2f9ae91b2d3436ce/textures/T_BR_01_YRZ_TD02_02.jpg", + "source_hash": "fbe008d42eb7f5c0bbd20e4c2bbc5e6ab710f273", + "target_url": "./Users/jujux/AppData/Local/Temp/2f9ae91b2d3436ce/textures/T_BR_01_YRZ_TD02_02.jpg", + "target_hash": "fbe008d42eb7f5c0bbd20e4c2bbc5e6ab710f273" + }, + { + "source_url": "C:/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl", + "source_hash": "7e361a04416ee49b4efbdee894c30a8feda4eec8", + "target_url": "./Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl", + "target_hash": "bb4f2f7400d0f18080706ad7c5bcd67192eb8cd3" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.thumbs/256x256/light2.usd.png b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.thumbs/256x256/light2.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e38f344e6834fabd4a2ce110c91475f1d8a819 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/.thumbs/256x256/light2.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e458ea19564643d929661ab93637171570e1cee266d4c8b55f34232f8779dc89 +size 10646 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl new file mode 100644 index 0000000000000000000000000000000000000000..95daa330fa3a3615f638df9bc74a49f5b431fbe1 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl @@ -0,0 +1,42 @@ +mdl 1.4; + +using ::OmniPBR import OmniPBR; +import ::tex::gamma_mode; +import ::state::normal; + +export material Light_5000K(*) + = OmniPBR( + diffuse_color_constant: color(1.0, 1.0, 1.0), + diffuse_texture: texture_2d(), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 1.0, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.0, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: false, + ORM_texture: texture_2d(), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: true, + emissive_color: color(1.0, 0.894118, 0.80784), + emissive_mask_texture: texture_2d(), + emissive_intensity: 5000.0, + bump_factor: 0.f, + normalmap_texture: texture_2d(), + detail_bump_factor: 0.3f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Users/jujux/AppData/Local/Temp/2f9ae91b2d3436ce/textures/T_BR_01_YRZ_TD02_02.jpg b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Users/jujux/AppData/Local/Temp/2f9ae91b2d3436ce/textures/T_BR_01_YRZ_TD02_02.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3e75935243eeaa62b5749d6f5ca1227ede1a73f6 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/Users/jujux/AppData/Local/Temp/2f9ae91b2d3436ce/textures/T_BR_01_YRZ_TD02_02.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c708ce2c6f739c152ff75e2db7afac8469632683470fe931cceb6c398943f70b +size 355082 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light2/light2.usd b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/light2.usd new file mode 100644 index 0000000000000000000000000000000000000000..216cebf30f532d9ad01dadd376cefa95423b19f6 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light2/light2.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87af56a2aca44fb230e5a14fe6f0170834e978ce52e4dea19e162a769d7e7b4b +size 278262 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.collect.mapping.json b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.collect.mapping.json new file mode 100644 index 0000000000000000000000000000000000000000..03ca49189ba0221c7ee1b257c8cd14b4e91389a9 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.collect.mapping.json @@ -0,0 +1,23 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_01.jpg", + "source_hash": "749d6bf1711ecf64b2fa23c21b0f7a941900df49", + "target_url": "./Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_01.jpg", + "target_hash": "749d6bf1711ecf64b2fa23c21b0f7a941900df49" + }, + { + "source_url": "C:/xingxing/2.Reverse modeling/USD/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_02.png", + "source_hash": "8ecd2ffe9f94af29db84a4b79f2a83b0d5264962", + "target_url": "./Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_02.png", + "target_hash": "8ecd2ffe9f94af29db84a4b79f2a83b0d5264962" + }, + { + "source_url": "C:/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl", + "source_hash": "7e361a04416ee49b4efbdee894c30a8feda4eec8", + "target_url": "./Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl", + "target_hash": "4ce2815d69c04109dd55721d5e22442512cb2609" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.thumbs/256x256/light3.usd.png b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.thumbs/256x256/light3.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..0de4912d086facb2e821aca45f2e24072f8867b0 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/.thumbs/256x256/light3.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cd9e53d12e4e9c09829e8c412307d5214449e8927a8585ef1fa16b75a56e6e9 +size 14064 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl new file mode 100644 index 0000000000000000000000000000000000000000..95daa330fa3a3615f638df9bc74a49f5b431fbe1 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl @@ -0,0 +1,42 @@ +mdl 1.4; + +using ::OmniPBR import OmniPBR; +import ::tex::gamma_mode; +import ::state::normal; + +export material Light_5000K(*) + = OmniPBR( + diffuse_color_constant: color(1.0, 1.0, 1.0), + diffuse_texture: texture_2d(), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 1.0, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.0, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: false, + ORM_texture: texture_2d(), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: true, + emissive_color: color(1.0, 0.894118, 0.80784), + emissive_mask_texture: texture_2d(), + emissive_intensity: 5000.0, + bump_factor: 0.f, + normalmap_texture: texture_2d(), + detail_bump_factor: 0.3f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_01.jpg b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c3b04670aafd1b54678b93a596446a5ae0dc4a0a --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_01.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7c752f2217d3439f2f7724559a01542d72b2ba62a1efb68ebf7305c2379f332 +size 559612 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_02.png b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_02.png new file mode 100644 index 0000000000000000000000000000000000000000..a586943e290a5285fa334c12ab5f15186b452e1c --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/Users/jujux/AppData/Local/Temp/3e43288af7051037/textures/T_BR_01_YRZ_TD03_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f55304593ec37d1119c9dab2cc2d4614cc47e2fdce578e9183ce46b7e3f8fb7 +size 32661 diff --git a/Articulated_objects/small_appliances/desk_lamp/Collected_light3/light3.usd b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/light3.usd new file mode 100644 index 0000000000000000000000000000000000000000..94b9e33cf931bb286f649627ce97ac5e143e867f --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/Collected_light3/light3.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1fa13422cb3cf2d43f7e269333eafd834a2d459ba76c342ace366b217055d1 +size 481698 diff --git a/Articulated_objects/small_appliances/desk_lamp/light1/.thumbs/256x256/light1.usd.png b/Articulated_objects/small_appliances/desk_lamp/light1/.thumbs/256x256/light1.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..fc998ccfcbf31441fe57281902f501897688a7d5 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/light1/.thumbs/256x256/light1.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1890c2749982c1eb42919520d024f0bc19e82986dfcb1cc0b936399e39d0b311 +size 28510 diff --git a/Articulated_objects/small_appliances/desk_lamp/light1/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl b/Articulated_objects/small_appliances/desk_lamp/light1/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl new file mode 100644 index 0000000000000000000000000000000000000000..95daa330fa3a3615f638df9bc74a49f5b431fbe1 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/light1/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Emissives/Light_5000K.mdl @@ -0,0 +1,42 @@ +mdl 1.4; + +using ::OmniPBR import OmniPBR; +import ::tex::gamma_mode; +import ::state::normal; + +export material Light_5000K(*) + = OmniPBR( + diffuse_color_constant: color(1.0, 1.0, 1.0), + diffuse_texture: texture_2d(), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 1.0, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.0, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: false, + ORM_texture: texture_2d(), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: true, + emissive_color: color(1.0, 0.894118, 0.80784), + emissive_mask_texture: texture_2d(), + emissive_intensity: 5000.0, + bump_factor: 0.f, + normalmap_texture: texture_2d(), + detail_bump_factor: 0.3f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_appliances/desk_lamp/light1/light1.usd b/Articulated_objects/small_appliances/desk_lamp/light1/light1.usd new file mode 100644 index 0000000000000000000000000000000000000000..7e2cd3bcc593b75796ca9e22c3b4964996725e97 --- /dev/null +++ b/Articulated_objects/small_appliances/desk_lamp/light1/light1.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1807d1c2cf74ade44f847d0c6222dfbbf0d7b7bb7ed0ff6ac8c52759b803958 +size 263723 diff --git a/Articulated_objects/small_appliances/laptop/S4_3/.collect.mapping.json b/Articulated_objects/small_appliances/laptop/S4_3/.collect.mapping.json new file mode 100755 index 0000000000000000000000000000000000000000..dd4b4e0bf35c1434a63700f7ac922a0cbe014505 --- /dev/null +++ b/Articulated_objects/small_appliances/laptop/S4_3/.collect.mapping.json @@ -0,0 +1,11 @@ +{ + "version": "1.0", + "file_records": [ + { + "source_url": "C:/Users/jujux/AppData/Local/Temp/a8102c2620b5951d/textures/T_BR_01_YRZ_BJBDN01_02.jpg", + "source_hash": "83b584ddb1bf7705ee2877acb6ec35fd670689ad", + "target_url": "./Users/jujux/AppData/Local/Temp/a8102c2620b5951d/textures/T_BR_01_YRZ_BJBDN01_02.jpg", + "target_hash": "83b584ddb1bf7705ee2877acb6ec35fd670689ad" + } + ] +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/laptop/S4_3/.thumbs/256x256/S4_3.usd.png b/Articulated_objects/small_appliances/laptop/S4_3/.thumbs/256x256/S4_3.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..6f988330ac71f8fa926d80e255967bcc8150009e --- /dev/null +++ b/Articulated_objects/small_appliances/laptop/S4_3/.thumbs/256x256/S4_3.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69a17050096467b366686a477f126dc5a84c95db5e4a648d5b8552fe8e022abc +size 17375 diff --git a/Articulated_objects/small_appliances/laptop/S4_3/S4_3.usd b/Articulated_objects/small_appliances/laptop/S4_3/S4_3.usd new file mode 100755 index 0000000000000000000000000000000000000000..12e38c0399fc39b2c4021d54694dad6a25f8e1df --- /dev/null +++ b/Articulated_objects/small_appliances/laptop/S4_3/S4_3.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45140ace87eed81fafd2d1e0f6df83350476e22a13ece6c6693ad1ddd5089f4c +size 41788 diff --git a/Articulated_objects/small_appliances/laptop/S4_3/Users/jujux/AppData/Local/Temp/a8102c2620b5951d/textures/T_BR_01_YRZ_BJBDN01_02.jpg b/Articulated_objects/small_appliances/laptop/S4_3/Users/jujux/AppData/Local/Temp/a8102c2620b5951d/textures/T_BR_01_YRZ_BJBDN01_02.jpg new file mode 100755 index 0000000000000000000000000000000000000000..0b3662b3dcc7e25da3a8aa79c94d917710a1e5ab --- /dev/null +++ b/Articulated_objects/small_appliances/laptop/S4_3/Users/jujux/AppData/Local/Temp/a8102c2620b5951d/textures/T_BR_01_YRZ_BJBDN01_02.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46bd4851a58f6d76240df338a594e0d79e1cc743ebead3fdc83e6b01c06df838 +size 7301805 diff --git a/Articulated_objects/small_appliances/laptop/computer_21/model_computer_21.usd b/Articulated_objects/small_appliances/laptop/computer_21/model_computer_21.usd index 5dcbf9de091de37345feb0416cf0342d654d136e..dd528c98fbb9871e673b3c6325428fc4a931238f 100644 --- a/Articulated_objects/small_appliances/laptop/computer_21/model_computer_21.usd +++ b/Articulated_objects/small_appliances/laptop/computer_21/model_computer_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa3fa262dd4b26466bd8fdb007eea02fcf5a9db8eb295c3858f6e65462413bf8 -size 3292176 +oid sha256:17432db7ea7c0d465c011a7cbce8aec5a5c4d06328eacfb3eec6670e1565d7c6 +size 3293354 diff --git a/Articulated_objects/small_appliances/laptop/computer_5/model_computer_5.usda b/Articulated_objects/small_appliances/laptop/computer_5/model_computer_5.usda index 7d427e1d03db42dc9b4d698f9fabfd8d416ee180..9e8fa9c29f411ce61d38616af8fa99df74115454 100644 --- a/Articulated_objects/small_appliances/laptop/computer_5/model_computer_5.usda +++ b/Articulated_objects/small_appliances/laptop/computer_5/model_computer_5.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5667dbd75bdda441a44b2789b08e07470c2d4fbdc73fe2f4bc4979762846e4e7 -size 4704036 +oid sha256:df3ab08ca83dcd803418e3b0d355ce1a31625e36c2d7496752f590309765f764 +size 4703534 diff --git a/Articulated_objects/small_appliances/laptop/computer_9/model_computer_9.usd b/Articulated_objects/small_appliances/laptop/computer_9/model_computer_9.usd index 6295289caf408521f7aa6fcff105f9cf2ee524e1..1e97f8ab5e7b83154a3be3cf8eaa8d47ab587789 100644 --- a/Articulated_objects/small_appliances/laptop/computer_9/model_computer_9.usd +++ b/Articulated_objects/small_appliances/laptop/computer_9/model_computer_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13c0ed76377c2abd5a55287d2aff75d68f9fd410702920393926def23fcbcde3 -size 131082 +oid sha256:90f5c409329af3a5ff9219b706dd53808a2bfeb09c98c234f0b3a10a5c230b96 +size 132013 diff --git a/Articulated_objects/small_appliances/microwave/microwave_1/model_microwave_1.usd b/Articulated_objects/small_appliances/microwave/microwave_1/model_microwave_1.usd index 349ec1a6f0a5cf88f335bc03f0c8d5f951a57e8f..8b9ed1d8dfb07a44fd800930d785b03a4aef91fb 100644 --- a/Articulated_objects/small_appliances/microwave/microwave_1/model_microwave_1.usd +++ b/Articulated_objects/small_appliances/microwave/microwave_1/model_microwave_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebf25865c2f3130f9869913ccc5c577355895dac4e7ab526e5b1c2d9fdf991b9 -size 28263 +oid sha256:bcc42a0d355dc752e2f241c7f520382563c86aea7b9ad8f87fa964e4cfe7f77f +size 29742 diff --git a/Articulated_objects/small_appliances/microwave/microwave_2/model_microwave_2.usda b/Articulated_objects/small_appliances/microwave/microwave_2/model_microwave_2.usda index 7c7c54b2a98da610f80b4958558fde324072e8ca..d3103c68daeadab997a04a2654589e0700b702e6 100644 --- a/Articulated_objects/small_appliances/microwave/microwave_2/model_microwave_2.usda +++ b/Articulated_objects/small_appliances/microwave/microwave_2/model_microwave_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c0a91d0f23659540175b4b0c835776c9ac272a8a18b6786447fc50ed907028f -size 424809 +oid sha256:0ccca96821509c232c15f138ae5fc5a7096736c0629cdb951bfd5e1ca5e7ac3b +size 424042 diff --git a/Articulated_objects/small_appliances/microwave/microwave_3/model_microwave_3.usd b/Articulated_objects/small_appliances/microwave/microwave_3/model_microwave_3.usd index 48defeb520f796d6e8e5e35c59418c1342a97ee6..e50ff4522bfebff95d282a55e2136800c8ca1292 100644 --- a/Articulated_objects/small_appliances/microwave/microwave_3/model_microwave_3.usd +++ b/Articulated_objects/small_appliances/microwave/microwave_3/model_microwave_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d520e55f61005f655c98813fa627b7e459c03dee6cb87913e3d4694147ea2b0 -size 586256 +oid sha256:0252cc064d680a9754e07dd82cfc1730417b1889fd1ea1c4234c4f444de67f4c +size 587597 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/C/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl b/Articulated_objects/small_appliances/oven/Collected_model_oven03/C/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl new file mode 100644 index 0000000000000000000000000000000000000000..d6c08a66ec3d6465474bf1e93968a42c369059a1 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/C/Isaac Sim 4.5/isaac-sim-assets/Materials/2023_2_1/Base/Glass/Clear_Glass.mdl @@ -0,0 +1,43 @@ +mdl 1.3; + +import ::OmniGlass::OmniGlass; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = OmniGlass::OmniGlass( + absorption_coeff: color(1.f, 1.f, 1.f), + glass_color: color(1.f, 1.f, 1.f), + use_glass_color_texture: false, + glass_color_texture: texture_2d(), + frosting_roughness: 0.f, + glass_ior: 1.52f, + thin_walled: true, + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f)); + +/* +mdl 1.5; + +import ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume; +import ::tex::gamma_mode; +import ::state::normal; + +export material Clear_Glass(*) + = ::Library::AEC::Materials::Templates::GlassWithVolume::GlassWithVolume( + thin_walled: true, + transmission_color: color(1.f, 1.f, 1.f), + roughness_texture: texture_2d(), + ior: 1.52f, + transmission_color_texture: texture_2d(), + roughness_texture_influence: 0.f, + roughness: 0.f, + reflection_color_texture: texture_2d(), + reflection_color: color(1.f, 1.f, 1.f), + depth: 0.0001f, + normal_map_texture: texture_2d()); +*/ diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/model_oven03.usd b/Articulated_objects/small_appliances/oven/Collected_model_oven03/model_oven03.usd new file mode 100644 index 0000000000000000000000000000000000000000..38048918ce6c06d3c948300f94d46d1cc6f08d46 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/model_oven03.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b706d830354e88f90b1fa3356818fa4dda59247f21d9ccf745fd9d4138a4be8 +size 14879756 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/3dc867ea7a737e83b9295bafdf5b24c3.png b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/3dc867ea7a737e83b9295bafdf5b24c3.png new file mode 100644 index 0000000000000000000000000000000000000000..92e2a30ff3b943fa6634d24d1335f284f52ed909 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/3dc867ea7a737e83b9295bafdf5b24c3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6615db4b1c7f30da1347a0818e9bb7b1291163c9a44910807109cb1eb7a3b61 +size 79153 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/c6dbd8d68ea359d0d49d4c4e39f3a080.png b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/c6dbd8d68ea359d0d49d4c4e39f3a080.png new file mode 100644 index 0000000000000000000000000000000000000000..079983540c1fb143dfb2e4ba8493734c0fa63da2 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/c6dbd8d68ea359d0d49d4c4e39f3a080.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c371c507c0c4acd55ec277800236412bd33e45f6242caf66d16559b2909557a8 +size 2024567 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/ee69344a9e8b2e377ccc57a83f592e69.png b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/ee69344a9e8b2e377ccc57a83f592e69.png new file mode 100644 index 0000000000000000000000000000000000000000..bc0e2e72f4d22bf50e8701442918b217027b7cf5 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/img/ee69344a9e8b2e377ccc57a83f592e69.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ce248cc7c9a39d8a5d0fa418f44838970eb27a91cc96c05c82bcff70b1aec6e +size 1059170 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/material.usd b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..a610b235c59fe3f0b8f5ed6e11bad85bf3d0c7b9 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71fe418d6f510748a5c129ee91dd86dc7cbfaf0d087385224f976e83d179baa0 +size 3799 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/oven_control.py b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/oven_control.py new file mode 100755 index 0000000000000000000000000000000000000000..eda8dc9ec1dd4e1c98f9ede88c9290a3b6ec0a41 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/oven_control.py @@ -0,0 +1,153 @@ +import carb +from omni.kit.scripting import BehaviorScript +from omni.isaac.dynamic_control import _dynamic_control +from enum import Enum +from pxr import Gf +from threading import Thread +import marshal,json +import omni.kit.commands +from omni.isaac.core.prims import XFormPrim +import numpy as np +from pxr import Gf, Sdf, Usd, UsdGeom +import math +from omni.isaac.core import SimulationContext, World +# from isaacsim.core.prims import XFormPrim + +def find_prim_path_by_name(prim_name: str, root_path: str = "/") -> str: + """Recursively find the full path by Prim name""" + stage = omni.usd.get_context().get_stage() + prim = stage.GetPrimAtPath(root_path) + + def _find_prim(prim): + if prim.GetName() == prim_name: + return prim.GetPath().pathString + for child in prim.GetChildren(): + result = _find_prim(child) + if result: + return result + return None + + found_path = _find_prim(prim) + if not found_path: + raise RuntimeError(f"Prim '{prim_name}' not found under {root_path}") + return found_path + +# # 1. prim init +# button_prim = XFormPrim("/sm_warehouse_a01_h10m_cornerout_01/micro_wave_oven_2/Xform") +# door_prim = XFormPrim("/sm_warehouse_a01_h10m_cornerout_01/micro_wave_oven_2/oven/oven_door") +# # 2. articulation Root prim +# root_articulation_prim = "/sm_warehouse_a01_h10m_cornerout_01/micro_wave_oven_2/oven/oven_base" +# # 3. joint name +# joint_names = ["PrismaticJoint", "RevoluteJoint"] +# # 4. joint num +# num_arm_dof = 2 + +# light_scopes=[XFormPrim("/sm_warehouse_a01_h10m_cornerout_01/micro_wave_oven_2/Lights_on"), +# XFormPrim("/sm_warehouse_a01_h10m_cornerout_01/micro_wave_oven_2/Lights_on_1"), +# ] +# for i in range(0, light_scopes.__len__()): +# light_scopes[i].set_visibility(False) +# index = random.randint(0, len(light_scopes)-1) +# light_scopes[index].set_visibility(True) +button_prim = XFormPrim(find_prim_path_by_name("oven_E_button_5")) +print("button_prim", button_prim.prim_path) +# door_prim = XFormPrim(find_prim_path_by_name("oven_E_door_4")) +# print("door_prim", door_prim.prim_path) +root_articulation_prim = find_prim_path_by_name("oven_E_body_7") +print("root_articulation_prim", root_articulation_prim) +joint_names = ["PrismaticJoint_oven_down", "RevoluteJoint_oven_up"] +light_scopes=[XFormPrim(find_prim_path_by_name("oven_light")) + ] + +class MicrowaveOverControl(BehaviorScript): + def on_init(self): + self.phsx_freq = 120 + self.joint_handles = [] + self.dc = _dynamic_control.acquire_dynamic_control_interface() + light_scopes[0].set_visibility(False) + + # 初始化门的锁定状态 + self.door_locked = True + + # init_pose + self.local_pose_button, self.local_ort_drawer_down = button_prim.get_local_pose() + # self.local_pose_door, self.local_ort_drawer_up = door_prim.get_local_pose() + + # Find Root + self.art = self.dc.get_articulation(root_articulation_prim) + if self.art == _dynamic_control.INVALID_HANDLE: + print('the prim is not an articulation') + + + def on_destroy(self): + pass + + def on_play(self): + self.simulation_context = SimulationContext( + stage_units_in_meters=1.0, + physics_dt=1.0/120, + rendering_dt=1.0/120 + ) + + + def on_pause(self): + pass + + def on_stop(self): + self.init_start=True + light_scopes[0].set_visibility(False) + # back to initial pose + # button_prim.set_local_pose(translation=self.local_pose_button) + # door_prim.set_local_pose(translation=self.local_pose_door) + self.door_locked = True + carb.log_info(f"{type(self).__name__}.on_stop()->{self.prim_path}") + pass + + def on_update(self, current_time: float, delta_time: float): + if delta_time <= 0: + return + self.dc = _dynamic_control.acquire_dynamic_control_interface() + self.active_art() + self.apply_behavior() + + def active_art(self): + # Find Root + self.art = self.dc.get_articulation(root_articulation_prim) + if self.art == _dynamic_control.INVALID_HANDLE: + print('the prim is not an articulation') + self.dc.wake_up_articulation(self.art) + + # Find joint + self.joint_handles = [] + for joint_name in joint_names: + self.joint_handles.append( self.dc.find_articulation_dof(self.art, joint_name)) + # print("self.joint_handles",self.joint_handles) + def apply_behavior(self): + self.oven_control() + + def oven_control(self): + self.Joint0_state = self.dc.get_dof_state(self.joint_handles[0], _dynamic_control.STATE_ALL).pos + self.Joint1_state = self.dc.get_dof_state(self.joint_handles[1], _dynamic_control.STATE_ALL).pos + # print("self.Joint0_state", self.Joint0_state) + # print("self.Joint1_state", self.Joint1_state) + # 按钮被按下且门处于锁定状态 + if self.Joint0_state < -0.001 and self.door_locked: + self.dc.set_dof_position_target(self.joint_handles[1], math.radians(-90)) + # if self.Joint1_state > math.radians(100): + # self.door_locked = False # 解除锁定 + + # 门开到30度后开灯,按钮归位s + if self.Joint1_state < math.radians(-30) : + self.door_locked = False # 解除锁定 + light_scopes[0].set_visibility(True) + self.dc.set_dof_position_target(self.joint_handles[0], 0) + + # 检测手动关门 + if self.Joint1_state > math.radians(-20) and not self.door_locked: # 当门接近关闭位置时 + + self.dc.set_dof_position_target(self.joint_handles[1], 0) # 设置目标位置为0 + self.door_locked = True + if self.Joint1_state < math.radians(5): # 当门完全关闭时 + # 锁定门 + self.door_locked = True + light_scopes[0].set_visibility(False) # 关闭灯 diff --git a/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/v_69323/link_0_0.usd b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..3083076823c4549a2fd4bd897328895462d40dad --- /dev/null +++ b/Articulated_objects/small_appliances/oven/Collected_model_oven03/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bcc661530df5b669e84b57131be3eff74088f4d77c503ef068e421dc441925b +size 8086558 diff --git a/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/11.usd.png b/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/11.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..88288cbd005f3e73a24a44de1ea7a47c034682bc --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/11.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96b860db03653c061c353c2432b723e196d121ee02c8b85db5293085f7f6d2e4 +size 88951 diff --git a/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/model_oven.usd.png b/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/model_oven.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..8b42e8cedb11006c98313f70b9c4bddb8592ce21 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/.thumbs/256x256/model_oven.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4b86e4eaba5132daa3b9bce2133af17cf9b4d2d2741db69ff97bd7bb7746373 +size 30613 diff --git a/Articulated_objects/small_appliances/oven/oven_1/model_oven.usd b/Articulated_objects/small_appliances/oven/oven_1/model_oven.usd new file mode 100644 index 0000000000000000000000000000000000000000..82ebcf9f72c871db6c352ebe57137aee27c84a43 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/model_oven.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7654c64cd688c76daf7d5c05431293986bb839d24bb72027c81fa03e1392302c +size 47908823 diff --git a/Articulated_objects/small_appliances/oven/oven_1/resource/img/246ad44e4e4eff840f5abd84b8945cab.png b/Articulated_objects/small_appliances/oven/oven_1/resource/img/246ad44e4e4eff840f5abd84b8945cab.png new file mode 100644 index 0000000000000000000000000000000000000000..f9cf4834e52eac4ae444bb689ef9b6bb12b58d6d --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/resource/img/246ad44e4e4eff840f5abd84b8945cab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6443765482355a1ba3e52c65f760862e4db6a7fa089e77e1a10b3999fb0badb7 +size 14807249 diff --git a/Articulated_objects/small_appliances/oven/oven_1/resource/img/3fef927ac0d7a1ef1241157bfaf4161b.png b/Articulated_objects/small_appliances/oven/oven_1/resource/img/3fef927ac0d7a1ef1241157bfaf4161b.png new file mode 100644 index 0000000000000000000000000000000000000000..622fcc55d00a7a8ded2ea458951c91166c489a05 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/resource/img/3fef927ac0d7a1ef1241157bfaf4161b.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f1fb0978b3773bcb93eb3f841b0ce3a1b596342cf6dacb8d280e87d4ae655c8 +size 2157145 diff --git a/Articulated_objects/small_appliances/oven/oven_1/resource/material.usd b/Articulated_objects/small_appliances/oven/oven_1/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..f2659b4d47d8db32fdbbc3b584c9c85031c5ec00 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eee127083f2c97d1c6a929acc853ea2149b9a0f7765f37536ab25bd931a5f99f +size 2602 diff --git a/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/element_path.json b/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/element_path.json new file mode 100644 index 0000000000000000000000000000000000000000..7500c195113772cb2ed4e3f06dc5fac70a42b743 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/element_path.json @@ -0,0 +1,28 @@ +{ + "203": "/root/E_body_203", + "108": "/root/E_body_203/E_part8_108", + "109": "/root/E_body_203/E_part3_109", + "116": "/root/E_body_203/E_part18_116", + "118": "/root/E_body_203/E_part10_118", + "125": "/root/E_body_203/E_part7_125", + "131": "/root/E_body_203/E_part4_131", + "135": "/root/E_body_203/E_part5_135", + "183": "/root/E_rack_183", + "197": "/root/E_door_197", + "206": "/root/E_body_203/E_part6_206", + "207": "/root/E_body_203/E_part11_207", + "209": "/root/E_body_203/E_part12_209", + "212": "/root/E_body_203/E_part13_212", + "213": "/root/E_body_203/E_part14_213", + "214": "/root/E_body_203/E_part9_214", + "228": "/root/E_door_197/E_part1_3_228", + "237": "/root/E_knob2_237", + "254": "/root/E_body_203/E_part2_254", + "256": "/root/E_body_203/E_part1_256", + "50": "/root/E_body_203/E_part15_50", + "61": "/root/E_body_203/E_part17_61", + "71": "/root/E_body_203/E_part16_71", + "77": "/root/E_knob1_77", + "84": "/root/E_door_197/E_part1_2_84", + "96": "/root/E_door_197/E_part1_1_96" +} \ No newline at end of file diff --git a/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/link_0.usd b/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/link_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..5f17250d5c46753e4aadc292d33161d8bc0f3eaf --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_1/resource/v_69323/link_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de481cb39f7f021a37f828ce3c3c5713ce0237f40fdfa482197b7404c7c0f15a +size 7563333 diff --git a/Articulated_objects/small_appliances/oven/oven_2/model_oven_2.usd b/Articulated_objects/small_appliances/oven/oven_2/model_oven_2.usd index d50faf54c824a457e39bfbf92363424347113a3d..b56b705736f233a863af8a2e57f340a2b2efb29f 100644 --- a/Articulated_objects/small_appliances/oven/oven_2/model_oven_2.usd +++ b/Articulated_objects/small_appliances/oven/oven_2/model_oven_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c2bbf058fa0bd5a47664731eac928b34af424d58b2f3cb353a6f889cf53607 -size 1457792 +oid sha256:fbb3c2ddcd8107575db4242f7146925ccdcce1f4c3b3e5cc5d4962d28871de49 +size 1459486 diff --git a/Articulated_objects/small_appliances/oven/oven_2/resource/v_0/link_default_0.usd b/Articulated_objects/small_appliances/oven/oven_2/resource/v_0/link_default_0.usd index 8d1ffc3b6befce1166d3d0d0fb73a21b46a53cd9..7a5fa8a39d0febd9f1690cce79518581c13bdbbb 100644 --- a/Articulated_objects/small_appliances/oven/oven_2/resource/v_0/link_default_0.usd +++ b/Articulated_objects/small_appliances/oven/oven_2/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea92349db0692bf2b50628e4ff00c853e927c2b98d8aa85a3279cad9aa367a1 -size 987024 +oid sha256:e865e3e899d56e1f3cd8b3e256bbec38c04365c481a146b6649faa74840006f1 +size 988219 diff --git a/Articulated_objects/small_appliances/oven/oven_3/oven_2.usd b/Articulated_objects/small_appliances/oven/oven_3/oven_2.usd new file mode 100644 index 0000000000000000000000000000000000000000..90cd30a9dd00bb26acc88fa314a2b5cb7a32efc3 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_3/oven_2.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b2bc9536fbe05af465235afbe451e18160d642acc8fce229f1b8118e52162cf +size 8105 diff --git a/Articulated_objects/small_appliances/oven/oven_3/resource/img/b5438c25905693520be7b48998be40a7.png b/Articulated_objects/small_appliances/oven/oven_3/resource/img/b5438c25905693520be7b48998be40a7.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ef53ec19035592b39c66aae48fd9ac674c031d --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_3/resource/img/b5438c25905693520be7b48998be40a7.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57825e298db850449f9ebbe75906a9fa96c2dbc2334c1f3ba542d52731626f21 +size 96513 diff --git a/Articulated_objects/small_appliances/oven/oven_3/resource/material.usd b/Articulated_objects/small_appliances/oven/oven_3/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..b54f8cd28aabbd251a08f4c4b5153cacc21d2a38 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_3/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85498c754198b640a5351f1511eff282c5ce6e78f561b9584ec63bd7df8bd43e +size 2870 diff --git a/Articulated_objects/small_appliances/oven/oven_3/resource/v_69323/link_0_0.usd b/Articulated_objects/small_appliances/oven/oven_3/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..f5dd56ad96389d487c79ccbfbe23ac9d1202efe7 --- /dev/null +++ b/Articulated_objects/small_appliances/oven/oven_3/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9dfa950cb9bef46a63adeb9872cf2698611f34c573ed0430d868c79c3cbcd1d +size 305904 diff --git a/Articulated_objects/small_appliances/rice cooker/rice_cooker_21/model_rice_cooker_21.usd b/Articulated_objects/small_appliances/rice cooker/rice_cooker_21/model_rice_cooker_21.usd index d85389abafdf4ad38f089e2981e9340ece77f978..007136bc4e9bfbb62d7b2a412d599ac69e3965bd 100644 --- a/Articulated_objects/small_appliances/rice cooker/rice_cooker_21/model_rice_cooker_21.usd +++ b/Articulated_objects/small_appliances/rice cooker/rice_cooker_21/model_rice_cooker_21.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77896f61c1471c9dd1f614bc8206eeed16398c82d758ce0110b9065c494147a9 -size 1375817 +oid sha256:543c0fa07645cab6bf4cc4e4e76acfa17507b89a62343eadb847c55b74ab833a +size 1376946 diff --git a/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/model_rice_cooker_3.usd b/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/model_rice_cooker_3.usd index 9dcc486764213d474dbccfe0854f110578422bfc..15f7534d42d95d20c456216faca05fd38ae523c8 100644 --- a/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/model_rice_cooker_3.usd +++ b/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/model_rice_cooker_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0240c808463ac0ae9dd80954d3c1676a01e874f08d5a8b18efda8f87da5e70e -size 480194 +oid sha256:8c0479311a7114321f2ce9d88a6f82d5a232ebbab3a9dba906a22a67a59c5cb7 +size 481429 diff --git a/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/resource/v_0/link_default_0.usd b/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/resource/v_0/link_default_0.usd index d1acaf97b3c4dcc0cd48fa24deec67a89de3503f..e2baa8906d0225a757adc4433573036561cbcbcd 100644 --- a/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/resource/v_0/link_default_0.usd +++ b/Articulated_objects/small_appliances/rice cooker/rice_cooker_3/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48ac8a2a8c24182f87546ce90c9c1a2d72cf3f7cae1d20c47b1a5a82fd2e5bf9 -size 5023712 +oid sha256:f95f495e96b0455f6421cd2aed966bbe5c701f692ac9b5b11388186cef4764e0 +size 5024405 diff --git a/Articulated_objects/small_appliances/rice cooker/rice_cooker_7/model_rice_cooker_7.usd b/Articulated_objects/small_appliances/rice cooker/rice_cooker_7/model_rice_cooker_7.usd index 75f02ebb6a05ada3c4557c344a4086538048d751..e917c1b31a4f2b3b298187e2c9928ea5e2a87f4f 100644 --- a/Articulated_objects/small_appliances/rice cooker/rice_cooker_7/model_rice_cooker_7.usd +++ b/Articulated_objects/small_appliances/rice cooker/rice_cooker_7/model_rice_cooker_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d473691e78a7ebe435d0d28479f28561b4a2b4e8f7f85bea936e37e32a55881 -size 22859 +oid sha256:7cb4aac32c389578d50746c9f5ae1af209544c7a645ac9fb74c4d4a4626c70ed +size 23675 diff --git a/Articulated_objects/small_appliances/table fan/electric_fan_1/model_electric_fan_1.usd b/Articulated_objects/small_appliances/table fan/electric_fan_1/model_electric_fan_1.usd index 61fdef931b19ae818fe80641f65df414d7af6bf5..b5f0d4a2f80d121822e6f5de73bf45012d385622 100644 --- a/Articulated_objects/small_appliances/table fan/electric_fan_1/model_electric_fan_1.usd +++ b/Articulated_objects/small_appliances/table fan/electric_fan_1/model_electric_fan_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4fc9016bc4bdda9523289a1274554adf40f125c06e6d26ac906a2f290f5719b -size 7543713 +oid sha256:825df2a5c5f9453e03ba71f71c3be4672e0f3de5f76edc33eb90f818682d8fee +size 7544278 diff --git a/Articulated_objects/small_appliances/table fan/electric_fan_10/model_electric_fan_10.usd b/Articulated_objects/small_appliances/table fan/electric_fan_10/model_electric_fan_10.usd index aae28442d52d0e1205ff39d9f8c34f1dff7e1d1c..1da28e9e1104aaedea7362f7e61bd15c868c579e 100644 --- a/Articulated_objects/small_appliances/table fan/electric_fan_10/model_electric_fan_10.usd +++ b/Articulated_objects/small_appliances/table fan/electric_fan_10/model_electric_fan_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c990221b0a050622d52521852a3b8802d8e307ebc97627bcaa27985dd961cb04 -size 7918907 +oid sha256:208514628323990964c5c1892eba6415e80c09a4ee48c63d518aabc055eb8d88 +size 7919434 diff --git a/Articulated_objects/small_appliances/table fan/electric_fan_11/model_electric_fan_11.usd b/Articulated_objects/small_appliances/table fan/electric_fan_11/model_electric_fan_11.usd index c93b0c2e7b754ca580446405f51c7493b6aca3bf..7a216d156c4455607574ca7961aab56a683a92dd 100644 --- a/Articulated_objects/small_appliances/table fan/electric_fan_11/model_electric_fan_11.usd +++ b/Articulated_objects/small_appliances/table fan/electric_fan_11/model_electric_fan_11.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b65a64e93b514e995b3f2c2fcdc680d7d7e0576a733964cfa1fe2c73691f47b7 -size 22932 +oid sha256:0d03f16e3a9092da2ee107ca693cab2cb2302137d4622b58c205cc3bbc8b9883 +size 23506 diff --git a/Articulated_objects/small_appliances/table fan/electric_fan_6/model_electric_fan_6.usda b/Articulated_objects/small_appliances/table fan/electric_fan_6/model_electric_fan_6.usda index 2bdf9648df55c11906f5743f011d9079fb4e570a..c796ebafb60aa7b5133b59c15418a02e131ce3a8 100644 --- a/Articulated_objects/small_appliances/table fan/electric_fan_6/model_electric_fan_6.usda +++ b/Articulated_objects/small_appliances/table fan/electric_fan_6/model_electric_fan_6.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cfc6d41898f1065711950e0008f6db8ceca59f6995566fa5874fc96b52b8357 -size 28156595 +oid sha256:92e87dd5c461edd49bf22adac9c61f026041a58d946ff2ef568b0cf526c3ca80 +size 28156305 diff --git a/Articulated_objects/small_appliances/table fan/electric_fan_8/model_electric_fan_8.usda b/Articulated_objects/small_appliances/table fan/electric_fan_8/model_electric_fan_8.usda index 3baa3a3a999094fe86d136b6e2c9a7ac438f79eb..0e40034de35e89f78924cf81011d2b193f706e34 100644 --- a/Articulated_objects/small_appliances/table fan/electric_fan_8/model_electric_fan_8.usda +++ b/Articulated_objects/small_appliances/table fan/electric_fan_8/model_electric_fan_8.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e50103fa06b1ff1bfbb4ef6931e79580284ae60652986e5a15a2a621c7e4d773 -size 8889989 +oid sha256:9a0b9516ab26c7336cedf72ec1d6e612c560fbbf409934131d8f9c635904e7e2 +size 8889597 diff --git a/Articulated_objects/small_appliances/water dispenser/water_dispenser_8/model_water_dispenser_8.usd b/Articulated_objects/small_appliances/water dispenser/water_dispenser_8/model_water_dispenser_8.usd index c8a90524c54757bed7c14814c49394d2248f42a3..51749dc260bba12dd15c297ee3cdd4f4a060d60b 100644 --- a/Articulated_objects/small_appliances/water dispenser/water_dispenser_8/model_water_dispenser_8.usd +++ b/Articulated_objects/small_appliances/water dispenser/water_dispenser_8/model_water_dispenser_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40f62296694ba9a28139eba0aae3c54fab390cee64fde4537ee8983b2680d3ef -size 2824923 +oid sha256:37c88962ab317ae2caa10b481ce110683ac2c3d2aa7c34c411f3318d008b1d66 +size 2828212 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/D1_3.usdc b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/D1_3.usdc new file mode 100755 index 0000000000000000000000000000000000000000..23319fef5f82c5212b3e739a3abc46521071647d --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/D1_3.usdc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c3d4b27ca499a1eafc448f35a237f1ed09b90c7bf7c8ef69d7d6ee3909cb55e +size 759609 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Carpaint/Carpaint_01.mdl b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Carpaint/Carpaint_01.mdl new file mode 100755 index 0000000000000000000000000000000000000000..842c9272ba7faee90433b135c19f4195ef30c90d --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Carpaint/Carpaint_01.mdl @@ -0,0 +1,177 @@ +mdl 1.8; + +import ::state::normal; +import ::OmniSurface::OmniShared::emission_mode; +import ..::Templates::OmniUber_Automotive::*; +import ::tex::gamma_mode; + +export material Carpaint_01(*) + = Templates::OmniUber_Automotive::OmniUber_Automotive( + diffuse_reflection_color: color(0.57180047f, 0.864686489f, 0.0542212836f), + metalness: 0.f, + roughness_u: 1.f, + enable_coat: true, + coat_color: color(0.719471931f, 0.719464719f, 0.719464719f), + coat_roughness: 0.f, + enable_flakes: true, + flake_color: color(0.490786523f, 0.821782172f, 0.27121523f), + flake_size: 0.049999997f, + flakes_density: 0.25f, + flakes_spread: 0.170000002f, + flake_roughness: 0.280000001f, + uv_set_layer_0: Templates::OmniUber_Automotive::uv_set_1, + base_color_image: texture_2d(), + base_color_scale: 1.f, + base_color_offset: 0.f, + base_color_desaturation: 0.f, + metalness_image: texture_2d(), + metalness_channel: Templates::OmniUber_Automotive::b, + specular_reflection_weight: 1.f, + specular_reflection_color: color(1.f, 1.f, 1.f), + cavity_image: texture_2d(), + cavity_channel: Templates::OmniUber_Automotive::r, + roughness_image: texture_2d(), + roughness_channel: Templates::OmniUber_Automotive::g, + roughness_range_position: float2(1.f, 0.5f), + normal_image: texture_2d(), + normal_flip_green: true, + normal_scale: 1.f, + enable_layer_1: false, + uv_set_layer_1: Templates::OmniUber_Automotive::uv_set_1, + layer_1_order: Templates::OmniUber_Automotive::above, + layer_1_base_color_image: texture_2d(), + layer_1_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_1_base_color_offset: 0.f, + layer_1_base_color_scale: 1.f, + layer_1_base_color_desaturation: 0.f, + layer_1_roughness_image: texture_2d(), + layer_1_roughness_channel: Templates::OmniUber_Automotive::g, + layer_1_roughness_u: 1.f, + layer_1_roughness_range_position: float2(1.f, 0.5f), + layer_1_metalness_image: texture_2d(), + layer_1_metalness_channel: Templates::OmniUber_Automotive::b, + layer_1_metalness: 1.f, + layer_1_cavity_image: texture_2d(), + layer_1_cavity_channel: Templates::OmniUber_Automotive::r, + layer_1_specular_reflection_weight: 1.f, + layer_1_normal_image: texture_2d(), + layer_1_normal_flip_green: true, + layer_1_normal_scale: 1.f, + layer_1_blend_source: Templates::OmniUber_Automotive::texture, + layer_1_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_splatmap: texture_2d(), + layer_1_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_direction: float3(0.f, 1.f, 0.f), + layer_1_blend_axis: Templates::OmniUber_Automotive::y, + layer_1_blend_object_space: true, + layer_1_blend_scale: 1.f, + layer_1_blend_offset: 0.f, + layer_1_blend_primvar_name: "", + layer_1_uv_set_detail: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_detail_image: texture_2d(), + layer_1_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_threshold: 0.330000013f, + layer_1_blend_factor_override: 0.f, + enable_layer_2: false, + layer_2_order: Templates::OmniUber_Automotive::above, + uv_set_layer_2: Templates::OmniUber_Automotive::uv_set_2, + layer_2_base_color_image: texture_2d(), + layer_2_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_2_base_color_offset: 0.f, + layer_2_base_color_scale: 1.f, + layer_2_base_color_desaturation: 0.f, + layer_2_metalness_image: texture_2d(), + layer_2_metalness_channel: Templates::OmniUber_Automotive::b, + layer_2_metalness: 1.f, + layer_2_roughness_image: texture_2d(), + layer_2_roughness_channel: Templates::OmniUber_Automotive::g, + layer_2_roughness_u: 1.f, + layer_2_roughness_range_position: float2(1.f, 0.5f), + layer_2_specular_reflection_weight: 1.f, + layer_2_cavity_image: texture_2d(), + layer_2_cavity_channel: Templates::OmniUber_Automotive::r, + layer_2_normal_image: texture_2d(), + layer_2_normal_flip_green: true, + layer_2_normal_scale: 1.f, + layer_2_blend_source: Templates::OmniUber_Automotive::texture, + layer_2_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_splatmap: texture_2d(), + layer_2_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_direction: float3(0.f, 1.f, 0.f), + layer_2_blend_axis: Templates::OmniUber_Automotive::y, + layer_2_blend_object_space: true, + layer_2_blend_scale: 1.f, + layer_2_blend_offset: 0.f, + layer_2_blend_primvar_name: "", + layer_2_uv_set_detail: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_detail_image: texture_2d(), + layer_2_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_threshold: 0.330000013f, + layer_2_blend_factor_override: 0.f, + uvs_mode_01: Templates::OmniUber_Automotive::triplanar, + uv_scale_01: float2(1.f), + uv_offset_01: float2(0.f), + uv_offset_time_01: float2(0.f), + uv_rotation_01: 0.f, + triplanar_blend_range_01: 0.5f, + uvs_mode_02: Templates::OmniUber_Automotive::triplanar, + uv_scale_02: float2(8.f), + uv_offset_02: float2(0.f), + uv_offset_time_02: float2(0.f), + uv_rotation_02: 0.f, + triplanar_blend_range_02: 0.5f, + uvs_mode_03: Templates::OmniUber_Automotive::triplanar, + uv_scale_03: float2(1.f), + uv_offset_03: float2(0.f), + uv_offset_time_03: float2(0.f), + uv_rotation_03: 0.f, + triplanar_blend_range_03: 0.5f, + uvs_mode_04: Templates::OmniUber_Automotive::triplanar, + uv_scale_04: float2(1.f), + uv_offset_04: float2(0.f), + uv_offset_time_04: float2(0.f), + uv_rotation_04: 0.f, + triplanar_blend_range_04: 0.5f, + enable_opacity: false, + uv_set_opacity: Templates::OmniUber_Automotive::uv_set_1, + enable_detail_normal: false, + uv_set_detail_normal: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_image: texture_2d(), + detail_normal_flip_green: true, + detail_normal_scale: 1.f, + uv_set_detail_weight: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_weight_image: texture_2d(), + detail_normal_weight_channel: Templates::OmniUber_Automotive::r, + enable_emission: false, + uv_set_emission: Templates::OmniUber_Automotive::uv_set_1, + emission_image: texture_2d(), + emission_use_temperature: false, + emission_temperature: 6500.f, + uv_set_emission_mask: Templates::OmniUber_Automotive::uv_set_1, + emission_color: color(1.f, 1.f, 1.f), + emission_mask_image: texture_2d(), + emission_mode: OmniSurface::OmniShared::emission_lx, + emission_intensity: 1.f, + opacity_image: texture_2d(), + opacity_channel: Templates::OmniUber_Automotive::a, + geometry_opacity_threshold: 0.150000006f, + enable_anisotropy: false, + uv_set_anisotropy: Templates::OmniUber_Automotive::uv_set_1, + anisotropic_direction_image: texture_2d(), + anisotropic_direction_channel: Templates::OmniUber_Automotive::r, + anisotropic_direction: 0.f, + anisotropic_roughness_u: 1.f, + anisotropic_roughness_v: 0.25f, + coat_mask_image: texture_2d(), + coat_mask_channel: Templates::OmniUber_Automotive::r, + coat_roughness_image: texture_2d("../../Surfacing/ov_misc_textures_noise/noise_scratch2.jpg", ::tex::gamma_default, ""), + coat_roughness_channel: Templates::OmniUber_Automotive::r, + coat_ior: 1.60000002f, + coat_normal_image: texture_2d(), + coat_normal_flip_green: true, + uv_set_coat_roughness_normal: Templates::OmniUber_Automotive::uv_set_1, + uv_set_coat_mask: Templates::OmniUber_Automotive::uv_set_1, + coat_anisotropy: 0.f, + coat_anisotropy_rotation: 0.f, + coat_affect_color: 0.f, + coat_affect_roughness: 0.f); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl new file mode 100755 index 0000000000000000000000000000000000000000..9123430b115c1b7d325814c3d9414da407f66a2e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl @@ -0,0 +1,2611 @@ +mdl 1.8; + +import ::anno::*; +import ::base::*; +import ::df::*; +import ::limits::*; +import ::math::*; +import ::state::*; +import ::tex::*; +import ::scene::*; + +import ::OmniSurface::OmniShared::*; +import ::OmniSurface::OmniImage::*; +import ::OmniSurface::OmniSurfaceLiteBase::*; +import ::OmniSurface::OmniSurfaceBase::*; + +import ::nvidia::core_definitions::blend_normals; + +import ::nvidia::core_definitions::triplanar_file_texture; +import ::nvidia::core_definitions::triplanar_normalmap_texture; + +export enum blend_source +{ + texture [[ anno::display_name( "Texture" ) ]], + direction [[ anno::display_name( "Direction" ) ]], + axis [[ anno::display_name( "Axis" ) ]], + primvar [[ anno::display_name( "Primvar" ) ]] +}; + +export enum uvs_mode +{ + texture_coord_0 [[ anno::display_name( "Texture Coordinate 0" ) ]], + triplanar [[ anno::display_name( "TriPlanar" ) ]] +}; + +export enum uv_set_selection +{ + uv_set_1 [[ anno::display_name( "UV Set 1" ) ]], + uv_set_2 [[ anno::display_name( "UV Set 2" ) ]], + uv_set_3 [[ anno::display_name( "UV Set 3" ) ]], + uv_set_4 [[ anno::display_name( "UV Set 4" ) ]] +}; + +export enum channel_mode +{ + r [[ anno::display_name( "R" ) ]], + g [[ anno::display_name( "G" ) ]], + b [[ anno::display_name( "B" ) ]], + a [[ anno::display_name( "A" ) ]], + rgb [[ anno::display_name( "RGB" ) ]] +}; + +export enum axis_mode +{ + x [[ anno::display_name( "X" ) ]], + x_invert [[ anno::display_name( "-X" ) ]], + y [[ anno::display_name( "Y" ) ]], + y_invert [[ anno::display_name( "-Y" ) ]], + z [[ anno::display_name( "Z" ) ]], + z_invert [[ anno::display_name( "-Z" ) ]] +}; + +export enum layer_order +{ + below [[ anno::display_name( "Below Clear Coat" ) ]], + above [[ anno::display_name( "Above Clear Coat" ) ]] +}; + +export struct material_layer +{ + color base_color; + float metallic; + float cavity; + float specular_weight; + float roughness; + float3 normal; +}; + +export struct coat_layer +{ + float coat_weight; + color coat_color; + float coat_roughness; + uniform float coat_ior; + float coat_anisotropy; + float coat_anisotropy_rotation; + float coat_affect_color; + float coat_affect_roughness; + float3 coat_normal; +}; + +export struct anisotropy +{ + float anisotropy_roughness_u; + float anisotropy_roughness_v; + float anisotropy_rotation; +}; + +export struct uv_set_settings +{ + uvs_mode mode = texture_coord_0; + float2 uv_scale = float2( 1.f ); + float2 uv_offset = float2( 0.f ); + float2 uv_offset_time = float2( 0.f ); + float uv_rotation = 0.f; + float triplanar_blend_range = 0.5f; +}; + +export struct uv_streams +{ + uv_set_settings uv_set_settings_1; + uv_set_settings uv_set_settings_2; + uv_set_settings uv_set_settings_3; + uv_set_settings uv_set_settings_4; +}; + +export struct flakes +{ + float priority; + int seed; + float4 carrier; +}; + +export struct flake_layer +{ + float3 normal; + float roughness; + float weight; +}; + +int hash( int seed, int i ) +{ + return(i ^ seed ) * 1075385539; +} + +int random_next( int seed ) +{ + seed ^= seed << 13; + seed ^= seed >>> 17; + seed ^= seed << 5; + return seed; +} + +float random_value( int seed ) +{ + return math::abs( float( seed ) * 0.00000000046566f ); +} + +int random_initialize( int3 seed ) +{ + return hash( hash( hash( 0, seed.x ), seed.y ), seed.z ); +} + +float3 rotate_position( + float3 position = state::position(), + float3 xi = float3( 0.f ) +) +{ + float theta = math::PI * 2.f * xi.x; + float phi = math::PI * 2.f * xi.y; + float z = xi.z * 2.f; + + float r = math::sqrt( z ); + float[2] sp_cp = math::sincos( phi ); + float Vx = r * sp_cp[0]; + float Vy = r * sp_cp[1]; + float Vz = math::sqrt( 2.f - z ); + + float[2] st_ct = math::sincos( theta ); + float Sx = Vx * st_ct[1] - Vy * st_ct[0]; + float Sy = Vx * st_ct[0] + Vy * st_ct[1]; + + float3x3 M( + Vx * Sx - st_ct[1], Vx * Sy - st_ct[0], Vx * Vz, + Vy * Sx + st_ct[0], Vy * Sy - st_ct[1], Vy * Vz, + Vz * Sx, Vz * Sy, 1.0f - z); + + return M * position; +} + +export float linstep( + float input = 0.f, + float min_in = 0.f, + float max_in = 1.f, + float min_out = 0.f, + float max_out = 1.f +) +{ + float in_range = math::saturate( ( input - min_in ) / ( max_in - min_in ) ); + float out_range = math::lerp( min_out, max_out, in_range ); + return out_range; + +} + +export float histogram_range( + float input = 0.f, + float range = 1.f, + float position = 0.5f +) +{ + float x = ( range * 0.5f ) + ( 1.f - position ); + float y = ( 1.f - position ) * 2.f; + float z = ( range * 0.5f ) + position; + float w = position * 2.f; + + return linstep( input, 0.f, 1.f, 1.f - math::min( x, y ), math::min( z, w ) ); +} + +export float threshold_blend( + float input = 1.f, + float height = 0.5f, + float threshold = 0.33f +) +{ + height = 1.f - height; + float epsilon = 0.0001; + float min = math::saturate( height - ( threshold + epsilon ) ); + return math::saturate( math::smoothstep( min, height, input ) ); +} + +export float lookup_float4_channel( + uniform texture_2d tex = texture_2d(), + float2 coord = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + float4 texel = tex::lookup_float4( tex: tex, coord: coord ); + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.w * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export color color_adjustments( + color input = color( 1.f ), + color color_offset = color( 0.f ), + color color_scale = color( 1.f ), + color color_tint = color( 1.f ), + float desaturation = 0.f +) +{ + input = input * color_scale + color_offset; + if ( desaturation > 0.f ){ + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + color gray = color( math::dot( float3( input ), luminance ) ); + input = color( math::lerp( input, gray, desaturation ) ); + } + return input * color_tint; +} + +export float lookup_triplanar_channel( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f, + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ) ); + + /*float3 texel = float3( triplanar_color( tex, float3( uv_scale.x, uv_scale.y, uv_scale.x ) ) );*/ + + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.x * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export float3 lookup_triplanar_normal( + uniform texture_2d tex = texture_2d(), + float normal_scale = 1.f, + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + uniform bool flip_green = false, + float3 default_value = state::normal(), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_normalmap_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + object_space: true, + blend_range: triplanar_blend_range, + flip_1: !flip_green, + flip_2: !flip_green, + flip_3: !flip_green, + strength: normal_scale ) ); + + return texel; +} + +export color lookup_triplanar_color( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + color default_value = color( 1.f ), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + color texel = ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ); + + return texel; +} + +flakes flake_normal( + flakes flake = flakes(), + float spread = 0.54f +) +{ + if( flake.priority <= 0.f ) + { + flake.carrier = float4( state::normal().x, state::normal().y, state::normal().z, 1.f ); + return flake; + } + + int seed = random_next( flake.seed ); + float xi0 = random_value( seed ); + seed = random_next( seed ); + float xi1 = random_value( seed ); + float phi = 2.f * math::PI * xi0; + + float roughness = spread * spread; + + float tantheta = math::sqrt( -roughness * roughness * math::log( 1.f - xi1 ) ); + float sintheta = tantheta / math::sqrt( 1.f + tantheta * tantheta ); + float costheta = math::sqrt( 1.f - sintheta * sintheta ); + float[2] scphi = math::sincos( phi ); + + float3 normal = state::texture_tangent_u(0) * scphi[1] * sintheta + + state::texture_tangent_v(0) * scphi[0] * sintheta + + state::normal() * costheta; + + flake.carrier = float4( normal.x, normal.y, normal.z, 1.f ); + flake.seed = seed; + return flake; +} + +flakes flake_noise( + float3 position = state::position(), + float jitter_scale = 0.5f, + float flake_diameter = 0.5f, + float flake_probability = 1.f +) +{ + flakes flake; + + float3 base_position = math::floor( position ); + int3 base_position_int = int3( base_position ); + + flake_diameter = math::min( flake_diameter, ( 1.5f - 0.5f * jitter_scale ) / math::sqrt( 3.f ) ); + + for( int i = -1; i < 2; ++i ){ + for( int j = -1; j < 2; ++j ){ + for( int k = -1; k < 2; ++k ){ + int seed = random_initialize( base_position_int + int3( i, j, k ) ); + + seed = random_next( seed ); + if( random_value( seed ) > flake_probability ) + continue; + + seed = random_next( seed ); + float priority = random_value( seed ); + if( priority < flake.priority ) + continue; + + float3 flake_position = base_position + float3( i, j, k ) + float3( 0.5f ); + + if( jitter_scale > 0.f ){ + seed = random_next( seed ); + flake_position.x += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.y += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.z += ( random_value( seed ) - 0.5f ) * jitter_scale; + } + + float3 p = position - flake_position; + if( math::dot( p, p ) >= flake_diameter * flake_diameter * 4.f ) + continue; + + float3 xi_rotation; + seed = random_next( seed ); + xi_rotation.x = random_value( seed ); + seed = random_next( seed ); + xi_rotation.y = random_value( seed ); + seed = random_next( seed ); + xi_rotation.z = random_value( seed ); + p = rotate_position( p, xi_rotation ); + + if( math::abs( p.x ) <= flake_diameter && + math::abs( p.y ) <= flake_diameter && + math::abs( p.z ) <= flake_diameter ) + { + flake.priority = priority; + flake.seed = seed; + } + } + } + } + + return flake; +} + +export uv_streams initialize_uv_streams( + uvs_mode mode_1 = texture_coord_0, float2 uv_scale_1 = float2( 1.f ), float2 uv_offset_1 = float2( 0.f ), float2 uv_offset_time_1 = float2( 0.f ), float uv_rotation_1 = 0.f, float triplanar_blend_range_1 = 0.5f, + uvs_mode mode_2 = texture_coord_0, float2 uv_scale_2 = float2( 1.f ), float2 uv_offset_2 = float2( 0.f ), float2 uv_offset_time_2 = float2( 0.f ), float uv_rotation_2 = 0.f, float triplanar_blend_range_2 = 0.5f, + uvs_mode mode_3 = texture_coord_0, float2 uv_scale_3 = float2( 1.f ), float2 uv_offset_3 = float2( 0.f ), float2 uv_offset_time_3 = float2( 0.f ), float uv_rotation_3 = 0.f, float triplanar_blend_range_3 = 0.5f, + uvs_mode mode_4 = texture_coord_0, float2 uv_scale_4 = float2( 1.f ), float2 uv_offset_4 = float2( 0.f ), float2 uv_offset_time_4 = float2( 0.f ), float uv_rotation_4 = 0.f, float triplanar_blend_range_4 = 0.5f +) +{ + uv_streams streams; + + streams.uv_set_settings_1.mode = mode_1; + streams.uv_set_settings_1.uv_scale = uv_scale_1; + uv_offset_1 += uv_offset_time_1 * state::animation_time(); + streams.uv_set_settings_1.uv_offset = uv_offset_1; + streams.uv_set_settings_1.uv_rotation = uv_rotation_1; + streams.uv_set_settings_1.triplanar_blend_range = triplanar_blend_range_1; + + streams.uv_set_settings_2.mode = mode_2; + streams.uv_set_settings_2.uv_scale = uv_scale_2; + uv_offset_2 += uv_offset_time_2 * state::animation_time(); + streams.uv_set_settings_2.uv_offset = uv_offset_2; + streams.uv_set_settings_2.uv_rotation = uv_rotation_2; + streams.uv_set_settings_2.triplanar_blend_range = triplanar_blend_range_2; + + streams.uv_set_settings_3.mode = mode_3; + streams.uv_set_settings_3.uv_scale = uv_scale_3; + uv_offset_3 += uv_offset_time_3 * state::animation_time(); + streams.uv_set_settings_3.uv_offset = uv_offset_3; + streams.uv_set_settings_3.uv_rotation = uv_rotation_3; + streams.uv_set_settings_3.triplanar_blend_range = triplanar_blend_range_3; + + streams.uv_set_settings_4.mode = mode_4; + streams.uv_set_settings_4.uv_scale = uv_scale_4; + uv_offset_4 += uv_offset_time_4 * state::animation_time(); + streams.uv_set_settings_4.uv_offset = uv_offset_4; + streams.uv_set_settings_4.uv_rotation = uv_rotation_4; + streams.uv_set_settings_4.triplanar_blend_range = triplanar_blend_range_4; + + return streams; +} + +export uv_set_settings select_uv_stream( + uv_streams streams, + uv_set_selection uv_stream = uv_set_1 +) +{ + switch( uv_stream ){ + case uv_set_1: + return streams.uv_set_settings_1; + case uv_set_2: + return streams.uv_set_settings_2; + case uv_set_3: + return streams.uv_set_settings_3; + case uv_set_4: + return streams.uv_set_settings_4; + } +} + +export material_layer initialize_material_layer( + uv_set_settings uv_stream = uv_set_settings(), + uniform texture_2d tBaseColor = texture_2d(), + color base_color_offset = color(0.f), + color base_color_scale = color(1.f), + color base_color_tint = color(1.f), + float base_color_desaturation = 0.f, + uniform texture_2d tMetallic = texture_2d(), + channel_mode metallic_channel = r, + float metallic_factor = 1.f, + uniform texture_2d tCavity = texture_2d(), + channel_mode cavity_channel = r, + float specular_weight = 1.f, + uniform texture_2d tRoughness = texture_2d(), + channel_mode roughness_channel = r, + float roughness_factor = 1.f, + float2 roughness_range_position = float2( 1.f, 0.5f ), + uniform texture_2d tNormal = texture_2d(), + uniform float normal_scale = 1.f, + uniform bool normal_flip_green = false +) +{ + material_layer layer; + color base_color_tex; + float metallic_tex; + float cavity_tex; + float roughness_tex; + float3 normal_tex; + + layer.specular_weight = specular_weight; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + base_color_tex = tex::texture_isvalid( tBaseColor ) ? + tex::lookup_color( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_float4_channel( tex: tMetallic, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_float4_channel( tex: tCavity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_float4_channel( tex: tRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = tex::texture_isvalid( tNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_factor: normal_scale, + tangent_space_flip_g_channel: normal_flip_green + ) : state::normal(); + layer.normal = normal_tex; + return layer; + + case triplanar: + base_color_tex = lookup_triplanar_color( + tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_triplanar_channel( + tex: tMetallic, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_triplanar_channel( + tex: tCavity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_triplanar_channel( + tex: tRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = lookup_triplanar_normal( + tex: tNormal, + normal_scale: normal_scale, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: normal_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.normal = normal_tex; + + return layer; + } +} + +export material_layer blend_material_layer( + bool enable_blend, + material_layer layer_1, + material_layer layer_2, + float blend_factor +) +{ + if ( !enable_blend ) + return layer_1; + + material_layer layer; + layer.base_color = math::lerp( layer_1.base_color, layer_2.base_color, blend_factor ); + layer.metallic = math::lerp( layer_1.metallic, layer_2.metallic, blend_factor ); + layer.cavity = math::lerp( layer_1.cavity, layer_2.cavity, blend_factor ); + layer.specular_weight = math::lerp( layer_1.specular_weight, layer_2.specular_weight, blend_factor ); + layer.roughness = math::lerp( layer_1.roughness, layer_2.roughness, blend_factor ); + layer.normal = math::lerp( layer_1.normal, layer_2.normal, blend_factor ); + layer.normal = math::normalize( layer.normal ); + return layer; +} + +export coat_layer initialize_coat_layer( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_coat = false, + uniform texture_2d tCoatMask = texture_2d(), + uniform texture_2d tCoatNormal = texture_2d(), + uniform texture_2d tCoatRoughness = texture_2d(), + channel_mode coat_weight_channel = r, + float coat_weight = 1.f, + color coat_color = color(1.f), + channel_mode coat_roughness_channel = r, + float coat_roughness_factor = 1.f, + uniform float coat_ior = 1.5f, + float coat_anisotropy = 0.f, + float coat_anisotropy_rotation = 0.f, + float coat_affect_color = 0.f, + float coat_affect_roughness = 0.f, + uniform bool coat_flip_green = false +) +{ + coat_layer layer; + if ( enable_coat ) + { + layer.coat_weight = coat_weight; + layer.coat_color = coat_color; + layer.coat_ior = coat_ior; + layer.coat_anisotropy = coat_anisotropy; + layer.coat_anisotropy_rotation = coat_anisotropy_rotation; + layer.coat_affect_color = coat_affect_color; + layer.coat_affect_roughness = coat_affect_roughness; + + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + layer.coat_weight = math::min( tex::texture_isvalid( tCoatMask ) ? + lookup_float4_channel( tex: tCoatMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f ) : 1.f, coat_weight ); + break; + + case triplanar: + layer.coat_weight = math::min( lookup_triplanar_channel( tex: tCoatMask, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ), coat_weight ); + break; + } + + if ( layer.coat_weight > 0 ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + layer.coat_normal = tex::texture_isvalid( tCoatNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tCoatNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_flip_g_channel: coat_flip_green + + ) : state::normal(); + + layer.coat_roughness = lookup_float4_channel( tex: tCoatRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor ); + break; + + case triplanar: + layer.coat_normal = lookup_triplanar_normal( tex: tCoatNormal, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: coat_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + + layer.coat_roughness = lookup_triplanar_channel( tex: tCoatRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + break; + } + } + return layer; + } + + return layer; +} + +export flake_layer initialize_flake_layer( + bool enable_flakes = false, + float flakes_weight = 1.f, + float flakes_size = 0.6f, + float flakes_density = 0.31f, + float flakes_spread = 0.54f +) +{ + flake_layer layer; + if ( enable_flakes ) + { + if ( flakes_weight > 0.f ) + { + float scale_transform = state::transform_scale(state::coordinate_object, state::coordinate_world, 1.f); + float3 flake_coordinates = state::position() * state::meters_per_scene_unit() * scale_transform; + float flake_scale = 1492.537313432835f / flakes_size; + layer.normal = float3( flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.x, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.y, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.z ); + float flake_mask = flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ).priority > 0.001 ? 1.f : 0.f; + layer.roughness = 1.f; + layer.weight = flake_mask; + } + } + return layer; +} + +export anisotropy initialize_anisotropy( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_anisotropy = false, + float anisotropy_roughness_u = 1.f, + float anisotropy_roughness_v = 0.25f, + uniform texture_2d tAnisotropyRotation = texture_2d(), + channel_mode anisotropy_channel = r, + float anisotropy_rotation = 1.f + +) +{ + anisotropy aniso; + + if ( enable_anisotropy ) + { + aniso.anisotropy_roughness_u = anisotropy_roughness_u; + aniso.anisotropy_roughness_v = anisotropy_roughness_v; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + aniso.anisotropy_rotation = lookup_float4_channel( tex: tAnisotropyRotation, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation ); + return aniso; + + case triplanar: + aniso.anisotropy_rotation = lookup_triplanar_channel( tex: tAnisotropyRotation, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return aniso; + } + } + + return aniso; +} + +export float3 detail_normal_combine( + uv_set_settings uv_set_normal = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_detail_normal = false, + float3 base_normal = state::normal(), + uniform texture_2d tDetailNormal = texture_2d(), + uniform texture_2d tDetailNormalWeight = texture_2d(), + channel_mode detail_normal_channel = r, + uniform float detail_normal_scale = 1.f, + uniform bool detail_normal_flip_green = false +) +{ + float3 final_normal = base_normal; + + if ( enable_detail_normal ) + { + float3 detail_normal; + switch ( uv_set_normal.mode ) + { + case texture_coord_0: + detail_normal = tex::texture_isvalid( tDetailNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tDetailNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_normal.uv_scale + + uv_set_normal.uv_offset, + tangent_space_factor: detail_normal_scale, + tangent_space_flip_g_channel: detail_normal_flip_green + ) : state::normal(); + break; + + case triplanar: + detail_normal = lookup_triplanar_normal( tex: tDetailNormal, + uv_scale: uv_set_normal.uv_scale, + uv_offset: uv_set_normal.uv_offset, + normal_scale: detail_normal_scale, + flip_green: detail_normal_flip_green, + triplanar_blend_range: uv_set_normal.triplanar_blend_range ); + break; + } + + float detail_normal_weight; + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + detail_normal_weight = lookup_float4_channel( tex: tDetailNormalWeight, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_normal_weight = lookup_triplanar_channel( tex: tDetailNormalWeight, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ); + break; + } + + final_normal = ::nvidia::core_definitions::blend_normals( + base_normal: base_normal, + base_normal_weight: 1.f, + detail_normal: detail_normal, + detail_normal_weight: detail_normal_weight + ); + return final_normal; + + } + + return final_normal; +} + +export color emission( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_stream_mask = uv_set_settings(), + bool enable_emission = false, + uniform texture_2d tEmission = texture_2d(), + uniform texture_2d tEmissionMask = texture_2d(), + color emission_color = color(1.f) +) +{ + color emission = color( 0.f ); + if ( enable_emission ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + emission = tex::texture_isvalid( tEmission ) ? + tex::lookup_color( tex: tEmission, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + emission *= emission_color; + break; + + case triplanar: + emission = lookup_triplanar_color( tex: tEmission, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + default_value: emission_color, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + emission *= emission_color; + break; + } + + float mask = 1.f; + switch ( uv_stream_mask.mode ) + { + case texture_coord_0: + mask = tex::texture_isvalid( tEmissionMask ) ? + tex::lookup_float( tex: tEmissionMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream_mask.uv_scale + + uv_stream_mask.uv_offset + ) : 1.f; + emission *= mask; + break; + + case triplanar: + mask = lookup_triplanar_channel( tex: tEmissionMask, + uv_scale: uv_stream_mask.uv_scale, + uv_offset: uv_stream_mask.uv_offset, + channel: r, + default_value: 1.f, + triplanar_blend_range: uv_stream_mask.triplanar_blend_range ); + emission *= mask; + break; + } + } + + return emission; +} + +export float opacity( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_opacity = false, + uniform texture_2d tOpacity = texture_2d(), + uniform texture_2d tBaseColor = texture_2d(), + channel_mode opacity_channel = a +) +{ + float final_opacity = 1.f; + + if ( enable_opacity ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_float4_channel( tex: tOpacity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_float4_channel( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : 1.f; + return final_opacity; + + case triplanar: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_triplanar_channel( tex: tOpacity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_triplanar_channel( tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : 1.f; + return final_opacity; + } + } + + return final_opacity; +} + +export float blend_factor( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_blend_factor = false, + blend_source blend_factor_source = texture, + uniform texture_2d tBlendFactor = texture_2d(), + channel_mode blend_factor_channel = r, + float3 blend_direction = float3( 0.f, 1.f, 0.f), + bool blend_axis_obect_space = false, + axis_mode blend_axis = y, + float blend_axis_scale = 1.f, + float blend_axis_offset = 0.f, + uniform string blend_primvar_string = string(), + float blend_threshold = 0.33f, + uv_set_settings uv_set_detail = uv_set_settings(), + uniform texture_2d tDetailBlendFactor = texture_2d(), + channel_mode detail_blend_factor_channel = r, + float blend_factor_override = 0.f +) +{ + float final_blend_factor = 0.f; + + if ( enable_blend_factor ) + { + if ( blend_factor_override > 0.f ) + return blend_factor_override; + + float detail_blend = 0.5f; + if ( tex::texture_isvalid( tDetailBlendFactor ) ) + { + switch ( uv_set_detail.mode ) + { + case texture_coord_0: + detail_blend = lookup_float4_channel( tex: tDetailBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_detail.uv_scale + + uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_blend = lookup_triplanar_channel( tex: tDetailBlendFactor, + uv_scale: uv_set_detail.uv_scale, + uv_offset: uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_detail.triplanar_blend_range ); + break; + } + } + + switch (blend_factor_source) + { + case texture: + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_blend_factor = lookup_float4_channel( tex: tBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case triplanar: + final_blend_factor = lookup_triplanar_channel( tex: tBlendFactor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + + case direction: + final_blend_factor = math::dot( state::normal(), blend_direction ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case axis: + switch ( blend_axis ) + { + case x: + final_blend_factor = state::position().x; + break; + case x_invert: + final_blend_factor = -state::position().x; + break; + case y: + final_blend_factor = state::position().y; + break; + case y_invert: + final_blend_factor = -state::position().y; + break; + case z: + final_blend_factor = state::position().z; + break; + case z_invert: + final_blend_factor = -state::position().z; + break; + } + + final_blend_factor *= state::meters_per_scene_unit(); + if ( blend_axis_obect_space ) + { + float object_axis; + switch ( blend_axis ) + { + case x: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case x_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case y: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case y_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case z: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + case z_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + } + object_axis *= state::meters_per_scene_unit(); + final_blend_factor -= object_axis; + } + final_blend_factor = math::saturate( final_blend_factor * blend_axis_scale - blend_axis_offset ); + return math::saturate( 1.f - threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ) ); + + case primvar: + final_blend_factor = scene::data_lookup_float( blend_primvar_string, 0.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + } + return final_blend_factor; +} + +export float accumulate_coat_weight( + layer_order layer_1_order = above, + float layer_1_weight = 0.f, + layer_order layer_2_order = above, + float layer_2_weight = 0.f + +) +{ + float final_coat_weight = 0.f; + + switch ( layer_1_order ) + { + case above: + final_coat_weight += layer_1_weight; + break; + case below: + break; + } + + switch ( layer_2_order ) + { + case above: + final_coat_weight += layer_2_weight; + break; + + case below: + break; + } + + return 1.f - final_coat_weight; +} + +export material OmniUber_Automotive( + //Basic Inputs - 100 + color diffuse_reflection_color = color(0.463f, 0.725f, 0.f) [[ + anno::display_name("Base Color"), + anno::ui_order(100) + ]], + + float metalness = float(0.f) [[ + anno::display_name("Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(101) + ]], + + float roughness_u = float(1.f) [[ + anno::display_name("Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(103) + ]], + + //Basic Clear Coat - 200 + bool enable_coat = true [[ + anno::display_name("Enable Clear Coat"), + anno::in_group("Clear Coat"), + anno::ui_order(200) + ]], + + color coat_color = color(1.f) [[ + anno::display_name("Clear Coat Color Tint"), + anno::in_group("Clear Coat"), + anno::ui_order(201) + ]], + + float coat_roughness = float(0.f) [[ + anno::display_name("Clear Coat Roughness"), + anno::in_group("Clear Coat"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(202) + ]], + + //Flakes - 300 + bool enable_flakes = true [[ + anno::display_name("Enable Flakes"), + anno::in_group("Flakes"), + anno::ui_order(300) + ]], + + color flake_color = color(1.f) [[ + anno::display_name("Flake Color"), + anno::in_group("Flakes"), + anno::ui_order(301) + ]], + + float flake_size = float(0.125f) [[ + anno::display_name("Flake Size"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(302) + ]], + + float flakes_density = float(0.25f) [[ + anno::display_name("Flake Density"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(303) + ]], + + float flakes_spread = float(0.15f) [[ + anno::display_name("Flake Spread"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(304) + ]], + + float flake_roughness = float(0.05f) [[ + anno::display_name("Flake Roughness"), + anno::in_group("Flakes"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(305) + ]], + + //Advanced + //Base Layer - 1000 + uv_set_selection uv_set_layer_0 = uv_set_1 [[ + anno::display_name("Base UV Set"), + anno::in_group("Advanced", "Base Layer"), + anno::ui_order(1000) + ]], + + uniform texture_2d base_color_image = texture_2d() [[ + anno::display_name("Base Color Image"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::ui_order(1001) + ]], + + float base_color_scale = 1.f [[ + anno::display_name("Base Color Multiply"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(1003) + ]], + + float base_color_offset = 0.f [[ + anno::display_name("Base Color Add"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(1004) + ]], + + float base_color_desaturation = float(0.f) [[ + anno::display_name("Base Color Desaturation"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1005) + ]], + + uniform texture_2d metalness_image = texture_2d() [[ + anno::display_name("Metalness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1100) + ]], + + uniform channel_mode metalness_channel = b [[ + anno::display_name("Metalness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1101) + ]], + + float specular_reflection_weight = float(1.0) [[ + anno::display_name("Specular Weight"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(1302) + ]], + + color specular_reflection_color = color(1.f) [[ + anno::display_name("Specular Color"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hidden(), + anno::ui_order(1000) + ]], + + uniform texture_2d cavity_image = texture_2d() [[ + anno::display_name("Specular Cavity Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1300) + ]], + + uniform channel_mode cavity_channel = r [[ + anno::display_name("Specular Cavity Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1301) + ]], + + uniform texture_2d roughness_image = texture_2d() [[ + anno::display_name("Roughness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1200) + ]], + + uniform channel_mode roughness_channel = g [[ + anno::display_name("Roughness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1201) + ]], + + float2 roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Roughness Range Position"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(1203) + ]], + + uniform texture_2d normal_image = texture_2d() [[ + anno::display_name("Normal Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::usage("normal"), + anno::ui_order(1400) + ]], + + uniform bool normal_flip_green = true [[ + anno::display_name("Normal Flip Green"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::ui_order(1401) + ]], + + uniform float normal_scale = float(1.f) [[ + anno::display_name("Normal Scale"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1402) + ]], + + //Layer 1 - 4000 + bool enable_layer_1 = false [[ + anno::display_name("Enable Layer 1"), + anno::in_group("Advanced", "Layer 1" ), + anno::ui_order(4000) + ]], + + uv_set_selection uv_set_layer_1 = uv_set_1 [[ + anno::display_name("Layer 1 UV Set"), + anno::in_group("Advanced", "Layer 1"), + anno::ui_order(4001) + ]], + + layer_order layer_1_order = above [[ + anno::display_name("Layer 1 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(4002) + ]], + + //Layer 1 Base Color - 4100 + uniform texture_2d layer_1_base_color_image = texture_2d() [[ + anno::display_name("Layer 1 Base Color Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4100) + ]], + + color layer_1_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 1 Base Color Tint"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4101) + ]], + + float layer_1_base_color_offset = float(0.f) [[ + anno::display_name("Layer 1 Base Color Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4102) + ]], + + float layer_1_base_color_scale = float(1.f) [[ + anno::display_name("Layer 1 Base Color Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(4103) + ]], + + float layer_1_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 1 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4104) + ]], + + //Layer 1 Specular - 4200 + uniform texture_2d layer_1_roughness_image = texture_2d() [[ + anno::display_name("Layer 1 Roughness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4300) + ]], + + uniform channel_mode layer_1_roughness_channel = g [[ + anno::display_name("Layer 1 Roughness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4301) + ]], + + float layer_1_roughness_u = float(1.f) [[ + anno::display_name("Layer 1 Roughness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4302) + ]], + + float2 layer_1_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 1 Roughness Range Position"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(4303) + ]], + + uniform texture_2d layer_1_metalness_image = texture_2d() [[ + anno::display_name("Layer 1 Metalness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4200) + ]], + + uniform channel_mode layer_1_metalness_channel = b [[ + anno::display_name("Layer 1 Metalness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4201) + ]], + + float layer_1_metalness = float(1.f) [[ + anno::display_name("Layer 1 Metalness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4202) + ]], + + //Layer 1 Specular - 4400 + uniform texture_2d layer_1_cavity_image = texture_2d() [[ + anno::display_name("Layer 1 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4400) + ]], + + uniform channel_mode layer_1_cavity_channel = r [[ + anno::display_name("Layer 1 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4401) + ]], + + float layer_1_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 1 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4402) + ]], + + //Layer 1 Normal - 4500 + uniform texture_2d layer_1_normal_image = texture_2d() [[ + anno::display_name("Layer 1 Normal Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::usage("normal"), + anno::ui_order(4500) + ]], + + uniform bool layer_1_normal_flip_green = true [[ + anno::display_name("Layer 1 Normal Flip Green"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::ui_order(4501) + ]], + + uniform float layer_1_normal_scale = float(1.f) [[ + anno::display_name("Layer 1 Normal Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4502) + ]], + + //Layer 1 Weight - 4600 + blend_source layer_1_blend_source = texture [[ + anno::display_name("Layer 1 Mask Source"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_blend_factor = uv_set_1 [[ + anno::display_name("Layer 1 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform texture_2d layer_1_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 1 Mask Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform channel_mode layer_1_blend_splatmap_channel = r [[ + anno::display_name("Layer 1 Mask Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + float3 layer_1_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 1 Mask Direction"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4620) + ]], + + axis_mode layer_1_blend_axis = y [[ + anno::display_name("Layer 1 Mask Axis"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4611) + ]], + + bool layer_1_blend_object_space = true [[ + anno::display_name("Layer 1 Mask Object Space"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4610) + ]], + + float layer_1_blend_scale = float(1.f) [[ + anno::display_name("Layer 1 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4612) + ]], + + float layer_1_blend_offset = float(0.f) [[ + anno::display_name("Layer 1 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4613) + ]], + + uniform string layer_1_blend_primvar_name = string() [[ + anno::display_name("Layer 1 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_detail = uv_set_1 [[ + anno::display_name("Layer 1 Detail UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4640) + ]], + + uniform texture_2d layer_1_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 1 Detail Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4641) + ]], + + uniform channel_mode layer_1_blend_detail_image_channel = r [[ + anno::display_name("Layer 1 Detail Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4642) + ]], + + float layer_1_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 1 Mask Threshold"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4601) + ]], + + float layer_1_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 1 Mask Factor Override"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(4600) + ]], + + //Layer 2 - 5000 + bool enable_layer_2 = false [[ + anno::display_name("Enable Layer 2"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5000) + ]], + + layer_order layer_2_order = above [[ + anno::display_name("Layer 2 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(5001) + ]], + + uv_set_selection uv_set_layer_2 = uv_set_1 [[ + anno::display_name("Layer 2 UV Set"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5002) + ]], + + //Layer 2 - Base Color - 5100 + uniform texture_2d layer_2_base_color_image = texture_2d() [[ + anno::display_name("Layer 2 Base Color Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5100) + ]], + + color layer_2_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 2 Base Color Tint"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5101) + ]], + + float layer_2_base_color_offset = float(0.f) [[ + anno::display_name("Layer 2 Base Color Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5102) + ]], + + float layer_2_base_color_scale = float(1.f) [[ + anno::display_name("Layer 2 Base Color Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(5103) + ]], + + float layer_2_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 2 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5104) + ]], + + //Layer 2 - Metallic - 5200 + uniform texture_2d layer_2_metalness_image = texture_2d() [[ + anno::display_name("Layer 2 Metalness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5200) + ]], + + uniform channel_mode layer_2_metalness_channel = b [[ + anno::display_name("Layer 2 Metalness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5201) + ]], + + float layer_2_metalness = float(1.f) [[ + anno::display_name("Layer 2 Metalness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5202) + ]], + + //Layer 2 - Roughness - 5300 + uniform texture_2d layer_2_roughness_image = texture_2d() [[ + anno::display_name("Layer 2 Roughness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5300) + ]], + + uniform channel_mode layer_2_roughness_channel = g [[ + anno::display_name("Layer 2 Roughness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5301) + ]], + + float layer_2_roughness_u = float(1.f) [[ + anno::display_name("Layer 2 Roughness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5302) + ]], + + float2 layer_2_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 2 Roughness Range Position"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(5303) + ]], + + //Layer 2 - Specular - 5400 + float layer_2_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 2 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5402) + ]], + + uniform texture_2d layer_2_cavity_image = texture_2d() [[ + anno::display_name("Layer 2 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5400) + ]], + + uniform channel_mode layer_2_cavity_channel = r [[ + anno::display_name("Layer 2 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5401) + ]], + + //Layer 2 - Normal - 5500 + uniform texture_2d layer_2_normal_image = texture_2d() [[ + anno::display_name("Layer 2 Normal Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::usage("normal"), + anno::ui_order(5500) + ]], + + uniform bool layer_2_normal_flip_green = true [[ + anno::display_name("Layer 2 Normal Flip Green"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::ui_order(5501) + ]], + + uniform float layer_2_normal_scale = float(1.f) [[ + anno::display_name("Layer 2 Normal Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5502) + ]], + + //Layer 2 - Weight - 5600 + blend_source layer_2_blend_source = texture [[ + anno::display_name("Layer 2 Mask Source"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_blend_factor = uv_set_2 [[ + anno::display_name("Layer 2 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform texture_2d layer_2_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 2 Mask Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform channel_mode layer_2_blend_splatmap_channel = r [[ + anno::display_name("Layer 2 Mask Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + float3 layer_2_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 2 Mask Direction"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5620) + ]], + + axis_mode layer_2_blend_axis = y [[ + anno::display_name("Layer 2 Mask Axis"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5611) + ]], + + bool layer_2_blend_object_space = true [[ + anno::display_name("Layer 2 Mask Object Space"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5610) + ]], + + float layer_2_blend_scale = float(1.f) [[ + anno::display_name("Layer 2 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5612) + ]], + + float layer_2_blend_offset = float(0.f) [[ + anno::display_name("Layer 2 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5613) + ]], + + uniform string layer_2_blend_primvar_name = string() [[ + anno::display_name("Layer 2 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_detail = uv_set_2 [[ + anno::display_name("Layer 2 Detail UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5640) + ]], + + uniform texture_2d layer_2_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 2 Detail Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5641) + ]], + + uniform channel_mode layer_2_blend_detail_image_channel = r [[ + anno::display_name("Layer 2 Detail Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5642) + ]], + + float layer_2_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 2 Mask Threshold"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5601) + ]], + + float layer_2_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 2 Mask Factor Override"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(5600) + ]], + + //UVs - 6000 + uvs_mode uvs_mode_01 = triplanar [[ + anno::display_name("UV Mode 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6100) + ]], + + float2 uv_scale_01 = float2(1.f) [[ + anno::display_name("UV Scale 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6101) + ]], + + float2 uv_offset_01 = float2(0.f) [[ + anno::display_name("UV Offset 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6102) + ]], + + float2 uv_offset_time_01 = float2(0.f) [[ + anno::display_name("UV Offset Time 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6103) + ]], + + float uv_rotation_01 = float(0.f) [[ + anno::display_name("UV Rotation 1"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6104) + ]], + + float triplanar_blend_range_01 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6105), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_02 = triplanar [[ + anno::display_name("UV Mode 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6200) + ]], + + float2 uv_scale_02 = float2(1.f) [[ + anno::display_name("UV Scale 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6201) + ]], + + float2 uv_offset_02 = float2(0.f) [[ + anno::display_name("UV Offset 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6202) + ]], + + float2 uv_offset_time_02 = float2(0.f) [[ + anno::display_name("UV Offset Time 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6203) + ]], + + float uv_rotation_02 = float(0.f) [[ + anno::display_name("UV Rotation 2"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6204) + ]], + + float triplanar_blend_range_02 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6205), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_03 = triplanar [[ + anno::display_name("UV Mode 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6300) + ]], + + float2 uv_scale_03 = float2(1.f) [[ + anno::display_name("UV Scale 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6301) + ]], + + float2 uv_offset_03 = float2(0.f) [[ + anno::display_name("UV Offset 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6302) + ]], + + float2 uv_offset_time_03 = float2(0.f) [[ + anno::display_name("UV Offset Time 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6303) + ]], + + float uv_rotation_03 = float(0.f) [[ + anno::display_name("UV Rotation 3"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6304) + ]], + + float triplanar_blend_range_03 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6305), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_04 = triplanar [[ + anno::display_name("UV Mode 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6400) + ]], + + float2 uv_scale_04 = float2(1.f) [[ + anno::display_name("UV Scale 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6401) + ]], + + float2 uv_offset_04 = float2(0.f) [[ + anno::display_name("UV Offset 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6402) + ]], + + float2 uv_offset_time_04 = float2(0.f) [[ + anno::display_name("UV Offset Time 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6403) + ]], + + float uv_rotation_04 = float(0.f) [[ + anno::display_name("UV Rotation 4"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6404) + ]], + + float triplanar_blend_range_04 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6405), + anno::hard_range(0.0,1.0) + ]], + + uniform bool enable_opacity = false [[ + anno::display_name("Enable Opacity"), + anno::description("Enables the use of cutout opacity"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uv_set_selection uv_set_opacity = uv_set_1 [[ + anno::display_name("Opacity UV Set"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8302) + ]], + + //Detail Normal - 8100 + bool enable_detail_normal = false [[ + anno::display_name("Enable Detail Normal"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8100) + ]], + + uv_set_selection uv_set_detail_normal = uv_set_1 [[ + anno::display_name("Detail Normal UV Set"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8101) + ]], + + uniform texture_2d detail_normal_image = texture_2d() [[ + anno::display_name("Detail Normal Image"), + anno::in_group("Advanced", "Detail Normal"), + anno::usage("normal"), + anno::ui_order(8102) + ]], + + uniform bool detail_normal_flip_green = true [[ + anno::display_name("Detail Normal Normal Flip Green"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8103) + ]], + + uniform float detail_normal_scale = float(1.f) [[ + anno::display_name("Detail Normal Scale"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8104) + ]], + + uv_set_selection uv_set_detail_weight = uv_set_1 [[ + anno::display_name("Detail Normal Mask UV Set"), + anno::in_group("Advanced", "Detail Normal", "Mask"), + anno::ui_order(8105) + ]], + + uniform texture_2d detail_normal_weight_image = texture_2d() [[ + anno::display_name("Detail Normal Mask Image"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8106) + ]], + + uniform channel_mode detail_normal_weight_channel = r [[ + anno::display_name("Detail Normal Mask Channel"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8107) + ]], + + //Emission - 8200 + bool enable_emission = false [[ + anno::display_name("Enable Emission"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8200) + ]], + + uv_set_selection uv_set_emission = uv_set_1 [[ + anno::display_name("Emission UV Set"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8201) + ]], + + uniform texture_2d emission_image = texture_2d() [[ + anno::display_name("Emission Image"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8202) + ]], + + uniform bool emission_use_temperature = false [[ + anno::display_name("Emission Use Temperature"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8203) + ]], + + float emission_temperature = float(6500.f) [[ + anno::display_name("Emission Temperature (kelvin)"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 10000.0f), + anno::ui_order(8204) + ]], + + uv_set_selection uv_set_emission_mask = uv_set_1 [[ + anno::display_name("Emission UV Set Mask"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8205) + ]], + + color emission_color = color(1.f) [[ + anno::display_name("Emission Color Tint"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8206) + ]], + + uniform texture_2d emission_mask_image = texture_2d() [[ + anno::display_name("Emission Mask Image"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8207) + ]], + + uniform ::OmniSurface::OmniShared::emission_mode emission_mode = + ::OmniSurface::OmniShared::emission_lx [[ + anno::display_name("Emission Mode"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8208) + ]], + + float emission_intensity = float(1.0) [[ + anno::display_name("Emission Intensity"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 1000.0f), + anno::ui_order(8209) + ]], + + //Opacity - 8300 + uniform texture_2d opacity_image = texture_2d() [[ + anno::display_name("Opacity Image"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uniform channel_mode opacity_channel = a [[ + anno::display_name("Opacity Channel"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8301) + ]], + + uniform float geometry_opacity_threshold = float(0.15f) [[ + anno::display_name("Opacity Threshold"), + anno::description("If > 0, remap opacity values to 1 when >= threshold and to 0 otherwise"), + anno::in_group("Advanced", "Opacity"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(8302) + ]], + + //Anisotropy - 8400 + bool enable_anisotropy = false [[ + anno::display_name("Enable Anisotropy"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8400) + ]], + + uv_set_selection uv_set_anisotropy = uv_set_1 [[ + anno::display_name("Anisotropy UV Set"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8401) + ]], + + uniform texture_2d anisotropic_direction_image = texture_2d() [[ + anno::display_name("Anisotropy Direction Image"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8402) + ]], + + uniform channel_mode anisotropic_direction_channel = r [[ + anno::display_name("Anisotropy Direction Channel"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8403) + ]], + + float anisotropic_direction = float(0.f) [[ + anno::display_name("Anisotropy Rotation (radian)"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::hard_range(-1.0f, 1.0f), + anno::ui_order(8404) + ]], + + float anisotropic_roughness_u = float(1.f) [[ + anno::display_name("Anisotropy Roughness U"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8405) + ]], + + float anisotropic_roughness_v = float(0.25f) [[ + anno::display_name("Anisotropy Roughness V"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8406) + ]], + + //Advanced Clear Coat - 8500 + uniform texture_2d coat_mask_image = texture_2d() [[ + anno::display_name("Clear Coat Mask Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2401) + ]], + + uniform channel_mode coat_mask_channel = r [[ + anno::display_name("Clear Coat Mask Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2402) + ]], + + uniform texture_2d coat_roughness_image = texture_2d() [[ + anno::display_name("Clear Coat Roughness Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2201) + ]], + + uniform channel_mode coat_roughness_channel = r [[ + anno::display_name("Clear Coat Roughness Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2202) + ]], + + uniform float coat_ior = float(1.6f) [[ + anno::display_name("Clear Coat IOR"), + anno::in_group("Clear Coat"), + anno::soft_range(1.0f, 5.0f), + anno::hard_range(1.0f, limits::FLOAT_MAX), + anno::ui_order(2002) + ]], + + uniform texture_2d coat_normal_image = texture_2d() [[ + anno::display_name("Clear Coat Normal Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::usage("normal"), + anno::ui_order(2300) + ]], + + uniform bool coat_normal_flip_green = true [[ + anno::display_name("Clear Coat Normal Flip Green"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::ui_order(2300) + ]], + + uv_set_selection uv_set_coat_roughness_normal = uv_set_1 [[ + anno::display_name("Clear Coat Normal UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(8500) + ]], + + uv_set_selection uv_set_coat_mask = uv_set_1 [[ + anno::display_name("Clear Coat Mask UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2400) + ]], + + float coat_anisotropy = float(0.f) [[ + anno::display_name("Clear Coat Anisotropy"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_anisotropy_rotation = float(0.f) [[ + anno::display_name("Clear Coat Rotation (radian)"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::soft_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_color = float(0.f) [[ + anno::display_name("Clear Coat Affect Color"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_roughness = float(0.f) [[ + anno::display_name("Clear Coat Affect Roughness"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]] + +) +[[ + anno::display_name("Omni Uber Automotive"), + anno::author("NVIDIA Corporation"), + anno::key_words(string[]("generic", "surface")), + anno::in_group("Automotive"), + anno::version(0, 0, 10, "") +]] = let { + + uv_streams streams = initialize_uv_streams( + uvs_mode_01, uv_scale_01, uv_offset_01, uv_offset_time_01, uv_rotation_01, triplanar_blend_range_01, + uvs_mode_02, uv_scale_02, uv_offset_02, uv_offset_time_02, uv_rotation_02, triplanar_blend_range_02, + uvs_mode_03, uv_scale_03, uv_offset_03, uv_offset_time_03, uv_rotation_03, triplanar_blend_range_03, + uvs_mode_04, uv_scale_04, uv_offset_04, uv_offset_time_04, uv_rotation_04, triplanar_blend_range_04 + ); + + float blend_factor_layer_1 = blend_factor( + uv_stream: select_uv_stream( streams, layer_1_uv_set_blend_factor ), + enable_blend_factor: enable_layer_1, + blend_factor_source: layer_1_blend_source, + tBlendFactor: layer_1_blend_splatmap, + blend_factor_channel: layer_1_blend_splatmap_channel, + blend_direction: layer_1_blend_direction, + blend_axis_obect_space: layer_1_blend_object_space, + blend_axis: layer_1_blend_axis, + blend_axis_scale: layer_1_blend_scale, + blend_axis_offset: layer_1_blend_offset, + blend_primvar_string: layer_1_blend_primvar_name, + blend_threshold: layer_1_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_1_uv_set_detail ), + tDetailBlendFactor: layer_1_blend_detail_image, + detail_blend_factor_channel: layer_1_blend_detail_image_channel, + blend_factor_override: layer_1_blend_factor_override + ); + + float blend_factor_layer_2 = blend_factor( + uv_stream: select_uv_stream( streams, layer_2_uv_set_blend_factor ), + enable_blend_factor: enable_layer_2, + blend_factor_source: layer_2_blend_source, + tBlendFactor: layer_2_blend_splatmap, + blend_factor_channel: layer_2_blend_splatmap_channel, + blend_direction: layer_2_blend_direction, + blend_axis_obect_space: layer_2_blend_object_space, + blend_axis: layer_2_blend_axis, + blend_axis_scale: layer_2_blend_scale, + blend_axis_offset: layer_2_blend_offset, + blend_primvar_string: layer_2_blend_primvar_name, + blend_threshold: layer_2_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_2_uv_set_detail ), + tDetailBlendFactor: layer_2_blend_detail_image, + detail_blend_factor_channel: layer_2_blend_detail_image_channel, + blend_factor_override: layer_2_blend_factor_override + ); + + material_layer layer_0 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_0 ), + tBaseColor: base_color_image, + base_color_tint: diffuse_reflection_color, + base_color_scale: color( base_color_scale ), + base_color_offset: color( base_color_offset ), + base_color_desaturation: base_color_desaturation, + tMetallic: metalness_image, + metallic_channel: metalness_channel, + metallic_factor: metalness, + tCavity: cavity_image, + cavity_channel: cavity_channel, + specular_weight: specular_reflection_weight, + tRoughness: roughness_image, + roughness_channel: roughness_channel, + roughness_factor: roughness_u, + roughness_range_position: roughness_range_position, + tNormal: normal_image, + normal_scale: normal_scale, + normal_flip_green: normal_flip_green + ); + + material_layer layer_1 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_1 ), + tBaseColor: layer_1_base_color_image, + base_color_tint: layer_1_diffuse_reflection_color, + base_color_scale: color( layer_1_base_color_scale ), + base_color_offset: color( layer_1_base_color_offset ), + base_color_desaturation: layer_1_base_color_desaturation, + tMetallic: layer_1_metalness_image, + metallic_channel: layer_1_metalness_channel, + metallic_factor: layer_1_metalness, + tCavity: layer_1_cavity_image, + cavity_channel: layer_1_cavity_channel, + specular_weight: layer_1_specular_reflection_weight, + tRoughness: layer_1_roughness_image, + roughness_channel: layer_1_roughness_channel, + roughness_factor: layer_1_roughness_u, + roughness_range_position: layer_1_roughness_range_position, + tNormal: layer_1_normal_image, + normal_scale: layer_1_normal_scale, + normal_flip_green: layer_1_normal_flip_green + ); + + material_layer layer_1_composite = blend_material_layer( + enable_blend: enable_layer_1, + layer_1: layer_0, + layer_2: layer_1, + blend_factor: blend_factor_layer_1 + ); + + material_layer layer_2 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_2 ), + tBaseColor: layer_2_base_color_image, + base_color_tint: layer_2_diffuse_reflection_color, + base_color_scale: color( layer_2_base_color_scale ), + base_color_offset: color( layer_2_base_color_offset ), + base_color_desaturation: layer_2_base_color_desaturation, + tMetallic: layer_2_metalness_image, + metallic_channel: layer_2_metalness_channel, + metallic_factor: layer_2_metalness, + tCavity: layer_2_cavity_image, + cavity_channel: layer_2_cavity_channel, + specular_weight: layer_2_specular_reflection_weight, + tRoughness: layer_2_roughness_image, + roughness_channel: layer_2_roughness_channel, + roughness_factor: layer_2_roughness_u, + roughness_range_position: layer_2_roughness_range_position, + tNormal: layer_2_normal_image, + normal_scale: layer_2_normal_scale, + normal_flip_green: layer_2_normal_flip_green + ); + + material_layer layer_2_composite = blend_material_layer( + enable_blend: enable_layer_2, + layer_1: layer_1_composite, + layer_2: layer_2, + blend_factor: blend_factor_layer_2 + ); + + anisotropy aniso = initialize_anisotropy( + uv_stream: select_uv_stream( streams, uv_set_anisotropy ), + enable_anisotropy: enable_anisotropy, + anisotropy_roughness_u: anisotropic_roughness_u, + anisotropy_roughness_v: anisotropic_roughness_v, + tAnisotropyRotation: anisotropic_direction_image, + anisotropy_channel: anisotropic_direction_channel, + anisotropy_rotation: anisotropic_direction + ); + + float accumulated_layer_coat_weight = accumulate_coat_weight( layer_1_order: layer_1_order, + layer_1_weight: blend_factor_layer_1, + layer_2_order: layer_2_order, + layer_2_weight: blend_factor_layer_2 ); + + coat_layer coat = initialize_coat_layer( + uv_stream: select_uv_stream( streams, uv_set_coat_roughness_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_coat_mask ), + enable_coat: enable_coat, + tCoatMask: coat_mask_image, + tCoatNormal: coat_normal_image, + tCoatRoughness: coat_roughness_image, + coat_weight: accumulated_layer_coat_weight, + coat_weight_channel: coat_mask_channel, + coat_color: coat_color, + coat_roughness_channel: coat_roughness_channel, + coat_roughness_factor: coat_roughness, + coat_ior: coat_ior, + coat_anisotropy: coat_anisotropy, + coat_anisotropy_rotation: coat_anisotropy_rotation, + coat_affect_color: coat_affect_color, + coat_affect_roughness: coat_affect_roughness, + coat_flip_green: coat_normal_flip_green + ); + + float3 detail_normal = detail_normal_combine( + uv_set_normal: select_uv_stream( streams, uv_set_detail_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_detail_weight ), + enable_detail_normal: enable_detail_normal, + base_normal: layer_2_composite.normal, + tDetailNormal: detail_normal_image, + tDetailNormalWeight: detail_normal_weight_image, + detail_normal_channel: detail_normal_weight_channel, + detail_normal_scale: detail_normal_scale, + detail_normal_flip_green: detail_normal_flip_green + ); + + flake_layer flakes = initialize_flake_layer( + enable_flakes: enable_flakes, + flakes_weight: coat.coat_weight, + flakes_size: flake_size, + flakes_density: flakes_density, + flakes_spread: flakes_spread + ); + + //Final Material Properties + color final_base_color = math::lerp( layer_2_composite.base_color, flake_color, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_metallic = math::lerp( layer_2_composite.metallic, 1.f, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_roughness = math::lerp( layer_2_composite.roughness, flake_roughness, flakes.weight > 0.001f ? 1.f : 0.f ); + float3 final_normal = nvidia::core_definitions::blend_normals( + base_normal: detail_normal, + base_normal_weight: 1.f, + detail_normal: flakes.normal, + detail_normal_weight: enable_flakes ? coat.coat_weight : 0.f + ); + + color final_emission_color = emission( + uv_stream: select_uv_stream( streams, uv_set_emission ), + uv_stream_mask: select_uv_stream( streams, uv_set_emission_mask ), + enable_emission: enable_emission, + tEmission: emission_image, + tEmissionMask: emission_mask_image, + emission_color: emission_color + ); + + float final_opacity = opacity( + uv_stream: select_uv_stream( streams, uv_set_opacity ), + enable_opacity: enable_opacity, + tBaseColor: base_color_image, + tOpacity: opacity_image, + opacity_channel: opacity_channel + ); + + material base = OmniSurface::OmniSurfaceBase::OmniSurfaceBase( + diffuse_reflection_weight: 1.f, + diffuse_reflection_color: final_base_color, + metalness: final_metallic, + specular_reflection_weight: layer_2_composite.specular_weight, + specular_reflection_color: specular_reflection_color * math::saturate( layer_2_composite.cavity * 2.f ), + specular_reflection_roughness: final_roughness, + specular_reflection_anisotropy: enable_anisotropy ? 1.f : 0.0f, + specular_reflection_anisotropy_rotation: enable_anisotropy ? aniso.anisotropy_rotation : 0.f, + coat_weight: coat.coat_weight, + coat_color: coat.coat_color, + coat_roughness: coat.coat_roughness, + coat_ior: coat.coat_ior, + coat_anisotropy: coat.coat_anisotropy, + coat_anisotropy_rotation: coat.coat_anisotropy_rotation, + coat_affect_color: coat.coat_affect_color, + coat_affect_roughness: coat.coat_affect_roughness, + coat_normal: coat.coat_normal, + emission_weight: 1.0, + emission_mode: emission_mode, + emission_intensity: enable_emission ? emission_intensity : 0.f, + emission_color: final_emission_color, + emission_use_temperature: emission_use_temperature, + emission_temperature: emission_temperature, + enable_opacity: enable_opacity, + geometry_opacity: final_opacity, + geometry_opacity_threshold: geometry_opacity_threshold, + geometry_normal_roughness: enable_anisotropy ? + float2( aniso.anisotropy_roughness_u, + aniso.anisotropy_roughness_v ) : + float2(0.f, 0.f), + geometry_normal: final_normal + ); + +} in material( + surface: base.surface, + ior: base.ior, + thin_walled: base.thin_walled, + volume: base.volume, + geometry: base.geometry +); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_04.mdl b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_04.mdl new file mode 100755 index 0000000000000000000000000000000000000000..9bfb9a3d56be411c6675c76e241c6e5d1583f61e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_04.mdl @@ -0,0 +1,177 @@ +mdl 1.8; + +import ::state::normal; +import ::OmniSurface::OmniShared::emission_mode; +import ..::Templates::OmniUber_Automotive::*; +import ::tex::gamma_mode; + +export material Carpaint_Metallic_04(*) + = Templates::OmniUber_Automotive::OmniUber_Automotive( + diffuse_reflection_color: color(0.999989986f, 1.f, 0.999998987f), + metalness: 1.f, + roughness_u: 1.f, + enable_coat: true, + coat_color: color(0.257425725f, 0.25722149f, 0.256576151f), + coat_roughness: 0.f, + enable_flakes: true, + flake_color: color(1.f, 0.999989986f, 0.999989986f), + flake_size: 0.0899999961f, + flakes_density: 0.280000001f, + flakes_spread: 0.150000006f, + flake_roughness: 0.25f, + uv_set_layer_0: Templates::OmniUber_Automotive::uv_set_1, + base_color_image: texture_2d(), + base_color_scale: 1.f, + base_color_offset: 0.f, + base_color_desaturation: 0.f, + metalness_image: texture_2d(), + metalness_channel: Templates::OmniUber_Automotive::b, + specular_reflection_weight: 1.f, + specular_reflection_color: color(1.f, 1.f, 1.f), + cavity_image: texture_2d(), + cavity_channel: Templates::OmniUber_Automotive::r, + roughness_image: texture_2d(), + roughness_channel: Templates::OmniUber_Automotive::g, + roughness_range_position: float2(0.f, 0.400000006f), + normal_image: texture_2d(), + normal_flip_green: true, + normal_scale: 1.f, + enable_layer_1: false, + uv_set_layer_1: Templates::OmniUber_Automotive::uv_set_1, + layer_1_order: Templates::OmniUber_Automotive::above, + layer_1_base_color_image: texture_2d(), + layer_1_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_1_base_color_offset: 0.f, + layer_1_base_color_scale: 1.f, + layer_1_base_color_desaturation: 0.f, + layer_1_roughness_image: texture_2d(), + layer_1_roughness_channel: Templates::OmniUber_Automotive::g, + layer_1_roughness_u: 1.f, + layer_1_roughness_range_position: float2(1.f, 0.5f), + layer_1_metalness_image: texture_2d(), + layer_1_metalness_channel: Templates::OmniUber_Automotive::b, + layer_1_metalness: 1.f, + layer_1_cavity_image: texture_2d(), + layer_1_cavity_channel: Templates::OmniUber_Automotive::r, + layer_1_specular_reflection_weight: 1.f, + layer_1_normal_image: texture_2d(), + layer_1_normal_flip_green: true, + layer_1_normal_scale: 1.f, + layer_1_blend_source: Templates::OmniUber_Automotive::texture, + layer_1_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_splatmap: texture_2d(), + layer_1_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_direction: float3(0.f, 1.f, 0.f), + layer_1_blend_axis: Templates::OmniUber_Automotive::y, + layer_1_blend_object_space: true, + layer_1_blend_scale: 1.f, + layer_1_blend_offset: 0.f, + layer_1_blend_primvar_name: "", + layer_1_uv_set_detail: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_detail_image: texture_2d(), + layer_1_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_threshold: 0.330000013f, + layer_1_blend_factor_override: 0.f, + enable_layer_2: false, + layer_2_order: Templates::OmniUber_Automotive::above, + uv_set_layer_2: Templates::OmniUber_Automotive::uv_set_2, + layer_2_base_color_image: texture_2d(), + layer_2_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_2_base_color_offset: 0.f, + layer_2_base_color_scale: 1.f, + layer_2_base_color_desaturation: 0.f, + layer_2_metalness_image: texture_2d(), + layer_2_metalness_channel: Templates::OmniUber_Automotive::b, + layer_2_metalness: 1.f, + layer_2_roughness_image: texture_2d(), + layer_2_roughness_channel: Templates::OmniUber_Automotive::g, + layer_2_roughness_u: 1.f, + layer_2_roughness_range_position: float2(1.f, 0.5f), + layer_2_specular_reflection_weight: 1.f, + layer_2_cavity_image: texture_2d(), + layer_2_cavity_channel: Templates::OmniUber_Automotive::r, + layer_2_normal_image: texture_2d(), + layer_2_normal_flip_green: true, + layer_2_normal_scale: 1.f, + layer_2_blend_source: Templates::OmniUber_Automotive::texture, + layer_2_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_splatmap: texture_2d(), + layer_2_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_direction: float3(0.f, 1.f, 0.f), + layer_2_blend_axis: Templates::OmniUber_Automotive::y, + layer_2_blend_object_space: true, + layer_2_blend_scale: 1.f, + layer_2_blend_offset: 0.f, + layer_2_blend_primvar_name: "", + layer_2_uv_set_detail: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_detail_image: texture_2d(), + layer_2_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_threshold: 0.330000013f, + layer_2_blend_factor_override: 0.f, + uvs_mode_01: Templates::OmniUber_Automotive::triplanar, + uv_scale_01: float2(1.f), + uv_offset_01: float2(0.f), + uv_offset_time_01: float2(0.f), + uv_rotation_01: 0.f, + triplanar_blend_range_01: 0.5f, + uvs_mode_02: Templates::OmniUber_Automotive::triplanar, + uv_scale_02: float2(8.f), + uv_offset_02: float2(0.f), + uv_offset_time_02: float2(0.f), + uv_rotation_02: 0.f, + triplanar_blend_range_02: 0.5f, + uvs_mode_03: Templates::OmniUber_Automotive::triplanar, + uv_scale_03: float2(1.f), + uv_offset_03: float2(0.f), + uv_offset_time_03: float2(0.f), + uv_rotation_03: 0.f, + triplanar_blend_range_03: 0.5f, + uvs_mode_04: Templates::OmniUber_Automotive::triplanar, + uv_scale_04: float2(1.f), + uv_offset_04: float2(0.f), + uv_offset_time_04: float2(0.f), + uv_rotation_04: 0.f, + triplanar_blend_range_04: 0.5f, + enable_opacity: false, + uv_set_opacity: Templates::OmniUber_Automotive::uv_set_1, + enable_detail_normal: false, + uv_set_detail_normal: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_image: texture_2d(), + detail_normal_flip_green: true, + detail_normal_scale: 1.f, + uv_set_detail_weight: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_weight_image: texture_2d(), + detail_normal_weight_channel: Templates::OmniUber_Automotive::r, + enable_emission: false, + uv_set_emission: Templates::OmniUber_Automotive::uv_set_1, + emission_image: texture_2d(), + emission_use_temperature: false, + emission_temperature: 6500.f, + uv_set_emission_mask: Templates::OmniUber_Automotive::uv_set_1, + emission_color: color(1.f, 1.f, 1.f), + emission_mask_image: texture_2d(), + emission_mode: OmniSurface::OmniShared::emission_lx, + emission_intensity: 1.f, + opacity_image: texture_2d(), + opacity_channel: Templates::OmniUber_Automotive::a, + geometry_opacity_threshold: 0.150000006f, + enable_anisotropy: false, + uv_set_anisotropy: Templates::OmniUber_Automotive::uv_set_1, + anisotropic_direction_image: texture_2d(), + anisotropic_direction_channel: Templates::OmniUber_Automotive::r, + anisotropic_direction: 0.f, + anisotropic_roughness_u: 1.f, + anisotropic_roughness_v: 0.25f, + coat_mask_image: texture_2d(), + coat_mask_channel: Templates::OmniUber_Automotive::r, + coat_roughness_image: texture_2d("../../Surfacing/ov_misc_textures_noise/noise_scratch2.jpg", ::tex::gamma_default, ""), + coat_roughness_channel: Templates::OmniUber_Automotive::r, + coat_ior: 1.60000002f, + coat_normal_image: texture_2d(), + coat_normal_flip_green: true, + uv_set_coat_roughness_normal: Templates::OmniUber_Automotive::uv_set_1, + uv_set_coat_mask: Templates::OmniUber_Automotive::uv_set_2, + coat_anisotropy: 0.f, + coat_anisotropy_rotation: 0.f, + coat_affect_color: 0.f, + coat_affect_roughness: 0.f); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_09.mdl b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_09.mdl new file mode 100755 index 0000000000000000000000000000000000000000..39335b0264dd154b9937b7496f160194f58b55e1 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Carpaint/Carpaint_Metallic_09.mdl @@ -0,0 +1,177 @@ +mdl 1.8; + +import ::state::normal; +import ::OmniSurface::OmniShared::emission_mode; +import ..::Templates::OmniUber_Automotive::*; +import ::tex::gamma_mode; + +export material Carpaint_Metallic_09(*) + = Templates::OmniUber_Automotive::OmniUber_Automotive( + diffuse_reflection_color: color(0.999989986f, 1.f, 0.999998987f), + metalness: 1.f, + roughness_u: 1.f, + enable_coat: true, + coat_color: color(0.399339914f, 0.133204028f, 0.0197692961f), + coat_roughness: 0.f, + enable_flakes: true, + flake_color: color(1.f, 0.999989986f, 0.999989986f), + flake_size: 0.0899999961f, + flakes_density: 0.280000001f, + flakes_spread: 0.150000006f, + flake_roughness: 0.25f, + uv_set_layer_0: Templates::OmniUber_Automotive::uv_set_1, + base_color_image: texture_2d(), + base_color_scale: 1.f, + base_color_offset: 0.f, + base_color_desaturation: 0.f, + metalness_image: texture_2d(), + metalness_channel: Templates::OmniUber_Automotive::b, + specular_reflection_weight: 1.f, + specular_reflection_color: color(1.f, 1.f, 1.f), + cavity_image: texture_2d(), + cavity_channel: Templates::OmniUber_Automotive::r, + roughness_image: texture_2d(), + roughness_channel: Templates::OmniUber_Automotive::g, + roughness_range_position: float2(0.f, 0.400000006f), + normal_image: texture_2d(), + normal_flip_green: true, + normal_scale: 1.f, + enable_layer_1: false, + uv_set_layer_1: Templates::OmniUber_Automotive::uv_set_1, + layer_1_order: Templates::OmniUber_Automotive::above, + layer_1_base_color_image: texture_2d(), + layer_1_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_1_base_color_offset: 0.f, + layer_1_base_color_scale: 1.f, + layer_1_base_color_desaturation: 0.f, + layer_1_roughness_image: texture_2d(), + layer_1_roughness_channel: Templates::OmniUber_Automotive::g, + layer_1_roughness_u: 1.f, + layer_1_roughness_range_position: float2(1.f, 0.5f), + layer_1_metalness_image: texture_2d(), + layer_1_metalness_channel: Templates::OmniUber_Automotive::b, + layer_1_metalness: 1.f, + layer_1_cavity_image: texture_2d(), + layer_1_cavity_channel: Templates::OmniUber_Automotive::r, + layer_1_specular_reflection_weight: 1.f, + layer_1_normal_image: texture_2d(), + layer_1_normal_flip_green: true, + layer_1_normal_scale: 1.f, + layer_1_blend_source: Templates::OmniUber_Automotive::texture, + layer_1_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_splatmap: texture_2d(), + layer_1_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_direction: float3(0.f, 1.f, 0.f), + layer_1_blend_axis: Templates::OmniUber_Automotive::y, + layer_1_blend_object_space: true, + layer_1_blend_scale: 1.f, + layer_1_blend_offset: 0.f, + layer_1_blend_primvar_name: "", + layer_1_uv_set_detail: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_detail_image: texture_2d(), + layer_1_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_threshold: 0.330000013f, + layer_1_blend_factor_override: 0.f, + enable_layer_2: false, + layer_2_order: Templates::OmniUber_Automotive::above, + uv_set_layer_2: Templates::OmniUber_Automotive::uv_set_2, + layer_2_base_color_image: texture_2d(), + layer_2_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_2_base_color_offset: 0.f, + layer_2_base_color_scale: 1.f, + layer_2_base_color_desaturation: 0.f, + layer_2_metalness_image: texture_2d(), + layer_2_metalness_channel: Templates::OmniUber_Automotive::b, + layer_2_metalness: 1.f, + layer_2_roughness_image: texture_2d(), + layer_2_roughness_channel: Templates::OmniUber_Automotive::g, + layer_2_roughness_u: 1.f, + layer_2_roughness_range_position: float2(1.f, 0.5f), + layer_2_specular_reflection_weight: 1.f, + layer_2_cavity_image: texture_2d(), + layer_2_cavity_channel: Templates::OmniUber_Automotive::r, + layer_2_normal_image: texture_2d(), + layer_2_normal_flip_green: true, + layer_2_normal_scale: 1.f, + layer_2_blend_source: Templates::OmniUber_Automotive::texture, + layer_2_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_splatmap: texture_2d(), + layer_2_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_direction: float3(0.f, 1.f, 0.f), + layer_2_blend_axis: Templates::OmniUber_Automotive::y, + layer_2_blend_object_space: true, + layer_2_blend_scale: 1.f, + layer_2_blend_offset: 0.f, + layer_2_blend_primvar_name: "", + layer_2_uv_set_detail: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_detail_image: texture_2d(), + layer_2_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_threshold: 0.330000013f, + layer_2_blend_factor_override: 0.f, + uvs_mode_01: Templates::OmniUber_Automotive::triplanar, + uv_scale_01: float2(1.f), + uv_offset_01: float2(0.f), + uv_offset_time_01: float2(0.f), + uv_rotation_01: 0.f, + triplanar_blend_range_01: 0.5f, + uvs_mode_02: Templates::OmniUber_Automotive::triplanar, + uv_scale_02: float2(8.f), + uv_offset_02: float2(0.f), + uv_offset_time_02: float2(0.f), + uv_rotation_02: 0.f, + triplanar_blend_range_02: 0.5f, + uvs_mode_03: Templates::OmniUber_Automotive::triplanar, + uv_scale_03: float2(1.f), + uv_offset_03: float2(0.f), + uv_offset_time_03: float2(0.f), + uv_rotation_03: 0.f, + triplanar_blend_range_03: 0.5f, + uvs_mode_04: Templates::OmniUber_Automotive::triplanar, + uv_scale_04: float2(1.f), + uv_offset_04: float2(0.f), + uv_offset_time_04: float2(0.f), + uv_rotation_04: 0.f, + triplanar_blend_range_04: 0.5f, + enable_opacity: false, + uv_set_opacity: Templates::OmniUber_Automotive::uv_set_1, + enable_detail_normal: false, + uv_set_detail_normal: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_image: texture_2d(), + detail_normal_flip_green: true, + detail_normal_scale: 1.f, + uv_set_detail_weight: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_weight_image: texture_2d(), + detail_normal_weight_channel: Templates::OmniUber_Automotive::r, + enable_emission: false, + uv_set_emission: Templates::OmniUber_Automotive::uv_set_1, + emission_image: texture_2d(), + emission_use_temperature: false, + emission_temperature: 6500.f, + uv_set_emission_mask: Templates::OmniUber_Automotive::uv_set_1, + emission_color: color(1.f, 1.f, 1.f), + emission_mask_image: texture_2d(), + emission_mode: OmniSurface::OmniShared::emission_lx, + emission_intensity: 1.f, + opacity_image: texture_2d(), + opacity_channel: Templates::OmniUber_Automotive::a, + geometry_opacity_threshold: 0.150000006f, + enable_anisotropy: false, + uv_set_anisotropy: Templates::OmniUber_Automotive::uv_set_1, + anisotropic_direction_image: texture_2d(), + anisotropic_direction_channel: Templates::OmniUber_Automotive::r, + anisotropic_direction: 0.f, + anisotropic_roughness_u: 1.f, + anisotropic_roughness_v: 0.25f, + coat_mask_image: texture_2d(), + coat_mask_channel: Templates::OmniUber_Automotive::r, + coat_roughness_image: texture_2d("../../Surfacing/ov_misc_textures_noise/noise_scratch2.jpg", ::tex::gamma_default, ""), + coat_roughness_channel: Templates::OmniUber_Automotive::r, + coat_ior: 1.60000002f, + coat_normal_image: texture_2d(), + coat_normal_flip_green: true, + uv_set_coat_roughness_normal: Templates::OmniUber_Automotive::uv_set_1, + uv_set_coat_mask: Templates::OmniUber_Automotive::uv_set_2, + coat_anisotropy: 0.f, + coat_anisotropy_rotation: 0.f, + coat_affect_color: 0.f, + coat_affect_roughness: 0.f); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Templates/OmniUber_Automotive.mdl b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Templates/OmniUber_Automotive.mdl new file mode 100755 index 0000000000000000000000000000000000000000..9123430b115c1b7d325814c3d9414da407f66a2e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Pristine/Templates/OmniUber_Automotive.mdl @@ -0,0 +1,2611 @@ +mdl 1.8; + +import ::anno::*; +import ::base::*; +import ::df::*; +import ::limits::*; +import ::math::*; +import ::state::*; +import ::tex::*; +import ::scene::*; + +import ::OmniSurface::OmniShared::*; +import ::OmniSurface::OmniImage::*; +import ::OmniSurface::OmniSurfaceLiteBase::*; +import ::OmniSurface::OmniSurfaceBase::*; + +import ::nvidia::core_definitions::blend_normals; + +import ::nvidia::core_definitions::triplanar_file_texture; +import ::nvidia::core_definitions::triplanar_normalmap_texture; + +export enum blend_source +{ + texture [[ anno::display_name( "Texture" ) ]], + direction [[ anno::display_name( "Direction" ) ]], + axis [[ anno::display_name( "Axis" ) ]], + primvar [[ anno::display_name( "Primvar" ) ]] +}; + +export enum uvs_mode +{ + texture_coord_0 [[ anno::display_name( "Texture Coordinate 0" ) ]], + triplanar [[ anno::display_name( "TriPlanar" ) ]] +}; + +export enum uv_set_selection +{ + uv_set_1 [[ anno::display_name( "UV Set 1" ) ]], + uv_set_2 [[ anno::display_name( "UV Set 2" ) ]], + uv_set_3 [[ anno::display_name( "UV Set 3" ) ]], + uv_set_4 [[ anno::display_name( "UV Set 4" ) ]] +}; + +export enum channel_mode +{ + r [[ anno::display_name( "R" ) ]], + g [[ anno::display_name( "G" ) ]], + b [[ anno::display_name( "B" ) ]], + a [[ anno::display_name( "A" ) ]], + rgb [[ anno::display_name( "RGB" ) ]] +}; + +export enum axis_mode +{ + x [[ anno::display_name( "X" ) ]], + x_invert [[ anno::display_name( "-X" ) ]], + y [[ anno::display_name( "Y" ) ]], + y_invert [[ anno::display_name( "-Y" ) ]], + z [[ anno::display_name( "Z" ) ]], + z_invert [[ anno::display_name( "-Z" ) ]] +}; + +export enum layer_order +{ + below [[ anno::display_name( "Below Clear Coat" ) ]], + above [[ anno::display_name( "Above Clear Coat" ) ]] +}; + +export struct material_layer +{ + color base_color; + float metallic; + float cavity; + float specular_weight; + float roughness; + float3 normal; +}; + +export struct coat_layer +{ + float coat_weight; + color coat_color; + float coat_roughness; + uniform float coat_ior; + float coat_anisotropy; + float coat_anisotropy_rotation; + float coat_affect_color; + float coat_affect_roughness; + float3 coat_normal; +}; + +export struct anisotropy +{ + float anisotropy_roughness_u; + float anisotropy_roughness_v; + float anisotropy_rotation; +}; + +export struct uv_set_settings +{ + uvs_mode mode = texture_coord_0; + float2 uv_scale = float2( 1.f ); + float2 uv_offset = float2( 0.f ); + float2 uv_offset_time = float2( 0.f ); + float uv_rotation = 0.f; + float triplanar_blend_range = 0.5f; +}; + +export struct uv_streams +{ + uv_set_settings uv_set_settings_1; + uv_set_settings uv_set_settings_2; + uv_set_settings uv_set_settings_3; + uv_set_settings uv_set_settings_4; +}; + +export struct flakes +{ + float priority; + int seed; + float4 carrier; +}; + +export struct flake_layer +{ + float3 normal; + float roughness; + float weight; +}; + +int hash( int seed, int i ) +{ + return(i ^ seed ) * 1075385539; +} + +int random_next( int seed ) +{ + seed ^= seed << 13; + seed ^= seed >>> 17; + seed ^= seed << 5; + return seed; +} + +float random_value( int seed ) +{ + return math::abs( float( seed ) * 0.00000000046566f ); +} + +int random_initialize( int3 seed ) +{ + return hash( hash( hash( 0, seed.x ), seed.y ), seed.z ); +} + +float3 rotate_position( + float3 position = state::position(), + float3 xi = float3( 0.f ) +) +{ + float theta = math::PI * 2.f * xi.x; + float phi = math::PI * 2.f * xi.y; + float z = xi.z * 2.f; + + float r = math::sqrt( z ); + float[2] sp_cp = math::sincos( phi ); + float Vx = r * sp_cp[0]; + float Vy = r * sp_cp[1]; + float Vz = math::sqrt( 2.f - z ); + + float[2] st_ct = math::sincos( theta ); + float Sx = Vx * st_ct[1] - Vy * st_ct[0]; + float Sy = Vx * st_ct[0] + Vy * st_ct[1]; + + float3x3 M( + Vx * Sx - st_ct[1], Vx * Sy - st_ct[0], Vx * Vz, + Vy * Sx + st_ct[0], Vy * Sy - st_ct[1], Vy * Vz, + Vz * Sx, Vz * Sy, 1.0f - z); + + return M * position; +} + +export float linstep( + float input = 0.f, + float min_in = 0.f, + float max_in = 1.f, + float min_out = 0.f, + float max_out = 1.f +) +{ + float in_range = math::saturate( ( input - min_in ) / ( max_in - min_in ) ); + float out_range = math::lerp( min_out, max_out, in_range ); + return out_range; + +} + +export float histogram_range( + float input = 0.f, + float range = 1.f, + float position = 0.5f +) +{ + float x = ( range * 0.5f ) + ( 1.f - position ); + float y = ( 1.f - position ) * 2.f; + float z = ( range * 0.5f ) + position; + float w = position * 2.f; + + return linstep( input, 0.f, 1.f, 1.f - math::min( x, y ), math::min( z, w ) ); +} + +export float threshold_blend( + float input = 1.f, + float height = 0.5f, + float threshold = 0.33f +) +{ + height = 1.f - height; + float epsilon = 0.0001; + float min = math::saturate( height - ( threshold + epsilon ) ); + return math::saturate( math::smoothstep( min, height, input ) ); +} + +export float lookup_float4_channel( + uniform texture_2d tex = texture_2d(), + float2 coord = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + float4 texel = tex::lookup_float4( tex: tex, coord: coord ); + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.w * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export color color_adjustments( + color input = color( 1.f ), + color color_offset = color( 0.f ), + color color_scale = color( 1.f ), + color color_tint = color( 1.f ), + float desaturation = 0.f +) +{ + input = input * color_scale + color_offset; + if ( desaturation > 0.f ){ + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + color gray = color( math::dot( float3( input ), luminance ) ); + input = color( math::lerp( input, gray, desaturation ) ); + } + return input * color_tint; +} + +export float lookup_triplanar_channel( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f, + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ) ); + + /*float3 texel = float3( triplanar_color( tex, float3( uv_scale.x, uv_scale.y, uv_scale.x ) ) );*/ + + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.x * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export float3 lookup_triplanar_normal( + uniform texture_2d tex = texture_2d(), + float normal_scale = 1.f, + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + uniform bool flip_green = false, + float3 default_value = state::normal(), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_normalmap_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + object_space: true, + blend_range: triplanar_blend_range, + flip_1: !flip_green, + flip_2: !flip_green, + flip_3: !flip_green, + strength: normal_scale ) ); + + return texel; +} + +export color lookup_triplanar_color( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + color default_value = color( 1.f ), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + color texel = ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ); + + return texel; +} + +flakes flake_normal( + flakes flake = flakes(), + float spread = 0.54f +) +{ + if( flake.priority <= 0.f ) + { + flake.carrier = float4( state::normal().x, state::normal().y, state::normal().z, 1.f ); + return flake; + } + + int seed = random_next( flake.seed ); + float xi0 = random_value( seed ); + seed = random_next( seed ); + float xi1 = random_value( seed ); + float phi = 2.f * math::PI * xi0; + + float roughness = spread * spread; + + float tantheta = math::sqrt( -roughness * roughness * math::log( 1.f - xi1 ) ); + float sintheta = tantheta / math::sqrt( 1.f + tantheta * tantheta ); + float costheta = math::sqrt( 1.f - sintheta * sintheta ); + float[2] scphi = math::sincos( phi ); + + float3 normal = state::texture_tangent_u(0) * scphi[1] * sintheta + + state::texture_tangent_v(0) * scphi[0] * sintheta + + state::normal() * costheta; + + flake.carrier = float4( normal.x, normal.y, normal.z, 1.f ); + flake.seed = seed; + return flake; +} + +flakes flake_noise( + float3 position = state::position(), + float jitter_scale = 0.5f, + float flake_diameter = 0.5f, + float flake_probability = 1.f +) +{ + flakes flake; + + float3 base_position = math::floor( position ); + int3 base_position_int = int3( base_position ); + + flake_diameter = math::min( flake_diameter, ( 1.5f - 0.5f * jitter_scale ) / math::sqrt( 3.f ) ); + + for( int i = -1; i < 2; ++i ){ + for( int j = -1; j < 2; ++j ){ + for( int k = -1; k < 2; ++k ){ + int seed = random_initialize( base_position_int + int3( i, j, k ) ); + + seed = random_next( seed ); + if( random_value( seed ) > flake_probability ) + continue; + + seed = random_next( seed ); + float priority = random_value( seed ); + if( priority < flake.priority ) + continue; + + float3 flake_position = base_position + float3( i, j, k ) + float3( 0.5f ); + + if( jitter_scale > 0.f ){ + seed = random_next( seed ); + flake_position.x += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.y += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.z += ( random_value( seed ) - 0.5f ) * jitter_scale; + } + + float3 p = position - flake_position; + if( math::dot( p, p ) >= flake_diameter * flake_diameter * 4.f ) + continue; + + float3 xi_rotation; + seed = random_next( seed ); + xi_rotation.x = random_value( seed ); + seed = random_next( seed ); + xi_rotation.y = random_value( seed ); + seed = random_next( seed ); + xi_rotation.z = random_value( seed ); + p = rotate_position( p, xi_rotation ); + + if( math::abs( p.x ) <= flake_diameter && + math::abs( p.y ) <= flake_diameter && + math::abs( p.z ) <= flake_diameter ) + { + flake.priority = priority; + flake.seed = seed; + } + } + } + } + + return flake; +} + +export uv_streams initialize_uv_streams( + uvs_mode mode_1 = texture_coord_0, float2 uv_scale_1 = float2( 1.f ), float2 uv_offset_1 = float2( 0.f ), float2 uv_offset_time_1 = float2( 0.f ), float uv_rotation_1 = 0.f, float triplanar_blend_range_1 = 0.5f, + uvs_mode mode_2 = texture_coord_0, float2 uv_scale_2 = float2( 1.f ), float2 uv_offset_2 = float2( 0.f ), float2 uv_offset_time_2 = float2( 0.f ), float uv_rotation_2 = 0.f, float triplanar_blend_range_2 = 0.5f, + uvs_mode mode_3 = texture_coord_0, float2 uv_scale_3 = float2( 1.f ), float2 uv_offset_3 = float2( 0.f ), float2 uv_offset_time_3 = float2( 0.f ), float uv_rotation_3 = 0.f, float triplanar_blend_range_3 = 0.5f, + uvs_mode mode_4 = texture_coord_0, float2 uv_scale_4 = float2( 1.f ), float2 uv_offset_4 = float2( 0.f ), float2 uv_offset_time_4 = float2( 0.f ), float uv_rotation_4 = 0.f, float triplanar_blend_range_4 = 0.5f +) +{ + uv_streams streams; + + streams.uv_set_settings_1.mode = mode_1; + streams.uv_set_settings_1.uv_scale = uv_scale_1; + uv_offset_1 += uv_offset_time_1 * state::animation_time(); + streams.uv_set_settings_1.uv_offset = uv_offset_1; + streams.uv_set_settings_1.uv_rotation = uv_rotation_1; + streams.uv_set_settings_1.triplanar_blend_range = triplanar_blend_range_1; + + streams.uv_set_settings_2.mode = mode_2; + streams.uv_set_settings_2.uv_scale = uv_scale_2; + uv_offset_2 += uv_offset_time_2 * state::animation_time(); + streams.uv_set_settings_2.uv_offset = uv_offset_2; + streams.uv_set_settings_2.uv_rotation = uv_rotation_2; + streams.uv_set_settings_2.triplanar_blend_range = triplanar_blend_range_2; + + streams.uv_set_settings_3.mode = mode_3; + streams.uv_set_settings_3.uv_scale = uv_scale_3; + uv_offset_3 += uv_offset_time_3 * state::animation_time(); + streams.uv_set_settings_3.uv_offset = uv_offset_3; + streams.uv_set_settings_3.uv_rotation = uv_rotation_3; + streams.uv_set_settings_3.triplanar_blend_range = triplanar_blend_range_3; + + streams.uv_set_settings_4.mode = mode_4; + streams.uv_set_settings_4.uv_scale = uv_scale_4; + uv_offset_4 += uv_offset_time_4 * state::animation_time(); + streams.uv_set_settings_4.uv_offset = uv_offset_4; + streams.uv_set_settings_4.uv_rotation = uv_rotation_4; + streams.uv_set_settings_4.triplanar_blend_range = triplanar_blend_range_4; + + return streams; +} + +export uv_set_settings select_uv_stream( + uv_streams streams, + uv_set_selection uv_stream = uv_set_1 +) +{ + switch( uv_stream ){ + case uv_set_1: + return streams.uv_set_settings_1; + case uv_set_2: + return streams.uv_set_settings_2; + case uv_set_3: + return streams.uv_set_settings_3; + case uv_set_4: + return streams.uv_set_settings_4; + } +} + +export material_layer initialize_material_layer( + uv_set_settings uv_stream = uv_set_settings(), + uniform texture_2d tBaseColor = texture_2d(), + color base_color_offset = color(0.f), + color base_color_scale = color(1.f), + color base_color_tint = color(1.f), + float base_color_desaturation = 0.f, + uniform texture_2d tMetallic = texture_2d(), + channel_mode metallic_channel = r, + float metallic_factor = 1.f, + uniform texture_2d tCavity = texture_2d(), + channel_mode cavity_channel = r, + float specular_weight = 1.f, + uniform texture_2d tRoughness = texture_2d(), + channel_mode roughness_channel = r, + float roughness_factor = 1.f, + float2 roughness_range_position = float2( 1.f, 0.5f ), + uniform texture_2d tNormal = texture_2d(), + uniform float normal_scale = 1.f, + uniform bool normal_flip_green = false +) +{ + material_layer layer; + color base_color_tex; + float metallic_tex; + float cavity_tex; + float roughness_tex; + float3 normal_tex; + + layer.specular_weight = specular_weight; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + base_color_tex = tex::texture_isvalid( tBaseColor ) ? + tex::lookup_color( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_float4_channel( tex: tMetallic, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_float4_channel( tex: tCavity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_float4_channel( tex: tRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = tex::texture_isvalid( tNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_factor: normal_scale, + tangent_space_flip_g_channel: normal_flip_green + ) : state::normal(); + layer.normal = normal_tex; + return layer; + + case triplanar: + base_color_tex = lookup_triplanar_color( + tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_triplanar_channel( + tex: tMetallic, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_triplanar_channel( + tex: tCavity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_triplanar_channel( + tex: tRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = lookup_triplanar_normal( + tex: tNormal, + normal_scale: normal_scale, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: normal_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.normal = normal_tex; + + return layer; + } +} + +export material_layer blend_material_layer( + bool enable_blend, + material_layer layer_1, + material_layer layer_2, + float blend_factor +) +{ + if ( !enable_blend ) + return layer_1; + + material_layer layer; + layer.base_color = math::lerp( layer_1.base_color, layer_2.base_color, blend_factor ); + layer.metallic = math::lerp( layer_1.metallic, layer_2.metallic, blend_factor ); + layer.cavity = math::lerp( layer_1.cavity, layer_2.cavity, blend_factor ); + layer.specular_weight = math::lerp( layer_1.specular_weight, layer_2.specular_weight, blend_factor ); + layer.roughness = math::lerp( layer_1.roughness, layer_2.roughness, blend_factor ); + layer.normal = math::lerp( layer_1.normal, layer_2.normal, blend_factor ); + layer.normal = math::normalize( layer.normal ); + return layer; +} + +export coat_layer initialize_coat_layer( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_coat = false, + uniform texture_2d tCoatMask = texture_2d(), + uniform texture_2d tCoatNormal = texture_2d(), + uniform texture_2d tCoatRoughness = texture_2d(), + channel_mode coat_weight_channel = r, + float coat_weight = 1.f, + color coat_color = color(1.f), + channel_mode coat_roughness_channel = r, + float coat_roughness_factor = 1.f, + uniform float coat_ior = 1.5f, + float coat_anisotropy = 0.f, + float coat_anisotropy_rotation = 0.f, + float coat_affect_color = 0.f, + float coat_affect_roughness = 0.f, + uniform bool coat_flip_green = false +) +{ + coat_layer layer; + if ( enable_coat ) + { + layer.coat_weight = coat_weight; + layer.coat_color = coat_color; + layer.coat_ior = coat_ior; + layer.coat_anisotropy = coat_anisotropy; + layer.coat_anisotropy_rotation = coat_anisotropy_rotation; + layer.coat_affect_color = coat_affect_color; + layer.coat_affect_roughness = coat_affect_roughness; + + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + layer.coat_weight = math::min( tex::texture_isvalid( tCoatMask ) ? + lookup_float4_channel( tex: tCoatMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f ) : 1.f, coat_weight ); + break; + + case triplanar: + layer.coat_weight = math::min( lookup_triplanar_channel( tex: tCoatMask, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ), coat_weight ); + break; + } + + if ( layer.coat_weight > 0 ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + layer.coat_normal = tex::texture_isvalid( tCoatNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tCoatNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_flip_g_channel: coat_flip_green + + ) : state::normal(); + + layer.coat_roughness = lookup_float4_channel( tex: tCoatRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor ); + break; + + case triplanar: + layer.coat_normal = lookup_triplanar_normal( tex: tCoatNormal, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: coat_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + + layer.coat_roughness = lookup_triplanar_channel( tex: tCoatRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + break; + } + } + return layer; + } + + return layer; +} + +export flake_layer initialize_flake_layer( + bool enable_flakes = false, + float flakes_weight = 1.f, + float flakes_size = 0.6f, + float flakes_density = 0.31f, + float flakes_spread = 0.54f +) +{ + flake_layer layer; + if ( enable_flakes ) + { + if ( flakes_weight > 0.f ) + { + float scale_transform = state::transform_scale(state::coordinate_object, state::coordinate_world, 1.f); + float3 flake_coordinates = state::position() * state::meters_per_scene_unit() * scale_transform; + float flake_scale = 1492.537313432835f / flakes_size; + layer.normal = float3( flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.x, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.y, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.z ); + float flake_mask = flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ).priority > 0.001 ? 1.f : 0.f; + layer.roughness = 1.f; + layer.weight = flake_mask; + } + } + return layer; +} + +export anisotropy initialize_anisotropy( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_anisotropy = false, + float anisotropy_roughness_u = 1.f, + float anisotropy_roughness_v = 0.25f, + uniform texture_2d tAnisotropyRotation = texture_2d(), + channel_mode anisotropy_channel = r, + float anisotropy_rotation = 1.f + +) +{ + anisotropy aniso; + + if ( enable_anisotropy ) + { + aniso.anisotropy_roughness_u = anisotropy_roughness_u; + aniso.anisotropy_roughness_v = anisotropy_roughness_v; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + aniso.anisotropy_rotation = lookup_float4_channel( tex: tAnisotropyRotation, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation ); + return aniso; + + case triplanar: + aniso.anisotropy_rotation = lookup_triplanar_channel( tex: tAnisotropyRotation, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return aniso; + } + } + + return aniso; +} + +export float3 detail_normal_combine( + uv_set_settings uv_set_normal = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_detail_normal = false, + float3 base_normal = state::normal(), + uniform texture_2d tDetailNormal = texture_2d(), + uniform texture_2d tDetailNormalWeight = texture_2d(), + channel_mode detail_normal_channel = r, + uniform float detail_normal_scale = 1.f, + uniform bool detail_normal_flip_green = false +) +{ + float3 final_normal = base_normal; + + if ( enable_detail_normal ) + { + float3 detail_normal; + switch ( uv_set_normal.mode ) + { + case texture_coord_0: + detail_normal = tex::texture_isvalid( tDetailNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tDetailNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_normal.uv_scale + + uv_set_normal.uv_offset, + tangent_space_factor: detail_normal_scale, + tangent_space_flip_g_channel: detail_normal_flip_green + ) : state::normal(); + break; + + case triplanar: + detail_normal = lookup_triplanar_normal( tex: tDetailNormal, + uv_scale: uv_set_normal.uv_scale, + uv_offset: uv_set_normal.uv_offset, + normal_scale: detail_normal_scale, + flip_green: detail_normal_flip_green, + triplanar_blend_range: uv_set_normal.triplanar_blend_range ); + break; + } + + float detail_normal_weight; + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + detail_normal_weight = lookup_float4_channel( tex: tDetailNormalWeight, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_normal_weight = lookup_triplanar_channel( tex: tDetailNormalWeight, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ); + break; + } + + final_normal = ::nvidia::core_definitions::blend_normals( + base_normal: base_normal, + base_normal_weight: 1.f, + detail_normal: detail_normal, + detail_normal_weight: detail_normal_weight + ); + return final_normal; + + } + + return final_normal; +} + +export color emission( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_stream_mask = uv_set_settings(), + bool enable_emission = false, + uniform texture_2d tEmission = texture_2d(), + uniform texture_2d tEmissionMask = texture_2d(), + color emission_color = color(1.f) +) +{ + color emission = color( 0.f ); + if ( enable_emission ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + emission = tex::texture_isvalid( tEmission ) ? + tex::lookup_color( tex: tEmission, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + emission *= emission_color; + break; + + case triplanar: + emission = lookup_triplanar_color( tex: tEmission, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + default_value: emission_color, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + emission *= emission_color; + break; + } + + float mask = 1.f; + switch ( uv_stream_mask.mode ) + { + case texture_coord_0: + mask = tex::texture_isvalid( tEmissionMask ) ? + tex::lookup_float( tex: tEmissionMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream_mask.uv_scale + + uv_stream_mask.uv_offset + ) : 1.f; + emission *= mask; + break; + + case triplanar: + mask = lookup_triplanar_channel( tex: tEmissionMask, + uv_scale: uv_stream_mask.uv_scale, + uv_offset: uv_stream_mask.uv_offset, + channel: r, + default_value: 1.f, + triplanar_blend_range: uv_stream_mask.triplanar_blend_range ); + emission *= mask; + break; + } + } + + return emission; +} + +export float opacity( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_opacity = false, + uniform texture_2d tOpacity = texture_2d(), + uniform texture_2d tBaseColor = texture_2d(), + channel_mode opacity_channel = a +) +{ + float final_opacity = 1.f; + + if ( enable_opacity ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_float4_channel( tex: tOpacity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_float4_channel( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : 1.f; + return final_opacity; + + case triplanar: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_triplanar_channel( tex: tOpacity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_triplanar_channel( tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : 1.f; + return final_opacity; + } + } + + return final_opacity; +} + +export float blend_factor( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_blend_factor = false, + blend_source blend_factor_source = texture, + uniform texture_2d tBlendFactor = texture_2d(), + channel_mode blend_factor_channel = r, + float3 blend_direction = float3( 0.f, 1.f, 0.f), + bool blend_axis_obect_space = false, + axis_mode blend_axis = y, + float blend_axis_scale = 1.f, + float blend_axis_offset = 0.f, + uniform string blend_primvar_string = string(), + float blend_threshold = 0.33f, + uv_set_settings uv_set_detail = uv_set_settings(), + uniform texture_2d tDetailBlendFactor = texture_2d(), + channel_mode detail_blend_factor_channel = r, + float blend_factor_override = 0.f +) +{ + float final_blend_factor = 0.f; + + if ( enable_blend_factor ) + { + if ( blend_factor_override > 0.f ) + return blend_factor_override; + + float detail_blend = 0.5f; + if ( tex::texture_isvalid( tDetailBlendFactor ) ) + { + switch ( uv_set_detail.mode ) + { + case texture_coord_0: + detail_blend = lookup_float4_channel( tex: tDetailBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_detail.uv_scale + + uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_blend = lookup_triplanar_channel( tex: tDetailBlendFactor, + uv_scale: uv_set_detail.uv_scale, + uv_offset: uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_detail.triplanar_blend_range ); + break; + } + } + + switch (blend_factor_source) + { + case texture: + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_blend_factor = lookup_float4_channel( tex: tBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case triplanar: + final_blend_factor = lookup_triplanar_channel( tex: tBlendFactor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + + case direction: + final_blend_factor = math::dot( state::normal(), blend_direction ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case axis: + switch ( blend_axis ) + { + case x: + final_blend_factor = state::position().x; + break; + case x_invert: + final_blend_factor = -state::position().x; + break; + case y: + final_blend_factor = state::position().y; + break; + case y_invert: + final_blend_factor = -state::position().y; + break; + case z: + final_blend_factor = state::position().z; + break; + case z_invert: + final_blend_factor = -state::position().z; + break; + } + + final_blend_factor *= state::meters_per_scene_unit(); + if ( blend_axis_obect_space ) + { + float object_axis; + switch ( blend_axis ) + { + case x: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case x_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case y: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case y_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case z: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + case z_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + } + object_axis *= state::meters_per_scene_unit(); + final_blend_factor -= object_axis; + } + final_blend_factor = math::saturate( final_blend_factor * blend_axis_scale - blend_axis_offset ); + return math::saturate( 1.f - threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ) ); + + case primvar: + final_blend_factor = scene::data_lookup_float( blend_primvar_string, 0.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + } + return final_blend_factor; +} + +export float accumulate_coat_weight( + layer_order layer_1_order = above, + float layer_1_weight = 0.f, + layer_order layer_2_order = above, + float layer_2_weight = 0.f + +) +{ + float final_coat_weight = 0.f; + + switch ( layer_1_order ) + { + case above: + final_coat_weight += layer_1_weight; + break; + case below: + break; + } + + switch ( layer_2_order ) + { + case above: + final_coat_weight += layer_2_weight; + break; + + case below: + break; + } + + return 1.f - final_coat_weight; +} + +export material OmniUber_Automotive( + //Basic Inputs - 100 + color diffuse_reflection_color = color(0.463f, 0.725f, 0.f) [[ + anno::display_name("Base Color"), + anno::ui_order(100) + ]], + + float metalness = float(0.f) [[ + anno::display_name("Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(101) + ]], + + float roughness_u = float(1.f) [[ + anno::display_name("Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(103) + ]], + + //Basic Clear Coat - 200 + bool enable_coat = true [[ + anno::display_name("Enable Clear Coat"), + anno::in_group("Clear Coat"), + anno::ui_order(200) + ]], + + color coat_color = color(1.f) [[ + anno::display_name("Clear Coat Color Tint"), + anno::in_group("Clear Coat"), + anno::ui_order(201) + ]], + + float coat_roughness = float(0.f) [[ + anno::display_name("Clear Coat Roughness"), + anno::in_group("Clear Coat"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(202) + ]], + + //Flakes - 300 + bool enable_flakes = true [[ + anno::display_name("Enable Flakes"), + anno::in_group("Flakes"), + anno::ui_order(300) + ]], + + color flake_color = color(1.f) [[ + anno::display_name("Flake Color"), + anno::in_group("Flakes"), + anno::ui_order(301) + ]], + + float flake_size = float(0.125f) [[ + anno::display_name("Flake Size"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(302) + ]], + + float flakes_density = float(0.25f) [[ + anno::display_name("Flake Density"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(303) + ]], + + float flakes_spread = float(0.15f) [[ + anno::display_name("Flake Spread"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(304) + ]], + + float flake_roughness = float(0.05f) [[ + anno::display_name("Flake Roughness"), + anno::in_group("Flakes"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(305) + ]], + + //Advanced + //Base Layer - 1000 + uv_set_selection uv_set_layer_0 = uv_set_1 [[ + anno::display_name("Base UV Set"), + anno::in_group("Advanced", "Base Layer"), + anno::ui_order(1000) + ]], + + uniform texture_2d base_color_image = texture_2d() [[ + anno::display_name("Base Color Image"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::ui_order(1001) + ]], + + float base_color_scale = 1.f [[ + anno::display_name("Base Color Multiply"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(1003) + ]], + + float base_color_offset = 0.f [[ + anno::display_name("Base Color Add"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(1004) + ]], + + float base_color_desaturation = float(0.f) [[ + anno::display_name("Base Color Desaturation"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1005) + ]], + + uniform texture_2d metalness_image = texture_2d() [[ + anno::display_name("Metalness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1100) + ]], + + uniform channel_mode metalness_channel = b [[ + anno::display_name("Metalness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1101) + ]], + + float specular_reflection_weight = float(1.0) [[ + anno::display_name("Specular Weight"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(1302) + ]], + + color specular_reflection_color = color(1.f) [[ + anno::display_name("Specular Color"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hidden(), + anno::ui_order(1000) + ]], + + uniform texture_2d cavity_image = texture_2d() [[ + anno::display_name("Specular Cavity Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1300) + ]], + + uniform channel_mode cavity_channel = r [[ + anno::display_name("Specular Cavity Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1301) + ]], + + uniform texture_2d roughness_image = texture_2d() [[ + anno::display_name("Roughness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1200) + ]], + + uniform channel_mode roughness_channel = g [[ + anno::display_name("Roughness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1201) + ]], + + float2 roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Roughness Range Position"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(1203) + ]], + + uniform texture_2d normal_image = texture_2d() [[ + anno::display_name("Normal Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::usage("normal"), + anno::ui_order(1400) + ]], + + uniform bool normal_flip_green = true [[ + anno::display_name("Normal Flip Green"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::ui_order(1401) + ]], + + uniform float normal_scale = float(1.f) [[ + anno::display_name("Normal Scale"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1402) + ]], + + //Layer 1 - 4000 + bool enable_layer_1 = false [[ + anno::display_name("Enable Layer 1"), + anno::in_group("Advanced", "Layer 1" ), + anno::ui_order(4000) + ]], + + uv_set_selection uv_set_layer_1 = uv_set_1 [[ + anno::display_name("Layer 1 UV Set"), + anno::in_group("Advanced", "Layer 1"), + anno::ui_order(4001) + ]], + + layer_order layer_1_order = above [[ + anno::display_name("Layer 1 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(4002) + ]], + + //Layer 1 Base Color - 4100 + uniform texture_2d layer_1_base_color_image = texture_2d() [[ + anno::display_name("Layer 1 Base Color Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4100) + ]], + + color layer_1_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 1 Base Color Tint"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4101) + ]], + + float layer_1_base_color_offset = float(0.f) [[ + anno::display_name("Layer 1 Base Color Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4102) + ]], + + float layer_1_base_color_scale = float(1.f) [[ + anno::display_name("Layer 1 Base Color Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(4103) + ]], + + float layer_1_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 1 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4104) + ]], + + //Layer 1 Specular - 4200 + uniform texture_2d layer_1_roughness_image = texture_2d() [[ + anno::display_name("Layer 1 Roughness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4300) + ]], + + uniform channel_mode layer_1_roughness_channel = g [[ + anno::display_name("Layer 1 Roughness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4301) + ]], + + float layer_1_roughness_u = float(1.f) [[ + anno::display_name("Layer 1 Roughness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4302) + ]], + + float2 layer_1_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 1 Roughness Range Position"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(4303) + ]], + + uniform texture_2d layer_1_metalness_image = texture_2d() [[ + anno::display_name("Layer 1 Metalness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4200) + ]], + + uniform channel_mode layer_1_metalness_channel = b [[ + anno::display_name("Layer 1 Metalness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4201) + ]], + + float layer_1_metalness = float(1.f) [[ + anno::display_name("Layer 1 Metalness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4202) + ]], + + //Layer 1 Specular - 4400 + uniform texture_2d layer_1_cavity_image = texture_2d() [[ + anno::display_name("Layer 1 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4400) + ]], + + uniform channel_mode layer_1_cavity_channel = r [[ + anno::display_name("Layer 1 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4401) + ]], + + float layer_1_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 1 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4402) + ]], + + //Layer 1 Normal - 4500 + uniform texture_2d layer_1_normal_image = texture_2d() [[ + anno::display_name("Layer 1 Normal Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::usage("normal"), + anno::ui_order(4500) + ]], + + uniform bool layer_1_normal_flip_green = true [[ + anno::display_name("Layer 1 Normal Flip Green"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::ui_order(4501) + ]], + + uniform float layer_1_normal_scale = float(1.f) [[ + anno::display_name("Layer 1 Normal Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4502) + ]], + + //Layer 1 Weight - 4600 + blend_source layer_1_blend_source = texture [[ + anno::display_name("Layer 1 Mask Source"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_blend_factor = uv_set_1 [[ + anno::display_name("Layer 1 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform texture_2d layer_1_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 1 Mask Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform channel_mode layer_1_blend_splatmap_channel = r [[ + anno::display_name("Layer 1 Mask Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + float3 layer_1_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 1 Mask Direction"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4620) + ]], + + axis_mode layer_1_blend_axis = y [[ + anno::display_name("Layer 1 Mask Axis"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4611) + ]], + + bool layer_1_blend_object_space = true [[ + anno::display_name("Layer 1 Mask Object Space"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4610) + ]], + + float layer_1_blend_scale = float(1.f) [[ + anno::display_name("Layer 1 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4612) + ]], + + float layer_1_blend_offset = float(0.f) [[ + anno::display_name("Layer 1 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4613) + ]], + + uniform string layer_1_blend_primvar_name = string() [[ + anno::display_name("Layer 1 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_detail = uv_set_1 [[ + anno::display_name("Layer 1 Detail UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4640) + ]], + + uniform texture_2d layer_1_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 1 Detail Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4641) + ]], + + uniform channel_mode layer_1_blend_detail_image_channel = r [[ + anno::display_name("Layer 1 Detail Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4642) + ]], + + float layer_1_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 1 Mask Threshold"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4601) + ]], + + float layer_1_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 1 Mask Factor Override"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(4600) + ]], + + //Layer 2 - 5000 + bool enable_layer_2 = false [[ + anno::display_name("Enable Layer 2"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5000) + ]], + + layer_order layer_2_order = above [[ + anno::display_name("Layer 2 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(5001) + ]], + + uv_set_selection uv_set_layer_2 = uv_set_1 [[ + anno::display_name("Layer 2 UV Set"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5002) + ]], + + //Layer 2 - Base Color - 5100 + uniform texture_2d layer_2_base_color_image = texture_2d() [[ + anno::display_name("Layer 2 Base Color Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5100) + ]], + + color layer_2_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 2 Base Color Tint"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5101) + ]], + + float layer_2_base_color_offset = float(0.f) [[ + anno::display_name("Layer 2 Base Color Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5102) + ]], + + float layer_2_base_color_scale = float(1.f) [[ + anno::display_name("Layer 2 Base Color Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(5103) + ]], + + float layer_2_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 2 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5104) + ]], + + //Layer 2 - Metallic - 5200 + uniform texture_2d layer_2_metalness_image = texture_2d() [[ + anno::display_name("Layer 2 Metalness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5200) + ]], + + uniform channel_mode layer_2_metalness_channel = b [[ + anno::display_name("Layer 2 Metalness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5201) + ]], + + float layer_2_metalness = float(1.f) [[ + anno::display_name("Layer 2 Metalness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5202) + ]], + + //Layer 2 - Roughness - 5300 + uniform texture_2d layer_2_roughness_image = texture_2d() [[ + anno::display_name("Layer 2 Roughness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5300) + ]], + + uniform channel_mode layer_2_roughness_channel = g [[ + anno::display_name("Layer 2 Roughness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5301) + ]], + + float layer_2_roughness_u = float(1.f) [[ + anno::display_name("Layer 2 Roughness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5302) + ]], + + float2 layer_2_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 2 Roughness Range Position"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(5303) + ]], + + //Layer 2 - Specular - 5400 + float layer_2_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 2 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5402) + ]], + + uniform texture_2d layer_2_cavity_image = texture_2d() [[ + anno::display_name("Layer 2 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5400) + ]], + + uniform channel_mode layer_2_cavity_channel = r [[ + anno::display_name("Layer 2 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5401) + ]], + + //Layer 2 - Normal - 5500 + uniform texture_2d layer_2_normal_image = texture_2d() [[ + anno::display_name("Layer 2 Normal Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::usage("normal"), + anno::ui_order(5500) + ]], + + uniform bool layer_2_normal_flip_green = true [[ + anno::display_name("Layer 2 Normal Flip Green"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::ui_order(5501) + ]], + + uniform float layer_2_normal_scale = float(1.f) [[ + anno::display_name("Layer 2 Normal Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5502) + ]], + + //Layer 2 - Weight - 5600 + blend_source layer_2_blend_source = texture [[ + anno::display_name("Layer 2 Mask Source"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_blend_factor = uv_set_2 [[ + anno::display_name("Layer 2 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform texture_2d layer_2_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 2 Mask Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform channel_mode layer_2_blend_splatmap_channel = r [[ + anno::display_name("Layer 2 Mask Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + float3 layer_2_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 2 Mask Direction"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5620) + ]], + + axis_mode layer_2_blend_axis = y [[ + anno::display_name("Layer 2 Mask Axis"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5611) + ]], + + bool layer_2_blend_object_space = true [[ + anno::display_name("Layer 2 Mask Object Space"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5610) + ]], + + float layer_2_blend_scale = float(1.f) [[ + anno::display_name("Layer 2 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5612) + ]], + + float layer_2_blend_offset = float(0.f) [[ + anno::display_name("Layer 2 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5613) + ]], + + uniform string layer_2_blend_primvar_name = string() [[ + anno::display_name("Layer 2 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_detail = uv_set_2 [[ + anno::display_name("Layer 2 Detail UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5640) + ]], + + uniform texture_2d layer_2_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 2 Detail Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5641) + ]], + + uniform channel_mode layer_2_blend_detail_image_channel = r [[ + anno::display_name("Layer 2 Detail Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5642) + ]], + + float layer_2_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 2 Mask Threshold"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5601) + ]], + + float layer_2_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 2 Mask Factor Override"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(5600) + ]], + + //UVs - 6000 + uvs_mode uvs_mode_01 = triplanar [[ + anno::display_name("UV Mode 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6100) + ]], + + float2 uv_scale_01 = float2(1.f) [[ + anno::display_name("UV Scale 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6101) + ]], + + float2 uv_offset_01 = float2(0.f) [[ + anno::display_name("UV Offset 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6102) + ]], + + float2 uv_offset_time_01 = float2(0.f) [[ + anno::display_name("UV Offset Time 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6103) + ]], + + float uv_rotation_01 = float(0.f) [[ + anno::display_name("UV Rotation 1"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6104) + ]], + + float triplanar_blend_range_01 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6105), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_02 = triplanar [[ + anno::display_name("UV Mode 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6200) + ]], + + float2 uv_scale_02 = float2(1.f) [[ + anno::display_name("UV Scale 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6201) + ]], + + float2 uv_offset_02 = float2(0.f) [[ + anno::display_name("UV Offset 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6202) + ]], + + float2 uv_offset_time_02 = float2(0.f) [[ + anno::display_name("UV Offset Time 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6203) + ]], + + float uv_rotation_02 = float(0.f) [[ + anno::display_name("UV Rotation 2"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6204) + ]], + + float triplanar_blend_range_02 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6205), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_03 = triplanar [[ + anno::display_name("UV Mode 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6300) + ]], + + float2 uv_scale_03 = float2(1.f) [[ + anno::display_name("UV Scale 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6301) + ]], + + float2 uv_offset_03 = float2(0.f) [[ + anno::display_name("UV Offset 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6302) + ]], + + float2 uv_offset_time_03 = float2(0.f) [[ + anno::display_name("UV Offset Time 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6303) + ]], + + float uv_rotation_03 = float(0.f) [[ + anno::display_name("UV Rotation 3"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6304) + ]], + + float triplanar_blend_range_03 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6305), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_04 = triplanar [[ + anno::display_name("UV Mode 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6400) + ]], + + float2 uv_scale_04 = float2(1.f) [[ + anno::display_name("UV Scale 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6401) + ]], + + float2 uv_offset_04 = float2(0.f) [[ + anno::display_name("UV Offset 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6402) + ]], + + float2 uv_offset_time_04 = float2(0.f) [[ + anno::display_name("UV Offset Time 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6403) + ]], + + float uv_rotation_04 = float(0.f) [[ + anno::display_name("UV Rotation 4"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6404) + ]], + + float triplanar_blend_range_04 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6405), + anno::hard_range(0.0,1.0) + ]], + + uniform bool enable_opacity = false [[ + anno::display_name("Enable Opacity"), + anno::description("Enables the use of cutout opacity"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uv_set_selection uv_set_opacity = uv_set_1 [[ + anno::display_name("Opacity UV Set"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8302) + ]], + + //Detail Normal - 8100 + bool enable_detail_normal = false [[ + anno::display_name("Enable Detail Normal"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8100) + ]], + + uv_set_selection uv_set_detail_normal = uv_set_1 [[ + anno::display_name("Detail Normal UV Set"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8101) + ]], + + uniform texture_2d detail_normal_image = texture_2d() [[ + anno::display_name("Detail Normal Image"), + anno::in_group("Advanced", "Detail Normal"), + anno::usage("normal"), + anno::ui_order(8102) + ]], + + uniform bool detail_normal_flip_green = true [[ + anno::display_name("Detail Normal Normal Flip Green"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8103) + ]], + + uniform float detail_normal_scale = float(1.f) [[ + anno::display_name("Detail Normal Scale"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8104) + ]], + + uv_set_selection uv_set_detail_weight = uv_set_1 [[ + anno::display_name("Detail Normal Mask UV Set"), + anno::in_group("Advanced", "Detail Normal", "Mask"), + anno::ui_order(8105) + ]], + + uniform texture_2d detail_normal_weight_image = texture_2d() [[ + anno::display_name("Detail Normal Mask Image"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8106) + ]], + + uniform channel_mode detail_normal_weight_channel = r [[ + anno::display_name("Detail Normal Mask Channel"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8107) + ]], + + //Emission - 8200 + bool enable_emission = false [[ + anno::display_name("Enable Emission"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8200) + ]], + + uv_set_selection uv_set_emission = uv_set_1 [[ + anno::display_name("Emission UV Set"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8201) + ]], + + uniform texture_2d emission_image = texture_2d() [[ + anno::display_name("Emission Image"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8202) + ]], + + uniform bool emission_use_temperature = false [[ + anno::display_name("Emission Use Temperature"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8203) + ]], + + float emission_temperature = float(6500.f) [[ + anno::display_name("Emission Temperature (kelvin)"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 10000.0f), + anno::ui_order(8204) + ]], + + uv_set_selection uv_set_emission_mask = uv_set_1 [[ + anno::display_name("Emission UV Set Mask"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8205) + ]], + + color emission_color = color(1.f) [[ + anno::display_name("Emission Color Tint"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8206) + ]], + + uniform texture_2d emission_mask_image = texture_2d() [[ + anno::display_name("Emission Mask Image"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8207) + ]], + + uniform ::OmniSurface::OmniShared::emission_mode emission_mode = + ::OmniSurface::OmniShared::emission_lx [[ + anno::display_name("Emission Mode"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8208) + ]], + + float emission_intensity = float(1.0) [[ + anno::display_name("Emission Intensity"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 1000.0f), + anno::ui_order(8209) + ]], + + //Opacity - 8300 + uniform texture_2d opacity_image = texture_2d() [[ + anno::display_name("Opacity Image"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uniform channel_mode opacity_channel = a [[ + anno::display_name("Opacity Channel"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8301) + ]], + + uniform float geometry_opacity_threshold = float(0.15f) [[ + anno::display_name("Opacity Threshold"), + anno::description("If > 0, remap opacity values to 1 when >= threshold and to 0 otherwise"), + anno::in_group("Advanced", "Opacity"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(8302) + ]], + + //Anisotropy - 8400 + bool enable_anisotropy = false [[ + anno::display_name("Enable Anisotropy"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8400) + ]], + + uv_set_selection uv_set_anisotropy = uv_set_1 [[ + anno::display_name("Anisotropy UV Set"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8401) + ]], + + uniform texture_2d anisotropic_direction_image = texture_2d() [[ + anno::display_name("Anisotropy Direction Image"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8402) + ]], + + uniform channel_mode anisotropic_direction_channel = r [[ + anno::display_name("Anisotropy Direction Channel"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8403) + ]], + + float anisotropic_direction = float(0.f) [[ + anno::display_name("Anisotropy Rotation (radian)"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::hard_range(-1.0f, 1.0f), + anno::ui_order(8404) + ]], + + float anisotropic_roughness_u = float(1.f) [[ + anno::display_name("Anisotropy Roughness U"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8405) + ]], + + float anisotropic_roughness_v = float(0.25f) [[ + anno::display_name("Anisotropy Roughness V"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8406) + ]], + + //Advanced Clear Coat - 8500 + uniform texture_2d coat_mask_image = texture_2d() [[ + anno::display_name("Clear Coat Mask Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2401) + ]], + + uniform channel_mode coat_mask_channel = r [[ + anno::display_name("Clear Coat Mask Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2402) + ]], + + uniform texture_2d coat_roughness_image = texture_2d() [[ + anno::display_name("Clear Coat Roughness Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2201) + ]], + + uniform channel_mode coat_roughness_channel = r [[ + anno::display_name("Clear Coat Roughness Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2202) + ]], + + uniform float coat_ior = float(1.6f) [[ + anno::display_name("Clear Coat IOR"), + anno::in_group("Clear Coat"), + anno::soft_range(1.0f, 5.0f), + anno::hard_range(1.0f, limits::FLOAT_MAX), + anno::ui_order(2002) + ]], + + uniform texture_2d coat_normal_image = texture_2d() [[ + anno::display_name("Clear Coat Normal Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::usage("normal"), + anno::ui_order(2300) + ]], + + uniform bool coat_normal_flip_green = true [[ + anno::display_name("Clear Coat Normal Flip Green"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::ui_order(2300) + ]], + + uv_set_selection uv_set_coat_roughness_normal = uv_set_1 [[ + anno::display_name("Clear Coat Normal UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(8500) + ]], + + uv_set_selection uv_set_coat_mask = uv_set_1 [[ + anno::display_name("Clear Coat Mask UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2400) + ]], + + float coat_anisotropy = float(0.f) [[ + anno::display_name("Clear Coat Anisotropy"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_anisotropy_rotation = float(0.f) [[ + anno::display_name("Clear Coat Rotation (radian)"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::soft_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_color = float(0.f) [[ + anno::display_name("Clear Coat Affect Color"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_roughness = float(0.f) [[ + anno::display_name("Clear Coat Affect Roughness"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]] + +) +[[ + anno::display_name("Omni Uber Automotive"), + anno::author("NVIDIA Corporation"), + anno::key_words(string[]("generic", "surface")), + anno::in_group("Automotive"), + anno::version(0, 0, 10, "") +]] = let { + + uv_streams streams = initialize_uv_streams( + uvs_mode_01, uv_scale_01, uv_offset_01, uv_offset_time_01, uv_rotation_01, triplanar_blend_range_01, + uvs_mode_02, uv_scale_02, uv_offset_02, uv_offset_time_02, uv_rotation_02, triplanar_blend_range_02, + uvs_mode_03, uv_scale_03, uv_offset_03, uv_offset_time_03, uv_rotation_03, triplanar_blend_range_03, + uvs_mode_04, uv_scale_04, uv_offset_04, uv_offset_time_04, uv_rotation_04, triplanar_blend_range_04 + ); + + float blend_factor_layer_1 = blend_factor( + uv_stream: select_uv_stream( streams, layer_1_uv_set_blend_factor ), + enable_blend_factor: enable_layer_1, + blend_factor_source: layer_1_blend_source, + tBlendFactor: layer_1_blend_splatmap, + blend_factor_channel: layer_1_blend_splatmap_channel, + blend_direction: layer_1_blend_direction, + blend_axis_obect_space: layer_1_blend_object_space, + blend_axis: layer_1_blend_axis, + blend_axis_scale: layer_1_blend_scale, + blend_axis_offset: layer_1_blend_offset, + blend_primvar_string: layer_1_blend_primvar_name, + blend_threshold: layer_1_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_1_uv_set_detail ), + tDetailBlendFactor: layer_1_blend_detail_image, + detail_blend_factor_channel: layer_1_blend_detail_image_channel, + blend_factor_override: layer_1_blend_factor_override + ); + + float blend_factor_layer_2 = blend_factor( + uv_stream: select_uv_stream( streams, layer_2_uv_set_blend_factor ), + enable_blend_factor: enable_layer_2, + blend_factor_source: layer_2_blend_source, + tBlendFactor: layer_2_blend_splatmap, + blend_factor_channel: layer_2_blend_splatmap_channel, + blend_direction: layer_2_blend_direction, + blend_axis_obect_space: layer_2_blend_object_space, + blend_axis: layer_2_blend_axis, + blend_axis_scale: layer_2_blend_scale, + blend_axis_offset: layer_2_blend_offset, + blend_primvar_string: layer_2_blend_primvar_name, + blend_threshold: layer_2_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_2_uv_set_detail ), + tDetailBlendFactor: layer_2_blend_detail_image, + detail_blend_factor_channel: layer_2_blend_detail_image_channel, + blend_factor_override: layer_2_blend_factor_override + ); + + material_layer layer_0 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_0 ), + tBaseColor: base_color_image, + base_color_tint: diffuse_reflection_color, + base_color_scale: color( base_color_scale ), + base_color_offset: color( base_color_offset ), + base_color_desaturation: base_color_desaturation, + tMetallic: metalness_image, + metallic_channel: metalness_channel, + metallic_factor: metalness, + tCavity: cavity_image, + cavity_channel: cavity_channel, + specular_weight: specular_reflection_weight, + tRoughness: roughness_image, + roughness_channel: roughness_channel, + roughness_factor: roughness_u, + roughness_range_position: roughness_range_position, + tNormal: normal_image, + normal_scale: normal_scale, + normal_flip_green: normal_flip_green + ); + + material_layer layer_1 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_1 ), + tBaseColor: layer_1_base_color_image, + base_color_tint: layer_1_diffuse_reflection_color, + base_color_scale: color( layer_1_base_color_scale ), + base_color_offset: color( layer_1_base_color_offset ), + base_color_desaturation: layer_1_base_color_desaturation, + tMetallic: layer_1_metalness_image, + metallic_channel: layer_1_metalness_channel, + metallic_factor: layer_1_metalness, + tCavity: layer_1_cavity_image, + cavity_channel: layer_1_cavity_channel, + specular_weight: layer_1_specular_reflection_weight, + tRoughness: layer_1_roughness_image, + roughness_channel: layer_1_roughness_channel, + roughness_factor: layer_1_roughness_u, + roughness_range_position: layer_1_roughness_range_position, + tNormal: layer_1_normal_image, + normal_scale: layer_1_normal_scale, + normal_flip_green: layer_1_normal_flip_green + ); + + material_layer layer_1_composite = blend_material_layer( + enable_blend: enable_layer_1, + layer_1: layer_0, + layer_2: layer_1, + blend_factor: blend_factor_layer_1 + ); + + material_layer layer_2 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_2 ), + tBaseColor: layer_2_base_color_image, + base_color_tint: layer_2_diffuse_reflection_color, + base_color_scale: color( layer_2_base_color_scale ), + base_color_offset: color( layer_2_base_color_offset ), + base_color_desaturation: layer_2_base_color_desaturation, + tMetallic: layer_2_metalness_image, + metallic_channel: layer_2_metalness_channel, + metallic_factor: layer_2_metalness, + tCavity: layer_2_cavity_image, + cavity_channel: layer_2_cavity_channel, + specular_weight: layer_2_specular_reflection_weight, + tRoughness: layer_2_roughness_image, + roughness_channel: layer_2_roughness_channel, + roughness_factor: layer_2_roughness_u, + roughness_range_position: layer_2_roughness_range_position, + tNormal: layer_2_normal_image, + normal_scale: layer_2_normal_scale, + normal_flip_green: layer_2_normal_flip_green + ); + + material_layer layer_2_composite = blend_material_layer( + enable_blend: enable_layer_2, + layer_1: layer_1_composite, + layer_2: layer_2, + blend_factor: blend_factor_layer_2 + ); + + anisotropy aniso = initialize_anisotropy( + uv_stream: select_uv_stream( streams, uv_set_anisotropy ), + enable_anisotropy: enable_anisotropy, + anisotropy_roughness_u: anisotropic_roughness_u, + anisotropy_roughness_v: anisotropic_roughness_v, + tAnisotropyRotation: anisotropic_direction_image, + anisotropy_channel: anisotropic_direction_channel, + anisotropy_rotation: anisotropic_direction + ); + + float accumulated_layer_coat_weight = accumulate_coat_weight( layer_1_order: layer_1_order, + layer_1_weight: blend_factor_layer_1, + layer_2_order: layer_2_order, + layer_2_weight: blend_factor_layer_2 ); + + coat_layer coat = initialize_coat_layer( + uv_stream: select_uv_stream( streams, uv_set_coat_roughness_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_coat_mask ), + enable_coat: enable_coat, + tCoatMask: coat_mask_image, + tCoatNormal: coat_normal_image, + tCoatRoughness: coat_roughness_image, + coat_weight: accumulated_layer_coat_weight, + coat_weight_channel: coat_mask_channel, + coat_color: coat_color, + coat_roughness_channel: coat_roughness_channel, + coat_roughness_factor: coat_roughness, + coat_ior: coat_ior, + coat_anisotropy: coat_anisotropy, + coat_anisotropy_rotation: coat_anisotropy_rotation, + coat_affect_color: coat_affect_color, + coat_affect_roughness: coat_affect_roughness, + coat_flip_green: coat_normal_flip_green + ); + + float3 detail_normal = detail_normal_combine( + uv_set_normal: select_uv_stream( streams, uv_set_detail_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_detail_weight ), + enable_detail_normal: enable_detail_normal, + base_normal: layer_2_composite.normal, + tDetailNormal: detail_normal_image, + tDetailNormalWeight: detail_normal_weight_image, + detail_normal_channel: detail_normal_weight_channel, + detail_normal_scale: detail_normal_scale, + detail_normal_flip_green: detail_normal_flip_green + ); + + flake_layer flakes = initialize_flake_layer( + enable_flakes: enable_flakes, + flakes_weight: coat.coat_weight, + flakes_size: flake_size, + flakes_density: flakes_density, + flakes_spread: flakes_spread + ); + + //Final Material Properties + color final_base_color = math::lerp( layer_2_composite.base_color, flake_color, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_metallic = math::lerp( layer_2_composite.metallic, 1.f, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_roughness = math::lerp( layer_2_composite.roughness, flake_roughness, flakes.weight > 0.001f ? 1.f : 0.f ); + float3 final_normal = nvidia::core_definitions::blend_normals( + base_normal: detail_normal, + base_normal_weight: 1.f, + detail_normal: flakes.normal, + detail_normal_weight: enable_flakes ? coat.coat_weight : 0.f + ); + + color final_emission_color = emission( + uv_stream: select_uv_stream( streams, uv_set_emission ), + uv_stream_mask: select_uv_stream( streams, uv_set_emission_mask ), + enable_emission: enable_emission, + tEmission: emission_image, + tEmissionMask: emission_mask_image, + emission_color: emission_color + ); + + float final_opacity = opacity( + uv_stream: select_uv_stream( streams, uv_set_opacity ), + enable_opacity: enable_opacity, + tBaseColor: base_color_image, + tOpacity: opacity_image, + opacity_channel: opacity_channel + ); + + material base = OmniSurface::OmniSurfaceBase::OmniSurfaceBase( + diffuse_reflection_weight: 1.f, + diffuse_reflection_color: final_base_color, + metalness: final_metallic, + specular_reflection_weight: layer_2_composite.specular_weight, + specular_reflection_color: specular_reflection_color * math::saturate( layer_2_composite.cavity * 2.f ), + specular_reflection_roughness: final_roughness, + specular_reflection_anisotropy: enable_anisotropy ? 1.f : 0.0f, + specular_reflection_anisotropy_rotation: enable_anisotropy ? aniso.anisotropy_rotation : 0.f, + coat_weight: coat.coat_weight, + coat_color: coat.coat_color, + coat_roughness: coat.coat_roughness, + coat_ior: coat.coat_ior, + coat_anisotropy: coat.coat_anisotropy, + coat_anisotropy_rotation: coat.coat_anisotropy_rotation, + coat_affect_color: coat.coat_affect_color, + coat_affect_roughness: coat.coat_affect_roughness, + coat_normal: coat.coat_normal, + emission_weight: 1.0, + emission_mode: emission_mode, + emission_intensity: enable_emission ? emission_intensity : 0.f, + emission_color: final_emission_color, + emission_use_temperature: emission_use_temperature, + emission_temperature: emission_temperature, + enable_opacity: enable_opacity, + geometry_opacity: final_opacity, + geometry_opacity_threshold: geometry_opacity_threshold, + geometry_normal_roughness: enable_anisotropy ? + float2( aniso.anisotropy_roughness_u, + aniso.anisotropy_roughness_v ) : + float2(0.f, 0.f), + geometry_normal: final_normal + ); + +} in material( + surface: base.surface, + ior: base.ior, + thin_walled: base.thin_walled, + volume: base.volume, + geometry: base.geometry +); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_misc_textures_noise/noise_scratch2.jpg b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_misc_textures_noise/noise_scratch2.jpg new file mode 100755 index 0000000000000000000000000000000000000000..d1dda52fc5ecdd320229f3e6a9e639be36f495ff --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_D1_3/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_misc_textures_noise/noise_scratch2.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:119fe9c9859526fdf7224f17fc2e206bd52c50256721f14a110a0da6de0242d7 +size 6339479 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/S1_2.usdc b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/S1_2.usdc new file mode 100755 index 0000000000000000000000000000000000000000..527be60221abc4cda9325266ffa7e58f8a2f36b2 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/S1_2.usdc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b8a5a44014aeae9d1113fe4ff34709e36aefd190a01e622a2b5e465b1b5a616 +size 196000 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Metal/Metal_Black_Paint.mdl b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Metal/Metal_Black_Paint.mdl new file mode 100755 index 0000000000000000000000000000000000000000..83adae147807a526a87e81bcdbbc3887394a254e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Metal/Metal_Black_Paint.mdl @@ -0,0 +1,177 @@ +mdl 1.8; + +import ::state::normal; +import ::OmniSurface::OmniShared::emission_mode; +import ..::Templates::OmniUber_Automotive::*; +import ::tex::gamma_mode; + +export material Metal_Black_Paint(*) + = Templates::OmniUber_Automotive::OmniUber_Automotive( + diffuse_reflection_color: color(0.06930691f, 0.0693062171f, 0.0693062171f), + metalness: 0.f, + roughness_u: 1.f, + enable_coat: false, + coat_color: color(1.f, 1.f, 1.f), + coat_roughness: 0.f, + enable_flakes: false, + flake_color: color(1.f, 1.f, 1.f), + flake_size: 0.125f, + flakes_density: 0.25f, + flakes_spread: 0.150000006f, + flake_roughness: 0.0500000007f, + uv_set_layer_0: Templates::OmniUber_Automotive::uv_set_1, + base_color_image: texture_2d("../../Surfacing/ov_metal_a_01/ov_metal_a_01_basecolor.jpg", ::tex::gamma_default, ""), + base_color_scale: 1.f, + base_color_offset: 0.f, + base_color_desaturation: 0.f, + metalness_image: texture_2d("../../Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg", ::tex::gamma_linear, ""), + metalness_channel: Templates::OmniUber_Automotive::b, + specular_reflection_weight: 1.f, + specular_reflection_color: color(1.f, 1.f, 1.f), + cavity_image: texture_2d("../../Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg", ::tex::gamma_linear, ""), + cavity_channel: Templates::OmniUber_Automotive::r, + roughness_image: texture_2d("../../Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg", ::tex::gamma_default, ""), + roughness_channel: Templates::OmniUber_Automotive::g, + roughness_range_position: float2(0.349999994f, 0.25f), + normal_image: texture_2d("../../Surfacing/ov_metal_a_01/ov_metal_a_01_normal.jpg", ::tex::gamma_linear, ""), + normal_flip_green: true, + normal_scale: 1.f, + enable_layer_1: false, + uv_set_layer_1: Templates::OmniUber_Automotive::uv_set_1, + layer_1_order: Templates::OmniUber_Automotive::above, + layer_1_base_color_image: texture_2d(), + layer_1_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_1_base_color_offset: 0.f, + layer_1_base_color_scale: 1.f, + layer_1_base_color_desaturation: 0.f, + layer_1_roughness_image: texture_2d(), + layer_1_roughness_channel: Templates::OmniUber_Automotive::g, + layer_1_roughness_u: 1.f, + layer_1_roughness_range_position: float2(0.949999988f, 0.5f), + layer_1_metalness_image: texture_2d(), + layer_1_metalness_channel: Templates::OmniUber_Automotive::b, + layer_1_metalness: 1.f, + layer_1_cavity_image: texture_2d(), + layer_1_cavity_channel: Templates::OmniUber_Automotive::r, + layer_1_specular_reflection_weight: 1.f, + layer_1_normal_image: texture_2d(), + layer_1_normal_flip_green: true, + layer_1_normal_scale: 1.f, + layer_1_blend_source: Templates::OmniUber_Automotive::texture, + layer_1_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_splatmap: texture_2d(), + layer_1_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_direction: float3(0.f, 1.f, 0.f), + layer_1_blend_axis: Templates::OmniUber_Automotive::y, + layer_1_blend_object_space: true, + layer_1_blend_scale: 1.f, + layer_1_blend_offset: 0.f, + layer_1_blend_primvar_name: "", + layer_1_uv_set_detail: Templates::OmniUber_Automotive::uv_set_1, + layer_1_blend_detail_image: texture_2d(), + layer_1_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_1_blend_threshold: 0.330000013f, + layer_1_blend_factor_override: 0.f, + enable_layer_2: false, + layer_2_order: Templates::OmniUber_Automotive::above, + uv_set_layer_2: Templates::OmniUber_Automotive::uv_set_2, + layer_2_base_color_image: texture_2d(), + layer_2_diffuse_reflection_color: color(1.f, 1.f, 1.f), + layer_2_base_color_offset: 0.f, + layer_2_base_color_scale: 1.f, + layer_2_base_color_desaturation: 0.f, + layer_2_metalness_image: texture_2d(), + layer_2_metalness_channel: Templates::OmniUber_Automotive::b, + layer_2_metalness: 1.f, + layer_2_roughness_image: texture_2d(), + layer_2_roughness_channel: Templates::OmniUber_Automotive::g, + layer_2_roughness_u: 1.f, + layer_2_roughness_range_position: float2(1.f, 0.5f), + layer_2_specular_reflection_weight: 1.f, + layer_2_cavity_image: texture_2d(), + layer_2_cavity_channel: Templates::OmniUber_Automotive::r, + layer_2_normal_image: texture_2d(), + layer_2_normal_flip_green: true, + layer_2_normal_scale: 1.f, + layer_2_blend_source: Templates::OmniUber_Automotive::texture, + layer_2_uv_set_blend_factor: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_splatmap: texture_2d(), + layer_2_blend_splatmap_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_direction: float3(0.f, 1.f, 0.f), + layer_2_blend_axis: Templates::OmniUber_Automotive::y, + layer_2_blend_object_space: true, + layer_2_blend_scale: 1.f, + layer_2_blend_offset: 0.f, + layer_2_blend_primvar_name: "", + layer_2_uv_set_detail: Templates::OmniUber_Automotive::uv_set_2, + layer_2_blend_detail_image: texture_2d(), + layer_2_blend_detail_image_channel: Templates::OmniUber_Automotive::r, + layer_2_blend_threshold: 0.330000013f, + layer_2_blend_factor_override: 0.f, + uvs_mode_01: Templates::OmniUber_Automotive::triplanar, + uv_scale_01: float2(1.f), + uv_offset_01: float2(0.f), + uv_offset_time_01: float2(0.f), + uv_rotation_01: 0.f, + triplanar_blend_range_01: 0.5f, + uvs_mode_02: Templates::OmniUber_Automotive::triplanar, + uv_scale_02: float2(1.f), + uv_offset_02: float2(0.f), + uv_offset_time_02: float2(0.f), + uv_rotation_02: 0.f, + triplanar_blend_range_02: 0.5f, + uvs_mode_03: Templates::OmniUber_Automotive::triplanar, + uv_scale_03: float2(1.f), + uv_offset_03: float2(0.f), + uv_offset_time_03: float2(0.f), + uv_rotation_03: 0.f, + triplanar_blend_range_03: 0.5f, + uvs_mode_04: Templates::OmniUber_Automotive::triplanar, + uv_scale_04: float2(1.f), + uv_offset_04: float2(0.f), + uv_offset_time_04: float2(0.f), + uv_rotation_04: 0.f, + triplanar_blend_range_04: 0.5f, + enable_opacity: false, + uv_set_opacity: Templates::OmniUber_Automotive::uv_set_1, + enable_detail_normal: false, + uv_set_detail_normal: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_image: texture_2d(), + detail_normal_flip_green: true, + detail_normal_scale: 1.f, + uv_set_detail_weight: Templates::OmniUber_Automotive::uv_set_1, + detail_normal_weight_image: texture_2d(), + detail_normal_weight_channel: Templates::OmniUber_Automotive::r, + enable_emission: false, + uv_set_emission: Templates::OmniUber_Automotive::uv_set_1, + emission_image: texture_2d(), + emission_use_temperature: false, + emission_temperature: 6500.f, + uv_set_emission_mask: Templates::OmniUber_Automotive::uv_set_1, + emission_color: color(1.f, 1.f, 1.f), + emission_mask_image: texture_2d(), + emission_mode: OmniSurface::OmniShared::emission_lx, + emission_intensity: 1.f, + opacity_image: texture_2d(), + opacity_channel: Templates::OmniUber_Automotive::a, + geometry_opacity_threshold: 0.150000006f, + enable_anisotropy: false, + uv_set_anisotropy: Templates::OmniUber_Automotive::uv_set_1, + anisotropic_direction_image: texture_2d(), + anisotropic_direction_channel: Templates::OmniUber_Automotive::r, + anisotropic_direction: 0.f, + anisotropic_roughness_u: 1.f, + anisotropic_roughness_v: 0.25f, + coat_mask_image: texture_2d(), + coat_mask_channel: Templates::OmniUber_Automotive::r, + coat_roughness_image: texture_2d(), + coat_roughness_channel: Templates::OmniUber_Automotive::r, + coat_ior: 1.60000002f, + coat_normal_image: texture_2d(), + coat_normal_flip_green: true, + uv_set_coat_roughness_normal: Templates::OmniUber_Automotive::uv_set_1, + uv_set_coat_mask: Templates::OmniUber_Automotive::uv_set_1, + coat_anisotropy: 0.f, + coat_anisotropy_rotation: 0.f, + coat_affect_color: 0.f, + coat_affect_roughness: 0.f); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl new file mode 100755 index 0000000000000000000000000000000000000000..9123430b115c1b7d325814c3d9414da407f66a2e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Imperfect/Templates/OmniUber_Automotive.mdl @@ -0,0 +1,2611 @@ +mdl 1.8; + +import ::anno::*; +import ::base::*; +import ::df::*; +import ::limits::*; +import ::math::*; +import ::state::*; +import ::tex::*; +import ::scene::*; + +import ::OmniSurface::OmniShared::*; +import ::OmniSurface::OmniImage::*; +import ::OmniSurface::OmniSurfaceLiteBase::*; +import ::OmniSurface::OmniSurfaceBase::*; + +import ::nvidia::core_definitions::blend_normals; + +import ::nvidia::core_definitions::triplanar_file_texture; +import ::nvidia::core_definitions::triplanar_normalmap_texture; + +export enum blend_source +{ + texture [[ anno::display_name( "Texture" ) ]], + direction [[ anno::display_name( "Direction" ) ]], + axis [[ anno::display_name( "Axis" ) ]], + primvar [[ anno::display_name( "Primvar" ) ]] +}; + +export enum uvs_mode +{ + texture_coord_0 [[ anno::display_name( "Texture Coordinate 0" ) ]], + triplanar [[ anno::display_name( "TriPlanar" ) ]] +}; + +export enum uv_set_selection +{ + uv_set_1 [[ anno::display_name( "UV Set 1" ) ]], + uv_set_2 [[ anno::display_name( "UV Set 2" ) ]], + uv_set_3 [[ anno::display_name( "UV Set 3" ) ]], + uv_set_4 [[ anno::display_name( "UV Set 4" ) ]] +}; + +export enum channel_mode +{ + r [[ anno::display_name( "R" ) ]], + g [[ anno::display_name( "G" ) ]], + b [[ anno::display_name( "B" ) ]], + a [[ anno::display_name( "A" ) ]], + rgb [[ anno::display_name( "RGB" ) ]] +}; + +export enum axis_mode +{ + x [[ anno::display_name( "X" ) ]], + x_invert [[ anno::display_name( "-X" ) ]], + y [[ anno::display_name( "Y" ) ]], + y_invert [[ anno::display_name( "-Y" ) ]], + z [[ anno::display_name( "Z" ) ]], + z_invert [[ anno::display_name( "-Z" ) ]] +}; + +export enum layer_order +{ + below [[ anno::display_name( "Below Clear Coat" ) ]], + above [[ anno::display_name( "Above Clear Coat" ) ]] +}; + +export struct material_layer +{ + color base_color; + float metallic; + float cavity; + float specular_weight; + float roughness; + float3 normal; +}; + +export struct coat_layer +{ + float coat_weight; + color coat_color; + float coat_roughness; + uniform float coat_ior; + float coat_anisotropy; + float coat_anisotropy_rotation; + float coat_affect_color; + float coat_affect_roughness; + float3 coat_normal; +}; + +export struct anisotropy +{ + float anisotropy_roughness_u; + float anisotropy_roughness_v; + float anisotropy_rotation; +}; + +export struct uv_set_settings +{ + uvs_mode mode = texture_coord_0; + float2 uv_scale = float2( 1.f ); + float2 uv_offset = float2( 0.f ); + float2 uv_offset_time = float2( 0.f ); + float uv_rotation = 0.f; + float triplanar_blend_range = 0.5f; +}; + +export struct uv_streams +{ + uv_set_settings uv_set_settings_1; + uv_set_settings uv_set_settings_2; + uv_set_settings uv_set_settings_3; + uv_set_settings uv_set_settings_4; +}; + +export struct flakes +{ + float priority; + int seed; + float4 carrier; +}; + +export struct flake_layer +{ + float3 normal; + float roughness; + float weight; +}; + +int hash( int seed, int i ) +{ + return(i ^ seed ) * 1075385539; +} + +int random_next( int seed ) +{ + seed ^= seed << 13; + seed ^= seed >>> 17; + seed ^= seed << 5; + return seed; +} + +float random_value( int seed ) +{ + return math::abs( float( seed ) * 0.00000000046566f ); +} + +int random_initialize( int3 seed ) +{ + return hash( hash( hash( 0, seed.x ), seed.y ), seed.z ); +} + +float3 rotate_position( + float3 position = state::position(), + float3 xi = float3( 0.f ) +) +{ + float theta = math::PI * 2.f * xi.x; + float phi = math::PI * 2.f * xi.y; + float z = xi.z * 2.f; + + float r = math::sqrt( z ); + float[2] sp_cp = math::sincos( phi ); + float Vx = r * sp_cp[0]; + float Vy = r * sp_cp[1]; + float Vz = math::sqrt( 2.f - z ); + + float[2] st_ct = math::sincos( theta ); + float Sx = Vx * st_ct[1] - Vy * st_ct[0]; + float Sy = Vx * st_ct[0] + Vy * st_ct[1]; + + float3x3 M( + Vx * Sx - st_ct[1], Vx * Sy - st_ct[0], Vx * Vz, + Vy * Sx + st_ct[0], Vy * Sy - st_ct[1], Vy * Vz, + Vz * Sx, Vz * Sy, 1.0f - z); + + return M * position; +} + +export float linstep( + float input = 0.f, + float min_in = 0.f, + float max_in = 1.f, + float min_out = 0.f, + float max_out = 1.f +) +{ + float in_range = math::saturate( ( input - min_in ) / ( max_in - min_in ) ); + float out_range = math::lerp( min_out, max_out, in_range ); + return out_range; + +} + +export float histogram_range( + float input = 0.f, + float range = 1.f, + float position = 0.5f +) +{ + float x = ( range * 0.5f ) + ( 1.f - position ); + float y = ( 1.f - position ) * 2.f; + float z = ( range * 0.5f ) + position; + float w = position * 2.f; + + return linstep( input, 0.f, 1.f, 1.f - math::min( x, y ), math::min( z, w ) ); +} + +export float threshold_blend( + float input = 1.f, + float height = 0.5f, + float threshold = 0.33f +) +{ + height = 1.f - height; + float epsilon = 0.0001; + float min = math::saturate( height - ( threshold + epsilon ) ); + return math::saturate( math::smoothstep( min, height, input ) ); +} + +export float lookup_float4_channel( + uniform texture_2d tex = texture_2d(), + float2 coord = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + float4 texel = tex::lookup_float4( tex: tex, coord: coord ); + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.w * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export color color_adjustments( + color input = color( 1.f ), + color color_offset = color( 0.f ), + color color_scale = color( 1.f ), + color color_tint = color( 1.f ), + float desaturation = 0.f +) +{ + input = input * color_scale + color_offset; + if ( desaturation > 0.f ){ + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + color gray = color( math::dot( float3( input ), luminance ) ); + input = color( math::lerp( input, gray, desaturation ) ); + } + return input * color_tint; +} + +export float lookup_triplanar_channel( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + channel_mode channel = r, + float default_value = 1.f, + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ) ); + + /*float3 texel = float3( triplanar_color( tex, float3( uv_scale.x, uv_scale.y, uv_scale.x ) ) );*/ + + switch ( channel ) + { + case r: + return texel.x * default_value; + case g: + return texel.y * default_value; + case b: + return texel.z * default_value; + case a: + return texel.x * default_value; + case rgb: + float3 luminance = float3( 0.2126f, 0.7152f, 0.0722f ); + return math::dot( float3( texel.x, texel.y, texel.z ), luminance ) * default_value; + } +} + +export float3 lookup_triplanar_normal( + uniform texture_2d tex = texture_2d(), + float normal_scale = 1.f, + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + uniform bool flip_green = false, + float3 default_value = state::normal(), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + float3 texel = float3( ::nvidia::core_definitions::triplanar_normalmap_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + object_space: true, + blend_range: triplanar_blend_range, + flip_1: !flip_green, + flip_2: !flip_green, + flip_3: !flip_green, + strength: normal_scale ) ); + + return texel; +} + +export color lookup_triplanar_color( + uniform texture_2d tex = texture_2d(), + float2 uv_scale = float2( 0.f ), + float2 uv_offset = float2( 0.f ), + color default_value = color( 1.f ), + float triplanar_blend_range = 0.5f +) +{ + if ( !tex::texture_isvalid( tex ) ){ + return default_value; + } + + uv_scale *= 0.01f; + color texel = ::nvidia::core_definitions::triplanar_file_texture( + texture_1: tex, + scaling_1: uv_scale, + translation_1: uv_offset, + texture_2: tex, + scaling_2: uv_scale, + translation_2: uv_offset, + texture_3: tex, + scaling_3: uv_scale, + translation_3: uv_offset, + blend_range: triplanar_blend_range, + object_space: true ); + + return texel; +} + +flakes flake_normal( + flakes flake = flakes(), + float spread = 0.54f +) +{ + if( flake.priority <= 0.f ) + { + flake.carrier = float4( state::normal().x, state::normal().y, state::normal().z, 1.f ); + return flake; + } + + int seed = random_next( flake.seed ); + float xi0 = random_value( seed ); + seed = random_next( seed ); + float xi1 = random_value( seed ); + float phi = 2.f * math::PI * xi0; + + float roughness = spread * spread; + + float tantheta = math::sqrt( -roughness * roughness * math::log( 1.f - xi1 ) ); + float sintheta = tantheta / math::sqrt( 1.f + tantheta * tantheta ); + float costheta = math::sqrt( 1.f - sintheta * sintheta ); + float[2] scphi = math::sincos( phi ); + + float3 normal = state::texture_tangent_u(0) * scphi[1] * sintheta + + state::texture_tangent_v(0) * scphi[0] * sintheta + + state::normal() * costheta; + + flake.carrier = float4( normal.x, normal.y, normal.z, 1.f ); + flake.seed = seed; + return flake; +} + +flakes flake_noise( + float3 position = state::position(), + float jitter_scale = 0.5f, + float flake_diameter = 0.5f, + float flake_probability = 1.f +) +{ + flakes flake; + + float3 base_position = math::floor( position ); + int3 base_position_int = int3( base_position ); + + flake_diameter = math::min( flake_diameter, ( 1.5f - 0.5f * jitter_scale ) / math::sqrt( 3.f ) ); + + for( int i = -1; i < 2; ++i ){ + for( int j = -1; j < 2; ++j ){ + for( int k = -1; k < 2; ++k ){ + int seed = random_initialize( base_position_int + int3( i, j, k ) ); + + seed = random_next( seed ); + if( random_value( seed ) > flake_probability ) + continue; + + seed = random_next( seed ); + float priority = random_value( seed ); + if( priority < flake.priority ) + continue; + + float3 flake_position = base_position + float3( i, j, k ) + float3( 0.5f ); + + if( jitter_scale > 0.f ){ + seed = random_next( seed ); + flake_position.x += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.y += ( random_value( seed ) - 0.5f ) * jitter_scale; + seed = random_next( seed ); + flake_position.z += ( random_value( seed ) - 0.5f ) * jitter_scale; + } + + float3 p = position - flake_position; + if( math::dot( p, p ) >= flake_diameter * flake_diameter * 4.f ) + continue; + + float3 xi_rotation; + seed = random_next( seed ); + xi_rotation.x = random_value( seed ); + seed = random_next( seed ); + xi_rotation.y = random_value( seed ); + seed = random_next( seed ); + xi_rotation.z = random_value( seed ); + p = rotate_position( p, xi_rotation ); + + if( math::abs( p.x ) <= flake_diameter && + math::abs( p.y ) <= flake_diameter && + math::abs( p.z ) <= flake_diameter ) + { + flake.priority = priority; + flake.seed = seed; + } + } + } + } + + return flake; +} + +export uv_streams initialize_uv_streams( + uvs_mode mode_1 = texture_coord_0, float2 uv_scale_1 = float2( 1.f ), float2 uv_offset_1 = float2( 0.f ), float2 uv_offset_time_1 = float2( 0.f ), float uv_rotation_1 = 0.f, float triplanar_blend_range_1 = 0.5f, + uvs_mode mode_2 = texture_coord_0, float2 uv_scale_2 = float2( 1.f ), float2 uv_offset_2 = float2( 0.f ), float2 uv_offset_time_2 = float2( 0.f ), float uv_rotation_2 = 0.f, float triplanar_blend_range_2 = 0.5f, + uvs_mode mode_3 = texture_coord_0, float2 uv_scale_3 = float2( 1.f ), float2 uv_offset_3 = float2( 0.f ), float2 uv_offset_time_3 = float2( 0.f ), float uv_rotation_3 = 0.f, float triplanar_blend_range_3 = 0.5f, + uvs_mode mode_4 = texture_coord_0, float2 uv_scale_4 = float2( 1.f ), float2 uv_offset_4 = float2( 0.f ), float2 uv_offset_time_4 = float2( 0.f ), float uv_rotation_4 = 0.f, float triplanar_blend_range_4 = 0.5f +) +{ + uv_streams streams; + + streams.uv_set_settings_1.mode = mode_1; + streams.uv_set_settings_1.uv_scale = uv_scale_1; + uv_offset_1 += uv_offset_time_1 * state::animation_time(); + streams.uv_set_settings_1.uv_offset = uv_offset_1; + streams.uv_set_settings_1.uv_rotation = uv_rotation_1; + streams.uv_set_settings_1.triplanar_blend_range = triplanar_blend_range_1; + + streams.uv_set_settings_2.mode = mode_2; + streams.uv_set_settings_2.uv_scale = uv_scale_2; + uv_offset_2 += uv_offset_time_2 * state::animation_time(); + streams.uv_set_settings_2.uv_offset = uv_offset_2; + streams.uv_set_settings_2.uv_rotation = uv_rotation_2; + streams.uv_set_settings_2.triplanar_blend_range = triplanar_blend_range_2; + + streams.uv_set_settings_3.mode = mode_3; + streams.uv_set_settings_3.uv_scale = uv_scale_3; + uv_offset_3 += uv_offset_time_3 * state::animation_time(); + streams.uv_set_settings_3.uv_offset = uv_offset_3; + streams.uv_set_settings_3.uv_rotation = uv_rotation_3; + streams.uv_set_settings_3.triplanar_blend_range = triplanar_blend_range_3; + + streams.uv_set_settings_4.mode = mode_4; + streams.uv_set_settings_4.uv_scale = uv_scale_4; + uv_offset_4 += uv_offset_time_4 * state::animation_time(); + streams.uv_set_settings_4.uv_offset = uv_offset_4; + streams.uv_set_settings_4.uv_rotation = uv_rotation_4; + streams.uv_set_settings_4.triplanar_blend_range = triplanar_blend_range_4; + + return streams; +} + +export uv_set_settings select_uv_stream( + uv_streams streams, + uv_set_selection uv_stream = uv_set_1 +) +{ + switch( uv_stream ){ + case uv_set_1: + return streams.uv_set_settings_1; + case uv_set_2: + return streams.uv_set_settings_2; + case uv_set_3: + return streams.uv_set_settings_3; + case uv_set_4: + return streams.uv_set_settings_4; + } +} + +export material_layer initialize_material_layer( + uv_set_settings uv_stream = uv_set_settings(), + uniform texture_2d tBaseColor = texture_2d(), + color base_color_offset = color(0.f), + color base_color_scale = color(1.f), + color base_color_tint = color(1.f), + float base_color_desaturation = 0.f, + uniform texture_2d tMetallic = texture_2d(), + channel_mode metallic_channel = r, + float metallic_factor = 1.f, + uniform texture_2d tCavity = texture_2d(), + channel_mode cavity_channel = r, + float specular_weight = 1.f, + uniform texture_2d tRoughness = texture_2d(), + channel_mode roughness_channel = r, + float roughness_factor = 1.f, + float2 roughness_range_position = float2( 1.f, 0.5f ), + uniform texture_2d tNormal = texture_2d(), + uniform float normal_scale = 1.f, + uniform bool normal_flip_green = false +) +{ + material_layer layer; + color base_color_tex; + float metallic_tex; + float cavity_tex; + float roughness_tex; + float3 normal_tex; + + layer.specular_weight = specular_weight; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + base_color_tex = tex::texture_isvalid( tBaseColor ) ? + tex::lookup_color( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_float4_channel( tex: tMetallic, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_float4_channel( tex: tCavity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_float4_channel( tex: tRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = tex::texture_isvalid( tNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_factor: normal_scale, + tangent_space_flip_g_channel: normal_flip_green + ) : state::normal(); + layer.normal = normal_tex; + return layer; + + case triplanar: + base_color_tex = lookup_triplanar_color( + tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.base_color = color_adjustments( input: base_color_tex, + color_offset: base_color_offset, + color_scale: base_color_scale, + color_tint: base_color_tint, + desaturation: base_color_desaturation ); + + metallic_tex = lookup_triplanar_channel( + tex: tMetallic, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: metallic_channel, + default_value: metallic_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.metallic = metallic_tex; + + cavity_tex = lookup_triplanar_channel( + tex: tCavity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: cavity_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.cavity = cavity_tex; + + roughness_tex = lookup_triplanar_channel( + tex: tRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: roughness_channel, + default_value: roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.roughness = histogram_range( roughness_tex, roughness_range_position.x, roughness_range_position.y ); + + normal_tex = lookup_triplanar_normal( + tex: tNormal, + normal_scale: normal_scale, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: normal_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + layer.normal = normal_tex; + + return layer; + } +} + +export material_layer blend_material_layer( + bool enable_blend, + material_layer layer_1, + material_layer layer_2, + float blend_factor +) +{ + if ( !enable_blend ) + return layer_1; + + material_layer layer; + layer.base_color = math::lerp( layer_1.base_color, layer_2.base_color, blend_factor ); + layer.metallic = math::lerp( layer_1.metallic, layer_2.metallic, blend_factor ); + layer.cavity = math::lerp( layer_1.cavity, layer_2.cavity, blend_factor ); + layer.specular_weight = math::lerp( layer_1.specular_weight, layer_2.specular_weight, blend_factor ); + layer.roughness = math::lerp( layer_1.roughness, layer_2.roughness, blend_factor ); + layer.normal = math::lerp( layer_1.normal, layer_2.normal, blend_factor ); + layer.normal = math::normalize( layer.normal ); + return layer; +} + +export coat_layer initialize_coat_layer( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_coat = false, + uniform texture_2d tCoatMask = texture_2d(), + uniform texture_2d tCoatNormal = texture_2d(), + uniform texture_2d tCoatRoughness = texture_2d(), + channel_mode coat_weight_channel = r, + float coat_weight = 1.f, + color coat_color = color(1.f), + channel_mode coat_roughness_channel = r, + float coat_roughness_factor = 1.f, + uniform float coat_ior = 1.5f, + float coat_anisotropy = 0.f, + float coat_anisotropy_rotation = 0.f, + float coat_affect_color = 0.f, + float coat_affect_roughness = 0.f, + uniform bool coat_flip_green = false +) +{ + coat_layer layer; + if ( enable_coat ) + { + layer.coat_weight = coat_weight; + layer.coat_color = coat_color; + layer.coat_ior = coat_ior; + layer.coat_anisotropy = coat_anisotropy; + layer.coat_anisotropy_rotation = coat_anisotropy_rotation; + layer.coat_affect_color = coat_affect_color; + layer.coat_affect_roughness = coat_affect_roughness; + + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + layer.coat_weight = math::min( tex::texture_isvalid( tCoatMask ) ? + lookup_float4_channel( tex: tCoatMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f ) : 1.f, coat_weight ); + break; + + case triplanar: + layer.coat_weight = math::min( lookup_triplanar_channel( tex: tCoatMask, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: coat_weight_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ), coat_weight ); + break; + } + + if ( layer.coat_weight > 0 ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + layer.coat_normal = tex::texture_isvalid( tCoatNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tCoatNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + tangent_space_flip_g_channel: coat_flip_green + + ) : state::normal(); + + layer.coat_roughness = lookup_float4_channel( tex: tCoatRoughness, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor ); + break; + + case triplanar: + layer.coat_normal = lookup_triplanar_normal( tex: tCoatNormal, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + flip_green: coat_flip_green, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + + layer.coat_roughness = lookup_triplanar_channel( tex: tCoatRoughness, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: coat_roughness_channel, + default_value: coat_roughness_factor, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + break; + } + } + return layer; + } + + return layer; +} + +export flake_layer initialize_flake_layer( + bool enable_flakes = false, + float flakes_weight = 1.f, + float flakes_size = 0.6f, + float flakes_density = 0.31f, + float flakes_spread = 0.54f +) +{ + flake_layer layer; + if ( enable_flakes ) + { + if ( flakes_weight > 0.f ) + { + float scale_transform = state::transform_scale(state::coordinate_object, state::coordinate_world, 1.f); + float3 flake_coordinates = state::position() * state::meters_per_scene_unit() * scale_transform; + float flake_scale = 1492.537313432835f / flakes_size; + layer.normal = float3( flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.x, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.y, + flake_normal( + flake: flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ), + spread: flakes_spread ).carrier.z ); + float flake_mask = flake_noise( position: flake_coordinates * flake_scale, + flake_probability: flakes_density * flakes_density ).priority > 0.001 ? 1.f : 0.f; + layer.roughness = 1.f; + layer.weight = flake_mask; + } + } + return layer; +} + +export anisotropy initialize_anisotropy( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_anisotropy = false, + float anisotropy_roughness_u = 1.f, + float anisotropy_roughness_v = 0.25f, + uniform texture_2d tAnisotropyRotation = texture_2d(), + channel_mode anisotropy_channel = r, + float anisotropy_rotation = 1.f + +) +{ + anisotropy aniso; + + if ( enable_anisotropy ) + { + aniso.anisotropy_roughness_u = anisotropy_roughness_u; + aniso.anisotropy_roughness_v = anisotropy_roughness_v; + + switch ( uv_stream.mode ) + { + case texture_coord_0: + aniso.anisotropy_rotation = lookup_float4_channel( tex: tAnisotropyRotation, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation ); + return aniso; + + case triplanar: + aniso.anisotropy_rotation = lookup_triplanar_channel( tex: tAnisotropyRotation, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: anisotropy_channel, + default_value: anisotropy_rotation, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return aniso; + } + } + + return aniso; +} + +export float3 detail_normal_combine( + uv_set_settings uv_set_normal = uv_set_settings(), + uv_set_settings uv_set_weight = uv_set_settings(), + bool enable_detail_normal = false, + float3 base_normal = state::normal(), + uniform texture_2d tDetailNormal = texture_2d(), + uniform texture_2d tDetailNormalWeight = texture_2d(), + channel_mode detail_normal_channel = r, + uniform float detail_normal_scale = 1.f, + uniform bool detail_normal_flip_green = false +) +{ + float3 final_normal = base_normal; + + if ( enable_detail_normal ) + { + float3 detail_normal; + switch ( uv_set_normal.mode ) + { + case texture_coord_0: + detail_normal = tex::texture_isvalid( tDetailNormal ) ? + OmniSurface::OmniImage::tangent_space_normal_lookup_2( + texture: tDetailNormal, + use_uv_coords: true, + uv_coords: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_normal.uv_scale + + uv_set_normal.uv_offset, + tangent_space_factor: detail_normal_scale, + tangent_space_flip_g_channel: detail_normal_flip_green + ) : state::normal(); + break; + + case triplanar: + detail_normal = lookup_triplanar_normal( tex: tDetailNormal, + uv_scale: uv_set_normal.uv_scale, + uv_offset: uv_set_normal.uv_offset, + normal_scale: detail_normal_scale, + flip_green: detail_normal_flip_green, + triplanar_blend_range: uv_set_normal.triplanar_blend_range ); + break; + } + + float detail_normal_weight; + switch ( uv_set_weight.mode ) + { + case texture_coord_0: + detail_normal_weight = lookup_float4_channel( tex: tDetailNormalWeight, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_weight.uv_scale + + uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_normal_weight = lookup_triplanar_channel( tex: tDetailNormalWeight, + uv_scale: uv_set_weight.uv_scale, + uv_offset: uv_set_weight.uv_offset, + channel: detail_normal_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_weight.triplanar_blend_range ); + break; + } + + final_normal = ::nvidia::core_definitions::blend_normals( + base_normal: base_normal, + base_normal_weight: 1.f, + detail_normal: detail_normal, + detail_normal_weight: detail_normal_weight + ); + return final_normal; + + } + + return final_normal; +} + +export color emission( + uv_set_settings uv_stream = uv_set_settings(), + uv_set_settings uv_stream_mask = uv_set_settings(), + bool enable_emission = false, + uniform texture_2d tEmission = texture_2d(), + uniform texture_2d tEmissionMask = texture_2d(), + color emission_color = color(1.f) +) +{ + color emission = color( 0.f ); + if ( enable_emission ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + emission = tex::texture_isvalid( tEmission ) ? + tex::lookup_color( tex: tEmission, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset + ) : color( 1.f ); + emission *= emission_color; + break; + + case triplanar: + emission = lookup_triplanar_color( tex: tEmission, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + default_value: emission_color, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + emission *= emission_color; + break; + } + + float mask = 1.f; + switch ( uv_stream_mask.mode ) + { + case texture_coord_0: + mask = tex::texture_isvalid( tEmissionMask ) ? + tex::lookup_float( tex: tEmissionMask, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream_mask.uv_scale + + uv_stream_mask.uv_offset + ) : 1.f; + emission *= mask; + break; + + case triplanar: + mask = lookup_triplanar_channel( tex: tEmissionMask, + uv_scale: uv_stream_mask.uv_scale, + uv_offset: uv_stream_mask.uv_offset, + channel: r, + default_value: 1.f, + triplanar_blend_range: uv_stream_mask.triplanar_blend_range ); + emission *= mask; + break; + } + } + + return emission; +} + +export float opacity( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_opacity = false, + uniform texture_2d tOpacity = texture_2d(), + uniform texture_2d tBaseColor = texture_2d(), + channel_mode opacity_channel = a +) +{ + float final_opacity = 1.f; + + if ( enable_opacity ) + { + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_float4_channel( tex: tOpacity, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_float4_channel( tex: tBaseColor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: opacity_channel, + default_value: 1.f ) : 1.f; + return final_opacity; + + case triplanar: + final_opacity = tex::texture_isvalid( tOpacity ) ? + lookup_triplanar_channel( tex: tOpacity, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : + tex::texture_isvalid( tBaseColor ) ? + lookup_triplanar_channel( tex: tBaseColor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: a, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ) : 1.f; + return final_opacity; + } + } + + return final_opacity; +} + +export float blend_factor( + uv_set_settings uv_stream = uv_set_settings(), + bool enable_blend_factor = false, + blend_source blend_factor_source = texture, + uniform texture_2d tBlendFactor = texture_2d(), + channel_mode blend_factor_channel = r, + float3 blend_direction = float3( 0.f, 1.f, 0.f), + bool blend_axis_obect_space = false, + axis_mode blend_axis = y, + float blend_axis_scale = 1.f, + float blend_axis_offset = 0.f, + uniform string blend_primvar_string = string(), + float blend_threshold = 0.33f, + uv_set_settings uv_set_detail = uv_set_settings(), + uniform texture_2d tDetailBlendFactor = texture_2d(), + channel_mode detail_blend_factor_channel = r, + float blend_factor_override = 0.f +) +{ + float final_blend_factor = 0.f; + + if ( enable_blend_factor ) + { + if ( blend_factor_override > 0.f ) + return blend_factor_override; + + float detail_blend = 0.5f; + if ( tex::texture_isvalid( tDetailBlendFactor ) ) + { + switch ( uv_set_detail.mode ) + { + case texture_coord_0: + detail_blend = lookup_float4_channel( tex: tDetailBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_set_detail.uv_scale + + uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f ); + break; + + case triplanar: + detail_blend = lookup_triplanar_channel( tex: tDetailBlendFactor, + uv_scale: uv_set_detail.uv_scale, + uv_offset: uv_set_detail.uv_offset, + channel: detail_blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_set_detail.triplanar_blend_range ); + break; + } + } + + switch (blend_factor_source) + { + case texture: + switch ( uv_stream.mode ) + { + case texture_coord_0: + final_blend_factor = lookup_float4_channel( tex: tBlendFactor, + coord: float2( state::texture_coordinate(0).x, + state::texture_coordinate(0).y ) * + uv_stream.uv_scale + + uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case triplanar: + final_blend_factor = lookup_triplanar_channel( tex: tBlendFactor, + uv_scale: uv_stream.uv_scale, + uv_offset: uv_stream.uv_offset, + channel: blend_factor_channel, + default_value: 1.f, + triplanar_blend_range: uv_stream.triplanar_blend_range ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + + case direction: + final_blend_factor = math::dot( state::normal(), blend_direction ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + + case axis: + switch ( blend_axis ) + { + case x: + final_blend_factor = state::position().x; + break; + case x_invert: + final_blend_factor = -state::position().x; + break; + case y: + final_blend_factor = state::position().y; + break; + case y_invert: + final_blend_factor = -state::position().y; + break; + case z: + final_blend_factor = state::position().z; + break; + case z_invert: + final_blend_factor = -state::position().z; + break; + } + + final_blend_factor *= state::meters_per_scene_unit(); + if ( blend_axis_obect_space ) + { + float object_axis; + switch ( blend_axis ) + { + case x: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case x_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).x; + break; + case y: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case y_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).y; + break; + case z: + object_axis = state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + case z_invert: + object_axis = -state::transform_point( state::coordinate_object, state::coordinate_world, float3( 0 ) ).z; + break; + } + object_axis *= state::meters_per_scene_unit(); + final_blend_factor -= object_axis; + } + final_blend_factor = math::saturate( final_blend_factor * blend_axis_scale - blend_axis_offset ); + return math::saturate( 1.f - threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ) ); + + case primvar: + final_blend_factor = scene::data_lookup_float( blend_primvar_string, 0.f ); + return threshold_blend( input: final_blend_factor, + height: detail_blend, + threshold: blend_threshold ); + } + } + return final_blend_factor; +} + +export float accumulate_coat_weight( + layer_order layer_1_order = above, + float layer_1_weight = 0.f, + layer_order layer_2_order = above, + float layer_2_weight = 0.f + +) +{ + float final_coat_weight = 0.f; + + switch ( layer_1_order ) + { + case above: + final_coat_weight += layer_1_weight; + break; + case below: + break; + } + + switch ( layer_2_order ) + { + case above: + final_coat_weight += layer_2_weight; + break; + + case below: + break; + } + + return 1.f - final_coat_weight; +} + +export material OmniUber_Automotive( + //Basic Inputs - 100 + color diffuse_reflection_color = color(0.463f, 0.725f, 0.f) [[ + anno::display_name("Base Color"), + anno::ui_order(100) + ]], + + float metalness = float(0.f) [[ + anno::display_name("Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(101) + ]], + + float roughness_u = float(1.f) [[ + anno::display_name("Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(103) + ]], + + //Basic Clear Coat - 200 + bool enable_coat = true [[ + anno::display_name("Enable Clear Coat"), + anno::in_group("Clear Coat"), + anno::ui_order(200) + ]], + + color coat_color = color(1.f) [[ + anno::display_name("Clear Coat Color Tint"), + anno::in_group("Clear Coat"), + anno::ui_order(201) + ]], + + float coat_roughness = float(0.f) [[ + anno::display_name("Clear Coat Roughness"), + anno::in_group("Clear Coat"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(202) + ]], + + //Flakes - 300 + bool enable_flakes = true [[ + anno::display_name("Enable Flakes"), + anno::in_group("Flakes"), + anno::ui_order(300) + ]], + + color flake_color = color(1.f) [[ + anno::display_name("Flake Color"), + anno::in_group("Flakes"), + anno::ui_order(301) + ]], + + float flake_size = float(0.125f) [[ + anno::display_name("Flake Size"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(302) + ]], + + float flakes_density = float(0.25f) [[ + anno::display_name("Flake Density"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(303) + ]], + + float flakes_spread = float(0.15f) [[ + anno::display_name("Flake Spread"), + anno::in_group("Flakes"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(304) + ]], + + float flake_roughness = float(0.05f) [[ + anno::display_name("Flake Roughness"), + anno::in_group("Flakes"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(305) + ]], + + //Advanced + //Base Layer - 1000 + uv_set_selection uv_set_layer_0 = uv_set_1 [[ + anno::display_name("Base UV Set"), + anno::in_group("Advanced", "Base Layer"), + anno::ui_order(1000) + ]], + + uniform texture_2d base_color_image = texture_2d() [[ + anno::display_name("Base Color Image"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::ui_order(1001) + ]], + + float base_color_scale = 1.f [[ + anno::display_name("Base Color Multiply"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(1003) + ]], + + float base_color_offset = 0.f [[ + anno::display_name("Base Color Add"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(1004) + ]], + + float base_color_desaturation = float(0.f) [[ + anno::display_name("Base Color Desaturation"), + anno::in_group("Advanced", "Base Layer", "Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1005) + ]], + + uniform texture_2d metalness_image = texture_2d() [[ + anno::display_name("Metalness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1100) + ]], + + uniform channel_mode metalness_channel = b [[ + anno::display_name("Metalness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Metalness"), + anno::ui_order(1101) + ]], + + float specular_reflection_weight = float(1.0) [[ + anno::display_name("Specular Weight"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(1302) + ]], + + color specular_reflection_color = color(1.f) [[ + anno::display_name("Specular Color"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::hidden(), + anno::ui_order(1000) + ]], + + uniform texture_2d cavity_image = texture_2d() [[ + anno::display_name("Specular Cavity Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1300) + ]], + + uniform channel_mode cavity_channel = r [[ + anno::display_name("Specular Cavity Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Specular"), + anno::ui_order(1301) + ]], + + uniform texture_2d roughness_image = texture_2d() [[ + anno::display_name("Roughness Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1200) + ]], + + uniform channel_mode roughness_channel = g [[ + anno::display_name("Roughness Channel"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::ui_order(1201) + ]], + + float2 roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Roughness Range Position"), + anno::in_group("Advanced", "Base Layer", "Base Layer Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(1203) + ]], + + uniform texture_2d normal_image = texture_2d() [[ + anno::display_name("Normal Image"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::usage("normal"), + anno::ui_order(1400) + ]], + + uniform bool normal_flip_green = true [[ + anno::display_name("Normal Flip Green"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::ui_order(1401) + ]], + + uniform float normal_scale = float(1.f) [[ + anno::display_name("Normal Scale"), + anno::in_group("Advanced", "Base Layer", "Base Layer Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(1402) + ]], + + //Layer 1 - 4000 + bool enable_layer_1 = false [[ + anno::display_name("Enable Layer 1"), + anno::in_group("Advanced", "Layer 1" ), + anno::ui_order(4000) + ]], + + uv_set_selection uv_set_layer_1 = uv_set_1 [[ + anno::display_name("Layer 1 UV Set"), + anno::in_group("Advanced", "Layer 1"), + anno::ui_order(4001) + ]], + + layer_order layer_1_order = above [[ + anno::display_name("Layer 1 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(4002) + ]], + + //Layer 1 Base Color - 4100 + uniform texture_2d layer_1_base_color_image = texture_2d() [[ + anno::display_name("Layer 1 Base Color Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4100) + ]], + + color layer_1_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 1 Base Color Tint"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::ui_order(4101) + ]], + + float layer_1_base_color_offset = float(0.f) [[ + anno::display_name("Layer 1 Base Color Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4102) + ]], + + float layer_1_base_color_scale = float(1.f) [[ + anno::display_name("Layer 1 Base Color Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(4103) + ]], + + float layer_1_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 1 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4104) + ]], + + //Layer 1 Specular - 4200 + uniform texture_2d layer_1_roughness_image = texture_2d() [[ + anno::display_name("Layer 1 Roughness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4300) + ]], + + uniform channel_mode layer_1_roughness_channel = g [[ + anno::display_name("Layer 1 Roughness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::ui_order(4301) + ]], + + float layer_1_roughness_u = float(1.f) [[ + anno::display_name("Layer 1 Roughness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4302) + ]], + + float2 layer_1_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 1 Roughness Range Position"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(4303) + ]], + + uniform texture_2d layer_1_metalness_image = texture_2d() [[ + anno::display_name("Layer 1 Metalness Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4200) + ]], + + uniform channel_mode layer_1_metalness_channel = b [[ + anno::display_name("Layer 1 Metalness Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::ui_order(4201) + ]], + + float layer_1_metalness = float(1.f) [[ + anno::display_name("Layer 1 Metalness"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4202) + ]], + + //Layer 1 Specular - 4400 + uniform texture_2d layer_1_cavity_image = texture_2d() [[ + anno::display_name("Layer 1 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4400) + ]], + + uniform channel_mode layer_1_cavity_channel = r [[ + anno::display_name("Layer 1 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4401) + ]], + + float layer_1_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 1 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Specular"), + anno::ui_order(4402) + ]], + + //Layer 1 Normal - 4500 + uniform texture_2d layer_1_normal_image = texture_2d() [[ + anno::display_name("Layer 1 Normal Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::usage("normal"), + anno::ui_order(4500) + ]], + + uniform bool layer_1_normal_flip_green = true [[ + anno::display_name("Layer 1 Normal Flip Green"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::ui_order(4501) + ]], + + uniform float layer_1_normal_scale = float(1.f) [[ + anno::display_name("Layer 1 Normal Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4502) + ]], + + //Layer 1 Weight - 4600 + blend_source layer_1_blend_source = texture [[ + anno::display_name("Layer 1 Mask Source"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_blend_factor = uv_set_1 [[ + anno::display_name("Layer 1 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform texture_2d layer_1_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 1 Mask Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + uniform channel_mode layer_1_blend_splatmap_channel = r [[ + anno::display_name("Layer 1 Mask Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4630) + ]], + + float3 layer_1_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 1 Mask Direction"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4620) + ]], + + axis_mode layer_1_blend_axis = y [[ + anno::display_name("Layer 1 Mask Axis"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4611) + ]], + + bool layer_1_blend_object_space = true [[ + anno::display_name("Layer 1 Mask Object Space"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4610) + ]], + + float layer_1_blend_scale = float(1.f) [[ + anno::display_name("Layer 1 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(4612) + ]], + + float layer_1_blend_offset = float(0.f) [[ + anno::display_name("Layer 1 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(4613) + ]], + + uniform string layer_1_blend_primvar_name = string() [[ + anno::display_name("Layer 1 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4600) + ]], + + uv_set_selection layer_1_uv_set_detail = uv_set_1 [[ + anno::display_name("Layer 1 Detail UV Stream"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4640) + ]], + + uniform texture_2d layer_1_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 1 Detail Image"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4641) + ]], + + uniform channel_mode layer_1_blend_detail_image_channel = r [[ + anno::display_name("Layer 1 Detail Image Channel"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::ui_order(4642) + ]], + + float layer_1_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 1 Mask Threshold"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(4601) + ]], + + float layer_1_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 1 Mask Factor Override"), + anno::in_group("Advanced", "Layer 1", "Layer 1 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(4600) + ]], + + //Layer 2 - 5000 + bool enable_layer_2 = false [[ + anno::display_name("Enable Layer 2"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5000) + ]], + + layer_order layer_2_order = above [[ + anno::display_name("Layer 2 Composite Order"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(5001) + ]], + + uv_set_selection uv_set_layer_2 = uv_set_1 [[ + anno::display_name("Layer 2 UV Set"), + anno::in_group("Advanced", "Layer 2"), + anno::ui_order(5002) + ]], + + //Layer 2 - Base Color - 5100 + uniform texture_2d layer_2_base_color_image = texture_2d() [[ + anno::display_name("Layer 2 Base Color Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5100) + ]], + + color layer_2_diffuse_reflection_color = color(1.f) [[ + anno::display_name("Layer 2 Base Color Tint"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::ui_order(5101) + ]], + + float layer_2_base_color_offset = float(0.f) [[ + anno::display_name("Layer 2 Base Color Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5102) + ]], + + float layer_2_base_color_scale = float(1.f) [[ + anno::display_name("Layer 2 Base Color Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 2.0f), + anno::ui_order(5103) + ]], + + float layer_2_base_color_desaturation = float(0.f) [[ + anno::display_name("Layer 2 Base Color Desaturation"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Base Color"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5104) + ]], + + //Layer 2 - Metallic - 5200 + uniform texture_2d layer_2_metalness_image = texture_2d() [[ + anno::display_name("Layer 2 Metalness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5200) + ]], + + uniform channel_mode layer_2_metalness_channel = b [[ + anno::display_name("Layer 2 Metalness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::ui_order(5201) + ]], + + float layer_2_metalness = float(1.f) [[ + anno::display_name("Layer 2 Metalness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Metalness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5202) + ]], + + //Layer 2 - Roughness - 5300 + uniform texture_2d layer_2_roughness_image = texture_2d() [[ + anno::display_name("Layer 2 Roughness Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5300) + ]], + + uniform channel_mode layer_2_roughness_channel = g [[ + anno::display_name("Layer 2 Roughness Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::ui_order(5301) + ]], + + float layer_2_roughness_u = float(1.f) [[ + anno::display_name("Layer 2 Roughness"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5302) + ]], + + float2 layer_2_roughness_range_position = float2( 1.f, 0.5f ) [[ + anno::display_name("Layer 2 Roughness Range Position"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Roughness"), + anno::hard_range(float2(0.0f), float2(1.0f)), + anno::ui_order(5303) + ]], + + //Layer 2 - Specular - 5400 + float layer_2_specular_reflection_weight = float(1.f) [[ + anno::display_name("Layer 2 Specular Reflection Weight"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5402) + ]], + + uniform texture_2d layer_2_cavity_image = texture_2d() [[ + anno::display_name("Layer 2 Specular Cavity Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5400) + ]], + + uniform channel_mode layer_2_cavity_channel = r [[ + anno::display_name("Layer 2 Specular Cavity Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Specular"), + anno::ui_order(5401) + ]], + + //Layer 2 - Normal - 5500 + uniform texture_2d layer_2_normal_image = texture_2d() [[ + anno::display_name("Layer 2 Normal Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::usage("normal"), + anno::ui_order(5500) + ]], + + uniform bool layer_2_normal_flip_green = true [[ + anno::display_name("Layer 2 Normal Flip Green"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::ui_order(5501) + ]], + + uniform float layer_2_normal_scale = float(1.f) [[ + anno::display_name("Layer 2 Normal Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Normal"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5502) + ]], + + //Layer 2 - Weight - 5600 + blend_source layer_2_blend_source = texture [[ + anno::display_name("Layer 2 Mask Source"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_blend_factor = uv_set_2 [[ + anno::display_name("Layer 2 Mask Image UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform texture_2d layer_2_blend_splatmap = texture_2d() [[ + anno::display_name("Layer 2 Mask Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + uniform channel_mode layer_2_blend_splatmap_channel = r [[ + anno::display_name("Layer 2 Mask Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5630) + ]], + + float3 layer_2_blend_direction = float3(0.f, 1.f, 0.f) [[ + anno::display_name("Layer 2 Mask Direction"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5620) + ]], + + axis_mode layer_2_blend_axis = y [[ + anno::display_name("Layer 2 Mask Axis"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5611) + ]], + + bool layer_2_blend_object_space = true [[ + anno::display_name("Layer 2 Mask Object Space"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5610) + ]], + + float layer_2_blend_scale = float(1.f) [[ + anno::display_name("Layer 2 Mask Axis Scale"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(5612) + ]], + + float layer_2_blend_offset = float(0.f) [[ + anno::display_name("Layer 2 Mask Axis Offset"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::soft_range(-1.0f, 1.0f), + anno::ui_order(5613) + ]], + + uniform string layer_2_blend_primvar_name = string() [[ + anno::display_name("Layer 2 Mask Primvar Name"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5600) + ]], + + uv_set_selection layer_2_uv_set_detail = uv_set_2 [[ + anno::display_name("Layer 2 Detail UV Stream"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5640) + ]], + + uniform texture_2d layer_2_blend_detail_image = texture_2d() [[ + anno::display_name("Layer 2 Detail Image"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5641) + ]], + + uniform channel_mode layer_2_blend_detail_image_channel = r [[ + anno::display_name("Layer 2 Detail Image Channel"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::ui_order(5642) + ]], + + float layer_2_blend_threshold = float(0.33f) [[ + anno::display_name("Layer 2 Mask Threshold"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(5601) + ]], + + float layer_2_blend_factor_override = float(0.f) [[ + anno::display_name("Layer 2 Mask Factor Override"), + anno::in_group("Advanced", "Layer 2", "Layer 2 Mask"), + anno::hard_range(0.0f, 1.0f), + anno::hidden(), + anno::ui_order(5600) + ]], + + //UVs - 6000 + uvs_mode uvs_mode_01 = triplanar [[ + anno::display_name("UV Mode 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6100) + ]], + + float2 uv_scale_01 = float2(1.f) [[ + anno::display_name("UV Scale 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6101) + ]], + + float2 uv_offset_01 = float2(0.f) [[ + anno::display_name("UV Offset 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6102) + ]], + + float2 uv_offset_time_01 = float2(0.f) [[ + anno::display_name("UV Offset Time 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6103) + ]], + + float uv_rotation_01 = float(0.f) [[ + anno::display_name("UV Rotation 1"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6104) + ]], + + float triplanar_blend_range_01 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 1"), + anno::in_group("Advanced", "UV Sets", "UV Set 1"), + anno::ui_order(6105), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_02 = triplanar [[ + anno::display_name("UV Mode 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6200) + ]], + + float2 uv_scale_02 = float2(1.f) [[ + anno::display_name("UV Scale 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6201) + ]], + + float2 uv_offset_02 = float2(0.f) [[ + anno::display_name("UV Offset 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6202) + ]], + + float2 uv_offset_time_02 = float2(0.f) [[ + anno::display_name("UV Offset Time 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6203) + ]], + + float uv_rotation_02 = float(0.f) [[ + anno::display_name("UV Rotation 2"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6204) + ]], + + float triplanar_blend_range_02 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 2"), + anno::in_group("Advanced", "UV Sets", "UV Set 2"), + anno::ui_order(6205), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_03 = triplanar [[ + anno::display_name("UV Mode 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6300) + ]], + + float2 uv_scale_03 = float2(1.f) [[ + anno::display_name("UV Scale 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6301) + ]], + + float2 uv_offset_03 = float2(0.f) [[ + anno::display_name("UV Offset 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6302) + ]], + + float2 uv_offset_time_03 = float2(0.f) [[ + anno::display_name("UV Offset Time 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6303) + ]], + + float uv_rotation_03 = float(0.f) [[ + anno::display_name("UV Rotation 3"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6304) + ]], + + float triplanar_blend_range_03 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 3"), + anno::in_group("Advanced", "UV Sets", "UV Set 3"), + anno::ui_order(6305), + anno::hard_range(0.0,1.0) + ]], + + uvs_mode uvs_mode_04 = triplanar [[ + anno::display_name("UV Mode 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6400) + ]], + + float2 uv_scale_04 = float2(1.f) [[ + anno::display_name("UV Scale 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6401) + ]], + + float2 uv_offset_04 = float2(0.f) [[ + anno::display_name("UV Offset 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6402) + ]], + + float2 uv_offset_time_04 = float2(0.f) [[ + anno::display_name("UV Offset Time 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6403) + ]], + + float uv_rotation_04 = float(0.f) [[ + anno::display_name("UV Rotation 4"), + anno::hidden(), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6404) + ]], + + float triplanar_blend_range_04 = float(0.5f) [[ + anno::display_name("Triplanar Blend Range 4"), + anno::in_group("Advanced", "UV Sets", "UV Set 4"), + anno::ui_order(6405), + anno::hard_range(0.0,1.0) + ]], + + uniform bool enable_opacity = false [[ + anno::display_name("Enable Opacity"), + anno::description("Enables the use of cutout opacity"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uv_set_selection uv_set_opacity = uv_set_1 [[ + anno::display_name("Opacity UV Set"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8302) + ]], + + //Detail Normal - 8100 + bool enable_detail_normal = false [[ + anno::display_name("Enable Detail Normal"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8100) + ]], + + uv_set_selection uv_set_detail_normal = uv_set_1 [[ + anno::display_name("Detail Normal UV Set"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8101) + ]], + + uniform texture_2d detail_normal_image = texture_2d() [[ + anno::display_name("Detail Normal Image"), + anno::in_group("Advanced", "Detail Normal"), + anno::usage("normal"), + anno::ui_order(8102) + ]], + + uniform bool detail_normal_flip_green = true [[ + anno::display_name("Detail Normal Normal Flip Green"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8103) + ]], + + uniform float detail_normal_scale = float(1.f) [[ + anno::display_name("Detail Normal Scale"), + anno::in_group("Advanced", "Detail Normal"), + anno::ui_order(8104) + ]], + + uv_set_selection uv_set_detail_weight = uv_set_1 [[ + anno::display_name("Detail Normal Mask UV Set"), + anno::in_group("Advanced", "Detail Normal", "Mask"), + anno::ui_order(8105) + ]], + + uniform texture_2d detail_normal_weight_image = texture_2d() [[ + anno::display_name("Detail Normal Mask Image"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8106) + ]], + + uniform channel_mode detail_normal_weight_channel = r [[ + anno::display_name("Detail Normal Mask Channel"), + anno::in_group("Advanced", "Detail Normal", "Detail Normal Mask"), + anno::ui_order(8107) + ]], + + //Emission - 8200 + bool enable_emission = false [[ + anno::display_name("Enable Emission"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8200) + ]], + + uv_set_selection uv_set_emission = uv_set_1 [[ + anno::display_name("Emission UV Set"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8201) + ]], + + uniform texture_2d emission_image = texture_2d() [[ + anno::display_name("Emission Image"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8202) + ]], + + uniform bool emission_use_temperature = false [[ + anno::display_name("Emission Use Temperature"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8203) + ]], + + float emission_temperature = float(6500.f) [[ + anno::display_name("Emission Temperature (kelvin)"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 10000.0f), + anno::ui_order(8204) + ]], + + uv_set_selection uv_set_emission_mask = uv_set_1 [[ + anno::display_name("Emission UV Set Mask"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8205) + ]], + + color emission_color = color(1.f) [[ + anno::display_name("Emission Color Tint"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8206) + ]], + + uniform texture_2d emission_mask_image = texture_2d() [[ + anno::display_name("Emission Mask Image"), + anno::in_group("Advanced", "Emission", "Emission Mask"), + anno::ui_order(8207) + ]], + + uniform ::OmniSurface::OmniShared::emission_mode emission_mode = + ::OmniSurface::OmniShared::emission_lx [[ + anno::display_name("Emission Mode"), + anno::in_group("Advanced", "Emission"), + anno::ui_order(8208) + ]], + + float emission_intensity = float(1.0) [[ + anno::display_name("Emission Intensity"), + anno::in_group("Advanced", "Emission"), + anno::soft_range(0.0f, 1000.0f), + anno::ui_order(8209) + ]], + + //Opacity - 8300 + uniform texture_2d opacity_image = texture_2d() [[ + anno::display_name("Opacity Image"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8300) + ]], + + uniform channel_mode opacity_channel = a [[ + anno::display_name("Opacity Channel"), + anno::in_group("Advanced", "Opacity"), + anno::ui_order(8301) + ]], + + uniform float geometry_opacity_threshold = float(0.15f) [[ + anno::display_name("Opacity Threshold"), + anno::description("If > 0, remap opacity values to 1 when >= threshold and to 0 otherwise"), + anno::in_group("Advanced", "Opacity"), + anno::hard_range(0.0f, 1.0f), + anno::ui_order(8302) + ]], + + //Anisotropy - 8400 + bool enable_anisotropy = false [[ + anno::display_name("Enable Anisotropy"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8400) + ]], + + uv_set_selection uv_set_anisotropy = uv_set_1 [[ + anno::display_name("Anisotropy UV Set"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8401) + ]], + + uniform texture_2d anisotropic_direction_image = texture_2d() [[ + anno::display_name("Anisotropy Direction Image"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8402) + ]], + + uniform channel_mode anisotropic_direction_channel = r [[ + anno::display_name("Anisotropy Direction Channel"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::ui_order(8403) + ]], + + float anisotropic_direction = float(0.f) [[ + anno::display_name("Anisotropy Rotation (radian)"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::hard_range(-1.0f, 1.0f), + anno::ui_order(8404) + ]], + + float anisotropic_roughness_u = float(1.f) [[ + anno::display_name("Anisotropy Roughness U"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8405) + ]], + + float anisotropic_roughness_v = float(0.25f) [[ + anno::display_name("Anisotropy Roughness V"), + anno::in_group("Advanced", "Anisotropy (Path Tracing Only)"), + anno::soft_range(0.0f, 1.0f), + anno::ui_order(8406) + ]], + + //Advanced Clear Coat - 8500 + uniform texture_2d coat_mask_image = texture_2d() [[ + anno::display_name("Clear Coat Mask Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2401) + ]], + + uniform channel_mode coat_mask_channel = r [[ + anno::display_name("Clear Coat Mask Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2402) + ]], + + uniform texture_2d coat_roughness_image = texture_2d() [[ + anno::display_name("Clear Coat Roughness Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2201) + ]], + + uniform channel_mode coat_roughness_channel = r [[ + anno::display_name("Clear Coat Roughness Channel"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Roughness"), + anno::ui_order(2202) + ]], + + uniform float coat_ior = float(1.6f) [[ + anno::display_name("Clear Coat IOR"), + anno::in_group("Clear Coat"), + anno::soft_range(1.0f, 5.0f), + anno::hard_range(1.0f, limits::FLOAT_MAX), + anno::ui_order(2002) + ]], + + uniform texture_2d coat_normal_image = texture_2d() [[ + anno::display_name("Clear Coat Normal Image"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::usage("normal"), + anno::ui_order(2300) + ]], + + uniform bool coat_normal_flip_green = true [[ + anno::display_name("Clear Coat Normal Flip Green"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Normal"), + anno::ui_order(2300) + ]], + + uv_set_selection uv_set_coat_roughness_normal = uv_set_1 [[ + anno::display_name("Clear Coat Normal UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::ui_order(8500) + ]], + + uv_set_selection uv_set_coat_mask = uv_set_1 [[ + anno::display_name("Clear Coat Mask UV Set"), + anno::in_group("Advanced", "Clear Coat (Advanced)", "Clear Coat Mask"), + anno::ui_order(2400) + ]], + + float coat_anisotropy = float(0.f) [[ + anno::display_name("Clear Coat Anisotropy"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_anisotropy_rotation = float(0.f) [[ + anno::display_name("Clear Coat Rotation (radian)"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::soft_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_color = float(0.f) [[ + anno::display_name("Clear Coat Affect Color"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]], + + float coat_affect_roughness = float(0.f) [[ + anno::display_name("Clear Coat Affect Roughness"), + anno::in_group("Advanced", "Clear Coat (Advanced)"), + anno::hard_range(0.0f, 1.0f), + anno::hidden() + ]] + +) +[[ + anno::display_name("Omni Uber Automotive"), + anno::author("NVIDIA Corporation"), + anno::key_words(string[]("generic", "surface")), + anno::in_group("Automotive"), + anno::version(0, 0, 10, "") +]] = let { + + uv_streams streams = initialize_uv_streams( + uvs_mode_01, uv_scale_01, uv_offset_01, uv_offset_time_01, uv_rotation_01, triplanar_blend_range_01, + uvs_mode_02, uv_scale_02, uv_offset_02, uv_offset_time_02, uv_rotation_02, triplanar_blend_range_02, + uvs_mode_03, uv_scale_03, uv_offset_03, uv_offset_time_03, uv_rotation_03, triplanar_blend_range_03, + uvs_mode_04, uv_scale_04, uv_offset_04, uv_offset_time_04, uv_rotation_04, triplanar_blend_range_04 + ); + + float blend_factor_layer_1 = blend_factor( + uv_stream: select_uv_stream( streams, layer_1_uv_set_blend_factor ), + enable_blend_factor: enable_layer_1, + blend_factor_source: layer_1_blend_source, + tBlendFactor: layer_1_blend_splatmap, + blend_factor_channel: layer_1_blend_splatmap_channel, + blend_direction: layer_1_blend_direction, + blend_axis_obect_space: layer_1_blend_object_space, + blend_axis: layer_1_blend_axis, + blend_axis_scale: layer_1_blend_scale, + blend_axis_offset: layer_1_blend_offset, + blend_primvar_string: layer_1_blend_primvar_name, + blend_threshold: layer_1_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_1_uv_set_detail ), + tDetailBlendFactor: layer_1_blend_detail_image, + detail_blend_factor_channel: layer_1_blend_detail_image_channel, + blend_factor_override: layer_1_blend_factor_override + ); + + float blend_factor_layer_2 = blend_factor( + uv_stream: select_uv_stream( streams, layer_2_uv_set_blend_factor ), + enable_blend_factor: enable_layer_2, + blend_factor_source: layer_2_blend_source, + tBlendFactor: layer_2_blend_splatmap, + blend_factor_channel: layer_2_blend_splatmap_channel, + blend_direction: layer_2_blend_direction, + blend_axis_obect_space: layer_2_blend_object_space, + blend_axis: layer_2_blend_axis, + blend_axis_scale: layer_2_blend_scale, + blend_axis_offset: layer_2_blend_offset, + blend_primvar_string: layer_2_blend_primvar_name, + blend_threshold: layer_2_blend_threshold, + uv_set_detail: select_uv_stream( streams, layer_2_uv_set_detail ), + tDetailBlendFactor: layer_2_blend_detail_image, + detail_blend_factor_channel: layer_2_blend_detail_image_channel, + blend_factor_override: layer_2_blend_factor_override + ); + + material_layer layer_0 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_0 ), + tBaseColor: base_color_image, + base_color_tint: diffuse_reflection_color, + base_color_scale: color( base_color_scale ), + base_color_offset: color( base_color_offset ), + base_color_desaturation: base_color_desaturation, + tMetallic: metalness_image, + metallic_channel: metalness_channel, + metallic_factor: metalness, + tCavity: cavity_image, + cavity_channel: cavity_channel, + specular_weight: specular_reflection_weight, + tRoughness: roughness_image, + roughness_channel: roughness_channel, + roughness_factor: roughness_u, + roughness_range_position: roughness_range_position, + tNormal: normal_image, + normal_scale: normal_scale, + normal_flip_green: normal_flip_green + ); + + material_layer layer_1 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_1 ), + tBaseColor: layer_1_base_color_image, + base_color_tint: layer_1_diffuse_reflection_color, + base_color_scale: color( layer_1_base_color_scale ), + base_color_offset: color( layer_1_base_color_offset ), + base_color_desaturation: layer_1_base_color_desaturation, + tMetallic: layer_1_metalness_image, + metallic_channel: layer_1_metalness_channel, + metallic_factor: layer_1_metalness, + tCavity: layer_1_cavity_image, + cavity_channel: layer_1_cavity_channel, + specular_weight: layer_1_specular_reflection_weight, + tRoughness: layer_1_roughness_image, + roughness_channel: layer_1_roughness_channel, + roughness_factor: layer_1_roughness_u, + roughness_range_position: layer_1_roughness_range_position, + tNormal: layer_1_normal_image, + normal_scale: layer_1_normal_scale, + normal_flip_green: layer_1_normal_flip_green + ); + + material_layer layer_1_composite = blend_material_layer( + enable_blend: enable_layer_1, + layer_1: layer_0, + layer_2: layer_1, + blend_factor: blend_factor_layer_1 + ); + + material_layer layer_2 = initialize_material_layer( + uv_stream: select_uv_stream( streams, uv_set_layer_2 ), + tBaseColor: layer_2_base_color_image, + base_color_tint: layer_2_diffuse_reflection_color, + base_color_scale: color( layer_2_base_color_scale ), + base_color_offset: color( layer_2_base_color_offset ), + base_color_desaturation: layer_2_base_color_desaturation, + tMetallic: layer_2_metalness_image, + metallic_channel: layer_2_metalness_channel, + metallic_factor: layer_2_metalness, + tCavity: layer_2_cavity_image, + cavity_channel: layer_2_cavity_channel, + specular_weight: layer_2_specular_reflection_weight, + tRoughness: layer_2_roughness_image, + roughness_channel: layer_2_roughness_channel, + roughness_factor: layer_2_roughness_u, + roughness_range_position: layer_2_roughness_range_position, + tNormal: layer_2_normal_image, + normal_scale: layer_2_normal_scale, + normal_flip_green: layer_2_normal_flip_green + ); + + material_layer layer_2_composite = blend_material_layer( + enable_blend: enable_layer_2, + layer_1: layer_1_composite, + layer_2: layer_2, + blend_factor: blend_factor_layer_2 + ); + + anisotropy aniso = initialize_anisotropy( + uv_stream: select_uv_stream( streams, uv_set_anisotropy ), + enable_anisotropy: enable_anisotropy, + anisotropy_roughness_u: anisotropic_roughness_u, + anisotropy_roughness_v: anisotropic_roughness_v, + tAnisotropyRotation: anisotropic_direction_image, + anisotropy_channel: anisotropic_direction_channel, + anisotropy_rotation: anisotropic_direction + ); + + float accumulated_layer_coat_weight = accumulate_coat_weight( layer_1_order: layer_1_order, + layer_1_weight: blend_factor_layer_1, + layer_2_order: layer_2_order, + layer_2_weight: blend_factor_layer_2 ); + + coat_layer coat = initialize_coat_layer( + uv_stream: select_uv_stream( streams, uv_set_coat_roughness_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_coat_mask ), + enable_coat: enable_coat, + tCoatMask: coat_mask_image, + tCoatNormal: coat_normal_image, + tCoatRoughness: coat_roughness_image, + coat_weight: accumulated_layer_coat_weight, + coat_weight_channel: coat_mask_channel, + coat_color: coat_color, + coat_roughness_channel: coat_roughness_channel, + coat_roughness_factor: coat_roughness, + coat_ior: coat_ior, + coat_anisotropy: coat_anisotropy, + coat_anisotropy_rotation: coat_anisotropy_rotation, + coat_affect_color: coat_affect_color, + coat_affect_roughness: coat_affect_roughness, + coat_flip_green: coat_normal_flip_green + ); + + float3 detail_normal = detail_normal_combine( + uv_set_normal: select_uv_stream( streams, uv_set_detail_normal ), + uv_set_weight: select_uv_stream( streams, uv_set_detail_weight ), + enable_detail_normal: enable_detail_normal, + base_normal: layer_2_composite.normal, + tDetailNormal: detail_normal_image, + tDetailNormalWeight: detail_normal_weight_image, + detail_normal_channel: detail_normal_weight_channel, + detail_normal_scale: detail_normal_scale, + detail_normal_flip_green: detail_normal_flip_green + ); + + flake_layer flakes = initialize_flake_layer( + enable_flakes: enable_flakes, + flakes_weight: coat.coat_weight, + flakes_size: flake_size, + flakes_density: flakes_density, + flakes_spread: flakes_spread + ); + + //Final Material Properties + color final_base_color = math::lerp( layer_2_composite.base_color, flake_color, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_metallic = math::lerp( layer_2_composite.metallic, 1.f, flakes.weight > 0.001f ? 1.f : 0.f ); + float final_roughness = math::lerp( layer_2_composite.roughness, flake_roughness, flakes.weight > 0.001f ? 1.f : 0.f ); + float3 final_normal = nvidia::core_definitions::blend_normals( + base_normal: detail_normal, + base_normal_weight: 1.f, + detail_normal: flakes.normal, + detail_normal_weight: enable_flakes ? coat.coat_weight : 0.f + ); + + color final_emission_color = emission( + uv_stream: select_uv_stream( streams, uv_set_emission ), + uv_stream_mask: select_uv_stream( streams, uv_set_emission_mask ), + enable_emission: enable_emission, + tEmission: emission_image, + tEmissionMask: emission_mask_image, + emission_color: emission_color + ); + + float final_opacity = opacity( + uv_stream: select_uv_stream( streams, uv_set_opacity ), + enable_opacity: enable_opacity, + tBaseColor: base_color_image, + tOpacity: opacity_image, + opacity_channel: opacity_channel + ); + + material base = OmniSurface::OmniSurfaceBase::OmniSurfaceBase( + diffuse_reflection_weight: 1.f, + diffuse_reflection_color: final_base_color, + metalness: final_metallic, + specular_reflection_weight: layer_2_composite.specular_weight, + specular_reflection_color: specular_reflection_color * math::saturate( layer_2_composite.cavity * 2.f ), + specular_reflection_roughness: final_roughness, + specular_reflection_anisotropy: enable_anisotropy ? 1.f : 0.0f, + specular_reflection_anisotropy_rotation: enable_anisotropy ? aniso.anisotropy_rotation : 0.f, + coat_weight: coat.coat_weight, + coat_color: coat.coat_color, + coat_roughness: coat.coat_roughness, + coat_ior: coat.coat_ior, + coat_anisotropy: coat.coat_anisotropy, + coat_anisotropy_rotation: coat.coat_anisotropy_rotation, + coat_affect_color: coat.coat_affect_color, + coat_affect_roughness: coat.coat_affect_roughness, + coat_normal: coat.coat_normal, + emission_weight: 1.0, + emission_mode: emission_mode, + emission_intensity: enable_emission ? emission_intensity : 0.f, + emission_color: final_emission_color, + emission_use_temperature: emission_use_temperature, + emission_temperature: emission_temperature, + enable_opacity: enable_opacity, + geometry_opacity: final_opacity, + geometry_opacity_threshold: geometry_opacity_threshold, + geometry_normal_roughness: enable_anisotropy ? + float2( aniso.anisotropy_roughness_u, + aniso.anisotropy_roughness_v ) : + float2(0.f, 0.f), + geometry_normal: final_normal + ); + +} in material( + surface: base.surface, + ior: base.ior, + thin_walled: base.thin_walled, + volume: base.volume, + geometry: base.geometry +); \ No newline at end of file diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_basecolor.jpg b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_basecolor.jpg new file mode 100755 index 0000000000000000000000000000000000000000..6b99fbe861ca753e8ba5c97904c08f93f474b666 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:142272912feb88bbc0468f4685884cae7263347bfea8ebba33665e656fa13822 +size 66162 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_normal.jpg b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_normal.jpg new file mode 100755 index 0000000000000000000000000000000000000000..d4b8664c962487ce76e22f80e067b083a7217dc8 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_normal.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c50e85f042346e8faf0342135abf541c084ed1a1e22f486c994be5a271279db4 +size 519894 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg new file mode 100755 index 0000000000000000000000000000000000000000..396a3eba7145dd54fb55c50442b9b9c2a6370f63 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Automotive/Surfacing/ov_metal_a_01/ov_metal_a_01_orm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de3dea7ca7b5149fa75f39ec5eaf478e3cea93d20128fd18b7eaa18253403c04 +size 2486427 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash.mdl b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash.mdl new file mode 100755 index 0000000000000000000000000000000000000000..1e6303fe8d1727cddabb63455c9eb44f5c0e59dc --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash.mdl @@ -0,0 +1,42 @@ +mdl 1.4; + +using ::OmniPBR import OmniPBR; +import ::tex::gamma_mode; +import ::state::normal; + +export material Ash(*) + = OmniPBR( + diffuse_color_constant: color(0.500000, 0.500000, 0.500000), + diffuse_texture: texture_2d("./Ash/Ash_BaseColor.png", ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 0.000000, + reflection_roughness_texture_influence: 1.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.000000, + metallic_texture_influence: 1.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Ash/Ash_ORM.png", ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.000000, 1.000000, 1.000000), + emissive_mask_texture: texture_2d(), + emissive_intensity: 0.000000, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Ash/Ash_Normal.png", ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_BaseColor.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_BaseColor.png new file mode 100755 index 0000000000000000000000000000000000000000..74872bb61e3d4ea568a3f7f68afd9e2718551e3f --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e12d4e9b5e39987673d26f84726c796fba7bddea8a14a4a8514381878e6aeddd +size 6691777 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_Normal.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_Normal.png new file mode 100755 index 0000000000000000000000000000000000000000..ea02183183df7464b760f3a02751dfce55085498 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44b5b518bdb52957ecd8159ee7c2f59ad0ceca5fd4799bab8122c97335f0547c +size 5932653 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_ORM.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_ORM.png new file mode 100755 index 0000000000000000000000000000000000000000..72b2a137b8e4ea837a3644cdbb1a806ac74f45b5 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Ash/Ash_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:549dadc96c0e9cdfa05ab487552acd600d03a6ba0688864171eeba27e6a1183d +size 1129426 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks.mdl b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks.mdl new file mode 100755 index 0000000000000000000000000000000000000000..366eb8c5b748afcf33e599594f94f034b93eef21 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks.mdl @@ -0,0 +1,54 @@ +mdl 1.4; + +import ::OmniPBR::OmniPBR; +import ::anno::author; +import ::anno::description; +import ::anno::display_name; +import ::anno::key_words; +import ::anno::version; +import ::tex::gamma_mode; +import ::state::normal; + +export material Mahogany_Planks(*) +[[ + ::anno::display_name("Omni PBR "), + ::anno::description("Omni PBR, supports ORM textures"), + ::anno::version(1, 0, 0, ""), + ::anno::author("NVIDIA CORPORATION"), + ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) +]] + = ::OmniPBR::OmniPBR( + diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), + diffuse_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_BaseColor.png" /* tag 2746, version 2957239479 */, ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(.25, .25, .25), + reflection_roughness_constant: 0.5f, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.f, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_ORM.png" /* tag 2748, version 2172705328 */, ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.f, 0.100000001f, 0.100000001f), + emissive_mask_texture: texture_2d(), + emissive_intensity: 40.f, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_N.png" /* tag 2750, version 3347756142 */, ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_BaseColor.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_BaseColor.png new file mode 100755 index 0000000000000000000000000000000000000000..f4c49eb4237090a6e3a487a4b0a1671b8e65371b --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3e69dacd264d481738b2a995ad793531515a153ec8a168e5c4b6d5a4dfb38ec +size 5750346 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_N.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_N.png new file mode 100755 index 0000000000000000000000000000000000000000..a722188af0b88e907fee8c73e013bd3b10fdb457 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b0e9d1611c4e1722085e15299197c69d9f813f0b77e96b476fc04b38407edb +size 5656449 diff --git a/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_ORM.png b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_ORM.png new file mode 100755 index 0000000000000000000000000000000000000000..27de5e7cc8ec3ad9ff88298262b1b761aa83e3ac --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/Collected_S1_2/omniverse-content-production.s3.us-west-2.amazonaws.com/Materials/2023_2_1/Base/Wood/Mahogany_Planks/Mahogany_Planks_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fe20889ad4737833ca2a4425aedf28c1bf34a0d1730827bf4f0403482404797 +size 6246551 diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/.thumbs/256x256/Cabinet_3.usd.png b/Articulated_objects/small_furniture/cabinet/D1_1/.thumbs/256x256/Cabinet_3.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..79e118771fb3b70bcae5c263b9378b7c3c6afadd --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/.thumbs/256x256/Cabinet_3.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59da5a95fbfe15a8afd4feaf8b42d72f27efa9ef521044b90f6f75344589aea3 +size 109984 diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/Cabinet_3.usd b/Articulated_objects/small_furniture/cabinet/D1_1/Cabinet_3.usd new file mode 100755 index 0000000000000000000000000000000000000000..f1b3361929cabdce5c2d43a1bb20d040c8f0b0e3 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/Cabinet_3.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca137ed342d64ac21ea6b0259b0156a873786487afa93a378518a0becf2b947e +size 1380905 diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak.mdl b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak.mdl new file mode 100755 index 0000000000000000000000000000000000000000..e61720aaa6b27a08f25d92b1ea9784ef793a99e8 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak.mdl @@ -0,0 +1,54 @@ +mdl 1.4; + +import ::OmniPBR::OmniPBR; +import ::anno::author; +import ::anno::description; +import ::anno::display_name; +import ::anno::key_words; +import ::anno::version; +import ::tex::gamma_mode; +import ::state::normal; + +export material Oak(*) +[[ + ::anno::display_name("Omni PBR "), + ::anno::description("Omni PBR, supports ORM textures"), + ::anno::version(1, 0, 0, ""), + ::anno::author("NVIDIA CORPORATION"), + ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) +]] + = ::OmniPBR::OmniPBR( + diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), + diffuse_texture: texture_2d("./Oak/Oak_BaseColor.png" /* tag 2821, version 274695127 */, ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 0.5f, + reflection_roughness_texture_influence: 1.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.f, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Oak/Oak_ORM.png" /* tag 2825, version 1792070153 */, ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.f, 0.100000001f, 0.100000001f), + emissive_mask_texture: texture_2d(), + emissive_intensity: 40.f, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Oak/Oak_N.png" /* tag 2823, version 2115322746 */, ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_BaseColor.png b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_BaseColor.png new file mode 100755 index 0000000000000000000000000000000000000000..18b53db115bcd6cdae015f3ca956adf3764bc304 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58648d35e3b8a9d953948ce0394b56aa95184e1f88b5abab139e7a32a2b44043 +size 5383545 diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_N.png b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_N.png new file mode 100755 index 0000000000000000000000000000000000000000..6d2055c8f79a7d9b08e9ba8c588da078deffcabd --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4538148c60da7c94d88d656bbc62106a16bd652052bc196cab56ee6d9e01c249 +size 2939899 diff --git a/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_ORM.png b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_ORM.png new file mode 100755 index 0000000000000000000000000000000000000000..47c3db5ef5a00f242074339be24e08233e0a0817 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_1/textures/Oak_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:754ccca3176ccb3bbeb648af574c57eb5be0b876c579faaf45f9e8a09f71ec39 +size 1171706 diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/.thumbs/256x256/Cabinet_100.usd.png b/Articulated_objects/small_furniture/cabinet/D1_2/.thumbs/256x256/Cabinet_100.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..35e30f71ab77a050f8e19916a3b26484eb4cf2f9 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/.thumbs/256x256/Cabinet_100.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48c52333451b7df75346d1fbe44305e814b02b180cf411fb998bc6c4784fc66b +size 28537 diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/Cabinet_100.usd b/Articulated_objects/small_furniture/cabinet/D1_2/Cabinet_100.usd new file mode 100755 index 0000000000000000000000000000000000000000..0751447bf6c33533fbf9d2eb77102e93e562f19e --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/Cabinet_100.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9c68af0638a7e2cb6ee1448e59874e5dc58626d3b24fe7dd357580627491c11 +size 3873561 diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak.mdl b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak.mdl new file mode 100755 index 0000000000000000000000000000000000000000..e61720aaa6b27a08f25d92b1ea9784ef793a99e8 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak.mdl @@ -0,0 +1,54 @@ +mdl 1.4; + +import ::OmniPBR::OmniPBR; +import ::anno::author; +import ::anno::description; +import ::anno::display_name; +import ::anno::key_words; +import ::anno::version; +import ::tex::gamma_mode; +import ::state::normal; + +export material Oak(*) +[[ + ::anno::display_name("Omni PBR "), + ::anno::description("Omni PBR, supports ORM textures"), + ::anno::version(1, 0, 0, ""), + ::anno::author("NVIDIA CORPORATION"), + ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) +]] + = ::OmniPBR::OmniPBR( + diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), + diffuse_texture: texture_2d("./Oak/Oak_BaseColor.png" /* tag 2821, version 274695127 */, ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(1.f, 1.f, 1.f), + reflection_roughness_constant: 0.5f, + reflection_roughness_texture_influence: 1.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.f, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Oak/Oak_ORM.png" /* tag 2825, version 1792070153 */, ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.f, 0.100000001f, 0.100000001f), + emissive_mask_texture: texture_2d(), + emissive_intensity: 40.f, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Oak/Oak_N.png" /* tag 2823, version 2115322746 */, ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_BaseColor.png b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_BaseColor.png new file mode 100755 index 0000000000000000000000000000000000000000..18b53db115bcd6cdae015f3ca956adf3764bc304 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58648d35e3b8a9d953948ce0394b56aa95184e1f88b5abab139e7a32a2b44043 +size 5383545 diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_N.png b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_N.png new file mode 100755 index 0000000000000000000000000000000000000000..6d2055c8f79a7d9b08e9ba8c588da078deffcabd --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4538148c60da7c94d88d656bbc62106a16bd652052bc196cab56ee6d9e01c249 +size 2939899 diff --git a/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_ORM.png b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_ORM.png new file mode 100755 index 0000000000000000000000000000000000000000..47c3db5ef5a00f242074339be24e08233e0a0817 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/D1_2/textures/Oak_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:754ccca3176ccb3bbeb648af574c57eb5be0b876c579faaf45f9e8a09f71ec39 +size 1171706 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/Cabinet_9.usd.png b/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/Cabinet_9.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..bb9ad8d6c52f3db3e295dd44583576b8b54e4f7d --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/Cabinet_9.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4624497e2490663b14983a63bbc59ab23c72137c9f6f66a7c1659363190c06f +size 34991 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/gui_2_1.usd.png b/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/gui_2_1.usd.png new file mode 100755 index 0000000000000000000000000000000000000000..c52ad855b8da2d917480db011929fb0d3ff77980 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/.thumbs/256x256/gui_2_1.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0aed050c1d8c1d5212f2620d726e9f85e7cb41960ec132b083dfcad01dac230 +size 18029 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Cabinet_9.usd b/Articulated_objects/small_furniture/cabinet/S1_3/Cabinet_9.usd new file mode 100755 index 0000000000000000000000000000000000000000..89c3776ec1ee7d6f14580a93bbfd6ee1847f301f --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Cabinet_9.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69dd3eeac4b8aaa165bb718436844b5762c01aab95af58345096a9059d787abe +size 2548445 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks.mdl b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks.mdl new file mode 100755 index 0000000000000000000000000000000000000000..ae04778831ceb95c57dc9c120a007a7f5bc9408c --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks.mdl @@ -0,0 +1,54 @@ +mdl 1.4; + +import ::OmniPBR::OmniPBR; +import ::anno::author; +import ::anno::description; +import ::anno::display_name; +import ::anno::key_words; +import ::anno::version; +import ::tex::gamma_mode; +import ::state::normal; + +export material Mahogany_Planks(*) +[[ + ::anno::display_name("Omni PBR "), + ::anno::description("Omni PBR, supports ORM textures"), + ::anno::version(1, 0, 0, ""), + ::anno::author("NVIDIA CORPORATION"), + ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) +]] + = ::OmniPBR::OmniPBR( + diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), + diffuse_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_BaseColor_1.png" /* tag 2746, version 2957239479 */, ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(.25, .25, .25), + reflection_roughness_constant: 0.5f, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.f, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_ORM_1.png" /* tag 2748, version 2172705328 */, ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.f, 0.100000001f, 0.100000001f), + emissive_mask_texture: texture_2d(), + emissive_intensity: 40.f, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_N_1.png" /* tag 2750, version 3347756142 */, ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_1.mdl b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_1.mdl new file mode 100755 index 0000000000000000000000000000000000000000..366eb8c5b748afcf33e599594f94f034b93eef21 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_1.mdl @@ -0,0 +1,54 @@ +mdl 1.4; + +import ::OmniPBR::OmniPBR; +import ::anno::author; +import ::anno::description; +import ::anno::display_name; +import ::anno::key_words; +import ::anno::version; +import ::tex::gamma_mode; +import ::state::normal; + +export material Mahogany_Planks(*) +[[ + ::anno::display_name("Omni PBR "), + ::anno::description("Omni PBR, supports ORM textures"), + ::anno::version(1, 0, 0, ""), + ::anno::author("NVIDIA CORPORATION"), + ::anno::key_words(string[]("omni", "PBR", "omniverse", "generic")) +]] + = ::OmniPBR::OmniPBR( + diffuse_color_constant: color(0.200000003f, 0.200000003f, 0.200000003f), + diffuse_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_BaseColor.png" /* tag 2746, version 2957239479 */, ::tex::gamma_srgb), + albedo_desaturation: 0.f, + albedo_add: 0.f, + albedo_brightness: 1.f, + diffuse_tint: color(.25, .25, .25), + reflection_roughness_constant: 0.5f, + reflection_roughness_texture_influence: 0.f, + reflectionroughness_texture: texture_2d(), + metallic_constant: 0.f, + metallic_texture_influence: 0.f, + metallic_texture: texture_2d(), + specular_level: 0.5f, + enable_ORM_texture: true, + ORM_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_ORM.png" /* tag 2748, version 2172705328 */, ::tex::gamma_linear), + ao_to_diffuse: 0.f, + ao_texture: texture_2d(), + enable_emission: false, + emissive_color: color(1.f, 0.100000001f, 0.100000001f), + emissive_mask_texture: texture_2d(), + emissive_intensity: 40.f, + bump_factor: 1.f, + normalmap_texture: texture_2d("./Mahogany_Planks/Mahogany_Planks_N.png" /* tag 2750, version 3347756142 */, ::tex::gamma_linear), + detail_bump_factor: 0.300000012f, + detail_normalmap_texture: texture_2d(), + project_uvw: false, + world_or_object: false, + uv_space_index: 0, + texture_translate: float2(0.f), + texture_rotate: 0.f, + texture_scale: float2(1.f), + detail_texture_translate: float2(0.f), + detail_texture_rotate: 0.f, + detail_texture_scale: float2(1.f)); diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor.png new file mode 100755 index 0000000000000000000000000000000000000000..f4c49eb4237090a6e3a487a4b0a1671b8e65371b --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3e69dacd264d481738b2a995ad793531515a153ec8a168e5c4b6d5a4dfb38ec +size 5750346 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor_1.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor_1.png new file mode 100755 index 0000000000000000000000000000000000000000..f4c49eb4237090a6e3a487a4b0a1671b8e65371b --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_BaseColor_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3e69dacd264d481738b2a995ad793531515a153ec8a168e5c4b6d5a4dfb38ec +size 5750346 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N.png new file mode 100755 index 0000000000000000000000000000000000000000..a722188af0b88e907fee8c73e013bd3b10fdb457 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b0e9d1611c4e1722085e15299197c69d9f813f0b77e96b476fc04b38407edb +size 5656449 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N_1.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N_1.png new file mode 100755 index 0000000000000000000000000000000000000000..a722188af0b88e907fee8c73e013bd3b10fdb457 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_N_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b0e9d1611c4e1722085e15299197c69d9f813f0b77e96b476fc04b38407edb +size 5656449 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM.png new file mode 100755 index 0000000000000000000000000000000000000000..27de5e7cc8ec3ad9ff88298262b1b761aa83e3ac --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fe20889ad4737833ca2a4425aedf28c1bf34a0d1730827bf4f0403482404797 +size 6246551 diff --git a/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM_1.png b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM_1.png new file mode 100755 index 0000000000000000000000000000000000000000..27de5e7cc8ec3ad9ff88298262b1b761aa83e3ac --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/S1_3/Textures/Mahogany_Planks_ORM_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fe20889ad4737833ca2a4425aedf28c1bf34a0d1730827bf4f0403482404797 +size 6246551 diff --git a/Articulated_objects/small_furniture/cabinet/bedside_table/.thumbs/256x256/model_bedsidetable.usd.png b/Articulated_objects/small_furniture/cabinet/bedside_table/.thumbs/256x256/model_bedsidetable.usd.png new file mode 100644 index 0000000000000000000000000000000000000000..8b86d9aad7c1382f78ed1da0703aefa739755e00 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/bedside_table/.thumbs/256x256/model_bedsidetable.usd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56986ed7986e5954b85f3e8948daa738673709498e2ec401286df3bf606a85a8 +size 68337 diff --git a/Articulated_objects/small_furniture/cabinet/bedside_table/model_bedsidetable.usd b/Articulated_objects/small_furniture/cabinet/bedside_table/model_bedsidetable.usd new file mode 100644 index 0000000000000000000000000000000000000000..a68593d8f1b1b754560f7a55be1f9250bdf159ce --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/bedside_table/model_bedsidetable.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cac2a23383218160eb6ff5fe3a258a7832b2d6804e7359afebc2d4485d5cd503 +size 61282 diff --git a/Articulated_objects/small_furniture/cabinet/bedside_table/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png new file mode 100644 index 0000000000000000000000000000000000000000..02caf2153922504cfa242c4ab69aaa7c299dabc5 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a90e4d6696ea994d8ecbdc704576c6729187805c6d1ab4188bef72e0567a39ea +size 3361250 diff --git a/Articulated_objects/small_furniture/cabinet/bedside_table/resource/material.usd b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..59160e21a1007dc8e33293e77f6b2f7ad4d5e660 --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:902a03448e2c2c74611032d65311cbf5886f9c62f40abf6f16d98a6def8e0257 +size 2132 diff --git a/Articulated_objects/small_furniture/cabinet/bedside_table/resource/v_69323/link_0_0.usd b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..dcd73705c68dc7959a87683d0f16b343f4d3092d --- /dev/null +++ b/Articulated_objects/small_furniture/cabinet/bedside_table/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cf85e3f2a30530cbd8a3df1cadb1b95ca47c079344b2bc3fb078e6f4a0484e7 +size 743144 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_1/cabinet_1.usd b/Articulated_objects/small_furniture/cabinet/cabinet_1/cabinet_1.usd index 29d3e0acd57fdc17a25728e31cf492a989e78dbd..7d3b65ae9bd6c37c366b773be0337057793c528f 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_1/cabinet_1.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_1/cabinet_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3fc9db197673e23fc4c073a9fba9b9c3ae96d3e7b907b77a7306d40b3d6839d -size 169544 +oid sha256:ae80f0549eb7505ea6a3c31a1cc3760eecebb7d3659fa67bb05cdafacc39161a +size 170387 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/extensions.json b/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/extensions.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/launch.json b/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/launch.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/settings.json b/Articulated_objects/small_furniture/cabinet/cabinet_1/resource/.vscode/settings.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_10/cabinet_10.usd b/Articulated_objects/small_furniture/cabinet/cabinet_10/cabinet_10.usd index f7c1cfd0c556450431a95a7c000be87c9ac6af68..c1227d92867981b56af15148348d0724311dbd35 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_10/cabinet_10.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_10/cabinet_10.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81f9fb98c4c57e272f0b70dad6522dae7cd17da32105b8d0cbf64477f18fad67 -size 493323 +oid sha256:0e958f1a8a0af14bb1616fcfaffa02bbd7206c6c6a48a68c5ffbd1181555a4a9 +size 493956 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_11/cabinet_11.usd b/Articulated_objects/small_furniture/cabinet/cabinet_11/cabinet_11.usd index a1ea0840c4f78600d80643ab2c24a80833711d0f..ba99bfc3ab118d1928ecc3c66d3ee615f0b3b8b2 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_11/cabinet_11.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_11/cabinet_11.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe6abe83153a2cb92c65f744f69ac14ae9c5b4e6148c587a2c16273dcfbe3a97 -size 202044 +oid sha256:73b987507b24c525f56034b5e92de642d6e76bbe178ff5c16c6b64ff0f9cae4c +size 202839 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_12/model_cabinet_12.usda b/Articulated_objects/small_furniture/cabinet/cabinet_12/model_cabinet_12.usda index 262f82a5e477a67f1ec1b2c09da238d51428d152..fa2b9ff6fb0a4a1460df1a40765ab7c0a21949c7 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_12/model_cabinet_12.usda +++ b/Articulated_objects/small_furniture/cabinet/cabinet_12/model_cabinet_12.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56c1999a4aff9f55920d2112509c00aa2ff49bbd779d379dd6d20c1a4e1854dc -size 11657728 +oid sha256:1f678b4b1da71f2a684490e4a5cad27d4b9edc4d205afa543a4da01be3d83b31 +size 11656618 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_13/cabinet_13.usd b/Articulated_objects/small_furniture/cabinet/cabinet_13/cabinet_13.usd index bb1bbbecfb72c4c92bbdec5b0b229e439b80efec..32d6bf04d013fd1b197363190a86a1ecbf5f6237 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_13/cabinet_13.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_13/cabinet_13.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3850e08475281bcacdb1c113c6d4495991b3baa3f6e189ddf1cd8a621cb7410e -size 48073 +oid sha256:46c110c06a87735c5c51f59c662a7afe1de57520c84e9a06430de525b62ff24f +size 48810 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_2/cabinet_2.usd b/Articulated_objects/small_furniture/cabinet/cabinet_2/cabinet_2.usd index 477be1dab7572e714c39affc11a825fcb0e393ff..7a5704ce5e777b33ca389e4eb5c4ced960e34798 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_2/cabinet_2.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_2/cabinet_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e1304f18cbc0052eaabc773a4c763bbfc7942dd3a06d6fadc2855d112f581b -size 2102914 +oid sha256:7a13473a4504265793475f4a3a2fa458d7cbde47a67dc7271f7c6c6d167beb6c +size 2103722 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/extensions.json b/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/extensions.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/launch.json b/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/launch.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/settings.json b/Articulated_objects/small_furniture/cabinet/cabinet_2/resource/.vscode/settings.json old mode 100755 new mode 100644 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_3/cabinet_3.usd b/Articulated_objects/small_furniture/cabinet/cabinet_3/cabinet_3.usd index c267485bc429a77a59e8f8d8dff7c6a029d5f66f..3441eaecae33f6fc8898220433dd4507e4665ac5 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_3/cabinet_3.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_3/cabinet_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1280003f44ec8ac9dce233c87b13340eb413594569bf41889ef7efa97b0428c8 -size 2673214 +oid sha256:fd8c2915fc405679a3e66e2577a7cd0bfde3259a2d0b4184557ceb120f76fb8f +size 2673907 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_4/cabinet_4.usd b/Articulated_objects/small_furniture/cabinet/cabinet_4/cabinet_4.usd index 57f3999a975bc62ee3ff648d28cc3f6ddc2c5c19..bd19b2816a54f032c4bb4b31c19248d3855484a9 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_4/cabinet_4.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_4/cabinet_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa4d64e4e678f1f9fa3ab0341d12c9c129739b04e296143d8663879faffd0641 -size 109554 +oid sha256:0dbcd9858e81da5cb1b7b55ef865535bcdf94aeae34917ff4e705374c3bc38ff +size 110128 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_5/cabinet_5.usd b/Articulated_objects/small_furniture/cabinet/cabinet_5/cabinet_5.usd index 1902774801ac4f048f6d17a5da418b16dd624325..4b49b7d22ef006df022d0b91209f97b252c794cf 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_5/cabinet_5.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_5/cabinet_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88351a3496c1301de27d9bc9a31efe4afb7e61e3f06b4deacba06bcb1f4606a1 -size 4846776 +oid sha256:f58a67026b37ae1973f9ff636bb5ac4cbe718e741e6b9f6c389281be182a6df2 +size 4848219 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_6/cabinet_6.usd b/Articulated_objects/small_furniture/cabinet/cabinet_6/cabinet_6.usd index e60e3a02796e83b658135f863cc3a810e5ed57d0..8cb8116be369407585d6f7204f348fa29f6da175 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_6/cabinet_6.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_6/cabinet_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce5bbcd38cb3991581972e58519dc53740a24b6b999d3b4b82c14aac8f200359 -size 401227 +oid sha256:a84a52821edc5a7e473f275fe102ee1dae0d4306a3966a8712aff08ec6d003bd +size 402258 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_7/cabinet_7.usd b/Articulated_objects/small_furniture/cabinet/cabinet_7/cabinet_7.usd index fcd36e431a52d46edb3bb16715ebaa23b6c096f7..d05fc82227a786d2af2e37320000781082ed75ca 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_7/cabinet_7.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_7/cabinet_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54b10dbf6ed5abbb28f975fa8c311110d85cc06b190ac12daf09ef89bccfcbe1 -size 502601 +oid sha256:aeecb8ae0c83a0980025bc6c5bd0a7b63978484681c34d47414d7243073d98ac +size 503592 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_8/cabinet_8.usd b/Articulated_objects/small_furniture/cabinet/cabinet_8/cabinet_8.usd index 20aa34e5d2893d0127208097fbe1ae4b5667c94d..7e68be8b0d53c851b5e2a8fe840624bda8dc586c 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_8/cabinet_8.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_8/cabinet_8.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faeeb57e38097c3d6720e0927194c737c270f13a54b8f13e38b4850a81fb3a4d -size 3726211 +oid sha256:b4c196f6c429c919ff57062aa35ecac53098c54a457822dec6dca6d925a17aa7 +size 3727160 diff --git a/Articulated_objects/small_furniture/cabinet/cabinet_9/cabinet_9.usd b/Articulated_objects/small_furniture/cabinet/cabinet_9/cabinet_9.usd index bc8a481f99a3fc33a574fa02f1d93363a8399f51..7fc8c0651fc08ff384907e44f367afcaf9c4c535 100644 --- a/Articulated_objects/small_furniture/cabinet/cabinet_9/cabinet_9.usd +++ b/Articulated_objects/small_furniture/cabinet/cabinet_9/cabinet_9.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d851d1c0effb9a812f2548a4d32c1ec8a8c8437749dfd949307b98d7cf8a69fa -size 2045216 +oid sha256:653e4599dc734e4ba0f82a430071742688aafb72173c135faf1e877184d322ac +size 2046167 diff --git a/Articulated_objects/small_furniture/chair/chair_1/model_chair_1.usda b/Articulated_objects/small_furniture/chair/chair_1/model_chair_1.usda index b77343be9fd404738c864c3d87a64906db2f028d..4653831f85b7d2fbd02b5d69dd99c97b13b5f3c4 100644 --- a/Articulated_objects/small_furniture/chair/chair_1/model_chair_1.usda +++ b/Articulated_objects/small_furniture/chair/chair_1/model_chair_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eafc945adce8b63a18e8a7b844c6aa62f82246483cda5128665e1b8b6a1e055 -size 10364418 +oid sha256:7dc0264a3e369dae164818c36937f44bbca2f341bc43e6dd6c5572a41a714613 +size 10364068 diff --git a/Articulated_objects/small_furniture/chair/chair_2/model_chair_2.usd b/Articulated_objects/small_furniture/chair/chair_2/model_chair_2.usd index 0384443134012b7229c88788c620ffd6dc6842ca..c4dae2d919d05801d9bb4c9dc55fdcebcccfb418 100644 --- a/Articulated_objects/small_furniture/chair/chair_2/model_chair_2.usd +++ b/Articulated_objects/small_furniture/chair/chair_2/model_chair_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1976e9aec5897fbf8c1863976b5996a4506fc14bfc93586f4ab442e31a31c293 -size 764701 +oid sha256:42d92d9eb510b1d5071fd12766bbd9f634a6b9bcd1b287d738f6852d793d2199 +size 765336 diff --git a/Articulated_objects/small_furniture/chair/model_office_chair_3/model_office_chair_3.usd b/Articulated_objects/small_furniture/chair/model_office_chair_3/model_office_chair_3.usd index 44a2d307d90159986d1c7fdce69ecf9b2efda92a..8f49c59331ba1b0cb308f6ba2b4e2c2cccceaf38 100644 --- a/Articulated_objects/small_furniture/chair/model_office_chair_3/model_office_chair_3.usd +++ b/Articulated_objects/small_furniture/chair/model_office_chair_3/model_office_chair_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c7c62af7c88d6b2a4f48de9fb1632ac1c8fdb323a6d900caec733e2c306cbbe -size 1060794 +oid sha256:3d8f4120abe8c32ff6a1d592ca23dd1da5e1e793014bb56e9faaa1fb65b20368 +size 1063419 diff --git a/Articulated_objects/small_furniture/chair/model_office_chair_3/resource/v_0/link_default_0.usd b/Articulated_objects/small_furniture/chair/model_office_chair_3/resource/v_0/link_default_0.usd index f1fc57c081ec4f507bf0db7bc14cbab9a64e8d36..16b8ef2dcacf2d05f3b1a1904a0d5e50b85fb203 100644 --- a/Articulated_objects/small_furniture/chair/model_office_chair_3/resource/v_0/link_default_0.usd +++ b/Articulated_objects/small_furniture/chair/model_office_chair_3/resource/v_0/link_default_0.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bc118df9f9aef28a5c589ac5312f7243da2a3f0b119f935515c95bc7f555460 -size 9820279 +oid sha256:e69fa26fdd347ad5ded728562aceafa09adf5849c93843994bdad21b5a7c4beb +size 9825932 diff --git a/Articulated_objects/small_furniture/faucet/faucet_10/model_faucet_10.usda b/Articulated_objects/small_furniture/faucet/faucet_10/model_faucet_10.usda index 2095e1262b5f86ea3a07000895833b28bd87037c..5a5c5c476c8f31dbfda56d796f91998aece3bb12 100644 --- a/Articulated_objects/small_furniture/faucet/faucet_10/model_faucet_10.usda +++ b/Articulated_objects/small_furniture/faucet/faucet_10/model_faucet_10.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2af946d81f02e37c50cddde4001e2e612acd38246d48e16e7850712c30824eac -size 1166404 +oid sha256:c1e09ddb8684454ae1672503c358997db35c0ea8df1dd447500975ef0de06bc1 +size 1165918 diff --git a/Articulated_objects/small_furniture/faucet/faucet_3/model_faucet_3.usd b/Articulated_objects/small_furniture/faucet/faucet_3/model_faucet_3.usd index 97643ad434fdb8c50e7ec3edb4b70314b8b181fb..41af10360b43b089d6fd88ae2a14c090e50a037b 100644 --- a/Articulated_objects/small_furniture/faucet/faucet_3/model_faucet_3.usd +++ b/Articulated_objects/small_furniture/faucet/faucet_3/model_faucet_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6f363d7c3ba5e18a93ddc882060eb83fe31c7139e87ce5f2541fef1605d689e -size 10295 +oid sha256:a58e310416860a49706d6dfbf8a61f935f03745de90263ca52486bc2b771ab08 +size 10829 diff --git a/Articulated_objects/small_furniture/faucet/faucet_4/model_faucet_4.usd b/Articulated_objects/small_furniture/faucet/faucet_4/model_faucet_4.usd index aa79e0021d0938224eedf1181e9eb107fa15097c..7e82779fa0982572211df4ee06ebc13af777c558 100644 --- a/Articulated_objects/small_furniture/faucet/faucet_4/model_faucet_4.usd +++ b/Articulated_objects/small_furniture/faucet/faucet_4/model_faucet_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cf40b87bcb13938a172f04bea7c575ba759bc2b6816f3fcef66d4c2777c157a -size 8399 +oid sha256:ab4b3d9cb5f9cb459045d9ea1333ce573c45d2d6dd74521c17b0b550933412f5 +size 8957 diff --git a/Articulated_objects/small_furniture/faucet/faucet_7/model_faucet_7.usda b/Articulated_objects/small_furniture/faucet/faucet_7/model_faucet_7.usda index 8657fb0358c02befde65318c9cf88c109a18204a..8fa5436b11d5d9cf28799996057848519ac41a56 100644 --- a/Articulated_objects/small_furniture/faucet/faucet_7/model_faucet_7.usda +++ b/Articulated_objects/small_furniture/faucet/faucet_7/model_faucet_7.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b692ea9496282c414d9ed257ce565ae4db69acd9e7895f337b1aac93d33dd1b5 -size 6986 +oid sha256:5c6ddbee50504d1d8b27f24941594c3e8f368761cbbf379a814d149ce4d20278 +size 6696 diff --git a/Articulated_objects/small_furniture/faucet/faucet_9/model_faucet_9.usda b/Articulated_objects/small_furniture/faucet/faucet_9/model_faucet_9.usda index acae192818bb28ccf5d6a060af28031698bcce89..3ace47e043384ba80e0a3b7fea0045fd60ced84b 100644 --- a/Articulated_objects/small_furniture/faucet/faucet_9/model_faucet_9.usda +++ b/Articulated_objects/small_furniture/faucet/faucet_9/model_faucet_9.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24fa3b91a7251e1aca6da762f5255400e25f6d6c47cebaf0caa3940ed65a87d7 -size 7060 +oid sha256:5fe3b105ead9fd7747af88138e0d119ebfa61ead61cd72277c43e8fc28e99ef0 +size 6770 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_1/model_double_door_1.usd b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_1/model_double_door_1.usd index 9803013c9ac340786ddfbcbd5263586117764df5..8fcfc718c353b494c2f9c1ff0c5a16f548b99527 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_1/model_double_door_1.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_1/model_double_door_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12255d24caa3a9108efaed94700adec43486323af924fd0c92eda1815f8ccd48 -size 2685126 +oid sha256:7786092706962229db63e27fbbb6d66bcf2935aa128f5b32238c055f94223dee +size 2686276 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_2/model_double_door_2.usda b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_2/model_double_door_2.usda index 2c771103800b69d48e879f51f97f9bf0a9eb4d86..94c9dc3236d614d4240aefcdbe186cb40fd0fdb0 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_2/model_double_door_2.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_2/model_double_door_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:312f92301ed01cd7d266cc06ec8f718d71ce179a6d9c218b50466a82ea11d4ac -size 21585 +oid sha256:0e6df4ffaf666c5c2734da8baf37b457bb51f17448d738f9d6e3ee8f75d7cd94 +size 20567 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_3/model_double_door_3.usd b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_3/model_double_door_3.usd index 40c8fa014bfe3a43fab416a7933212abac07b75d..d6610c7e27ccb2ef9eabbbce28882bdb9823dc48 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_3/model_double_door_3.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_3/model_double_door_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03af790b067ad38d7dfd2cce5c9344bd6a996c989e69efdec49fb0942df87a8e -size 1205243 +oid sha256:21f03a8fecd9c3d6473c6b2a33080d0f3bf211ccf4ad0137f52e3820ad91794d +size 1206240 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_4/model_double_door_4.usd b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_4/model_double_door_4.usd index f65de904e94f3134daee981226ffb604df7e694b..474c3455cfa07f88567d9c569b475fd191d28ae5 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_4/model_double_door_4.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_4/model_double_door_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21b280548c4fabbe5d7e376138b96391292947702882d1e7ebc9fe11cb9d453d -size 2083977 +oid sha256:be5b62a33e7f7cd26a952772ea9d0853a6e464f815edae130d9fc978c4657dc6 +size 2085209 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/double_door_5.usdc b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/double_door_5.usdc new file mode 100644 index 0000000000000000000000000000000000000000..c8dfca0da8718898ddf19660c94b5e442e637666 --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/double_door_5.usdc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cd67d745cc4bc6259cd07a0a6daf3c050872164c06819726981bda0a3abf89f +size 3893882 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_diffuse_xtm.png b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_diffuse_xtm.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8cf545dfa53982b5d1b6e8c05f40a79d5a1661 --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_diffuse_xtm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab639aa604f8ff565e8bf04c21bf6870714b0096cfb88dd7c46c929146202a4e +size 174985 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_normal_xtm.png b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_normal_xtm.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf5d08f5b80cfb8f6a8e575eb40bf863a0d4a5d --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_normal_xtm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a25ccbe9c4ef459659cf4a2ed5f86d5e64f3ab5a491f2b12d15d194c1bed7512 +size 528688 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_roughness_xtm.png b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_roughness_xtm.png new file mode 100644 index 0000000000000000000000000000000000000000..d46c5bf939d52111368fe291c82e133fc8cb63ae --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/Arrows_road_marking_01_roughness_xtm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc9a11340771584481116d1da993de64785790323b3d18d7ace3700a133433c3 +size 221856 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_diffuse_xtm.jpg b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_diffuse_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4223408c09d5e95f1609eb13090b4435c0a83f80 --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_diffuse_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88fea5bb5bc3034b682f35aaa24ae93be643c80eacdb9000ed61f55d95a9224b +size 648090 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_normal_xtm.jpg b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_normal_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..591444e833d2a47fda1b95d0add5a3976822a421 --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_normal_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bce5610d912dde5dd21cc356d2f0a3827eff73b577b01d5963cd164643f573aa +size 291878 diff --git a/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_specular_xtm.jpg b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_specular_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b356db3393c5ce464387dc59b5bb51b35e5ac500 --- /dev/null +++ b/Articulated_objects/small_furniture/filing_cabinet/double_door/double_door_5/textures/concrete_white_specular_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e34631157ed52f6a283649e32d514d6086d09ab3266f0bf9d23d9a1839c8e9b3 +size 359054 diff --git a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_1/model_chest_of_drawers_1.usd b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_1/model_chest_of_drawers_1.usd index edaf079a121c138382f48391cb23dc4c79576b86..f6e06fdc11ca7f7676fcf713368ee8d1aff57a70 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_1/model_chest_of_drawers_1.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_1/model_chest_of_drawers_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11ee6fcd9bab436cc2068a88cde31b90d1294ec31063c2f684152f52fa6c74e9 -size 17493 +oid sha256:fbc6589ee13495e60127b3de3f634b5cd7bad18ebeb2a5ba19579643be3e8200 +size 18662 diff --git a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_2/model_chest_of_drawers_2.usda b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_2/model_chest_of_drawers_2.usda index a810d6d06044e7e2d97df227aeab53d09704a775..33a70d27d1d0da9a014bdabe517332ca20682f83 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_2/model_chest_of_drawers_2.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_2/model_chest_of_drawers_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:223a41c924faf476f2ec9f7b785cde522c25fe7700ba1df5e8ba8cceab4a156c -size 17950 +oid sha256:b3e80dc981129122c49926fc9f04d310b8ce2e43c2e1fbc35ce2647eb30bb35f +size 17660 diff --git a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_3/model_chest_of_drawers_3.usd b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_3/model_chest_of_drawers_3.usd index 450340585ed7eea4cfd335b5458afe69fa2b07ad..299a56270b55933d4df24e997806f9964c8a22d2 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_3/model_chest_of_drawers_3.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_3/model_chest_of_drawers_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4e246753cd1e302be99a803afc586b7c3a54dfa3898604856de669488f3018f -size 130619 +oid sha256:22dffe1ee8bc2cc7b0eff78992df219f5cf3186a79788529b89a7ac0f41e81b0 +size 132717 diff --git a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_4/model_chest_of_drawers_4.usda b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_4/model_chest_of_drawers_4.usda index d4d219a880614017ef6d3d768797f28132049cd1..e6f8664c4dff480c69cdf224a229e64ac99f8548 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_4/model_chest_of_drawers_4.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_4/model_chest_of_drawers_4.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5e5e9414ca447b5a3aa9c5b46cdddf9ef07a5763d9e0e5dfe98b994a602a64 -size 340535 +oid sha256:5eb1d6b54175146e24c1ec56abfebf76b88eaaffa45414770076a89dfcd6c996 +size 339841 diff --git a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_5/model_chest_of_drawers_5.usda b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_5/model_chest_of_drawers_5.usda index d2b296d542d7830112ef139a7e601f651bf3fc98..88235554c3946cc657901bb91fe8efecd593e4c8 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_5/model_chest_of_drawers_5.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/drawers/chest_of_drawers_5/model_chest_of_drawers_5.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9200fd96de35a6406c58b57735803f286a072bffc9b885f9c5c8cb492c3fad12 -size 1534092 +oid sha256:1d3643f0775b00d5a68a4e9d149fccd3c44c3904bc0006bd23dc2a6c5b2dd89e +size 1532998 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_1/model_sliding_door_1.usd b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_1/model_sliding_door_1.usd index 17b03c7bd478242daaab1f272c7a3d38f488ddc4..c1038510ba912232cc342aae875db3e06ef645ca 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_1/model_sliding_door_1.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_1/model_sliding_door_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c7071b6c2f51c518391efeaab9cafda3c9cd30730d1ea9ad9efc1ce14f2f2c1 -size 19120 +oid sha256:f38274b927fb85d38a946b4f3ade031005107b47384294c1513d06ed1fcd86d2 +size 19820 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_2/model_sliding_door_2.usda b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_2/model_sliding_door_2.usda index 5636a26fb2032897ef452a03a5bdb9b21277de99..20dc0a109f3bed10d076f8c770155edeefacee61 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_2/model_sliding_door_2.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_2/model_sliding_door_2.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7e6af3e8a74ed887beeab088b664f689a6923f9212f32f38471ce42e3f6cb01 -size 11292 +oid sha256:2cc97f8cefd3bcae6363badbca5d331806db75366f907270fa99e0cc9db81827 +size 10736 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_20/model_sliding_door_20.usd b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_20/model_sliding_door_20.usd index f37bb219a13035cb020549dcb43f5174193dc84c..1bc5249656f69f6a162b99fe8ad233903e3be376 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_20/model_sliding_door_20.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_20/model_sliding_door_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:950778ece6cea9508d520e3344ef223590c16c9a0c86e7d4477f0a24c86c7770 -size 688777 +oid sha256:31e91e96835767de725295e1b138cbbbda9ba62bc7edce03d65efef4ab63551d +size 689600 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_3/model_sliding_door_3.usd b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_3/model_sliding_door_3.usd index a1c57dce7757b950dc570bdcb90d8370abe363d9..44826226892dd3c6598d2825f8627defd3ef69c9 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_3/model_sliding_door_3.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_3/model_sliding_door_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:983f72eb1c37a7d612e423ba525777d51b977e3d10bf9aa6f40c608bcb568c9f -size 460557 +oid sha256:18d6a80d6855a2eb98143e290fe8b075c9de93665f5261336180cb0aa3f06050 +size 461526 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_4/model_sliding_door_4.usda b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_4/model_sliding_door_4.usda index da3fdc2868ce6b80ed88f0af316e67a9e1b128f3..b33f92f4ba8bbaa0da757bf913fcb68cb87d996d 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_4/model_sliding_door_4.usda +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_4/model_sliding_door_4.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ff297048fac8c608a50f30c97c77a42df6a5c74c4a7773dc5557f02071f20e5 -size 1992257 +oid sha256:f7ed0d86d23127c246cabc323b9e647055d5ab5a69cd48b292a1197838f78f1e +size 1991661 diff --git a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_5/model_sliding_door_5.usd b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_5/model_sliding_door_5.usd index 6c666a9b1d0c8eef7c9ad68c4902550536f0b016..ec47db1ac00408ad5b9c9ba4bfa443e4e24fb0c1 100644 --- a/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_5/model_sliding_door_5.usd +++ b/Articulated_objects/small_furniture/filing_cabinet/sliding_door/sliding_door_5/model_sliding_door_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3740db104aea41dcfe8800a95ee70854536983938e606aff05bab9cf4889f955 -size 221052 +oid sha256:4af6b77d0e752f3a6003382d22961965215bc38962b8ac257ecaf664ba702849 +size 221856 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_1/model_flip_shoe_cabinet_1.usd b/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_1/model_flip_shoe_cabinet_1.usd index df1cad9952557993460efb1b1033603ba537c565..cfab51d2d7e922c0f3a913d28961d3db542ad13c 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_1/model_flip_shoe_cabinet_1.usd +++ b/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_1/model_flip_shoe_cabinet_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e75b5f113bf6ab04c4a480828c90dffabda51ac4ba962b759528fc9e79a42b0f -size 13995 +oid sha256:8c3f7d2cbb5354a8cd38534f8bd7f0e10d66e7df07c2fbe21773ca7835338b64 +size 14834 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_2/model_flip_shoe_cabinet_2.usd b/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_2/model_flip_shoe_cabinet_2.usd index 478a0b59bef2ef7b852a2eac231c2b9378b762dd..0977367ec83e8394680ada027c158253955090dd 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_2/model_flip_shoe_cabinet_2.usd +++ b/Articulated_objects/small_furniture/shoe_cabinet/flip_shoe_cabinet_2/model_flip_shoe_cabinet_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc4f7ce0bfb2120ca9c5be9cfce133ed4022c136c79ceaf0d6f3fc3f8592da7f -size 14462 +oid sha256:b2edd49d31a90da50654c72e86ddb916719f39f8875c768a1507c7c3465b101e +size 15088 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_1/model_pull_shoe_cabinet_1.usd b/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_1/model_pull_shoe_cabinet_1.usd index 112294b26776c05012191cae8d2b74cf2635b661..ba0a0460de41dcff3a6c8fa3f199b3a5acfcbf38 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_1/model_pull_shoe_cabinet_1.usd +++ b/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_1/model_pull_shoe_cabinet_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa5caee9df7d1f28fbbbe61f8a628f339167532a06caa6c35462a5d6adb8a8a0 -size 789494 +oid sha256:e28c51e014a452bad18e0761d84eec992abb25fc266a921784477ff82eaf0d4e +size 790049 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_20/model_pull_shoe_cabinet_20.usd b/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_20/model_pull_shoe_cabinet_20.usd index c79cfcd32f9d4d85e447efa5e013a4ea87a57dfc..d2fb6b871776ccabec1b39a487b4ca2e10135c7a 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_20/model_pull_shoe_cabinet_20.usd +++ b/Articulated_objects/small_furniture/shoe_cabinet/pull_shoe_cabinet_20/model_pull_shoe_cabinet_20.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f729ea82d0bef093e0118899d5a164d8c9bf72307ea9083a8c4f26014d869f1 -size 9197507 +oid sha256:ee74db2ef08b86403f45b24a5854c387d8ab21373b0ba6d557cb11202b087ee9 +size 9199920 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_1/model_shoe_cabinet_1.usda b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_1/model_shoe_cabinet_1.usda index 362713b5bc857eefbe0d5b2972fd2c3b78bbfc7c..ba22ad856d80c9d3ccfce2b631895c630c877933 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_1/model_shoe_cabinet_1.usda +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_1/model_shoe_cabinet_1.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac7db4c7a7d10bee6fe4bea762bd4648cdb20ee57f6c818b08360f687d3afbf5 -size 32959038 +oid sha256:d0289e0fea764ed20818936bb8a931ddf069a81f5d0bc3d36814ed29e88d3ce4 +size 32958340 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_2/model_shoe_cabinet_2.usd b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_2/model_shoe_cabinet_2.usd index 47c3cb16b221365504d4384a7b5cee2b0f9efeea..542db8dac7965a3b3f2f51394b5399b1d8841e11 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_2/model_shoe_cabinet_2.usd +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_2/model_shoe_cabinet_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ee49cd70b3eb93bbfb2b8a194a205c2e3c16728e4393aab0e0994a5f7b665e5 -size 23644445 +oid sha256:08864e4e2bfb93baa3c1d245e40d676dd4a482071a1306f620680458d8bd349b +size 23645637 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_4/model_shoe_cabinet_4.usda b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_4/model_shoe_cabinet_4.usda index 339fc2a6dd4e0484da9f5be924c0c8be69480c45..45ae4ca010da54ad6206124bad3736e3c7dad710 100644 --- a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_4/model_shoe_cabinet_4.usda +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_4/model_shoe_cabinet_4.usda @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f6e691f3bdb5c205277e6390946cfc0aacf4b35709425457fa5348ea4d24647 -size 3568591 +oid sha256:f4f14b31653a49bb95fbd766878f737b2bf574eeded8e4f078fa3c3e96932d8f +size 3567489 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/shoe_cabinet_5.usdc b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/shoe_cabinet_5.usdc new file mode 100644 index 0000000000000000000000000000000000000000..6a3d90aa6577c89f57453973b68838e0c4315d9b --- /dev/null +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/shoe_cabinet_5.usdc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc7dc5fbcaa9288c5a73a0c10d40c62aa1b4d4748114b68ab5f0f59aea724d2e +size 1160233 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_diffuse_xtm.jpg b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_diffuse_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4223408c09d5e95f1609eb13090b4435c0a83f80 --- /dev/null +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_diffuse_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88fea5bb5bc3034b682f35aaa24ae93be643c80eacdb9000ed61f55d95a9224b +size 648090 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_normal_xtm.jpg b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_normal_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..591444e833d2a47fda1b95d0add5a3976822a421 --- /dev/null +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_normal_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bce5610d912dde5dd21cc356d2f0a3827eff73b577b01d5963cd164643f573aa +size 291878 diff --git a/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_specular_xtm.jpg b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_specular_xtm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b356db3393c5ce464387dc59b5bb51b35e5ac500 --- /dev/null +++ b/Articulated_objects/small_furniture/shoe_cabinet/shoe_cabinet_5/textures/concrete_white_specular_xtm.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e34631157ed52f6a283649e32d514d6086d09ab3266f0bf9d23d9a1839c8e9b3 +size 359054 diff --git a/Articulated_objects/small_furniture/table/ShoolDesk/model_shoolDesk.usd b/Articulated_objects/small_furniture/table/ShoolDesk/model_shoolDesk.usd new file mode 100644 index 0000000000000000000000000000000000000000..5a3929932d6a45fe337058d2dc14c21030ae554a --- /dev/null +++ b/Articulated_objects/small_furniture/table/ShoolDesk/model_shoolDesk.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77d7f006543c2d489b420f580be8d1018837c68ce8cfdec6f602d0eb2853767f +size 7460 diff --git a/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png b/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png new file mode 100644 index 0000000000000000000000000000000000000000..02caf2153922504cfa242c4ab69aaa7c299dabc5 --- /dev/null +++ b/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/2d8335fb6f80124b8b827f1e46cce2e0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a90e4d6696ea994d8ecbdc704576c6729187805c6d1ab4188bef72e0567a39ea +size 3361250 diff --git a/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/678cfe0809ef5935996568aaa49d92e5.png b/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/678cfe0809ef5935996568aaa49d92e5.png new file mode 100644 index 0000000000000000000000000000000000000000..a56eaa7b020c47cb8d1881e9246a6906e4d2d0ed --- /dev/null +++ b/Articulated_objects/small_furniture/table/ShoolDesk/resource/img/678cfe0809ef5935996568aaa49d92e5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09b7574a5828dd9f6cce4f8e937056411a77f167a5bf3c49c4d7ffb2ec69488f +size 344967 diff --git a/Articulated_objects/small_furniture/table/ShoolDesk/resource/material.usd b/Articulated_objects/small_furniture/table/ShoolDesk/resource/material.usd new file mode 100644 index 0000000000000000000000000000000000000000..3d93fdb223fa06c48d9e35cb4e1d33f71b1d1d5c --- /dev/null +++ b/Articulated_objects/small_furniture/table/ShoolDesk/resource/material.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4029e674899f3f0294439c6bfc9a189177c9262fcd26907737c0b4e8f2a8107 +size 2774 diff --git a/Articulated_objects/small_furniture/table/ShoolDesk/resource/v_69323/link_0_0.usd b/Articulated_objects/small_furniture/table/ShoolDesk/resource/v_69323/link_0_0.usd new file mode 100644 index 0000000000000000000000000000000000000000..0304371d7f9e3d99679751923887a1417c1a44a2 --- /dev/null +++ b/Articulated_objects/small_furniture/table/ShoolDesk/resource/v_69323/link_0_0.usd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:042bc192ebafdbe2907a7c432a7e8d816339b6bd711033387a351996840b6338 +size 1513506 diff --git a/Articulated_objects/small_furniture/table/table_1/model_table_1.usd b/Articulated_objects/small_furniture/table/table_1/model_table_1.usd index e3a58763bb6f34653dececefe8cf6c88afce57a9..18e63a3ea58ece0dfac3cc01be14f93ba05cbe65 100644 --- a/Articulated_objects/small_furniture/table/table_1/model_table_1.usd +++ b/Articulated_objects/small_furniture/table/table_1/model_table_1.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:338f6ed18a56897d9ece69e66fb67303826af236baf9cb65a45b54ef8fca0d44 -size 1115244 +oid sha256:ebaf2819e97722a9507b1eceda33ec105f0a23504c41d296be0f37ff1c631108 +size 1116038 diff --git a/Articulated_objects/small_furniture/table/table_2/model_table_2.usd b/Articulated_objects/small_furniture/table/table_2/model_table_2.usd index 9330616e2426ff9fbe5434556c53e83c51cbcde6..894470e6314ad83ab77bbabcb9d8ebb149196dc9 100644 --- a/Articulated_objects/small_furniture/table/table_2/model_table_2.usd +++ b/Articulated_objects/small_furniture/table/table_2/model_table_2.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81a6ba3b06037f8974e819fa9a6a5cd30d8089cea822c13e6755abb4ef33b13c -size 1044779 +oid sha256:3a870638059fdb93307dae12f2be1f81a9d02d88936610c2408ab760878cd869 +size 1045693 diff --git a/Articulated_objects/small_furniture/table/table_3/model_table_3.usd b/Articulated_objects/small_furniture/table/table_3/model_table_3.usd index c17f2f2ff93ff6b1c400f93b2fb5d4729473b753..a2935be32467d3d634179c6e49d12db65ecbe951 100644 --- a/Articulated_objects/small_furniture/table/table_3/model_table_3.usd +++ b/Articulated_objects/small_furniture/table/table_3/model_table_3.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1abf467134dc1b9cd0ad9c1183774c0d843bf33e827f2c9d3a0035c78df7ba1d -size 1576421 +oid sha256:df23eb3585a66871749c7abead7daec3a2d4631950332359c5f73c2272176acc +size 1577705 diff --git a/Articulated_objects/small_furniture/table/table_4/model_table_4.usd b/Articulated_objects/small_furniture/table/table_4/model_table_4.usd index 5263d86840cdce2923cf11b0fd4eb91b3e79503d..b14f9dbc07bac26dffb2c62ad8fbfee87d8bd73d 100644 --- a/Articulated_objects/small_furniture/table/table_4/model_table_4.usd +++ b/Articulated_objects/small_furniture/table/table_4/model_table_4.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82e803fb02658fe3ad18be6b8f66d77f92de81b108c80e8587466d4aa84cfc90 -size 13882 +oid sha256:10ad5700f6121e98b80adccdf0e228ec02bbf6cac705c82bc827cf3d2cb4553a +size 14406 diff --git a/Articulated_objects/small_furniture/table/table_5/model_table_5.usd b/Articulated_objects/small_furniture/table/table_5/model_table_5.usd index 9fdee668ceca8391bff67d90375a60e7cacf5f6a..9886fb99cd7473d6655c005f28aaced9c89a0043 100644 --- a/Articulated_objects/small_furniture/table/table_5/model_table_5.usd +++ b/Articulated_objects/small_furniture/table/table_5/model_table_5.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe27baf0a201e8b195edb290252e456e506b692a252ed1f36fee9e2090451024 -size 194398 +oid sha256:37b211add383a8d2a3399aafafc840121e007f0d0a8c988eefa4e4ce4aaa927f +size 195148 diff --git a/Articulated_objects/small_furniture/table/table_6/model_table_6.usd b/Articulated_objects/small_furniture/table/table_6/model_table_6.usd index c08a86e0e61ac6a749290ab943b51f586f2c6f6a..2f1041ce855306195abe444e74acbb976250ea68 100644 --- a/Articulated_objects/small_furniture/table/table_6/model_table_6.usd +++ b/Articulated_objects/small_furniture/table/table_6/model_table_6.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b86af5484cf063e072b4e707d0fea8657ded662c7becf581478817a7312ca3b -size 95899 +oid sha256:af29ed880302b3ffd526e6f29a57a7f016c4cad3b7a7a6753119fad85416d966 +size 96594 diff --git a/Articulated_objects/small_furniture/table/table_7/model_table_7.usd b/Articulated_objects/small_furniture/table/table_7/model_table_7.usd index d6b546987e012f8260dbc540454f1a45288334c0..572385f129dda43c491480bf3db8eeebaa67bb3d 100644 --- a/Articulated_objects/small_furniture/table/table_7/model_table_7.usd +++ b/Articulated_objects/small_furniture/table/table_7/model_table_7.usd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5afb803761c60dfeef9914f7ce5ec881686b0ec57d2b4b10c51725ee335d4121 -size 33726 +oid sha256:72a6e28917aa178e223b34a69b84fab11c99035ee9a65571149fb705bc7820b8 +size 34697 diff --git a/README.md b/README.md index c345de95c7c556cf8bb11bfd7cab0f2a426c77c9..f10243ccefd891ceb5c1341a128b551af6bc1d4a 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Formats: ## Key Features -✅ 428 high-quality digital-twin articulated objects. +✅ 476 high-quality digital-twin articulated objects. 