diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d45f01dc68b0cbb9f47298f2a225cae8520c3d72..4c136df4ae5bcf65014b33c566dfd1c54f25d4da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,11 +2,13 @@ include_directories( "${PROJECT_SOURCE_DIR}/src/osi/include" "${PROJECT_SOURCE_DIR}/src/utils/include" "${PROJECT_SOURCE_DIR}/src/studio/include" + "${PROJECT_SOURCE_DIR}/src/gfx/include" ) set(ROFIBOTS_LIBRARIES_TO_LINK_WITH osi utils + gfx ) message("Including the following libraries to the build:") @@ -14,6 +16,8 @@ add_subdirectory(./osi) message("-- osi") add_subdirectory(./utils) message("-- utils") +add_subdirectory(./gfx) +message("-- gfx") message("Including the following executables to the build:") add_subdirectory(./studio) diff --git a/src/gfx/CMakeLists.txt b/src/gfx/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..5b3ad5809ca8a07209270953c056205dbc0ed0eb --- /dev/null +++ b/src/gfx/CMakeLists.txt @@ -0,0 +1,19 @@ +set(THIS_TARGET_NAME gfx) + +add_library(${THIS_TARGET_NAME} + #./include/gfx/file.hpp + + ./include/gfx/temp_file.hpp + ./src/temp_file.cpp + + # ./include/osi/opengl.hpp + # ./include/osi/gui.hpp + ) + +set_target_properties(${THIS_TARGET_NAME} PROPERTIES + DEBUG_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Debug" + RELEASE_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Release" + RELWITHDEBINFO_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_RelWithDebInfo" + ) + +#install(TARGETS ${THIS_TARGET_NAME} DESTINATION "lib") diff --git a/src/gfx/include/gfx/temp_file.hpp b/src/gfx/include/gfx/temp_file.hpp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/gfx/src/temp_file.cpp b/src/gfx/src/temp_file.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/studio/src/basicshader.vert b/src/studio/src/basicshader.vert new file mode 100644 index 0000000000000000000000000000000000000000..ad6687d46df227d22b47515e106cafc88746d095 --- /dev/null +++ b/src/studio/src/basicshader.vert @@ -0,0 +1,6 @@ +#version 330 core +layout (location = 0) in vec3 aPos; +void main() +{ +gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0); +} diff --git a/src/studio/src/simulator.cpp b/src/studio/src/simulator.cpp index ae2931006a6ef4170965ec9861568f995604a4d2..8b19c4300e83d0de89d6bcb2bfc2cbfe845dabf5 100644 --- a/src/studio/src/simulator.cpp +++ b/src/studio/src/simulator.cpp @@ -1,6 +1,7 @@ #include <studio/simulator.hpp> #include <osi/opengl.hpp> #include <osi/gui.hpp> +#include <gfx/temp_file.hpp> namespace studio {