e5bbcb8bcf
Also turn off -Wsign-compare warnings in the future, we do not consider them important.
Fixes the following GCC 5 warnings:
```
core/node_path.cpp:279:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/oa_hash_map.h:169:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/oa_hash_map.h:314:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles2/shader_gles2.cpp:985:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles3/rasterizer_storage_gles3.cpp:1075:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/pulseaudio/audio_driver_pulseaudio.cpp:343:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/editor_plugin.cpp:525:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/editor_properties_array_dict.cpp:747:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/spatial_editor_plugin.cpp:2078:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/spatial_editor_plugin.cpp:4096:27: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/sprite_editor_plugin.cpp💯20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:122:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:134:77: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:339:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/etc/image_etc.cpp:222:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/gdnative/register_types.cpp:242:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/gdnative/register_types.cpp:258:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:200:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:222:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:246:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1085:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1489:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1623:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:206:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:356:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:406:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:493:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/audio_stream_player_3d.cpp:420:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/audio_stream_sample.cpp:565:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/audio_stream_sample.cpp:571:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_rb_resampler.cpp:156:36: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
```
The following warnings were not fixed, as they implied casting for no gain:
```
core/io/packet_peer.cpp:228:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/io/resource_format_binary.cpp:109:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles2/rasterizer_scene_gles2.cpp:144:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/unix/file_access_unix.cpp:249:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:889:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:1020:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:1154:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:2255:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/bit_mask.cpp:336:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:141:49: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:150:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:154:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio_server.cpp:86:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio_server.cpp:89:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
```
257 lines
8 KiB
C++
257 lines
8 KiB
C++
/*************************************************************************/
|
|
/* simplex_noise.cpp */
|
|
/*************************************************************************/
|
|
/* This file is part of: */
|
|
/* GODOT ENGINE */
|
|
/* https://godotengine.org */
|
|
/*************************************************************************/
|
|
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
/* */
|
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
/* a copy of this software and associated documentation files (the */
|
|
/* "Software"), to deal in the Software without restriction, including */
|
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
/* the following conditions: */
|
|
/* */
|
|
/* The above copyright notice and this permission notice shall be */
|
|
/* included in all copies or substantial portions of the Software. */
|
|
/* */
|
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
/*************************************************************************/
|
|
|
|
#include "simplex_noise.h"
|
|
|
|
#include "core/core_string_names.h"
|
|
|
|
SimplexNoise::SimplexNoise() {
|
|
|
|
seed = 0;
|
|
persistence = 0.5;
|
|
octaves = 3;
|
|
period = 64;
|
|
lacunarity = 2.0;
|
|
|
|
_init_seeds();
|
|
}
|
|
|
|
SimplexNoise::~SimplexNoise() {
|
|
}
|
|
|
|
void SimplexNoise::_init_seeds() {
|
|
for (int i = 0; i < 6; ++i) {
|
|
open_simplex_noise(seed + i * 2, &(contexts[i]));
|
|
}
|
|
}
|
|
|
|
void SimplexNoise::set_seed(int p_seed) {
|
|
|
|
if (seed == p_seed)
|
|
return;
|
|
|
|
seed = p_seed;
|
|
|
|
_init_seeds();
|
|
|
|
emit_changed();
|
|
}
|
|
|
|
int SimplexNoise::get_seed() {
|
|
|
|
return seed;
|
|
}
|
|
|
|
void SimplexNoise::set_octaves(int p_octaves) {
|
|
if (p_octaves == octaves) return;
|
|
octaves = CLAMP(p_octaves, 1, 6);
|
|
emit_changed();
|
|
}
|
|
|
|
void SimplexNoise::set_period(float p_period) {
|
|
if (p_period == period) return;
|
|
period = p_period;
|
|
emit_changed();
|
|
}
|
|
|
|
void SimplexNoise::set_persistence(float p_persistence) {
|
|
if (p_persistence == persistence) return;
|
|
persistence = p_persistence;
|
|
emit_changed();
|
|
}
|
|
|
|
void SimplexNoise::set_lacunarity(float p_lacunarity) {
|
|
if (p_lacunarity == lacunarity) return;
|
|
lacunarity = p_lacunarity;
|
|
emit_changed();
|
|
}
|
|
|
|
Ref<Image> SimplexNoise::get_image(int p_width, int p_height) {
|
|
|
|
PoolVector<uint8_t> data;
|
|
data.resize(p_width * p_height * 4);
|
|
|
|
PoolVector<uint8_t>::Write wd8 = data.write();
|
|
|
|
for (int i = 0; i < p_height; i++) {
|
|
for (int j = 0; j < p_width; j++) {
|
|
float v = get_noise_2d(i, j);
|
|
v = v * 0.5 + 0.5; // Normalize [0..1]
|
|
uint8_t value = uint8_t(CLAMP(v * 255.0, 0, 255));
|
|
wd8[(i * p_width + j) * 4 + 0] = value;
|
|
wd8[(i * p_width + j) * 4 + 1] = value;
|
|
wd8[(i * p_width + j) * 4 + 2] = value;
|
|
wd8[(i * p_width + j) * 4 + 3] = 255;
|
|
}
|
|
}
|
|
|
|
Ref<Image> image = memnew(Image(p_width, p_height, false, Image::FORMAT_RGBA8, data));
|
|
return image;
|
|
}
|
|
|
|
Ref<Image> SimplexNoise::get_seamless_image(int p_size) {
|
|
|
|
PoolVector<uint8_t> data;
|
|
data.resize(p_size * p_size * 4);
|
|
|
|
PoolVector<uint8_t>::Write wd8 = data.write();
|
|
|
|
for (int i = 0; i < p_size; i++) {
|
|
for (int j = 0; j < p_size; j++) {
|
|
|
|
float ii = (float)i / (float)p_size;
|
|
float jj = (float)j / (float)p_size;
|
|
|
|
ii *= 2.0 * Math_PI;
|
|
jj *= 2.0 * Math_PI;
|
|
|
|
float radius = p_size / (2.0 * Math_PI);
|
|
|
|
float x = radius * Math::sin(jj);
|
|
float y = radius * Math::cos(jj);
|
|
float z = radius * Math::sin(ii);
|
|
float w = radius * Math::cos(ii);
|
|
float v = get_noise_4d(x, y, z, w);
|
|
|
|
v = v * 0.5 + 0.5; // Normalize [0..1]
|
|
uint8_t value = uint8_t(CLAMP(v * 255.0, 0, 255));
|
|
wd8[(i * p_size + j) * 4 + 0] = value;
|
|
wd8[(i * p_size + j) * 4 + 1] = value;
|
|
wd8[(i * p_size + j) * 4 + 2] = value;
|
|
wd8[(i * p_size + j) * 4 + 3] = 255;
|
|
}
|
|
}
|
|
|
|
Ref<Image> image = memnew(Image(p_size, p_size, false, Image::FORMAT_RGBA8, data));
|
|
return image;
|
|
}
|
|
|
|
void SimplexNoise::_bind_methods() {
|
|
|
|
ClassDB::bind_method(D_METHOD("get_seed"), &SimplexNoise::get_seed);
|
|
ClassDB::bind_method(D_METHOD("set_seed", "seed"), &SimplexNoise::set_seed);
|
|
|
|
ClassDB::bind_method(D_METHOD("set_octaves", "octave_count"), &SimplexNoise::set_octaves);
|
|
ClassDB::bind_method(D_METHOD("get_octaves"), &SimplexNoise::get_octaves);
|
|
|
|
ClassDB::bind_method(D_METHOD("set_period", "period"), &SimplexNoise::set_period);
|
|
ClassDB::bind_method(D_METHOD("get_period"), &SimplexNoise::get_period);
|
|
|
|
ClassDB::bind_method(D_METHOD("set_persistence", "persistence"), &SimplexNoise::set_persistence);
|
|
ClassDB::bind_method(D_METHOD("get_persistence"), &SimplexNoise::get_persistence);
|
|
|
|
ClassDB::bind_method(D_METHOD("set_lacunarity", "lacunarity"), &SimplexNoise::set_lacunarity);
|
|
ClassDB::bind_method(D_METHOD("get_lacunarity"), &SimplexNoise::get_lacunarity);
|
|
|
|
ClassDB::bind_method(D_METHOD("get_image", "width", "height"), &SimplexNoise::get_image);
|
|
ClassDB::bind_method(D_METHOD("get_seamless_image", "size"), &SimplexNoise::get_seamless_image);
|
|
|
|
ClassDB::bind_method(D_METHOD("get_noise_2d", "x", "y"), &SimplexNoise::get_noise_2d);
|
|
ClassDB::bind_method(D_METHOD("get_noise_3d", "x", "y", "z"), &SimplexNoise::get_noise_3d);
|
|
ClassDB::bind_method(D_METHOD("get_noise_4d", "x", "y", "z", "w"), &SimplexNoise::get_noise_4d);
|
|
|
|
ClassDB::bind_method(D_METHOD("get_noise_2dv", "pos"), &SimplexNoise::get_noise_2dv);
|
|
ClassDB::bind_method(D_METHOD("get_noise_3dv", "pos"), &SimplexNoise::get_noise_3dv);
|
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::INT, "seed"), "set_seed", "get_seed");
|
|
ADD_PROPERTY(PropertyInfo(Variant::INT, "octaves", PROPERTY_HINT_RANGE, "1,6,1"), "set_octaves", "get_octaves");
|
|
ADD_PROPERTY(PropertyInfo(Variant::REAL, "period", PROPERTY_HINT_RANGE, "0.1,256.0,0.1"), "set_period", "get_period");
|
|
ADD_PROPERTY(PropertyInfo(Variant::REAL, "persistence", PROPERTY_HINT_RANGE, "0.0,1.0,0.001"), "set_persistence", "get_persistence");
|
|
ADD_PROPERTY(PropertyInfo(Variant::REAL, "lacunarity", PROPERTY_HINT_RANGE, "0.1,4.0,0.01"), "set_lacunarity", "get_lacunarity");
|
|
}
|
|
|
|
float SimplexNoise::get_noise_2d(float x, float y) {
|
|
|
|
x /= period;
|
|
y /= period;
|
|
|
|
float amp = 1.0;
|
|
float max = 1.0;
|
|
float sum = _get_octave_noise_2d(0, x, y);
|
|
|
|
int i = 0;
|
|
while (++i < octaves) {
|
|
x *= lacunarity;
|
|
y *= lacunarity;
|
|
amp *= persistence;
|
|
max += amp;
|
|
sum += _get_octave_noise_2d(i, x, y) * amp;
|
|
}
|
|
|
|
return sum / max;
|
|
}
|
|
|
|
float SimplexNoise::get_noise_3d(float x, float y, float z) {
|
|
|
|
x /= period;
|
|
y /= period;
|
|
z /= period;
|
|
|
|
float amp = 1.0;
|
|
float max = 1.0;
|
|
float sum = _get_octave_noise_3d(0, x, y, z);
|
|
|
|
int i = 0;
|
|
while (++i < octaves) {
|
|
x *= lacunarity;
|
|
y *= lacunarity;
|
|
z *= lacunarity;
|
|
amp *= persistence;
|
|
max += amp;
|
|
sum += _get_octave_noise_3d(i, x, y, z) * amp;
|
|
}
|
|
|
|
return sum / max;
|
|
}
|
|
|
|
float SimplexNoise::get_noise_4d(float x, float y, float z, float w) {
|
|
|
|
x /= period;
|
|
y /= period;
|
|
z /= period;
|
|
w /= period;
|
|
|
|
float amp = 1.0;
|
|
float max = 1.0;
|
|
float sum = _get_octave_noise_4d(0, x, y, z, w);
|
|
|
|
int i = 0;
|
|
while (++i < octaves) {
|
|
x *= lacunarity;
|
|
y *= lacunarity;
|
|
z *= lacunarity;
|
|
w *= lacunarity;
|
|
amp *= persistence;
|
|
max += amp;
|
|
sum += _get_octave_noise_4d(i, x, y, z, w) * amp;
|
|
}
|
|
|
|
return sum / max;
|
|
}
|