Skip to content

Commit

Permalink
Revert "Fix pink GradientTexture2D"
Browse files Browse the repository at this point in the history
This reverts commit 3e0d3c4.
  • Loading branch information
The Rizzler committed Oct 1, 2024
1 parent 0ce797d commit 052aeda
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions scene/resources/gradient_texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void GradientTexture1D::_queue_update() {
callable_mp(this, &GradientTexture1D::update_now).call_deferred();
}

void GradientTexture1D::_update() const {
void GradientTexture1D::_update() {
update_pending = false;

if (gradient.is_null()) {
Expand Down Expand Up @@ -172,14 +172,14 @@ RID GradientTexture1D::get_rid() const {
}

Ref<Image> GradientTexture1D::get_image() const {
update_now();
const_cast<GradientTexture1D *>(this)->update_now();
if (!texture.is_valid()) {
return Ref<Image>();
}
return RenderingServer::get_singleton()->texture_2d_get(texture);
}

void GradientTexture1D::update_now() const {
void GradientTexture1D::update_now() {
if (update_pending) {
_update();
}
Expand Down Expand Up @@ -225,7 +225,7 @@ void GradientTexture2D::_queue_update() {
callable_mp(this, &GradientTexture2D::update_now).call_deferred();
}

void GradientTexture2D::_update() const {
void GradientTexture2D::_update() {
update_pending = false;

if (gradient.is_null()) {
Expand Down Expand Up @@ -405,14 +405,14 @@ RID GradientTexture2D::get_rid() const {
}

Ref<Image> GradientTexture2D::get_image() const {
update_now();
const_cast<GradientTexture2D *>(this)->update_now();
if (!texture.is_valid()) {
return Ref<Image>();
}
return RenderingServer::get_singleton()->texture_2d_get(texture);
}

void GradientTexture2D::update_now() const {
void GradientTexture2D::update_now() {
if (update_pending) {
_update();
}
Expand Down
12 changes: 6 additions & 6 deletions scene/resources/gradient_texture.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ class GradientTexture1D : public Texture2D {

private:
Ref<Gradient> gradient;
mutable bool update_pending = false;
bool update_pending = false;
mutable RID texture;
int width = 256;
bool use_hdr = false;

void _queue_update();
void _update() const;
void _update();

protected:
static void _bind_methods();
Expand All @@ -64,7 +64,7 @@ class GradientTexture1D : public Texture2D {
virtual bool has_alpha() const override { return true; }

virtual Ref<Image> get_image() const override;
void update_now() const;
void update_now();

GradientTexture1D();
virtual ~GradientTexture1D();
Expand Down Expand Up @@ -102,9 +102,9 @@ class GradientTexture2D : public Texture2D {

float _get_gradient_offset_at(int x, int y) const;

mutable bool update_pending = false;
bool update_pending = false;
void _queue_update();
void _update() const;
void _update();

protected:
static void _bind_methods();
Expand Down Expand Up @@ -134,7 +134,7 @@ class GradientTexture2D : public Texture2D {
virtual RID get_rid() const override;
virtual bool has_alpha() const override { return true; }
virtual Ref<Image> get_image() const override;
void update_now() const;
void update_now();

GradientTexture2D();
virtual ~GradientTexture2D();
Expand Down

0 comments on commit 052aeda

Please sign in to comment.