-
Notifications
You must be signed in to change notification settings - Fork 3
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
[for reference] Add Support for Image Planes (as a concrete schema type) #1
base: dev
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
-- glslfx version 0.1 | ||
|
||
#import $TOOLS/glf/shaders/simpleLighting.glslfx | ||
|
||
-- configuration | ||
{ | ||
"techniques": { | ||
"default": { | ||
"surfaceShader": { | ||
"source": [ "simpleTexturedSurface.Surface" ] | ||
} | ||
} | ||
} | ||
} | ||
|
||
-- glsl simpleTexturedSurface.Surface | ||
|
||
vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord) | ||
{ | ||
#if defined(HD_HAS_baseColor) | ||
return vec4(HdGet_baseColor(), 1.0); | ||
#else | ||
return vec4(1.0, 0.0, 0.0, 1.0); | ||
#endif | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
-- glslfx version 0.1 | ||
|
||
#import $TOOLS/glf/shaders/simpleLighting.glslfx | ||
|
||
-- configuration | ||
{ | ||
"techniques": { | ||
"default": { | ||
"surfaceShader": { | ||
"source": [ "simpleTexturedSurface.Surface" ] | ||
} | ||
} | ||
} | ||
} | ||
|
||
-- glsl simpleTexturedSurface.Surface | ||
|
||
vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord) | ||
{ | ||
#if defined(HD_HAS_baseColor) | ||
return vec4(HdGet_baseColor(), 1.0); | ||
#else | ||
return vec4(1.0, 0.0, 0.0, 1.0); | ||
#endif | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,11 +12,13 @@ pxr_library(usdGeom | |
usd | ||
work | ||
${Boost_PYTHON_LIBRARY} | ||
${TBB_tbb_LIBRARY} | ||
${OIIO_LIBRARIES} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OpenUSD 23.11 has OpenEXR support built in, so it shouldn't be necessary to directly link OIIO or OpenEXR There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. exr does not support 8-16 etc formats There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure, to be more clear about my comment, we won't be able to add a dependency on OpenImageIO to usdGeom. Loading textures is a function of the Hio library, and Hio already has a plugin to support OpenImageIO reading and writing. |
||
${OPENEXR_LIBRARIES} | ||
|
||
INCLUDE_DIRS | ||
${Boost_INCLUDE_DIRS} | ||
${TBB_INCLUDE_DIRS} | ||
${OIIO_INCLUDE_DIRS} | ||
${OPENEXR_INCLUDE_DIRS} | ||
|
||
PUBLIC_CLASSES | ||
debugCodes | ||
|
@@ -35,6 +37,7 @@ pxr_library(usdGeom | |
cylinder | ||
hermiteCurves | ||
imageable | ||
imagePlane | ||
gprim | ||
mesh | ||
metrics | ||
|
@@ -81,6 +84,7 @@ pxr_library(usdGeom | |
wrapGprim.cpp | ||
wrapHermiteCurves.cpp | ||
wrapImageable.cpp | ||
wrapImagePlane.cpp | ||
wrapMesh.cpp | ||
wrapMetrics.cpp | ||
wrapModelAPI.cpp | ||
|
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.
is the introduction of imaging/lib/hdSt/shaders/... intentional?