-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' of github.com:LuisaGroup/LuisaRender into next
- Loading branch information
Showing
5 changed files
with
188 additions
and
5 deletions.
There are no files selected for viewing
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
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,28 @@ | ||
// | ||
// Created by mike on 4/17/24. | ||
// | ||
/** | ||
* # bump_image = np.power( | ||
# cv.imread(material_bump, cv.IMREAD_GRAYSCALE) / 255, 2.2 | ||
# ) | ||
# h, w = bump_image.shape[:2] | ||
# scale = 4 | ||
# bump_image = cv.resize(bump_image, (w * scale, h * scale), interpolation=cv.INTER_LANCZOS4) | ||
# bump_image = cv.GaussianBlur(bump_image, (5, 5), 0) | ||
# dx_image = cv.copyMakeBorder(bump_image, 0, 0, 1, 1, cv.BORDER_REPLICATE) | ||
# dy_image = cv.copyMakeBorder(bump_image, 1, 1, 0, 0, cv.BORDER_REPLICATE) | ||
# strength = min(w, h) / 50 * scale | ||
# dx_image = np.clip(strength * (dx_image[:, 2:] - dx_image[:, :-2]), -5, 5) | ||
# dy_image = np.clip(-strength * (dy_image[2:, :] - dy_image[:-2, :]), -5, 5) | ||
# dx_image = cv.resize(dx_image, (w, h), interpolation=cv.INTER_AREA) | ||
# dy_image = cv.resize(dy_image, (w, h), interpolation=cv.INTER_AREA) | ||
# dz_image = np.ones_like(dx_image) | ||
# norm = np.sqrt(dx_image**2 + dy_image**2 + dz_image**2) | ||
# normal_image = np.dstack([dz_image, dy_image, dx_image]) | ||
# normal_image = (normal_image / norm[:, :, np.newaxis]) * 0.5 + 0.5 | ||
# # normal_image = cv.GaussianBlur(normal_image, (3, 3), 0) | ||
# # normal_image = cv.resize(normal_image, (w, h), interpolation=cv.INTER_CUBIC) | ||
# normal_image = np.uint8(np.clip(normal_image * 255, 0, 255)) | ||
# save_name = f"lr_exported_textures/{material_bump.split('/')[-1]}" | ||
# cv.imwrite(save_name, normal_image) | ||
*/ |
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
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,69 @@ | ||
// | ||
// Created by mike on 4/17/24. | ||
// | ||
|
||
#include <base/texture.h> | ||
#include <base/scene.h> | ||
#include <base/pipeline.h> | ||
|
||
namespace luisa::render { | ||
|
||
class MultiplyTexture final : public Texture { | ||
|
||
private: | ||
Texture *_a; | ||
Texture *_b; | ||
|
||
public: | ||
MultiplyTexture(Scene *scene, const SceneNodeDesc *desc) noexcept | ||
: Texture{scene, desc}, | ||
_a{scene->load_texture(desc->property_node("a"))}, | ||
_b{scene->load_texture(desc->property_node("b"))} {} | ||
|
||
[[nodiscard]] auto a() const noexcept { return _a; } | ||
[[nodiscard]] auto b() const noexcept { return _b; } | ||
[[nodiscard]] bool is_black() const noexcept override { return _a->is_black() || _b->is_black(); } | ||
[[nodiscard]] bool is_constant() const noexcept override { return is_black() || (_a->is_constant() && _b->is_constant()); } | ||
[[nodiscard]] luisa::optional<float4> evaluate_static() const noexcept override { | ||
if (auto a = _a->evaluate_static(), | ||
b = _b->evaluate_static(); | ||
a && b) { | ||
return a.value() * b.value(); | ||
} | ||
return nullopt; | ||
} | ||
[[nodiscard]] luisa::string_view impl_type() const noexcept override { return LUISA_RENDER_PLUGIN_NAME; } | ||
[[nodiscard]] uint channels() const noexcept override { return std::min(_a->channels(), _b->channels()); } | ||
[[nodiscard]] luisa::unique_ptr<Instance> build( | ||
Pipeline &pipeline, CommandBuffer &command_buffer) const noexcept override; | ||
}; | ||
|
||
class MultiplyTextureInstance final : public Texture::Instance { | ||
|
||
private: | ||
const Texture::Instance *_a; | ||
const Texture::Instance *_b; | ||
|
||
public: | ||
MultiplyTextureInstance(const Pipeline &pipeline, | ||
const Texture *node, | ||
const Texture::Instance *a, | ||
const Texture::Instance *b) noexcept | ||
: Texture::Instance{pipeline, node}, _a{a}, _b{b} {} | ||
[[nodiscard]] Float4 evaluate(const Interaction &it, | ||
const SampledWavelengths &swl, | ||
Expr<float> time) const noexcept override { | ||
return _a->evaluate(it, swl, time) * _b->evaluate(it, swl, time); | ||
} | ||
}; | ||
|
||
luisa::unique_ptr<Texture::Instance> MultiplyTexture::build( | ||
Pipeline &pipeline, CommandBuffer &command_buffer) const noexcept { | ||
auto a = pipeline.build_texture(command_buffer, _a); | ||
auto b = pipeline.build_texture(command_buffer, _b); | ||
return luisa::make_unique<MultiplyTextureInstance>(pipeline, this, a, b); | ||
} | ||
|
||
}// namespace luisa::render | ||
|
||
LUISA_RENDER_MAKE_SCENE_NODE_PLUGIN(luisa::render::MultiplyTexture) |
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,79 @@ | ||
// | ||
// Created by mike on 4/17/24. | ||
// | ||
|
||
#include <base/texture.h> | ||
#include <base/scene.h> | ||
#include <base/pipeline.h> | ||
|
||
namespace luisa::render { | ||
|
||
class ScaleTexture final : public Texture { | ||
|
||
private: | ||
Texture *_base; | ||
float4 _scale; | ||
float4 _offset; | ||
|
||
public: | ||
ScaleTexture(Scene *scene, const SceneNodeDesc *desc) noexcept | ||
: Texture{scene, desc}, | ||
_base{scene->load_texture(desc->property_node("base"))}, | ||
_scale{[desc] { | ||
auto s = desc->property_float_list_or_default("scale"); | ||
if (s.size() == 1u) { return make_float4(s[0]); } | ||
s.reserve(4u); | ||
if (s.size() < 4u) { s.resize(4u, 1.f); } | ||
s.resize(4u); | ||
return make_float4(s[0], s[1], s[2], s[3]); | ||
}()}, | ||
_offset{[desc] { | ||
auto o = desc->property_float_list_or_default("offset"); | ||
if (o.size() == 1u) { return make_float4(o[0]); } | ||
o.reserve(4u); | ||
if (o.size() < 4u) { o.resize(4u, 0.f); } | ||
o.resize(4u); | ||
return make_float4(o[0], o[1], o[2], o[3]); | ||
}()} {} | ||
[[nodiscard]] auto base() const noexcept { return _base; } | ||
[[nodiscard]] auto scale() const noexcept { return _scale; } | ||
[[nodiscard]] auto offset() const noexcept { return _offset; } | ||
[[nodiscard]] bool is_black() const noexcept override { return false; } | ||
[[nodiscard]] bool is_constant() const noexcept override { return _base->is_constant(); } | ||
[[nodiscard]] luisa::optional<float4> evaluate_static() const noexcept override { | ||
if (auto v = _base->evaluate_static()) { | ||
return v.value() * _scale; | ||
} | ||
return nullopt; | ||
} | ||
[[nodiscard]] luisa::string_view impl_type() const noexcept override { return LUISA_RENDER_PLUGIN_NAME; } | ||
[[nodiscard]] uint channels() const noexcept override { return _base->channels(); } | ||
[[nodiscard]] luisa::unique_ptr<Instance> build( | ||
Pipeline &pipeline, CommandBuffer &command_buffer) const noexcept override; | ||
}; | ||
|
||
class ScaleTextureInstance final : public Texture::Instance { | ||
|
||
private: | ||
const Texture::Instance *_base; | ||
|
||
public: | ||
ScaleTextureInstance(const Pipeline &pipeline, const Texture *node, | ||
const Texture::Instance *base) noexcept | ||
: Texture::Instance{pipeline, node}, _base{base} {} | ||
[[nodiscard]] Float4 evaluate(const Interaction &it, | ||
const SampledWavelengths &swl, | ||
Expr<float> time) const noexcept override { | ||
return _base->evaluate(it, swl, time) * node<ScaleTexture>()->scale() + node<ScaleTexture>()->offset(); | ||
} | ||
}; | ||
|
||
luisa::unique_ptr<Texture::Instance> ScaleTexture::build( | ||
Pipeline &pipeline, CommandBuffer &command_buffer) const noexcept { | ||
auto base = pipeline.build_texture(command_buffer, _base); | ||
return luisa::make_unique<ScaleTextureInstance>(pipeline, this, base); | ||
} | ||
|
||
}// namespace luisa::render | ||
|
||
LUISA_RENDER_MAKE_SCENE_NODE_PLUGIN(luisa::render::ScaleTexture) |