feat: modules moved and engine moved to submodule
This commit is contained in:
parent
dfb5e645cd
commit
c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
|
|
@ -7,12 +7,14 @@ Import("env_modules")
|
|||
env_noise = env_modules.Clone()
|
||||
|
||||
thirdparty_dir = "#thirdparty/noise/"
|
||||
env_noise.Prepend(CPPPATH=[thirdparty_dir])
|
||||
env_noise.Prepend(CPPEXTPATH=[thirdparty_dir])
|
||||
|
||||
# Godot source files
|
||||
|
||||
module_obj = []
|
||||
|
||||
env_noise.add_source_files(module_obj, "*.cpp")
|
||||
env_noise.add_source_files(module_obj, "editor/*.cpp")
|
||||
if env.editor_build:
|
||||
env_noise.add_source_files(module_obj, "editor/*.cpp")
|
||||
|
||||
env.modules_sources += module_obj
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
|
||||
#include "noise_editor_plugin.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
#include "../noise.h"
|
||||
#include "../noise_texture_2d.h"
|
||||
|
||||
|
|
@ -148,5 +146,3 @@ NoiseEditorPlugin::NoiseEditorPlugin() {
|
|||
plugin.instantiate();
|
||||
add_inspector_plugin(plugin);
|
||||
}
|
||||
|
||||
#endif // TOOLS_ENABLED
|
||||
|
|
|
|||
|
|
@ -28,10 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef NOISE_EDITOR_PLUGIN_H
|
||||
#define NOISE_EDITOR_PLUGIN_H
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#pragma once
|
||||
|
||||
#include "editor/plugins/editor_plugin.h"
|
||||
|
||||
|
|
@ -43,7 +40,3 @@ public:
|
|||
|
||||
NoiseEditorPlugin();
|
||||
};
|
||||
|
||||
#endif // TOOLS_ENABLED
|
||||
|
||||
#endif // NOISE_EDITOR_PLUGIN_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef FASTNOISE_LITE_H
|
||||
#define FASTNOISE_LITE_H
|
||||
#pragma once
|
||||
|
||||
#include "noise.h"
|
||||
|
||||
|
|
@ -220,5 +219,3 @@ VARIANT_ENUM_CAST(FastNoiseLite::CellularDistanceFunction);
|
|||
VARIANT_ENUM_CAST(FastNoiseLite::CellularReturnType);
|
||||
VARIANT_ENUM_CAST(FastNoiseLite::DomainWarpType);
|
||||
VARIANT_ENUM_CAST(FastNoiseLite::DomainWarpFractalType);
|
||||
|
||||
#endif // FASTNOISE_LITE_H
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm3 1v2h2V4zm2 2v2h2v2h2V4h-2v2zm0 2H6V6H4v4h4z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm3 1v2h2V4zm2 2v2h2v2h2V4h-2v2zm0 2H6V6H4v4h4z"/></svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 223 B After Width: | Height: | Size: 224 B |
|
|
@ -1 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13zM3 11h4l1.25-1.25V9H9l1.25-1.25v-2h-2L7 7v.75h-.75v-2h-2L3 7z"/><path fill-opacity=".4" d="M3 7h2l1.25-1.25h-2zm2 2h2V7.75h-.75zm2-2h2l1.25-1.25H8z"/><path fill-opacity=".2" d="M5 7v2l1.25-1.25v-2zm2 2v2l1.25-1.25V9zm2 0V7l1.25-1.25v2z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13zM3 11h4l1.25-1.25V9H9l1.25-1.25v-2h-2L7 7v.75h-.75v-2h-2L3 7z"/><path fill-opacity=".4" d="M3 7h2l1.25-1.25h-2zm2 2h2V7.75h-.75zm2-2h2l1.25-1.25H8z"/><path fill-opacity=".2" d="M5 7v2l1.25-1.25v-2zm2 2v2l1.25-1.25V9zm2 0V7l1.25-1.25v2z"/></svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 526 B After Width: | Height: | Size: 527 B |
|
|
@ -54,7 +54,7 @@ Vector<Ref<Image>> Noise::_get_seamless_image(int p_width, int p_height, int p_d
|
|||
|
||||
Ref<Image> Noise::get_seamless_image(int p_width, int p_height, bool p_invert, bool p_in_3d_space, real_t p_blend_skirt, bool p_normalize) const {
|
||||
Vector<Ref<Image>> images = _get_seamless_image(p_width, p_height, 1, p_invert, p_in_3d_space, p_blend_skirt, p_normalize);
|
||||
if (images.size() == 0) {
|
||||
if (images.is_empty()) {
|
||||
return Ref<Image>();
|
||||
}
|
||||
return images[0];
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef NOISE_H
|
||||
#define NOISE_H
|
||||
#pragma once
|
||||
|
||||
#include "core/io/image.h"
|
||||
#include "core/variant/typed_array.h"
|
||||
|
|
@ -298,5 +297,3 @@ public:
|
|||
virtual Ref<Image> get_seamless_image(int p_width, int p_height, bool p_invert = false, bool p_in_3d_space = false, real_t p_blend_skirt = 0.1, bool p_normalize = true) const;
|
||||
virtual TypedArray<Image> get_seamless_image_3d(int p_width, int p_height, int p_depth, bool p_invert = false, real_t p_blend_skirt = 0.1, bool p_normalize = true) const;
|
||||
};
|
||||
|
||||
#endif // NOISE_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef NOISE_TEXTURE_2D_H
|
||||
#define NOISE_TEXTURE_2D_H
|
||||
#pragma once
|
||||
|
||||
#include "noise.h"
|
||||
|
||||
|
|
@ -123,5 +122,3 @@ public:
|
|||
NoiseTexture2D();
|
||||
virtual ~NoiseTexture2D();
|
||||
};
|
||||
|
||||
#endif // NOISE_TEXTURE_2D_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef NOISE_TEXTURE_3D_H
|
||||
#define NOISE_TEXTURE_3D_H
|
||||
#pragma once
|
||||
|
||||
#include "noise.h"
|
||||
|
||||
|
|
@ -113,5 +112,3 @@ public:
|
|||
NoiseTexture3D();
|
||||
virtual ~NoiseTexture3D();
|
||||
};
|
||||
|
||||
#endif // NOISE_TEXTURE_3D_H
|
||||
|
|
|
|||
|
|
@ -28,12 +28,9 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef NOISE_REGISTER_TYPES_H
|
||||
#define NOISE_REGISTER_TYPES_H
|
||||
#pragma once
|
||||
|
||||
#include "modules/register_module_types.h"
|
||||
|
||||
void initialize_noise_module(ModuleInitializationLevel p_level);
|
||||
void uninitialize_noise_module(ModuleInitializationLevel p_level);
|
||||
|
||||
#endif // NOISE_REGISTER_TYPES_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef TEST_FASTNOISE_LITE_H
|
||||
#define TEST_FASTNOISE_LITE_H
|
||||
#pragma once
|
||||
|
||||
#include "../fastnoise_lite.h"
|
||||
|
||||
|
|
@ -633,5 +632,3 @@ TEST_CASE("[FastNoiseLite] Generating seamless 2D images (11x11px) and compare t
|
|||
}
|
||||
|
||||
} //namespace TestFastNoiseLite
|
||||
|
||||
#endif // TEST_FASTNOISE_LITE_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef TEST_NOISE_TEXTURE_2D_H
|
||||
#define TEST_NOISE_TEXTURE_2D_H
|
||||
#pragma once
|
||||
|
||||
#include "../noise_texture_2d.h"
|
||||
|
||||
|
|
@ -266,5 +265,3 @@ TEST_CASE("[NoiseTexture2D][SceneTree] Generating a seamless noise texture") {
|
|||
}
|
||||
|
||||
} //namespace TestNoiseTexture2D
|
||||
|
||||
#endif // TEST_NOISE_TEXTURE_2D_H
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef TEST_NOISE_TEXTURE_3D_H
|
||||
#define TEST_NOISE_TEXTURE_3D_H
|
||||
#pragma once
|
||||
|
||||
#include "../noise_texture_3d.h"
|
||||
|
||||
|
|
@ -234,5 +233,3 @@ TEST_CASE("[NoiseTexture3D][SceneTree] Generating a seamless noise texture") {
|
|||
}
|
||||
|
||||
} //namespace TestNoiseTexture3D
|
||||
|
||||
#endif // TEST_NOISE_TEXTURE_3D_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue