From 3df99ab2e51b6f988d1eeed97294ed5df9e54cc9 Mon Sep 17 00:00:00 2001 From: Bernard Kwok Date: Wed, 12 May 2021 16:24:17 -0400 Subject: [PATCH] Move "unlit_surface" shader to proper library location (#1199) * Move unlit_shader to pbrlib and no longer make it an "adsk" definitoin. * Rename test file. --- libraries/adsk/adsklib/unlit_surface.mtlx | 95 ----------- libraries/pbrlib/unlit_surface.mtlx | 147 ++++++++++++++++++ .../TestSuite/adsklib/adsk_unlit_shaders.mtlx | 93 ----------- .../surfaceshader/unlit_surfaceshader.mtlx | 123 +++++++++++++++ 4 files changed, 270 insertions(+), 188 deletions(-) delete mode 100644 libraries/adsk/adsklib/unlit_surface.mtlx create mode 100644 libraries/pbrlib/unlit_surface.mtlx delete mode 100644 resources/Materials/TestSuite/adsklib/adsk_unlit_shaders.mtlx create mode 100644 resources/Materials/TestSuite/pbrlib/surfaceshader/unlit_surfaceshader.mtlx diff --git a/libraries/adsk/adsklib/unlit_surface.mtlx b/libraries/adsk/adsklib/unlit_surface.mtlx deleted file mode 100644 index a1813432a9..0000000000 --- a/libraries/adsk/adsklib/unlit_surface.mtlx +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libraries/pbrlib/unlit_surface.mtlx b/libraries/pbrlib/unlit_surface.mtlx new file mode 100644 index 0000000000..b66ae56910 --- /dev/null +++ b/libraries/pbrlib/unlit_surface.mtlx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/Materials/TestSuite/adsklib/adsk_unlit_shaders.mtlx b/resources/Materials/TestSuite/adsklib/adsk_unlit_shaders.mtlx deleted file mode 100644 index 71d0e977c0..0000000000 --- a/resources/Materials/TestSuite/adsklib/adsk_unlit_shaders.mtlx +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/Materials/TestSuite/pbrlib/surfaceshader/unlit_surfaceshader.mtlx b/resources/Materials/TestSuite/pbrlib/surfaceshader/unlit_surfaceshader.mtlx new file mode 100644 index 0000000000..c876f5f2ed --- /dev/null +++ b/resources/Materials/TestSuite/pbrlib/surfaceshader/unlit_surfaceshader.mtlx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +