started working with MRT

small fixes for windows
2026-02-20 15:58:51 +01:00 · 2026-02-09 15:25:01 +01:00
16 changed files with 767 additions and 39 deletions
--- a/TSE_Core/src/BehaviourScripts/TileMap.cpp
+++ b/TSE_Core/src/BehaviourScripts/TileMap.cpp
@@ -279,3 +279,13 @@ TSE::Vector2 TSE::TileMap::ChunkToLocalPos(const Vector2 &v, const TileMapChunk
 {
    return v + chunk.pos * chunkSize;
 }
+
+TSE::Vector2 TSE::TileMap::RealPosToTileMapPos(const Vector2 &v)
+{
+    return v + nextLine * v.y;
+}
+
+TSE::Vector2 TSE::TileMap::TileMapToRealPos(const Vector2 &v)
+{
+    return v - nextLine * v.y;
+}
--- a/TSE_Core/src/BehaviourScripts/TileMap.hpp
+++ b/TSE_Core/src/BehaviourScripts/TileMap.hpp
@@ -60,6 +60,8 @@ namespace TSE
        const Rect& GetBounds() const { return bounds; }
        void SetNextLineOffset(const Vector2& offset);
        Vector2 GetNextLineOffset();
+        Vector2 RealPosToTileMapPos(const Vector2& v);
+        Vector2 TileMapToRealPos(const Vector2& v);

        inline const char* GetName() override
        {
--- a/TSE_Core/src/elements/Texture.cpp
+++ b/TSE_Core/src/elements/Texture.cpp
@@ -2,6 +2,7 @@
 #include "Debug.hpp"
 #include "Color.hpp"
 #include "ErrorTextureData.hpp"
+#include <filesystem>

 TSE::Texture::Texture(const string &path)
 {
@@ -10,9 +11,20 @@ TSE::Texture::Texture(const string &path)
    imagePtr = nullptr;
    Size = Vector2(0,0);

-    fif = FreeImage_GetFileType(path.c_str(), 0);
+    string name = std::filesystem::absolute(path).string();
+
+    if(!std::filesystem::exists(name))
+    {
+        string msg = string("File dose not exist: ") + std::filesystem::absolute(path).string();
+        TSE_ERROR(msg);
+        Bpp = 24;
+        makeError(*this);
+        return;
+    }
+    
+    fif = FreeImage_GetFileType(name.c_str(), 0);
    if(fif == FREE_IMAGE_FORMAT::FIF_UNKNOWN)
-        fif = FreeImage_GetFIFFromFilename(path.c_str());
+        fif = FreeImage_GetFIFFromFilename(name.c_str());
    if(fif == FREE_IMAGE_FORMAT::FIF_UNKNOWN)
    {
        TSE_ERROR("Failed to load image. Unsupported Format.");
--- a/TSE_Core/src/elements/TileSet.cpp
+++ b/TSE_Core/src/elements/TileSet.cpp
@@ -1,5 +1,6 @@
 #include "TileSet.hpp"
 #include "Debug.hpp"
+#include "Types.hpp"

 #define PADDING 0.0f

@@ -45,7 +46,7 @@ int TSE::TileSet::GetSpriteIdAt(int x, int y)
    return y * resx + x;
 }

-uint TSE::TileSet::GetTextueID()
+TSE::uint TSE::TileSet::GetTextueID()
 {
    return tex->GetTextureId();
 }
--- a/TSE_Core/src/interfaces/IRenderTexture.hpp
+++ b/TSE_Core/src/interfaces/IRenderTexture.hpp
@@ -13,11 +13,12 @@ namespace TSE
    public:
        inline static IRenderTextureCreator* factory = nullptr;
        virtual void SetSize(Vector2 v) = 0;
+        virtual uint GetTextureId(uint id) const = 0;
    };

    class IRenderTextureCreator
    {
    public:
-        virtual IRenderTexture* CreateTextureHeap(Vector2 v) = 0;
+        virtual IRenderTexture* CreateTextureHeap(Vector2 v, uint textureCount = 1) = 0;
    };
 } // namespace TSE
--- a/TSE_Core/src/interfaces/IWindow.cpp
+++ b/TSE_Core/src/interfaces/IWindow.cpp
@@ -6,6 +6,9 @@
 #include "IInputManager.hpp"
 #include "elements/AudioEngine.hpp"

+#define FREEIMAGE_LIB
+#include "FI/FreeImage.h"
+
 TSE::IWindow* TSE::IWindow::lastWindow = nullptr;

 bool TSE::IWindow::BaseInit() const
@@ -14,6 +17,7 @@ bool TSE::IWindow::BaseInit() const
    Debug::Init();
    Debug::Log("TSE:" + TSE_VERSION_STRING);
    AudioEngine::Init();
+    FreeImage_Initialise(true);
    return true;
 }

@@ -29,6 +33,7 @@ TSE::Vector2 TSE::IWindow::GetSize() const

 TSE::IWindow::~IWindow()
 {
+    FreeImage_DeInitialise();
    AudioEngine::Destroy();
    IInputManager::instance()->Delete();
    Time::Destroy();
--- a/TSE_Editor/src/EditorSubsystem.cpp
+++ b/TSE_Editor/src/EditorSubsystem.cpp
@@ -7,7 +7,7 @@

 TSE::EDITOR::EditorSubsystem::EditorSubsystem() : sv(nullptr), editorLayer("")
 {
-    rt = IRenderTexture::factory->CreateTextureHeap({100,100});
+    rt = IRenderTexture::factory->CreateTextureHeap({100,100}, 2);
    sv = SceneView(rt);

    controller.AddGuiElement("Scene", &sv);
--- a/TSE_Editor/src/UI/windows/CameraView.cpp
+++ b/TSE_Editor/src/UI/windows/CameraView.cpp
@@ -19,7 +19,7 @@ void TSE::EDITOR::CameraView::Define()
    ImGuiWindowFlags flags2 = ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar;
    if(ImGui::BeginChild("##CameraChild", {0,0}, ImGuiChildFlags_None, flags2))
    {
-        ImGui::Image(fb->GetTextureId(), {fb->Width(), fb->Height()},{0,1}, {1,0});
+        ImGui::Image(fb->GetTextureId(0), {fb->Width(), fb->Height()},{0,1}, {1,0});
        auto vec2 = ImGui::GetWindowSize();
        if(fb->Width() != vec2.x || fb->Height() != vec2.y)
        {
--- a/TSE_Editor/src/UI/windows/SceneView.cpp
+++ b/TSE_Editor/src/UI/windows/SceneView.cpp
@@ -5,25 +5,37 @@ TSE::EDITOR::SceneView::SceneView(TSE::IRenderTexture *frameBuffer) : GuiWindow(
    fb = frameBuffer;
 }

+int selected = 0;
+
 void TSE::EDITOR::SceneView::Define()
 {
    ImGuiWindowFlags flags2 = ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar;
    if(ImGui::BeginChild("##SceneChild", {0,0}, ImGuiChildFlags_None, flags2))
    {
-        ImGui::Image(fb->GetTextureId(), {fb->Width(), fb->Height()},{0,1}, {1,0});
+        ImGui::Image(fb->GetTextureId(selected), {fb->Width(), fb->Height()},{0,1}, {1,0});
        auto vec2 = ImGui::GetWindowSize();
        if(fb->Width() != vec2.x || fb->Height() != vec2.y)
        {
            fb->SetSize({vec2.x, vec2.y});
        }
-        if(ImGui::IsWindowFocused())
-        {
-            IsHovered = true;
-        }
-        else
-        {
-            IsHovered = false;
-        }
+
+
+        static const char* items[] = {
+            "0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15",
+            "16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"
+        };
+
+        ImGui::SetCursorPos(ImVec2(6.0f, 6.0f));
+
+        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0,0,0,0.6f));
+        ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0,0,0,0.9f));
+
+        ImGui::SetNextItemWidth(80.0f);
+        ImGui::Combo("##SceneDropdown", &selected, items, IM_ARRAYSIZE(items));
+
+        ImGui::PopStyleColor(2);
+
+        IsHovered = ImGui::IsWindowFocused();
    }
    ImGui::EndChild();
 }
--- a/TSE_GlfwOpenGlImpl/src/RenderTexture.cpp
+++ b/TSE_GlfwOpenGlImpl/src/RenderTexture.cpp
@@ -1,6 +1,6 @@
 #include "RenderTexture.hpp"

-TSE::GLFW::RenderTexture::RenderTexture(Vector2 v) : buffer(v)
+TSE::GLFW::RenderTexture::RenderTexture(Vector2 v, uint textureCount) : buffer(v, textureCount)
 {
    buffer.AddResizeNotifiable(this);
 }
@@ -30,6 +30,11 @@ TSE::uint TSE::GLFW::RenderTexture::GetTextureId() const
    return buffer.GetTextureId();
 }

+TSE::uint TSE::GLFW::RenderTexture::GetTextureId(uint id) const
+{
+    return buffer.GetTextureId(id);
+}
+
 void TSE::GLFW::RenderTexture::Update()
 {
    buffer.Update();
--- a/TSE_GlfwOpenGlImpl/src/RenderTexture.hpp
+++ b/TSE_GlfwOpenGlImpl/src/RenderTexture.hpp
@@ -13,13 +13,14 @@ namespace TSE::GLFW
    public:
        FrameBuffer buffer;

-        RenderTexture(Vector2 v);
+        RenderTexture(Vector2 v, uint textureCount = 1);

        Vector2 size() const override;
        void SetSize(Vector2 v) override;
        float Width() const override;
        float Height() const override;
        uint GetTextureId() const override;
+        uint GetTextureId(uint id) const override;

        void Update() override;
        void Bind() override;
--- a/TSE_GlfwOpenGlImpl/src/RenderTextureCreatorOpenGL.hpp
+++ b/TSE_GlfwOpenGlImpl/src/RenderTextureCreatorOpenGL.hpp
@@ -8,9 +8,9 @@ namespace TSE::GLFW
    class RenderTextureCreatorOpenGL : public IRenderTextureCreator
    {
    public:
-        inline IRenderTexture* CreateTextureHeap(Vector2 v) override
+        inline IRenderTexture* CreateTextureHeap(Vector2 v, uint textureCount = 1) override
        {
-            return new RenderTexture(v);
+            return new RenderTexture(v, textureCount);
        };
    };
 } // namespace name
--- a/TSE_GlfwOpenGlImpl/src/buffer/FrameBuffer.cpp
+++ b/TSE_GlfwOpenGlImpl/src/buffer/FrameBuffer.cpp
@@ -1,8 +1,9 @@
 #include "FrameBuffer.hpp"
 #include "Debug.hpp"

-TSE::GLFW::FrameBuffer::FrameBuffer(const Vector2 &size)
+TSE::GLFW::FrameBuffer::FrameBuffer(const Vector2 &size, uint textureCount)
 {
+    textureOutputCount = textureCount;
    width = size.x;
    height = size.y;
    CreateFBTexture();
@@ -26,7 +27,10 @@ void TSE::GLFW::FrameBuffer::Unbind()
 TSE::GLFW::FrameBuffer::~FrameBuffer()
 {
    glDeleteFramebuffers(1,&bufferID);
-    glDeleteTextures(1, &textureID);
+    for (int i = 0; i < textureOutputCount; i++)
+    {
+        glDeleteTextures(1, &(textureIDs[i]));
+    }
    glDeleteRenderbuffers(1, &depthRboID);
 }

@@ -48,9 +52,9 @@ void TSE::GLFW::FrameBuffer::Update()
    }
 }

-TSE::uint TSE::GLFW::FrameBuffer::GetTextureId() const
+TSE::uint TSE::GLFW::FrameBuffer::GetTextureId(uint id) const
 {
-    return textureID;
+    return textureIDs[id];
 }

 TSE::Vector2 TSE::GLFW::FrameBuffer::GetSize() const
@@ -62,9 +66,17 @@ void TSE::GLFW::FrameBuffer::Initialize()
 {
    glGenFramebuffers(1, &bufferID);
    Bind();
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textureID, 0);
+    uint bufs[32];
+    for (int i = 0; i < textureOutputCount; i++)
+    {
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, textureIDs[i], 0);
+        bufs[i] = GL_COLOR_ATTACHMENT0 + i;
+    }
    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRboID);
    
+    if(textureOutputCount > 1)
+        glDrawBuffers(textureOutputCount, bufs);
+
    if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
    {
        TSE_ERROR("Failed to create OpenGL FBO.");
@@ -75,7 +87,9 @@ void TSE::GLFW::FrameBuffer::Initialize()

 void TSE::GLFW::FrameBuffer::LoadFBTexture()
 {
-    glBindTexture(GL_TEXTURE_2D, textureID);
+    for (int i = 0; i < textureOutputCount; i++)
+    {
+        glBindTexture(GL_TEXTURE_2D, textureIDs[i]);
        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);

        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -86,13 +100,17 @@ void TSE::GLFW::FrameBuffer::LoadFBTexture()
        glBindRenderbuffer(GL_RENDERBUFFER, depthRboID);
        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
    }
+}

 void TSE::GLFW::FrameBuffer::CreateFBTexture()
 {
    glViewport(0,0, width, height);
    //resize
-    if(textureID == 0)
-        glGenTextures(1, &textureID);
+    for (int i = 0; i < textureOutputCount; i++)
+    {
+        if(textureIDs[i] == 0)
+            glGenTextures(1, &(textureIDs[i]));
+    }
    if(depthRboID == 0)
        glGenRenderbuffers(1, &depthRboID);
    LoadFBTexture();
--- a/TSE_GlfwOpenGlImpl/src/buffer/FrameBuffer.hpp
+++ b/TSE_GlfwOpenGlImpl/src/buffer/FrameBuffer.hpp
@@ -9,18 +9,19 @@ namespace TSE::GLFW
    class FrameBuffer : public buffer, public IResizable
    {
    private:
-        uint textureID = 0;
+        uint textureOutputCount = 1;
+        uint textureIDs[32] = {0};
        uint depthRboID = 0;
        bool shouldResize = false;

    public:
-        FrameBuffer(const Vector2& size);
+        FrameBuffer(const Vector2& size, uint textureCount = 1);
        void Bind() override;
        void Unbind() override;
        ~FrameBuffer() override;
        void Resize(Vector2 size);
        void Update();
-        uint GetTextureId() const;
+        uint GetTextureId(uint id = 0) const;
        Vector2 GetSize() const;

    private:
--- a/TSE_GlfwOpenGlImpl/src/shader/basicTileMapShader.cpp
+++ b/TSE_GlfwOpenGlImpl/src/shader/basicTileMapShader.cpp
@@ -171,7 +171,7 @@ void TSE::GLFW::BasicTileMapShader::OnSubmit(const Transformable &t, float *&tar
    SpriteCount = tileSet->GetCount();
    SpriteScale = tm->SpriteScale;

-    int chunkcount = tm->GetChunkCount();
+    const int chunkcount = tm->GetChunkCount();
    Vector2 orderedChunks[chunkcount];
    tm->GetChunkPositionsInOrder(orderedChunks);

@@ -182,7 +182,7 @@ void TSE::GLFW::BasicTileMapShader::OnSubmit(const Transformable &t, float *&tar
    for(auto chunkPos : orderedChunks)
    {
        auto chunk = tm->GetChunk(chunkPos);
-        int spriteCount = chunk->GetSpriteCount();
+        const int spriteCount = chunk->GetSpriteCount();
        Vector2 spritePositions[spriteCount];
        int spriteIds[spriteCount];
        chunk->GetOrderedPositions(spritePositions);
@@ -208,5 +208,6 @@ void TSE::GLFW::BasicTileMapShader::OnSubmit(const Transformable &t, float *&tar
        }
    }

+    stack.Pop();
    restartDrawcall(rnd);
 }
--- a/TSE_Math/src/PerlinNoise.hpp
+++ b/TSE_Math/src/PerlinNoise.hpp
@@ -0,0 +1,659 @@
+//----------------------------------------------------------------------------------------
+//
+//	siv::PerlinNoise
+//	Perlin noise library for modern C++
+//
+//	Copyright (C) 2013-2021 Ryo Suzuki <reputeless@gmail.com>
+//
+//	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.
+//
+//----------------------------------------------------------------------------------------
+
+# pragma once
+# include <cstdint>
+# include <algorithm>
+# include <array>
+# include <iterator>
+# include <numeric>
+# include <random>
+# include <type_traits>
+
+# if __has_include(<concepts>) && defined(__cpp_concepts)
+#	include <concepts>
+# endif
+
+
+// Library major version
+# define SIVPERLIN_VERSION_MAJOR			3
+
+// Library minor version
+# define SIVPERLIN_VERSION_MINOR			0
+
+// Library revision version
+# define SIVPERLIN_VERSION_REVISION			0
+
+// Library version
+# define SIVPERLIN_VERSION			((SIVPERLIN_VERSION_MAJOR * 100 * 100) + (SIVPERLIN_VERSION_MINOR * 100) + (SIVPERLIN_VERSION_REVISION))
+
+
+// [[nodiscard]] for constructors
+# if (201907L <= __has_cpp_attribute(nodiscard))
+#	define SIVPERLIN_NODISCARD_CXX20 [[nodiscard]]
+# else
+#	define SIVPERLIN_NODISCARD_CXX20
+# endif
+
+
+// std::uniform_random_bit_generator concept
+# if __cpp_lib_concepts
+#	define SIVPERLIN_CONCEPT_URBG  template <std::uniform_random_bit_generator URBG>
+#	define SIVPERLIN_CONCEPT_URBG_ template <std::uniform_random_bit_generator URBG>
+# else
+#	define SIVPERLIN_CONCEPT_URBG  template <class URBG, std::enable_if_t<std::conjunction_v<std::is_invocable<URBG&>, std::is_unsigned<std::invoke_result_t<URBG&>>>>* = nullptr>
+#	define SIVPERLIN_CONCEPT_URBG_ template <class URBG, std::enable_if_t<std::conjunction_v<std::is_invocable<URBG&>, std::is_unsigned<std::invoke_result_t<URBG&>>>>*>
+# endif
+
+
+// arbitrary value for increasing entropy
+# ifndef SIVPERLIN_DEFAULT_Y
+#	define SIVPERLIN_DEFAULT_Y (0.12345)
+# endif
+
+// arbitrary value for increasing entropy
+# ifndef SIVPERLIN_DEFAULT_Z
+#	define SIVPERLIN_DEFAULT_Z (0.34567)
+# endif
+
+
+namespace siv
+{
+	template <class Float>
+	class BasicPerlinNoise
+	{
+	public:
+
+		static_assert(std::is_floating_point_v<Float>);
+
+		///////////////////////////////////////
+		//
+		//	Typedefs
+		//
+
+		using state_type = std::array<std::uint8_t, 256>;
+
+		using value_type = Float;
+
+		using default_random_engine = std::mt19937;
+
+		using seed_type = typename default_random_engine::result_type;
+
+		///////////////////////////////////////
+		//
+		//	Constructors
+		//
+
+		SIVPERLIN_NODISCARD_CXX20
+		constexpr BasicPerlinNoise() noexcept;
+
+		SIVPERLIN_NODISCARD_CXX20
+		explicit BasicPerlinNoise(seed_type seed);
+
+		SIVPERLIN_CONCEPT_URBG
+		SIVPERLIN_NODISCARD_CXX20
+		explicit BasicPerlinNoise(URBG&& urbg);
+
+		///////////////////////////////////////
+		//
+		//	Reseed
+		//
+
+		void reseed(seed_type seed);
+
+		SIVPERLIN_CONCEPT_URBG
+		void reseed(URBG&& urbg);
+
+		///////////////////////////////////////
+		//
+		//	Serialization
+		//
+
+		[[nodiscard]]
+		constexpr const state_type& serialize() const noexcept;
+
+		constexpr void deserialize(const state_type& state) noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Noise (The result is in the range [-1, 1])
+		//
+
+		[[nodiscard]]
+		value_type noise1D(value_type x) const noexcept;
+
+		[[nodiscard]]
+		value_type noise2D(value_type x, value_type y) const noexcept;
+
+		[[nodiscard]]
+		value_type noise3D(value_type x, value_type y, value_type z) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Noise (The result is remapped to the range [0, 1])
+		//
+
+		[[nodiscard]]
+		value_type noise1D_01(value_type x) const noexcept;
+
+		[[nodiscard]]
+		value_type noise2D_01(value_type x, value_type y) const noexcept;
+
+		[[nodiscard]]
+		value_type noise3D_01(value_type x, value_type y, value_type z) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Octave noise (The result can be out of the range [-1, 1])
+		//
+
+		[[nodiscard]]
+		value_type octave1D(value_type x, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave2D(value_type x, value_type y, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave3D(value_type x, value_type y, value_type z, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Octave noise (The result is clamped to the range [-1, 1])
+		//
+
+		[[nodiscard]]
+		value_type octave1D_11(value_type x, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave2D_11(value_type x, value_type y, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave3D_11(value_type x, value_type y, value_type z, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Octave noise (The result is clamped and remapped to the range [0, 1])
+		//
+
+		[[nodiscard]]
+		value_type octave1D_01(value_type x, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave2D_01(value_type x, value_type y, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type octave3D_01(value_type x, value_type y, value_type z, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Octave noise (The result is normalized to the range [-1, 1])
+		//
+
+		[[nodiscard]]
+		value_type normalizedOctave1D(value_type x, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type normalizedOctave2D(value_type x, value_type y, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type normalizedOctave3D(value_type x, value_type y, value_type z, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		///////////////////////////////////////
+		//
+		//	Octave noise (The result is normalized and remapped to the range [0, 1])
+		//
+
+		[[nodiscard]]
+		value_type normalizedOctave1D_01(value_type x, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type normalizedOctave2D_01(value_type x, value_type y, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+		[[nodiscard]]
+		value_type normalizedOctave3D_01(value_type x, value_type y, value_type z, std::int32_t octaves, value_type persistence = value_type(0.5)) const noexcept;
+
+	private:
+
+		state_type m_permutation;
+	};
+
+	using PerlinNoise = BasicPerlinNoise<double>;
+
+	namespace perlin_detail
+	{
+		////////////////////////////////////////////////
+		//
+		//	These functions are provided for consistency.
+		//	You may get different results from std::shuffle() with different standard library implementations.
+		//
+		SIVPERLIN_CONCEPT_URBG
+		[[nodiscard]]
+		inline std::uint64_t Random(const std::uint64_t max, URBG&& urbg)
+		{
+			return (urbg() % (max + 1));
+		}
+
+		template <class RandomIt, class URBG>
+		inline void Shuffle(RandomIt first, RandomIt last, URBG&& urbg)
+		{
+			if (first == last)
+			{
+				return;
+			}
+
+			using difference_type = typename std::iterator_traits<RandomIt>::difference_type;
+
+			for (RandomIt it = first + 1; it < last; ++it)
+			{
+				const std::uint64_t n = static_cast<std::uint64_t>(it - first);
+				std::iter_swap(it, first + static_cast<difference_type>(Random(n, std::forward<URBG>(urbg))));
+			}
+		}
+		//
+		////////////////////////////////////////////////
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float Fade(const Float t) noexcept
+		{
+			return t * t * t * (t * (t * 6 - 15) + 10);
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float Lerp(const Float a, const Float b, const Float t) noexcept
+		{
+			return (a + (b - a) * t);
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float Grad(const std::uint8_t hash, const Float x, const Float y, const Float z) noexcept
+		{
+			const std::uint8_t h = hash & 15;
+			const Float u = h < 8 ? x : y;
+			const Float v = h < 4 ? y : h == 12 || h == 14 ? x : z;
+			return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float Remap_01(const Float x) noexcept
+		{
+			return (x * Float(0.5) + Float(0.5));
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float Clamp_11(const Float x) noexcept
+		{
+			return std::clamp(x, Float(-1.0), Float(1.0));
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float RemapClamp_01(const Float x) noexcept
+		{
+			if (x <= Float(-1.0))
+			{
+				return Float(0.0);
+			}
+			else if (Float(1.0) <= x)
+			{
+				return Float(1.0);
+			}
+
+			return (x * Float(0.5) + Float(0.5));
+		}
+
+		template <class Noise, class Float>
+		[[nodiscard]]
+		inline auto Octave1D(const Noise& noise, Float x, const std::int32_t octaves, const Float persistence) noexcept
+		{
+			using value_type = Float;
+			value_type result = 0;
+			value_type amplitude = 1;
+
+			for (std::int32_t i = 0; i < octaves; ++i)
+			{
+				result += (noise.noise1D(x) * amplitude);
+				x *= 2;
+				amplitude *= persistence;
+			}
+
+			return result;
+		}
+
+		template <class Noise, class Float>
+		[[nodiscard]]
+		inline auto Octave2D(const Noise& noise, Float x, Float y, const std::int32_t octaves, const Float persistence) noexcept
+		{
+			using value_type = Float;
+			value_type result = 0;
+			value_type amplitude = 1;
+
+			for (std::int32_t i = 0; i < octaves; ++i)
+			{
+				result += (noise.noise2D(x, y) * amplitude);
+				x *= 2;
+				y *= 2;
+				amplitude *= persistence;
+			}
+
+			return result;
+		}
+
+		template <class Noise, class Float>
+		[[nodiscard]]
+		inline auto Octave3D(const Noise& noise, Float x, Float y, Float z, const std::int32_t octaves, const Float persistence) noexcept
+		{
+			using value_type = Float;
+			value_type result = 0;
+			value_type amplitude = 1;
+
+			for (std::int32_t i = 0; i < octaves; ++i)
+			{
+				result += (noise.noise3D(x, y, z) * amplitude);
+				x *= 2;
+				y *= 2;
+				z *= 2;
+				amplitude *= persistence;
+			}
+
+			return result;
+		}
+
+		template <class Float>
+		[[nodiscard]]
+		inline constexpr Float MaxAmplitude(const std::int32_t octaves, const Float persistence) noexcept
+		{
+			using value_type = Float;
+			value_type result = 0;
+			value_type amplitude = 1;
+
+			for (std::int32_t i = 0; i < octaves; ++i)
+			{
+				result += amplitude;
+				amplitude *= persistence;
+			}
+
+			return result;
+		}
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline constexpr BasicPerlinNoise<Float>::BasicPerlinNoise() noexcept
+		: m_permutation{ 151,160,137,91,90,15,
+				131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23,
+				190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33,
+				88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166,
+				77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244,
+				102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196,
+				135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123,
+				5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42,
+				223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9,
+				129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228,
+				251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107,
+				49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254,
+				138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180 } {}
+
+	template <class Float>
+	inline BasicPerlinNoise<Float>::BasicPerlinNoise(const seed_type seed)
+	{
+		reseed(seed);
+	}
+
+	template <class Float>
+	SIVPERLIN_CONCEPT_URBG_
+	inline BasicPerlinNoise<Float>::BasicPerlinNoise(URBG&& urbg)
+	{
+		reseed(std::forward<URBG>(urbg));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline void BasicPerlinNoise<Float>::reseed(const seed_type seed)
+	{
+		reseed(default_random_engine{ seed });
+	}
+
+	template <class Float>
+	SIVPERLIN_CONCEPT_URBG_
+	inline void BasicPerlinNoise<Float>::reseed(URBG&& urbg)
+	{
+		std::iota(m_permutation.begin(), m_permutation.end(), uint8_t{ 0 });
+
+		perlin_detail::Shuffle(m_permutation.begin(), m_permutation.end(), std::forward<URBG>(urbg));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline constexpr const typename BasicPerlinNoise<Float>::state_type& BasicPerlinNoise<Float>::serialize() const noexcept
+	{
+		return m_permutation;
+	}
+
+	template <class Float>
+	inline constexpr void BasicPerlinNoise<Float>::deserialize(const state_type& state) noexcept
+	{
+		m_permutation = state;
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise1D(const value_type x) const noexcept
+	{
+		return noise3D(x,
+			static_cast<value_type>(SIVPERLIN_DEFAULT_Y),
+			static_cast<value_type>(SIVPERLIN_DEFAULT_Z));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise2D(const value_type x, const value_type y) const noexcept
+	{
+		return noise3D(x,
+			y,
+			static_cast<value_type>(SIVPERLIN_DEFAULT_Z));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise3D(const value_type x, const value_type y, const value_type z) const noexcept
+	{
+		const value_type _x = std::floor(x);
+		const value_type _y = std::floor(y);
+		const value_type _z = std::floor(z);
+
+		const std::int32_t ix = static_cast<std::int32_t>(_x) & 255;
+		const std::int32_t iy = static_cast<std::int32_t>(_y) & 255;
+		const std::int32_t iz = static_cast<std::int32_t>(_z) & 255;
+
+		const value_type fx = (x - _x);
+		const value_type fy = (y - _y);
+		const value_type fz = (z - _z);
+
+		const value_type u = perlin_detail::Fade(fx);
+		const value_type v = perlin_detail::Fade(fy);
+		const value_type w = perlin_detail::Fade(fz);
+
+		const std::uint8_t A = (m_permutation[ix & 255] + iy) & 255;
+		const std::uint8_t B = (m_permutation[(ix + 1) & 255] + iy) & 255;
+
+		const std::uint8_t AA = (m_permutation[A] + iz) & 255;
+		const std::uint8_t AB = (m_permutation[(A + 1) & 255] + iz) & 255;
+
+		const std::uint8_t BA = (m_permutation[B] + iz) & 255;
+		const std::uint8_t BB = (m_permutation[(B + 1) & 255] + iz) & 255;
+
+		const value_type p0 = perlin_detail::Grad(m_permutation[AA], fx, fy, fz);
+		const value_type p1 = perlin_detail::Grad(m_permutation[BA], fx - 1, fy, fz);
+		const value_type p2 = perlin_detail::Grad(m_permutation[AB], fx, fy - 1, fz);
+		const value_type p3 = perlin_detail::Grad(m_permutation[BB], fx - 1, fy - 1, fz);
+		const value_type p4 = perlin_detail::Grad(m_permutation[(AA + 1) & 255], fx, fy, fz - 1);
+		const value_type p5 = perlin_detail::Grad(m_permutation[(BA + 1) & 255], fx - 1, fy, fz - 1);
+		const value_type p6 = perlin_detail::Grad(m_permutation[(AB + 1) & 255], fx, fy - 1, fz - 1);
+		const value_type p7 = perlin_detail::Grad(m_permutation[(BB + 1) & 255], fx - 1, fy - 1, fz - 1);
+
+		const value_type q0 = perlin_detail::Lerp(p0, p1, u);
+		const value_type q1 = perlin_detail::Lerp(p2, p3, u);
+		const value_type q2 = perlin_detail::Lerp(p4, p5, u);
+		const value_type q3 = perlin_detail::Lerp(p6, p7, u);
+
+		const value_type r0 = perlin_detail::Lerp(q0, q1, v);
+		const value_type r1 = perlin_detail::Lerp(q2, q3, v);
+
+		return perlin_detail::Lerp(r0, r1, w);
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise1D_01(const value_type x) const noexcept
+	{
+		return perlin_detail::Remap_01(noise1D(x));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise2D_01(const value_type x, const value_type y) const noexcept
+	{
+		return perlin_detail::Remap_01(noise2D(x, y));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::noise3D_01(const value_type x, const value_type y, const value_type z) const noexcept
+	{
+		return perlin_detail::Remap_01(noise3D(x, y, z));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave1D(const value_type x, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Octave1D(*this, x, octaves, persistence);
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave2D(const value_type x, const value_type y, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Octave2D(*this, x, y, octaves, persistence);
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave3D(const value_type x, const value_type y, const value_type z, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Octave3D(*this, x, y, z, octaves, persistence);
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave1D_11(const value_type x, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Clamp_11(octave1D(x, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave2D_11(const value_type x, const value_type y, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Clamp_11(octave2D(x, y, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave3D_11(const value_type x, const value_type y, const value_type z, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Clamp_11(octave3D(x, y, z, octaves, persistence));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave1D_01(const value_type x, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::RemapClamp_01(octave1D(x, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave2D_01(const value_type x, const value_type y, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::RemapClamp_01(octave2D(x, y, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::octave3D_01(const value_type x, const value_type y, const value_type z, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::RemapClamp_01(octave3D(x, y, z, octaves, persistence));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave1D(const value_type x, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return (octave1D(x, octaves, persistence) / perlin_detail::MaxAmplitude(octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave2D(const value_type x, const value_type y, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return (octave2D(x, y, octaves, persistence) / perlin_detail::MaxAmplitude(octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave3D(const value_type x, const value_type y, const value_type z, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return (octave3D(x, y, z, octaves, persistence) / perlin_detail::MaxAmplitude(octaves, persistence));
+	}
+
+	///////////////////////////////////////
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave1D_01(const value_type x, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Remap_01(normalizedOctave1D(x, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave2D_01(const value_type x, const value_type y, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Remap_01(normalizedOctave2D(x, y, octaves, persistence));
+	}
+
+	template <class Float>
+	inline typename BasicPerlinNoise<Float>::value_type BasicPerlinNoise<Float>::normalizedOctave3D_01(const value_type x, const value_type y, const value_type z, const std::int32_t octaves, const value_type persistence) const noexcept
+	{
+		return perlin_detail::Remap_01(normalizedOctave3D(x, y, z, octaves, persistence));
+	}
+}
+
+# undef SIVPERLIN_NODISCARD_CXX20
+# undef SIVPERLIN_CONCEPT_URBG
+# undef SIVPERLIN_CONCEPT_URBG_
Author	SHA256	Message	Date
Mexpert_PRO	45501f153d	started working with MRT	2026-02-20 15:58:51 +01:00
Mexpert_PRO	55dce5776a	small fixes for windows	2026-02-09 15:25:01 +01:00