forked from AcademySoftwareFoundation/MaterialX
-
Notifications
You must be signed in to change notification settings - Fork 23
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.
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
Initial commit legacy materials #1398
Merged
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3d59c69
Initial commit legacy materials
zicher3d 0792760
Test files for legacy material
zicher3d ea3c401
Adding values to test file
zicher3d c66aba8
USD test file
zicher3d c3e00d5
Stubs for OSL and MDL turbulence noise
zicher3d 12e011f
Test for matching implementation count
zicher3d c5aa1ca
Revert "Test for matching implementation count"
zicher3d cea3caa
Added test mtlx file for unused nodedefs
zicher3d File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
333 changes: 333 additions & 0 deletions
333
contrib/adsk/libraries/adsklib/adsklib_legacy_defs.mtlx
Large diffs are not rendered by default.
Oops, something went wrong.
2,219 changes: 2,219 additions & 0 deletions
2,219
contrib/adsk/libraries/adsklib/adsklib_legacy_ng.mtlx
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
contrib/adsk/libraries/adsklib/genglsl/mx_turbulence2d_float.glsl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "../../stdlib/genglsl/lib/mx_noise.glsl" | ||
nicolassavva-autodesk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
void mx_turbulence2d_float(float amplitude, float octaves, vec2 texcoord, out float result) | ||
{ | ||
float sum = 0.0; | ||
float scale = 1.0; | ||
|
||
// Accumulate the required number of octaves of noise. | ||
float i = 0.0; | ||
for (i = octaves; i >= 1.0; i -= 1.0) { | ||
float value = mx_perlin_noise_float(texcoord * scale) / scale; | ||
sum += abs(value); | ||
scale *= 2.0; | ||
} | ||
|
||
// Add a portion of the remaining octave, if any. | ||
if (i > 0.0) { | ||
float value = mx_perlin_noise_float(texcoord * scale) / scale; | ||
sum += abs(value) * i; | ||
} | ||
|
||
result = sum * amplitude; | ||
} |
23 changes: 23 additions & 0 deletions
23
contrib/adsk/libraries/adsklib/genglsl/mx_turbulence3d_float.glsl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "../../stdlib/genglsl/lib/mx_noise.glsl" | ||
nicolassavva-autodesk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
void mx_turbulence3d_float(float amplitude, float octaves, vec3 position, out float result) | ||
{ | ||
float sum = 0.0; | ||
float scale = 1.0; | ||
|
||
// Accumulate the required number of octaves of noise. | ||
float i = 0.0; | ||
for (i = octaves; i >= 1.0; i -= 1.0) { | ||
float value = mx_perlin_noise_float(position * scale) / scale; | ||
sum += abs(value); | ||
scale *= 2.0; | ||
} | ||
|
||
// Add a portion of the remaining octave, if any. | ||
if (i > 0.0) { | ||
float value = mx_perlin_noise_float(position * scale) / scale; | ||
sum += abs(value) * i; | ||
} | ||
|
||
result = sum * amplitude; | ||
} |
413 changes: 413 additions & 0 deletions
413
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file added
BIN
+44.5 KB
...dsk/resources/Materials/TestSuite/adsklib/legacy/textures/Plane001HeightMap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+845 KB
...s/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomCurved_pattern.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+820 KB
...TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomStraight_pattern.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+502 KB
...s/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Granite_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+590 KB
...es/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Marble_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+139 KB
...Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_StoneWall_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+179 KB
...TestSuite/adsklib/legacy/textures/SiteWork.Planting.Basket.Woven.Loose.Mask.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+454 KB
...te/adsklib/legacy/textures/Woods - Plastics.Finish Carpentry.Wood.Red Birch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+625 KB
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+642 KB
...sk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_soldier_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+10.1 KB
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brush.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+127 KB
...urces/Materials/TestSuite/adsklib/legacy/textures/leather_perforated_cutout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+146 KB
...esources/Materials/TestSuite/adsklib/legacy/textures/polished_concrete_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+8.63 KB
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/roller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+10.8 KB
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/spray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+57.1 KB
...es/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_1_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+79.9 KB
...es/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_3_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+142 KB
...urces/Materials/TestSuite/adsklib/legacy/textures/texture_glass_clouds_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+165 KB
...urces/Materials/TestSuite/adsklib/legacy/textures/texture_glass_mosaic_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+196 KB
...ources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_noise_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+27.2 KB
...sk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_knurl_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+347 KB
...urces/Materials/TestSuite/adsklib/legacy/textures/texture_orangepeel_height.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+336 KB
...adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_mix01_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+200 KB
...aterials/TestSuite/adsklib/legacy/textures/tiles_travertine_versailles_bump.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+43.2 KB
contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_calm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+233 KB
...sk/resources/Materials/TestSuite/adsklib/legacy/textures/water_seacalm_bump.jpg
Oops, something went wrong.
Binary file added
BIN
+167 KB
...sources/Materials/TestSuite/adsklib/legacy/textures/water_swimmingpool_bump.jpg
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did we already determine that the noise functions in question here are not available through the existing stdlib noise()?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the current stdlib noise types are Perlin, Cell, Worley and Fractal