cleaned up renderer
This commit is contained in:
parent
afe23851f0
commit
d661c88ee2
58 changed files with 3030 additions and 4722 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
Crafter®.Graphics
|
||||
Copyright (C) 2025 Catcrafts®
|
||||
Copyright (C) 2026 Catcrafts®
|
||||
Catcrafts.net
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
|
|
@ -18,41 +18,23 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
module;
|
||||
#ifdef CRAFTER_GRAPHICS_VULKAN
|
||||
#ifdef CRAFTER_GRAPHICS_RENDERER_VULKAN
|
||||
#include "vulkan/vulkan.h"
|
||||
#endif
|
||||
export module Crafter.Graphics:Types;
|
||||
import std;
|
||||
import Crafter.Math;
|
||||
|
||||
export namespace Crafter {
|
||||
struct MousePoint {
|
||||
std::uint32_t x;
|
||||
std::uint32_t y;
|
||||
};
|
||||
|
||||
struct MouseDelta {
|
||||
std::int64_t x;
|
||||
std::int64_t y;
|
||||
};
|
||||
|
||||
struct MouseMoveEvent {
|
||||
MousePoint lastMousePos;
|
||||
MousePoint currentMousePos;
|
||||
MouseDelta mouseDelta;
|
||||
Vector<float, 2> lastMousePos;
|
||||
Vector<float, 2> currentMousePos;
|
||||
Vector<float, 2> mouseDelta;
|
||||
};
|
||||
|
||||
struct ScaleData {
|
||||
std::int32_t x;
|
||||
std::int32_t y;
|
||||
std::int32_t width;
|
||||
std::int32_t height;
|
||||
};
|
||||
|
||||
struct ScaleDataBoundless {
|
||||
std::uint32_t x;
|
||||
std::uint32_t y;
|
||||
std::uint32_t width;
|
||||
std::uint32_t height;
|
||||
struct ScaleData2D {
|
||||
Vector<std::int32_t, 2> position;
|
||||
Vector<std::int32_t, 2> size;
|
||||
};
|
||||
|
||||
struct ClipRect {
|
||||
|
|
@ -62,67 +44,6 @@ export namespace Crafter {
|
|||
std::int32_t bottom;
|
||||
};
|
||||
|
||||
struct __attribute__((packed)) Pixel_BU8_GU8_RU8_AU8 {
|
||||
std::uint8_t b;
|
||||
std::uint8_t g;
|
||||
std::uint8_t r;
|
||||
std::uint8_t a;
|
||||
};
|
||||
|
||||
struct __attribute__((packed)) Pixel_RU8_GU8_BU8_AU8 {
|
||||
std::uint8_t r;
|
||||
std::uint8_t g;
|
||||
std::uint8_t b;
|
||||
std::uint8_t a;
|
||||
};
|
||||
|
||||
struct __attribute__((packed)) Pixel_RU8_GU8_BU8 {
|
||||
std::uint8_t r;
|
||||
std::uint8_t g;
|
||||
std::uint8_t b;
|
||||
};
|
||||
|
||||
// struct __attribute__((packed)) Vertex {
|
||||
// float x;
|
||||
// float y;
|
||||
// float z;
|
||||
// float w;
|
||||
// };
|
||||
// struct __attribute__((packed)) VertexUV {
|
||||
// float x;
|
||||
// float y;
|
||||
// float z;
|
||||
// float w;
|
||||
|
||||
// float u;
|
||||
// float v;
|
||||
|
||||
// float pad[2];
|
||||
// };
|
||||
|
||||
// struct __attribute__((packed)) VertexRGBA {
|
||||
// float x;
|
||||
// float y;
|
||||
// float z;
|
||||
// float w;
|
||||
|
||||
// float r;
|
||||
// float g;
|
||||
// float b;
|
||||
// float a;
|
||||
// };
|
||||
|
||||
// struct __attribute__((packed)) HeightRGBA {
|
||||
// float height;
|
||||
|
||||
// float pad[3];
|
||||
|
||||
// float r;
|
||||
// float g;
|
||||
// float b;
|
||||
// float a;
|
||||
// };
|
||||
|
||||
struct FrameTime {
|
||||
std::chrono::time_point<std::chrono::high_resolution_clock> now;
|
||||
std::chrono::duration<double> delta;
|
||||
|
|
@ -134,191 +55,6 @@ export namespace Crafter {
|
|||
Transparent // Color blending is used
|
||||
};
|
||||
|
||||
|
||||
constexpr std::int8_t BOUND8 = 9;
|
||||
constexpr std::int8_t SCALE8 = std::numeric_limits<std::int8_t>::max() / BOUND8;
|
||||
constexpr std::uint8_t SCALEBOUNDLESS8 = std::numeric_limits<std::uint8_t>::max();
|
||||
|
||||
constexpr double SCALEDOUBLE8 = static_cast<double>(std::numeric_limits<std::int8_t>::max() / BOUND8);
|
||||
constexpr double SCALEBOUNDLESSDOUBLE8 = static_cast<double>(std::numeric_limits<std::uint8_t>::max());
|
||||
|
||||
constexpr std::int16_t BOUND16 = 9;
|
||||
constexpr std::int16_t SCALE16 = std::numeric_limits<std::int16_t>::max() / BOUND16;
|
||||
constexpr std::uint16_t SCALEBOUNDLESS16 = std::numeric_limits<std::uint16_t>::max();
|
||||
|
||||
constexpr double SCALEDOUBLE16 = static_cast<double>(std::numeric_limits<std::int16_t>::max() / BOUND16);
|
||||
constexpr double SCALEBOUNDLESSDOUBLE16 = static_cast<double>(std::numeric_limits<std::uint16_t>::max());
|
||||
|
||||
constexpr std::int32_t BOUND32 = 9;
|
||||
constexpr std::int32_t SCALE32 = std::numeric_limits<std::int32_t>::max() / BOUND32;
|
||||
constexpr std::uint32_t SCALEBOUNDLESS32 = std::numeric_limits<std::uint32_t>::max();
|
||||
|
||||
constexpr double SCALEDOUBLE32 = static_cast<double>(std::numeric_limits<std::int32_t>::max() / BOUND32);
|
||||
constexpr double SCALEBOUNDLESSDOUBLE32 = static_cast<double>(std::numeric_limits<std::uint32_t>::max());
|
||||
|
||||
constexpr std::int64_t BOUND64 = 9;
|
||||
constexpr std::int64_t SCALE64 = std::numeric_limits<std::int64_t>::max() / BOUND64;
|
||||
constexpr std::uint64_t SCALEBOUNDLESS64 = std::numeric_limits<std::uint64_t>::max();
|
||||
|
||||
constexpr double SCALEDOUBLE64 = static_cast<double>(std::numeric_limits<std::int64_t>::max() / BOUND64);
|
||||
constexpr double SCALEBOUNDLESSDOUBLE64 = static_cast<double>(std::numeric_limits<std::uint64_t>::max());
|
||||
|
||||
template <typename T>
|
||||
constexpr T FractionalToMapped(double f) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::int8_t> || std::is_same_v<T, std::uint8_t>) {
|
||||
return T(f * SCALEDOUBLE8);
|
||||
} else if constexpr (std::is_same_v<T, std::int16_t> || std::is_same_v<T, std::uint16_t>) {
|
||||
return T(f * SCALEDOUBLE16);
|
||||
} else if constexpr (std::is_same_v<T, std::int32_t> || std::is_same_v<T, std::uint32_t>) {
|
||||
return T(f * SCALEDOUBLE32);
|
||||
} else {
|
||||
return T(f * SCALEDOUBLE64);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr T FractionalToMappedBoundless(double f) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t>) {
|
||||
return T(f * SCALEBOUNDLESSDOUBLE8);
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return T(f * SCALEBOUNDLESSDOUBLE16);
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return T(f * SCALEBOUNDLESSDOUBLE32);
|
||||
} else {
|
||||
return T(f * SCALEBOUNDLESSDOUBLE64);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr double MappedToFractional(T mapped) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::int8_t> || std::is_same_v<T, std::uint8_t>) {
|
||||
return mapped / SCALEDOUBLE8;
|
||||
} else if constexpr (std::is_same_v<T, std::int16_t> || std::is_same_v<T, std::uint16_t>) {
|
||||
return mapped / SCALEDOUBLE16;
|
||||
} else if constexpr (std::is_same_v<T, std::int32_t> || std::is_same_v<T, std::uint32_t>) {
|
||||
return mapped / SCALEDOUBLE32;
|
||||
} else {
|
||||
return mapped / SCALEDOUBLE64;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr double MappedToFractionalBoundless(T mapped) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE8;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE16;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE32;
|
||||
} else {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE64;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr double MappedToNDCBoundless(T mapped, std::uint32_t size) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE8 - 0.5;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE16 - 0.5;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE32 - 0.5;
|
||||
} else {
|
||||
return mapped / SCALEBOUNDLESSDOUBLE64 - 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename T2>
|
||||
constexpr T MappedToAbsolute(T mapped, T2 absolute) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::int8_t> || std::is_same_v<T, std::uint8_t>) {
|
||||
return static_cast<std::int16_t>(mapped) * absolute / SCALE8;
|
||||
} else if constexpr (std::is_same_v<T, std::int16_t> || std::is_same_v<T, std::uint16_t>) {
|
||||
return static_cast<std::int32_t>(mapped) * absolute / SCALE16;
|
||||
} else if constexpr (std::is_same_v<T, std::int32_t> || std::is_same_v<T, std::uint32_t>) {
|
||||
return static_cast<std::int64_t>(mapped) * absolute / SCALE32;
|
||||
} else {
|
||||
return static_cast<__int128>(mapped) * absolute / SCALE64;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename T2>
|
||||
constexpr T MappedToAbsoluteBoundless(T mapped, T2 absolute) requires(std::is_integral_v<T>) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t>) {
|
||||
return static_cast<std::uint16_t>(mapped) * absolute / SCALEBOUNDLESS8;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return static_cast<std::uint32_t>(mapped) * absolute / SCALEBOUNDLESS16;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return static_cast<std::uint64_t>(mapped) * absolute / SCALEBOUNDLESS32;
|
||||
} else {
|
||||
return static_cast<unsigned __int128>(mapped) * absolute / SCALEBOUNDLESS64;
|
||||
}
|
||||
}
|
||||
|
||||
// template <typename T, typename T2>
|
||||
// constexpr T PixelToMappedBoundless(T pixel, T2 screen) requires(std::is_integral_v<T>) {
|
||||
// if constexpr (std::is_same_v<T, std::uint8_t>) {
|
||||
// return (static_cast<std::uint16_t>(relative) * SCALE8) / (static_cast<std::uint16_t>(absolute) * SCALE8);
|
||||
// } else if constexpr (std::is_same_v<T, std::uint16_t>) {
|
||||
// return (static_cast<std::uint32_t>(relative) * SCALE16) / (static_cast<std::uint32_t>(absolute) * SCALE16);
|
||||
// } else if constexpr (std::is_same_v<T, std::uint32_t>) {
|
||||
// return (static_cast<std::uint64_t>(relative) * SCALE32) / (static_cast<std::uint64_t>(absolute) * SCALE32);
|
||||
// } else {
|
||||
// return (static_cast<unsigned __int128>(relative) * SCALE32) / (static_cast<unsigned __int128>(absolute) * SCALE32);
|
||||
// }
|
||||
// }
|
||||
|
||||
template <typename T, typename T2>
|
||||
constexpr T AbsoluteToMapped(T absolute, T2 mapped) {
|
||||
if constexpr (std::is_same_v<T, std::int8_t> || std::is_same_v<T, std::uint8_t>) {
|
||||
return static_cast<std::int16_t>(absolute) * SCALE8 / mapped;
|
||||
} else if constexpr (std::is_same_v<T, std::int16_t> || std::is_same_v<T, std::uint16_t> ) {
|
||||
return static_cast<std::int32_t>(absolute) * SCALE16 / mapped;
|
||||
} else if constexpr (std::is_same_v<T, std::int32_t>|| std::is_same_v<T, std::uint32_t>) {
|
||||
return static_cast<std::int64_t>(absolute) * SCALE32 / mapped;
|
||||
} else {
|
||||
return static_cast<__int128>(absolute) * SCALE64 / mapped;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename T2>
|
||||
constexpr T AbsoluteToMappedBoundless(T absolute, T2 mapped) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t> ) {
|
||||
return static_cast<std::uint16_t>(absolute) * SCALEBOUNDLESS8 / mapped;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return static_cast<std::uint32_t>(absolute) * SCALEBOUNDLESS16 / mapped;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return static_cast<std::uint64_t>(absolute) * SCALEBOUNDLESS32 / mapped;
|
||||
} else {
|
||||
return static_cast<unsigned __int128>(absolute) * SCALEBOUNDLESS64 / mapped;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr T BoundToBoundless(T mapped) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t>) {
|
||||
return mapped * BOUND8 * 2;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return mapped * BOUND16 * 2;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return mapped * BOUND32 * 2;
|
||||
} else {
|
||||
return mapped * BOUND64 * 2;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
constexpr T BoundlessToBound(T mapped) {
|
||||
if constexpr (std::is_same_v<T, std::uint8_t> || std::is_same_v<T, std::int8_t> ) {
|
||||
return mapped / 2;
|
||||
} else if constexpr (std::is_same_v<T, std::uint16_t> || std::is_same_v<T, std::int16_t>) {
|
||||
return mapped / 2;
|
||||
} else if constexpr (std::is_same_v<T, std::uint32_t> || std::is_same_v<T, std::int32_t>) {
|
||||
return mapped / 2;
|
||||
} else {
|
||||
return mapped / 2;
|
||||
}
|
||||
}
|
||||
|
||||
enum class CrafterKeys {
|
||||
// Alphabetic keys
|
||||
A, B, C, D, E, F, G, H, I, J, K, L, M,
|
||||
|
|
@ -372,7 +108,7 @@ export namespace Crafter {
|
|||
return std::tan(fov * std::numbers::pi / 360.0);
|
||||
}
|
||||
|
||||
#ifdef CRAFTER_GRAPHICS_VULKAN
|
||||
#ifdef CRAFTER_GRAPHICS_RENDERER_VULKAN
|
||||
struct DescriptorBinding {
|
||||
VkDescriptorType type;
|
||||
std::uint32_t slot;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue