Skip to content
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.

Sign up for GitHub

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

Add placeholder RID to GradientTexture1D #81198

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Add placeholder RID to GradientTexture1D #81198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions scene/resources/gradient_texture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ void GradientTexture1D::set_gradient(Ref<Gradient> p_gradient) {
return;
}
if (gradient.is_valid()) {
gradient->disconnect_changed(callable_mp(this, &GradientTexture1D::_update));
gradient->disconnect_changed(callable_mp(this, &GradientTexture1D::_queue_update));
}
gradient = p_gradient;
if (gradient.is_valid()) {
gradient->connect_changed(callable_mp(this, &GradientTexture1D::_update));
gradient->connect_changed(callable_mp(this, &GradientTexture1D::_queue_update));
}
_queue_update();
emit_changed();
Expand Down Expand Up @@ -164,6 +164,13 @@ bool GradientTexture1D::is_using_hdr() const {
return use_hdr;
}

RID GradientTexture1D::get_rid() const {
if (!texture.is_valid()) {
texture = RS::get_singleton()->texture_2d_placeholder_create();
}
return texture;
}

Ref<Image> GradientTexture1D::get_image() const {
const_cast<GradientTexture1D *>(this)->update_now();
if (!texture.is_valid()) {
Expand Down
4 changes: 2 additions & 2 deletions scene/resources/gradient_texture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class GradientTexture1D : public Texture2D {
private:
Ref<Gradient> gradient;
bool update_pending = false;
RID texture;
mutable RID texture;
int width = 256;
bool use_hdr = false;

Expand All @@ -59,7 +59,7 @@ class GradientTexture1D : public Texture2D {
void set_use_hdr(bool p_enabled);
bool is_using_hdr() const;

virtual RID get_rid() const override { return texture; }
virtual RID get_rid() const override;
virtual int get_height() const override { return 1; }
virtual bool has_alpha() const override { return true; }

Expand Down