mirror of
https://github.com/orange-cpp/omath.git
synced 2026-02-13 07:03:25 +00:00
Auto stash before merge of "main" and "origin/main"
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
"OMATH_BUILD_VIA_VCPKG": "ON",
|
"OMATH_BUILD_VIA_VCPKG": "ON",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||||
"VCPKG_INSTALLED_DIR": "${sourceDir}/cmake-build/vcpkg_installed",
|
"VCPKG_INSTALLED_DIR": "${sourceDir}/cmake-build/vcpkg_installed",
|
||||||
"VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2"
|
"VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2;examples"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,16 +1,31 @@
|
|||||||
project(examples)
|
project(examples)
|
||||||
|
|
||||||
add_executable(example_projection_matrix_builder example_proj_mat_builder.cpp)
|
add_executable(example_projection_matrix_builder example_proj_mat_builder.cpp)
|
||||||
set_target_properties(example_projection_matrix_builder PROPERTIES CXX_STANDARD 26)
|
set_target_properties(example_projection_matrix_builder PROPERTIES
|
||||||
|
CXX_STANDARD 26
|
||||||
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
)
|
||||||
target_link_libraries(example_projection_matrix_builder PRIVATE omath::omath)
|
target_link_libraries(example_projection_matrix_builder PRIVATE omath::omath)
|
||||||
|
|
||||||
add_executable(example_signature_scan example_signature_scan.cpp)
|
add_executable(example_signature_scan example_signature_scan.cpp)
|
||||||
set_target_properties(example_signature_scan PROPERTIES CXX_STANDARD 26)
|
set_target_properties(example_signature_scan PROPERTIES
|
||||||
|
CXX_STANDARD 26
|
||||||
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
)
|
||||||
target_link_libraries(example_signature_scan PRIVATE omath::omath)
|
target_link_libraries(example_signature_scan PRIVATE omath::omath)
|
||||||
|
|
||||||
|
|
||||||
add_executable(example_glfw3 example_glfw3.cpp)
|
add_executable(example_glfw3 example_glfw3.cpp)
|
||||||
set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26)
|
set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26
|
||||||
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
)
|
||||||
|
|
||||||
find_package(GLEW REQUIRED)
|
find_package(GLEW REQUIRED)
|
||||||
find_package(glfw3 CONFIG REQUIRED)
|
find_package(glfw3 CONFIG REQUIRED)
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ int main()
|
|||||||
|
|
||||||
CubeMesh cube{std::move(vbo), std::move(ebo)};
|
CubeMesh cube{std::move(vbo), std::move(ebo)};
|
||||||
cube.set_origin({0.f, 0.f, 0.f});
|
cube.set_origin({0.f, 0.f, 0.f});
|
||||||
cube.set_scale({1.f, 2.f, 1.f});
|
cube.set_scale({2.f, 2.f, 2.f});
|
||||||
cube.set_rotation(RotationAngles{});
|
cube.set_rotation(RotationAngles{});
|
||||||
|
|
||||||
// ---------- OpenGL buffers ----------
|
// ---------- OpenGL buffers ----------
|
||||||
|
|||||||
Reference in New Issue
Block a user