godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26541 from clayjohn/noise_texture_scale 

Added bump_strength to NoiseTexture
This commit is contained in:
Rémi Verschelde 2019-03-04 10:49:53 +01:00 committed by GitHub
parent 7889e9b7ca 44b71a22ff
commit 49d82f245b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/opensimplex/noise_texture.cpp
View File

@ -41,6 +41,7 @@ NoiseTexture::NoiseTexture() {
size = Vector2i(512, 512); size = Vector2i(512, 512);
seamless = false; seamless = false;
as_normalmap = false; as_normalmap = false;
bump_strength = 1.0; //1.0 is a little low. Keep at 1.0 for compatibility for now. For 3.2 increase to 8.0.
flags = FLAGS_DEFAULT; flags = FLAGS_DEFAULT;
noise = Ref<OpenSimplexNoise>(); noise = Ref<OpenSimplexNoise>();
@ -68,6 +69,9 @@ void NoiseTexture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_as_normalmap", "as_normalmap"), &NoiseTexture::set_as_normalmap); ClassDB::bind_method(D_METHOD("set_as_normalmap", "as_normalmap"), &NoiseTexture::set_as_normalmap);
ClassDB::bind_method(D_METHOD("is_normalmap"), &NoiseTexture::is_normalmap); ClassDB::bind_method(D_METHOD("is_normalmap"), &NoiseTexture::is_normalmap);
ClassDB::bind_method(D_METHOD("set_bump_strength", "bump_strength"), &NoiseTexture::set_bump_strength);
ClassDB::bind_method(D_METHOD("get_bump_strength"), &NoiseTexture::get_bump_strength);
ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture); ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture);
ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture); ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture);
ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done); ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done);
@ -76,9 +80,19 @@ void NoiseTexture::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater"), "set_height", "get_height"); ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater"), "set_height", "get_height");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "as_normalmap"), "set_as_normalmap", "is_normalmap"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "as_normalmap"), "set_as_normalmap", "is_normalmap");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "bump_strength", PROPERTY_HINT_RANGE, "0,32,0.1,or_greater"), "set_bump_strength", "get_bump_strength");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "OpenSimplexNoise"), "set_noise", "get_noise"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "OpenSimplexNoise"), "set_noise", "get_noise");
} }
void NoiseTexture::_validate_property(PropertyInfo &property) const {
if (property.name == "bump_strength") {
if (!as_normalmap) {
property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
}
}
}
void NoiseTexture::_set_texture_data(const Ref<Image> &p_image) { void NoiseTexture::_set_texture_data(const Ref<Image> &p_image) {
data = p_image; data = p_image;
if (data.is_valid()) { if (data.is_valid()) {
@ -129,7 +143,7 @@ Ref<Image> NoiseTexture::_generate_texture() {
} }
if (as_normalmap) { if (as_normalmap) {
image->bumpmap_to_normalmap(); image->bumpmap_to_normalmap(bump_strength);
} }
return image; return image;
@ -202,12 +216,26 @@ void NoiseTexture::set_as_normalmap(bool p_as_normalmap) {
if (p_as_normalmap == as_normalmap) return; if (p_as_normalmap == as_normalmap) return;
as_normalmap = p_as_normalmap; as_normalmap = p_as_normalmap;
_queue_update(); _queue_update();
_change_notify();
} }
bool NoiseTexture::is_normalmap() { bool NoiseTexture::is_normalmap() {
return as_normalmap; return as_normalmap;
} }
void NoiseTexture::set_bump_strength(float p_bump_strength) {
if (p_bump_strength == bump_strength) return;
bump_strength = p_bump_strength;
if (as_normalmap)
_queue_update();
}
float NoiseTexture::get_bump_strength() {
return bump_strength;
}
int NoiseTexture::get_width() const { int NoiseTexture::get_width() const {
return size.x; return size.x;

5
modules/opensimplex/noise_texture.h
View File

@ -58,6 +58,7 @@ private:
Vector2i size; Vector2i size;
bool seamless; bool seamless;
bool as_normalmap; bool as_normalmap;
float bump_strength;
void _thread_done(const Ref<Image> &p_image); void _thread_done(const Ref<Image> &p_image);
static void _thread_function(void *p_ud); static void _thread_function(void *p_ud);
@ -69,6 +70,7 @@ private:
protected: protected:
static void _bind_methods(); static void _bind_methods();
virtual void _validate_property(PropertyInfo &property) const;
public: public:
void set_noise(Ref<OpenSimplexNoise> p_noise); void set_noise(Ref<OpenSimplexNoise> p_noise);
@ -83,6 +85,9 @@ public:
void set_as_normalmap(bool p_seamless); void set_as_normalmap(bool p_seamless);
bool is_normalmap(); bool is_normalmap();
void set_bump_strength(float p_bump_strength);
float get_bump_strength();
int get_width() const; int get_width() const;
int get_height() const; int get_height() const;