Skip to content

Commit

Permalink
Merge branch 'enh-add-kalman-filter' of github.com:oddkiva/sara into …
Browse files Browse the repository at this point in the history
…enh-add-kalman-filter
  • Loading branch information
Odd Kiva committed Dec 4, 2023
2 parents 76534e2 + a61e935 commit 65351f9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions cpp/examples/Kalpana/ImPlot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ target_compile_definitions(
implot_example
PRIVATE $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:DO_SARA_STATIC> #
)
set_target_properties(implot_example PROPERTIES FOLDER "Examples/Shakti/ImPlot")
1 change: 1 addition & 0 deletions cpp/examples/Shakti/Vulkan/Common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ add_library(
HostUniforms.hpp #
SignalHandler.hpp SignalHandler.cpp)
target_include_directories(SignalHandler PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
set_target_properties(SignalHandler PROPERTIES FOLDER "Examples/Shakti/Vulkan")
2 changes: 1 addition & 1 deletion cpp/examples/Shakti/Vulkan/hello_vulkan_image/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class VulkanImageRenderer : public kvk::GraphicsBackend

// Device memory for image data..
const auto image_fp = program_dir_path / "data" / "dog.jpg";
const auto image_host = sara::imread<sara::Rgba8>(image_fp);
const auto image_host = sara::imread<sara::Rgba8>(image_fp.string());
init_vulkan_image_objects(image_host);
init_image_copy_command_buffers();
// Initialize the image data on the device side.
Expand Down
1 change: 1 addition & 0 deletions cpp/third-party/implot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ add_library(
)
target_include_directories(ImPlot PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(ImPlot PUBLIC ImGui)
set_target_properties(ImPlot PROPERTIES FOLDER "Third-Party")

0 comments on commit 65351f9

Please sign in to comment.