tri11paragon
/
image-gp-2
mirror of https://github.com/tri11paragon/image-gp-2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

silly

main
Brett 2025-03-31 18:37:38 -04:00
parent d3ea632712
commit 8de8e985aa
9 changed files with 171 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "lib/blt-gp"]
path = lib/blt-gp
url = https://github.com/Tri11Paragon/blt-gp
[submodule "lib/blt"]
path = lib/blt
url = https://github.com/Tri11Paragon/BLT

21
.idea/vcs.xml
View File

@ -2,24 +2,13 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/freetype-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/freetype-src/subprojects/dlg" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/glfw3-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/imgui-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-release/_deps/freetype-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-release/_deps/freetype-src/subprojects/dlg" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-release/_deps/glfw3-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-release/_deps/imgui-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo-addrsan/_deps/freetype-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo-addrsan/_deps/freetype-src/subprojects/dlg" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo-addrsan/_deps/glfw3-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo-addrsan/_deps/imgui-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo/_deps/freetype-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo/_deps/freetype-src/subprojects/dlg" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo/_deps/glfw3-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-relwithdebinfo/_deps/imgui-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-gp" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-gp/lib/blt" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-gp/lib/blt/libraries/parallel-hashmap" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-with-graphics" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-with-graphics/libraries/BLT" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt-with-graphics/libraries/BLT/libraries/parallel-hashmap" vcs="Git" />
<mapping directory="$PROJECT_DIR$/lib/blt/libraries/parallel-hashmap" vcs="Git" />
</component>
</project>

