Page MenuHome
Differential D14604 Diff 50369 intern/cycles/scene/shader_nodes.cpp

Changeset View

Standalone View

View Options

intern/cycles/scene/shader_nodes.cpp

Context not available.
static NodeEnum projection_enum; static NodeEnum projection_enum;
projection_enum.insert("equirectangular", NODE_ENVIRONMENT_EQUIRECTANGULAR); projection_enum.insert("equirectangular", NODE_ENVIRONMENT_EQUIRECTANGULAR);
projection_enum.insert("mirror_ball", NODE_ENVIRONMENT_MIRROR_BALL); projection_enum.insert("mirror_ball", NODE_ENVIRONMENT_MIRROR_BALL);
projection_enum.insert("cubemap", NODE_ENVIRONMENT_CUBEMAP);
SOCKET_ENUM(projection, "Projection", projection_enum, NODE_ENVIRONMENT_EQUIRECTANGULAR); SOCKET_ENUM(projection, "Projection", projection_enum, NODE_ENVIRONMENT_EQUIRECTANGULAR);
static NodeEnum cubemap_layout_enum;
cubemap_layout_enum.insert("cross_horizontal", NODE_ENVIRONMENT_CROSS_HORIZONTAL);
cubemap_layout_enum.insert("stripe_horizontal", NODE_ENVIRONMENT_STRIPE_HORIZONTAL);
cubemap_layout_enum.insert("stripe_vertical", NODE_ENVIRONMENT_STRIPE_VERTICAL);
SOCKET_ENUM(cubemap_layout, "Layout", cubemap_layout_enum, NODE_ENVIRONMENT_CROSS_HORIZONTAL);
SOCKET_BOOLEAN(animated, "Animated", false); SOCKET_BOOLEAN(animated, "Animated", false);
SOCKET_IN_POINT(vector, "Vector", zero_float3(), SocketType::LINK_POSITION); SOCKET_IN_POINT(vector, "Vector", zero_float3(), SocketType::LINK_POSITION);
Context not available.
flags |= NODE_IMAGE_COMPRESS_AS_SRGB; flags |= NODE_IMAGE_COMPRESS_AS_SRGB;
} }
/* To avoid adding another node we steal the upper unused bits to store the cubemap layout. */
kevindietrichUnsubmitted
Not Done
Inline Actions

This should probably explain that you are stealing the unused upper bits to store the layout (similarly in the kernel side), so we don't have to add a node for it.

kevindietrich: This should probably explain that you are stealing the unused upper bits to store the layout…
flags |= cubemap_layout << 4;
compiler.add_node(NODE_TEX_ENVIRONMENT, compiler.add_node(NODE_TEX_ENVIRONMENT,
handle.svm_slot(), handle.svm_slot(),
compiler.encode_uchar4(vector_offset, compiler.encode_uchar4(vector_offset,
Context not available.
} }
compiler.parameter(this, "projection"); compiler.parameter(this, "projection");
compiler.parameter(this, "cubemap_layout");
compiler.parameter(this, "interpolation"); compiler.parameter(this, "interpolation");
compiler.parameter("compress_as_srgb", compress_as_srgb); compiler.parameter("compress_as_srgb", compress_as_srgb);
compiler.parameter("ignore_alpha", alpha_type == IMAGE_ALPHA_IGNORE); compiler.parameter("ignore_alpha", alpha_type == IMAGE_ALPHA_IGNORE);
Context not available.