Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single channel should show as black and white in viewport #2952

Merged
merged 5 commits into from
Mar 21, 2023
Merged

Single channel should show as black and white in viewport #2952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d478860
Single channel should show as black and white in viewport
JGamache-autodesk Mar 20, 2023
9845d94
Performance optimization
JGamache-autodesk Mar 21, 2023
8eb57b0
Use a common and efficient coding style across all expansions
JGamache-autodesk Mar 21, 2023
ffa5cfb
clang-format
JGamache-autodesk Mar 21, 2023
565dbac
Pre-emptively fix Linux/OS/X builds
JGamache-autodesk Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 113 additions & 36 deletions lib/mayaUsd/render/vp2RenderDelegate/material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,24 +1488,103 @@ MHWRender::MTexture* _LoadTexture(
#endif
switch (specFormat) {
// Single Channel
case HioFormatFloat32:
desc.fFormat = MHWRender::kR32_FLOAT;
texture = textureMgr->acquireTexture(path.c_str(), desc, spec.data);
break;
case HioFormatFloat16:
desc.fFormat = MHWRender::kR16_FLOAT;
texture = textureMgr->acquireTexture(path.c_str(), desc, spec.data);
break;
case HioFormatUNorm8:
desc.fFormat = MHWRender::kR8_UNORM;
texture = textureMgr->acquireTexture(path.c_str(), desc, spec.data);
break;
case HioFormatFloat32: {
// We want white instead or red when expanding to RGB, so convert to kR32G32B32_FLOAT
constexpr int bpp_RGB32 = 3 * 4;

desc.fFormat = MHWRender::kR32G32B32_FLOAT;
desc.fBytesPerRow = spec.width * bpp_RGB32;
desc.fBytesPerSlice = desc.fBytesPerRow * spec.height;

std::vector<unsigned char> texels(desc.fBytesPerSlice);

uint32_t* texels32 = (uint32_t*)texels.data();
uint32_t* storage32 = (uint32_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint32_t pixel = *storage32++;
*texels32++ = pixel;
*texels32++ = pixel;
*texels32++ = pixel;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
} break;
case HioFormatFloat16: {
// We want white instead or red when expanding to RGB, so convert to kR16G16B16A16_FLOAT
constexpr int bpp_8 = 8;

desc.fFormat = MHWRender::kR16G16B16A16_FLOAT;
desc.fBytesPerRow = spec.width * bpp_8;
desc.fBytesPerSlice = desc.fBytesPerRow * spec.height;

std::vector<unsigned char> texels(desc.fBytesPerSlice);

GfHalf opaqueAlpha(1.0f);
const uint16_t alphaBits = opaqueAlpha.bits();

uint16_t* texels16 = (uint16_t*)texels.data();
uint16_t* storage16 = (uint16_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint16_t pixel = *storage16++;
*texels16++ = pixel;
*texels16++ = pixel;
*texels16++ = pixel;
*texels16++ = alphaBits;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
} break;
case HioFormatUNorm8: {
// We want white instead or red when expanding to RGB, so convert to kR8G8B8A8_UNORM
constexpr int bpp_4 = 4;

desc.fFormat = MHWRender::kR8G8B8A8_UNORM;
desc.fBytesPerRow = spec.width * bpp_4;
desc.fBytesPerSlice = desc.fBytesPerRow * spec.height;

std::vector<unsigned char> texels(desc.fBytesPerSlice);

uint8_t* texels8 = (uint8_t*)texels.data();
uint8_t* storage8 = (uint8_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint8_t pixel = *storage8++;
*texels8++ = pixel;
*texels8++ = pixel;
*texels8++ = pixel;
*texels8++ = 0xFF;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
isColorSpaceSRGB = image->IsColorSpaceSRGB();
} break;

// Dual channel (quite rare, but seen with mono + alpha files)
case HioFormatFloat32Vec2:
desc.fFormat = MHWRender::kR32G32_FLOAT;
texture = textureMgr->acquireTexture(path.c_str(), desc, spec.data);
break;
case HioFormatFloat32Vec2: {
// R32G32 is supported by VP2. But we want black and white, so R32G32B32A32.
constexpr int bpp_RGBA32 = 4 * 4;

desc.fFormat = MHWRender::kR32G32B32A32_FLOAT;
desc.fBytesPerRow = spec.width * bpp_RGBA32;
desc.fBytesPerSlice = desc.fBytesPerRow * spec.height;

std::vector<unsigned char> texels(desc.fBytesPerSlice);

uint32_t* texels32 = (uint32_t*)texels.data();
uint32_t* storage32 = (uint32_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint32_t pixel = *storage32++;
*texels32++ = pixel;
*texels32++ = pixel;
*texels32++ = pixel;
*texels32++ = *storage32++;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
} break;
case HioFormatFloat16Vec2: {
// R16G16 is not supported by VP2. Converted to R16G16B16A16.
constexpr int bpp_8 = 8;
Expand All @@ -1516,18 +1595,15 @@ MHWRender::MTexture* _LoadTexture(

std::vector<unsigned char> texels(desc.fBytesPerSlice);

for (int y = 0; y < spec.height; y++) {
for (int x = 0; x < spec.width; x++) {
const int t = spec.width * y + x;
texels[t * bpp_8 + 0] = storage[t * bpp + 0];
texels[t * bpp_8 + 1] = storage[t * bpp + 1];
texels[t * bpp_8 + 2] = storage[t * bpp + 0];
texels[t * bpp_8 + 3] = storage[t * bpp + 1];
texels[t * bpp_8 + 4] = storage[t * bpp + 0];
texels[t * bpp_8 + 5] = storage[t * bpp + 1];
texels[t * bpp_8 + 6] = storage[t * bpp + 2];
texels[t * bpp_8 + 7] = storage[t * bpp + 3];
}
uint16_t* texels16 = (uint16_t*)texels.data();
uint16_t* storage16 = (uint16_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint16_t pixel = *storage16++;
*texels16++ = pixel;
*texels16++ = pixel;
*texels16++ = pixel;
*texels16++ = *storage16++;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
Expand All @@ -1544,14 +1620,15 @@ MHWRender::MTexture* _LoadTexture(

std::vector<unsigned char> texels(desc.fBytesPerSlice);

for (int y = 0; y < spec.height; y++) {
for (int x = 0; x < spec.width; x++) {
const int t = spec.width * y + x;
texels[t * bpp_4] = storage[t * bpp];
texels[t * bpp_4 + 1] = storage[t * bpp];
texels[t * bpp_4 + 2] = storage[t * bpp];
texels[t * bpp_4 + 3] = storage[t * bpp + 1];
}
uint8_t* texels8 = (uint8_t*)texels.data();
uint8_t* storage8 = (uint8_t*)storage.data();

for (int p = 0; p < spec.height * spec.width; p++) {
const uint8_t pixel = *storage8++;
*texels8++ = pixel;
*texels8++ = pixel;
*texels8++ = pixel;
*texels8++ = *storage8++;
}

texture = textureMgr->acquireTexture(path.c_str(), desc, texels.data());
Expand Down
Binary file added .../vp2RenderDelegate/VP2RenderDelegateMaterialXTest/baseline/DemoQuads_render.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...erDelegate/VP2RenderDelegateMaterialXTest/baseline/MayaSurfaces_flat_render.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...2RenderDelegate/VP2RenderDelegateMaterialXTest/baseline/MayaSurfaces_render.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...enderDelegate/VP2RenderDelegateMaterialXTest/baseline/delete_attr_test_base.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...derDelegate/VP2RenderDelegateMaterialXTest/baseline/delete_attr_test_render.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ate/VP2RenderDelegateMaterialXTest/baseline/delete_attr_test_specular_color.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 14 additions & 3 deletions test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateMaterialX.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,20 @@ def testTransparency(self):
testFile = testUtils.getTestScene("MaterialX", "transparencyScene.ma")
cmds.file(testFile, force=True, open=True)
cmds.move(0, 7, -1.5, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
self.assertSnapshotClose('transparencyScene.png', 960, 960)

def testDemoQuads(self):
cmds.file(force=True, new=True)

cmds.move(0, 8, 0, 'persp')
cmds.rotate(-90, 0, 0, 'persp')

panel = mayaUtils.activeModelPanel()
cmds.modelEditor(panel, edit=True, displayTextures=True)

self._StartTest('DemoQuads')

def testMayaPlace2dTexture(self):
mayaUtils.loadPlugin("mayaUsdPlugin")
panel = mayaUtils.activeModelPanel()
Expand All @@ -149,7 +160,7 @@ def testMayaPlace2dTexture(self):
testFile = testUtils.getTestScene("MaterialX", "place2dTextureShowcase.ma")
cmds.file(testFile, force=True, open=True)
cmds.move(0, 7, -1.5, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
self.assertSnapshotClose('place2dTextureShowcase_Maya_render.png', 960, 960)
usdFilePath = os.path.join(self._testDir, "place2dTextureShowcase.usda")
cmds.mayaUSDExport(mergeTransformAndShape=True, file=usdFilePath,
Expand Down Expand Up @@ -178,7 +189,7 @@ def testMayaNodesExport(self):
testFile = testUtils.getTestScene("MaterialX", "mtlxNodesShowcase.ma")
cmds.file(testFile, force=True, open=True)
cmds.move(0, 7, -1.5, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
cmds.rotate(-90, 0, 0, 'persp')
self.assertSnapshotClose('mtlxNodesShowcase_Maya_render.png', 960, 960)
usdFilePath = os.path.join(self._testDir, "mtlxNodesShowcase.usda")
cmds.mayaUSDExport(mergeTransformAndShape=True, file=usdFilePath,
Expand Down
Loading