Skip to content

Updates to Web Viewer to allow values outside of 'uisoftmin' and 'uisoftmax' #2930

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

Open
paytonGilbertson wants to merge 8 commits into
base: main
Choose a base branch
from
+6 −18
Open

Updates to Web Viewer to allow values outside of 'uisoftmin' and 'uisoftmax' #2930

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1937e40
Fixing GLSL implementation to stop always setting to 1
paytonGilbertson May 14, 2026
60217c5
Merge branch 'main' into dev_color4_hsv
paytonGilbertson May 14, 2026
65d37a4
Merge branch 'main' into dev_color4_hsv
paytonGilbertson May 14, 2026
b73fe18
Removing uisoftmin and uisoftmax restrictions for web viewer
paytonGilbertson May 14, 2026
6af24d3
Merge branch 'main' into dev_color4_hsv
paytonGilbertson May 15, 2026
38eb9d5
Merge branch 'AcademySoftwareFoundation:main' into dev_color4_hsv
paytonGilbertson May 19, 2026
fe51225
Merge branch 'AcademySoftwareFoundation:main' into dev_color4_hsv
paytonGilbertson May 21, 2026
90e34b3
Merge branch 'main' into dev_color4_hsv
jstone-lucasfilm May 26, 2026
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
24 changes: 6 additions & 18 deletions javascript/MaterialXView/source/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,14 +1246,10 @@ export class Material
var step = 0;
if (nodeDefInput)
{
if (nodeDefInput.hasAttribute('uisoftmin'))
minValue = parseFloat(nodeDefInput.getAttribute('uisoftmin'));
else if (nodeDefInput.hasAttribute('uimin'))
if (nodeDefInput.hasAttribute('uimin'))
minValue = parseFloat(nodeDefInput.getAttribute('uimin'));

if (nodeDefInput.hasAttribute('uisoftmax'))
maxValue = parseFloat(nodeDefInput.getAttribute('uisoftmax'));
else if (nodeDefInput.hasAttribute('uimax'))
if (nodeDefInput.hasAttribute('uimax'))
maxValue = parseFloat(nodeDefInput.getAttribute('uimax'));

if (nodeDefInput.hasAttribute('uistep'))
Expand Down Expand Up @@ -1298,14 +1294,10 @@ export class Material
}
else
{
if (nodeDefInput.hasAttribute('uisoftmin'))
minValue = parseInt(nodeDefInput.getAttribute('uisoftmin'));
else if (nodeDefInput.hasAttribute('uimin'))
if (nodeDefInput.hasAttribute('uimin'))
minValue = parseInt(nodeDefInput.getAttribute('uimin'));

if (nodeDefInput.hasAttribute('uisoftmax'))
maxValue = parseInt(nodeDefInput.getAttribute('uisoftmax'));
else if (nodeDefInput.hasAttribute('uimax'))
if (nodeDefInput.hasAttribute('uimax'))
maxValue = parseInt(nodeDefInput.getAttribute('uimax'));

if (nodeDefInput.hasAttribute('uistep'))
Expand Down Expand Up @@ -1383,14 +1375,10 @@ export class Material

if (nodeDefInput)
{
if (nodeDefInput.hasAttribute('uisoftmin'))
minValue = nodeDefInput.getAttribute('uisoftmin').split(',').map(Number);
else if (nodeDefInput.hasAttribute('uimin'))
if (nodeDefInput.hasAttribute('uimin'))
minValue = nodeDefInput.getAttribute('uimin').split(',').map(Number);

if (nodeDefInput.hasAttribute('uisoftmax'))
maxValue = nodeDefInput.getAttribute('uisoftmax').split(',').map(Number);
else if (nodeDefInput.hasAttribute('uimax'))
if (nodeDefInput.hasAttribute('uimax'))
maxValue = nodeDefInput.getAttribute('uimax').split(',').map(Number);

if (nodeDefInput.hasAttribute('uistep'))
Expand Down
Loading