11
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.30)
project(image-gp-2 VERSION 0.0.2)
cmake_minimum_required(VERSION 3.25)
project(image-gp-2 VERSION 0.0.3)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
@ -7,9 +7,14 @@ option(ENABLE_TSAN "Enable the thread data race sanitizer" OFF)
set(CMAKE_CXX_STANDARD 17)
add_subdirectory(lib/blt)
add_subdirectory(lib/blt-with-graphics)
add_subdirectory(lib/blt-gp)
find_package(OpenCV REQUIRED)
include_directories( ${OpenCV_INCLUDE_DIRS} )
include_directories(include/)
file(GLOB_RECURSE PROJECT_BUILD_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
@ -18,7 +23,7 @@ add_executable(image-gp-2 ${PROJECT_BUILD_FILES})
target_compile_options(image-gp-2 PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
target_link_options(image-gp-2 PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
target_link_libraries(image-gp-2 PRIVATE BLT_WITH_GRAPHICS blt-gp)
target_link_libraries(image-gp-2 PRIVATE BLT_WITH_GRAPHICS blt-gp ${OpenCV_LIBS})
if (${ENABLE_ADDRSAN} MATCHES ON)
target_compile_options(image-gp-2 PRIVATE -fsanitize=address)

2
commit.py
View File

@ -36,7 +36,7 @@ else:
if len(str(XDG_CONFIG_HOME)) == 0:
XDG_CONFIG_HOME = USER_HOME
CONFIG_FILE_DIRECTORY = XDG_CONFIG_HOME / "blt"
CONFIG_FILE_LOCATION = CONFIG_FILE_DIRECTORY / "commit_config.env"
CONFIG_FILE_LOCATION = CONFIG_FILE_DIRECTORY / "commit_config.json"
class Config:
def __init__(self):

93
include/image_storage.h Normal file
View File

@ -0,0 +1,93 @@
#pragma once
/*
* Copyright (C) 2024 Brett Terpstra
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef IMAGE_STORAGE_H
#define IMAGE_STORAGE_H
#include <array>
#include <atomic>
struct image_storage_t
{
std::array<float, 4> data;
};
struct atomic_node_t
{
std::atomic<atomic_node_t*> next = nullptr;
image_storage_t* data = nullptr;
};
class atomic_list_t
{
public:
atomic_list_t() = default;
void push_back(atomic_node_t* node)
{
while (true)
{
auto head = this->m_head.load();
node->next = head;
if (this->m_head.compare_exchange_weak(head, node))
break;
}
}
atomic_node_t* pop_front()
{
while (true)
{
auto head = this->m_head.load();
if (head == nullptr)
return nullptr;
if (this->m_head.compare_exchange_weak(head, head->next))
return head;
}
}
private:
std::atomic<atomic_node_t*> m_head = nullptr;
};
inline atomic_list_t g_image_list;
struct image_t
{
image_t()
{
const auto front = g_image_list.pop_front();
if (front)
{
data = front->data;
delete front;
}else
data = new image_storage_t;
}
void drop()
{
const auto node = new atomic_node_t(); // NOLINT
node->data = data;
data = nullptr;
g_image_list.push_back(node);
}
private:
image_storage_t* data;
};
#endif //IMAGE_STORAGE_H

1
lib/blt Submodule

@ -0,0 +1 @@
Subproject commit 0ebbc198c5b80ca99e537460ef92fd806864fa3e

2
lib/blt-gp

@ -1 +1 @@
Subproject commit 88957ce8056f48aa451f8ff93c532c20759d9792
Subproject commit 577f3d613c2081637bc2565ab19c64f7be60d890

2
lib/blt-with-graphics

@ -1 +1 @@
Subproject commit f49876dab27974b1644410010b94f59fa3d0b79c
Subproject commit 9b1c1a1bb116ca7f6fdec666f74cde8a6a40f7f9

68
src/main.cpp
View File

@ -2,10 +2,21 @@
#include <operations.h>
#include <random>
#include <blt/gp/program.h>
#include <blt/gfx/window.h>
#include "blt/gfx/renderer/resource_manager.h"
#include "blt/gfx/renderer/batch_2d_renderer.h"
#include "blt/gfx/renderer/camera.h"
#include <imgui.h>
#include <image_storage.h>
using namespace blt;
using namespace blt::gp;
gp::gp_program program{
blt::gfx::matrix_state_manager global_matrices;
blt::gfx::resource_manager resources;
blt::gfx::batch_renderer_2d renderer_2d(resources, global_matrices);
blt::gfx::first_person_camera camera;
gp_program program{
[]() {
return std::random_device()();
}
@ -13,19 +24,19 @@ gp::gp_program program{
void setup_operations()
{
static gp::operation_t op_sin([](const float a) {
static operation_t op_sin([](const float a) {
return std::sin(a);
}, "sin");
static gp::operation_t op_cos([](const float a) {
static operation_t op_cos([](const float a) {
return std::cos(a);
}, "cos");
static gp::operation_t op_exp([](const float a) {
static operation_t op_exp([](const float a) {
return std::exp(a);
}, "exp");
static gp::operation_t op_log([](const float a) {
static operation_t op_log([](const float a) {
return a <= 0.0f ? 0.0f : std::log(a);
}, "log");
static auto lit = gp::operation_t([this]() {
static auto lit = operation_t([]() {
return program.get_random().get_float(-1.0f, 1.0f);
}, "lit").set_ephemeral();
@ -34,10 +45,47 @@ void setup_operations()
// return context.x;
// }, "x");
gp::operator_builder builder{};
builder.build(make_add<float>(), make_sub<float>(), make_mul<float>(), make_prot_div<float>(), op_sin, op_cos, op_exp, op_log, lit);
operator_builder builder{};
builder.build(
make_add<float>(),
make_sub<float>(),
make_mul<float>(),
make_prot_div<float>(),
op_sin, op_cos, op_exp, op_log, lit
);
program.set_operations(builder.grab());
}
void init(const blt::gfx::window_data&)
{
using namespace blt::gfx;
global_matrices.create_internals();
resources.load_resources();
renderer_2d.create();
}
void update(const blt::gfx::window_data& data)
{
global_matrices.update_perspectives(data.width, data.height, 90, 0.1, 2000);
camera.update();
camera.update_view(global_matrices);
global_matrices.update();
renderer_2d.render(data.width, data.height);
}
void destroy(const blt::gfx::window_data&)
{
global_matrices.cleanup();
resources.cleanup();
renderer_2d.cleanup();
blt::gfx::cleanup();
}
int main()
{}
{
blt::gfx::init(blt::gfx::window_data{"Image GP", init, update, destroy}.setSyncInterval(1));
}