floats suck

main
Brett 2024-07-15 21:22:50 -04:00
parent a606995ece
commit cf579eda46
4 changed files with 30 additions and 27 deletions

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(image-gp-6 VERSION 0.0.8) project(image-gp-6 VERSION 0.0.9)
include(FetchContent) include(FetchContent)

@ -1 +1 @@
Subproject commit 37e885634800331ce68de3ae6dea9ac5d6202d53 Subproject commit 9ff86161bb7caddbd6ac942c4373465a8af573aa

@ -1 +1 @@
Subproject commit 8fd52222939b9e58da8511d9000bb1cf12e4de71 Subproject commit 4e34161bcb3f7e12879c519a2fda10f223bdea63

View File

@ -53,25 +53,47 @@ struct context
float x, y; float x, y;
}; };
inline context get_ctx(blt::size_t i)
{
context ctx{};
ctx.y = std::floor(static_cast<float>(i) / static_cast<float>(IMAGE_SIZE * CHANNELS));
ctx.x = static_cast<float>(i) - (ctx.y * IMAGE_SIZE * CHANNELS);
return ctx;
}
inline context get_pop_ctx(blt::size_t i)
{
auto const sq = static_cast<float>(std::sqrt(POP_SIZE));
context ctx{};
ctx.y = std::floor(static_cast<float>(i) / static_cast<float>(sq));
ctx.x = static_cast<float>(i) - (ctx.y * sq);
return ctx;
}
struct full_image_t struct full_image_t
{ {
blt::u8 rgb_data[DATA_SIZE * CHANNELS]; float rgb_data[DATA_SIZE * CHANNELS];
full_image_t() = default; full_image_t() = default;
void load(const std::string& path) void load(const std::string& path)
{ {
int width, height, channels; int width, height, channels;
auto data = stbi_load(path.c_str(), &width, &height, &channels, CHANNELS); auto data = stbi_loadf(path.c_str(), &width, &height, &channels, CHANNELS);
stbir_resize_uint8_linear(data, width, height, 0, rgb_data, IMAGE_SIZE, IMAGE_SIZE, 0, static_cast<stbir_pixel_layout>(CHANNELS)); stbir_resize_float_linear(data, width, height, 0, rgb_data, IMAGE_SIZE, IMAGE_SIZE, 0, static_cast<stbir_pixel_layout>(CHANNELS));
stbi_image_free(data); stbi_image_free(data);
} }
void save(const std::string& str) void save(const std::string& str)
{ {
stbi_write_png(str.c_str(), IMAGE_SIZE, IMAGE_SIZE, CHANNELS, rgb_data, 0); //stbi_write_png(str.c_str(), IMAGE_SIZE, IMAGE_SIZE, CHANNELS, rgb_data, 0);
}
friend std::ostream& operator<<(std::ostream& str, const full_image_t&)
{
return str;
} }
}; };
@ -195,23 +217,6 @@ static blt::gp::operation_t op_y([](const context& context) {
return context.y; return context.y;
}, "y"); }, "y");
inline context get_ctx(blt::size_t i)
{
context ctx{};
ctx.y = std::floor(static_cast<float>(i) / static_cast<float>(IMAGE_SIZE));
ctx.x = static_cast<float>(i) - (ctx.y * IMAGE_SIZE);
return ctx;
}
inline context get_pop_ctx(blt::size_t i)
{
auto const sq = static_cast<float>(std::sqrt(POP_SIZE));
context ctx{};
ctx.y = std::floor(static_cast<float>(i) / static_cast<float>(sq));
ctx.x = static_cast<float>(i) - (ctx.y * sq);
return ctx;
}
constexpr auto create_fitness_function() constexpr auto create_fitness_function()
{ {
return [](blt::gp::tree_t& current_tree, blt::gp::fitness_t& fitness, blt::size_t index) { return [](blt::gp::tree_t& current_tree, blt::gp::fitness_t& fitness, blt::size_t index) {
@ -277,8 +282,6 @@ void init(const blt::gfx::window_data&)
type_system.register_type<full_image_t>(); type_system.register_type<full_image_t>();
blt::gp::operator_builder<context> builder{type_system}; blt::gp::operator_builder<context> builder{type_system};
builder.add_operator(perlin);
builder.add_operator(perlin_bumpy);
builder.add_operator(perlin_terminal); builder.add_operator(perlin_terminal);
builder.add_operator(add); builder.add_operator(add);