Add color_ramp

mitsuba-renderer · Jul 25, 2023 · 83054dd · 83054dd
1 parent b94c8f2
commit 83054dd
Show file tree

Hide file tree

Showing 8 changed files with 1,592 additions and 2 deletions.
diff --git a/include/mitsuba/core/object.h b/include/mitsuba/core/object.h
@@ -28,6 +28,7 @@ NAMESPACE_BEGIN(mitsuba)
  * and has no overhead for references.
  */
 class MI_EXPORT_LIB Object {
+
 public:
     /// Default constructor
     Object() { }

diff --git a/include/mitsuba/render/fwd.h b/include/mitsuba/render/fwd.h
@@ -105,6 +105,7 @@ template <typename Float_, typename Spectrum_> struct RenderAliases {
     using ShapePtr               = dr::replace_scalar_t<Float, const Shape *>;
     using SensorPtr              = dr::replace_scalar_t<Float, const Sensor *>;
     using EmitterPtr             = dr::replace_scalar_t<Float, const Emitter *>;
+    using TexturePtr             = dr::replace_scalar_t<Float, const Texture *>;
 };
 
 #define MMI_USING_MEMBERS_MACRO2(x) \
@@ -186,6 +187,7 @@ template <typename Float_, typename Spectrum_> struct RenderAliases {
     using MediumPtr              = typename RenderAliases::MediumPtr;                              \
     using ShapePtr               = typename RenderAliases::ShapePtr;                               \
     using EmitterPtr             = typename RenderAliases::EmitterPtr;                             \
-    using SensorPtr              = typename RenderAliases::SensorPtr;
+    using SensorPtr              = typename RenderAliases::SensorPtr;                              \
+    using TexturePtr              = typename RenderAliases::TexturePtr;
 
 NAMESPACE_END(mitsuba)
diff --git a/include/mitsuba/render/texture.h b/include/mitsuba/render/texture.h
@@ -226,6 +226,8 @@ class MI_EXPORT_LIB Texture : public Object {
     /// Set a string identifier
     void set_id(const std::string& id) override { m_id = id; };
 
+    DRJIT_VCALL_REGISTER(Float, mitsuba::Texture)
+
     MI_DECLARE_CLASS()
 
 protected:
@@ -238,3 +240,23 @@ class MI_EXPORT_LIB Texture : public Object {
 
 MI_EXTERN_CLASS(Texture)
 NAMESPACE_END(mitsuba)
+
+
+// -----------------------------------------------------------------------
+//! @{ \name Dr.Jit support for vectorized function calls
+// -----------------------------------------------------------------------
+
+DRJIT_VCALL_TEMPLATE_BEGIN(mitsuba::Texture)
+    DRJIT_VCALL_METHOD(eval)
+    DRJIT_VCALL_METHOD(sample_spectrum)
+    DRJIT_VCALL_METHOD(pdf_spectrum)
+    DRJIT_VCALL_METHOD(sample_position)
+    DRJIT_VCALL_METHOD(pdf_position)
+    DRJIT_VCALL_METHOD(eval_1)
+    DRJIT_VCALL_METHOD(eval_1_grad)
+    DRJIT_VCALL_METHOD(eval_3)
+    DRJIT_VCALL_METHOD(mean)
+DRJIT_VCALL_TEMPLATE_END(mitsuba::Texture)
+
+//! @}
+// -----------------------------------------------------------------------
diff --git a/src/bsdfs/principled.cpp b/src/bsdfs/principled.cpp
@@ -213,7 +213,7 @@ class Principled final : public BSDF<Float, Spectrum> {
 
         /*Eta and specular has one to one correspondence, both of them can
          * not be specified. */
-        if (props.has_property("eta") && props.has_property("specular")) {
+        if (props.has_property("eta") && props.has_property("specular")) { // TODO: ask
             Throw("Specified an invalid index of refraction property  "
                   "\"%s\", either use \"eta\" or \"specular\" !");
         } else if (props.has_property("eta")) {

diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp
@@ -147,6 +147,7 @@ const Class *PluginManager::get_plugin_class(const std::string &name,
 
     auto it = std::find(d->m_python_plugins.begin(), d->m_python_plugins.end(),
                         name + "@" + variant);
+
     if (it != d->m_python_plugins.end()) {
         plugin_class = Class::for_name(name, variant);
     } else {
@@ -178,6 +179,7 @@ ref<Object> PluginManager::create_object(const Properties &props,
        return class_->construct(props);
 
     std::string variant = class_->variant();
+
     const Class *plugin_class = get_plugin_class(props.plugin_name(), variant);
 
     /* Construct each plugin in its own scope to isolate them from each other.

diff --git a/src/textures/CMakeLists.txt b/src/textures/CMakeLists.txt
@@ -4,5 +4,6 @@ add_plugin(bitmap         bitmap.cpp)
 add_plugin(checkerboard   checkerboard.cpp)
 add_plugin(mesh_attribute mesh_attribute.cpp)
 add_plugin(volume         volume.cpp)
+add_plugin(color_ramp     color_ramp.cpp)
 
 set(MI_PLUGIN_TARGETS "${MI_PLUGIN_TARGETS}" PARENT_SCOPE)