naifb/NBEngine
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Honestly fuck if i know atp

Browse Source
This commit is contained in:
NaifBanana
2026-10-19 03:09:35 -05:00
parent 416446206f
commit 97aed4e5ca
7 changed files with 137 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4 -3
View File
@@ -1,9 +1,10 @@
build/
.vscode/
.*
!.gitignore
!.clangd
CMakeFiles/
CMakeKits.json
CMakeCache.txt
docs/*
!docs/CMake*
!docs/Doxyfile.in
!.clangd
.glsld
CMakeLists.txt
+16 -29
View File
@@ -28,45 +28,32 @@ function(toAbsolutePath SETVAR PATHS)
set(${SETVAR} ${RET_VAL} PARENT_SCOPE)
endfunction()
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug")
endif()
if(CMAKE_BUILD_TYPE STREQUAL "Release")
message(STATUS "Targeting Release build")
add_compile_definitions(_NB_BUILD_RELEASE)
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
message(STATUS "Targeting Debug build")
set(NB_DEBUG_BUILD ON)
add_compile_definitions(_NB_BUILD_DEBUG)
endif()
message(STATUS "Targeting ${CMAKE_BUILD_TYPE} build")
if (NB_DEBUG_BUILD)
set(NB_LOGGING ON)
set(NB_BUILD_TESTS ON)
set(NB_BUILD_DOCS ON)
set(NB_MONITOR_OPENGL_CALLS ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()
cmake_dependent_option(NB_LOGGING
"Creates a default logger and automatically logs with code locations."
ON
NB_DEBUG_BUILD
OFF
)
cmake_dependent_option(NB_BUILD_TESTS
"Build unit tests"
ON
NB_DEBUG_BUILD
OFF
)
cmake_dependent_option(NB_BUILD_DOCS
"Build documentation"
ON
NB_DEBUG_BUILD
OFF
)
cmake_dependent_option(NBENGINE_INSTALL
"Install NBEngine"
ON
NB_DEBUG_BUILD
OFF
)
cmake_dependent_option(NB_MONITOR_OPENGL_CALLS
"Monitors every OpenGL call for errors"
ON
NB_DEBUG_BUILD
OFF
)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
message(STATUS "Building for Windows")
@@ -106,13 +93,13 @@ endif()
get_filename_component(NBENGINE_ROOT ${CMAKE_CURRENT_LIST_DIR} ABSOLUTE)
add_subdirectory(./engine ${PROJECT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
add_subdirectory(./engine)
# Toggle
set(NB_REBUILD_DOCS)
if (NB_BUILD_DOCS)
add_subdirectory(./docs)
add_subdirectory(./docs)
endif()
include(CMakePackageConfigHelpers)
engine/NBCore/CMakeLists.txt
+3 -2
View File
@@ -18,7 +18,8 @@ toAbsolutePath(NB_CORE_SOURCE
)
toAbsolutePath(NB_CORE_INCLUDE
./include/NBCore/DataSink.hpp
./include/NBCore/Errors.hpp
./include/NBCore/DataTypes.hpp
./include/NBCore/Errors.hpp
./include/NBCore/ErrorsImpl.hpp
./include/NBCore/Logger.hpp
./include/NBCore/Printer.hpp
@@ -83,4 +84,4 @@ endif()
if (NB_BUILD_TESTS)
add_subdirectory(./tests )
endif()
endif()
engine/NBCore/include/NBCore/DataTypes.hpp
+71
View File
@@ -0,0 +1,71 @@
#pragma once
#include <cstring>
#ifndef _NB_DATA_TYPES
#define _NB_DATA_TYPES
#include <algorithm>
#include <array>
#include <memory>
namespace nb {
template<typename T, unsigned int N>
class NDArray {
protected:
std::unique_ptr<T[]> _data;
static unsigned int calculateTotalSize(const std::array<unsigned int, N>& dims) {
unsigned int ret = 1;
std::for_each(dims.begin(), dims.end(), [&](unsigned int n){
ret *= n;
});
return ret;
}
public:
const std::array<unsigned int, N> dimensions;
const unsigned int totalSize;
static constexpr unsigned int NumberDimensions = N;
NDArray(
const std::array<unsigned int, N>& dimensions_,
T* data_=nullptr
) :
dimensions(dimensions_),
totalSize(calculateTotalSize(dimensions_))
{
if (data_) { data(data_); }
}
NDArray(
const std::array<unsigned int, N>& dimensions_,
const T* data_
) : NDArray(dimensions_) { data(data_); }
unsigned int coordinateToIndex(const std::array<T, N>& coord) const {
unsigned int blockSize = 1;
unsigned int ret = 0;
for (auto i = 0; i < dimensions.size(); ++i) {
ret += coord[i] * blockSize;
blockSize *= dimensions[i];
}
return ret;
}
inline const T& at(const std::array<T, N>& coord) const {
return _data[coordinateToIndex(coord)];
}
inline std::shared_ptr<T> data() const { return _data; }
inline T& at(const std::array<T, N>& coord) {
return _data[coordinateToIndex(coord)];
}
inline T* data(const T* data_) {
_data = std::make_unique<T[]>(totalSize);
std::memcpy(_data.get(), data_, totalSize * sizeof(T));
return _data.get();
}
}; // namespace nb
}
#endif // _NB_DATA_TYPES
engine/NBCore/include/NBCore/Utils.hpp
+3 -3
View File
@@ -1,6 +1,6 @@
#pragma once
#ifndef _NB_CORE_TYPES
#define _NB_CORE_TYPES
#ifndef _NB_UTILTIES
#define _NB_UTILTIES
#include <memory>
#include <unordered_map>
@@ -131,4 +131,4 @@ class ThreadsafeObjectLock {
}; */
} // namespace nb
#endif // _NB_CORE_TYPES
#endif // _NB_CORE_TYPES
engine/NBCore/tests/CMakeLists.txt
+19 -20
View File
@@ -1,24 +1,23 @@
cmake_minimum_required(VERSION 3.26.0)
if (NB_BUILD_TESTS)
enable_testing()
include(GoogleTest)
add_executable(TestCore
./testErrors.cpp
#./testProcesses.cpp
./testUtils.cpp
)
target_link_libraries(TestCore
NBCore
GTest::gtest_main
)
enable_testing()
include(GoogleTest)
add_executable(TestCore
./testErrors.cpp
#./testProcesses.cpp
./testUtils.cpp
)
target_link_libraries(TestCore
NBCore
GTest::gtest_main
)
add_executable(LoggerTest
./testLogger.cpp
)
target_link_libraries(LoggerTest
NBCore
)
add_executable(LoggerTest
./testLogger.cpp
)
target_link_libraries(LoggerTest
NBCore
)
gtest_discover_tests(TestCore)
gtest_discover_tests(TestCore)
endif()
engine/NBCore/tests/testUtils.cpp
+21 -41
View File
@@ -3,6 +3,7 @@
#include <gtest/gtest.h>
#include <string>
#include <NBCore/DataTypes.hpp>
#include <NBCore/TypeTraits.hpp>
#include <NBCore/StringUtils.hpp>
@@ -22,7 +23,7 @@ TEST(UtilsTest, TestFindAndReplace) {
tmp = find_and_replace("aeiou", "a", "afa");
tmp = find_and_replace(tmp, "e", "efe");
tmp = find_and_replace(tmp, "i", "ifi");
tmp = find_and_replace(tmp, "i", "ifi");
tmp = find_and_replace(tmp, "o", "ofo");
tmp = find_and_replace(tmp, "u", "ufu");
ASSERT_STREQ(
@@ -46,7 +47,6 @@ TEST(UtilsTest, TestFindAndReplaceWstr) {
find_and_replace<wchar_t>(L"Jeff", L"e", L"efe").c_str(),
L"Jefeff"
);
std::wstring tmp = find_and_replace<wchar_t>(L"Naif", L"a", L"afa");
ASSERT_STREQ(
find_and_replace<wchar_t>(tmp, L"i", L"ifi").c_str(),
@@ -74,44 +74,6 @@ TEST(UtilsTest, TestFindAndReplaceWstr) {
);
}
/* TEST(UtilsTest, TestWstrToStr) {
ASSERT_STREQ(
nb::wstr_to_str(L"Hi!").c_str(),
"Hi!"
);
ASSERT_STREQ(
nb::wstr_to_str(L"Naif").c_str(),
"Naif"
);
ASSERT_STREQ(
nb::wstr_to_str(L"\r\r\r\n").c_str(),
"\r\r\r\n"
);
ASSERT_STREQ(
nb::wstr_to_str(L"Naif\ttalks\r\ra\t\nlot").c_str(),
"Naif\ttalks\r\ra\t\nlot"
);
} */
/* TEST(UtilsTest, TestStrToWstr) {
ASSERT_STREQ(
nb::str_to_wstr("Hi!").c_str(),
L"Hi!"
);
ASSERT_STREQ(
nb::str_to_wstr("Naif").c_str(),
L"Naif"
);
ASSERT_STREQ(
nb::str_to_wstr("\r\r\r\n").c_str(),
L"\r\r\r\n"
);
ASSERT_STREQ(
nb::str_to_wstr("Naif\ttalks\r\ra\t\nlot").c_str(),
L"Naif\ttalks\r\ra\t\nlot"
);
} */
struct A { bool x(); };
struct B { bool y(); };
struct C { bool x(); bool y; };
@@ -145,4 +107,22 @@ TEST(UtilsTest, TestIsDetected) {
ASSERT_TRUE(ret);
}
} // namespace nb
TEST(DataTypesTests, TestNDArray) {
float* data_f = new float[9] {0,1,2,3,4,5,6,7,8};
nb::NDArray<float, 2> arr({3, 3}, data_f);
ASSERT_FLOAT_EQ(data_f[4], arr.at({1,1}));
arr.at({1,1}) = 0.5;
ASSERT_FLOAT_EQ(0.5, arr.at({1,1}));
delete[] data_f;
unsigned int* data_ui = new unsigned int[8] {0,1,2,3,4,5,6,7};
nb::NDArray<unsigned int, 3> arr3d({2,2,2}, data_ui);
ASSERT_EQ(data_ui[5], arr3d.at({1,0,1}));
arr3d.at({0,1,1}) = 23;
ASSERT_EQ(23, arr3d.at({0,1,1}));
delete[] data_ui;
}
} // namespace nb