Skip to content

Commit

Permalink
Merge commit 'dc074d16f359cbd3a85cea44062e7228dc946391' into render-r…
Browse files Browse the repository at this point in the history
…efactor

# Conflicts:
#	examples/render/00-hello-triangle/bgfx/glfw/hello_triangle_glfw.cpp
#	examples/render/00-hello-triangle/bgfx/qt/hello_triangle_qt.cpp
#	examples/render/00-hello-triangle/opengl2/glfw/hello_triangle_glfw.h
#	examples/render/00-hello-triangle/opengl2/qt/hello_triangle_qt.cpp
#	vclib/render/include/vclib/glfw/event_manager_window.h
#	vclib/render/include/vclib/qt/event_manager_widget.h
#	vclib/render/include/vclib/render/interfaces/event_manager_i.h
#	vclib/render/include/vclib/render/interfaces/viewer_i.h
#	vclib/render/src/vclib/bgfx/canvas.cpp
#	vclib/render/src/vclib/bgfx/viewer_canvas.cpp
#	vclib/render/src/vclib/glfw/canvas_window.cpp
#	vclib/render/src/vclib/glfw/event_manager_window.cpp
#	vclib/render/src/vclib/glfw/viewer_window.cpp
#	vclib/render/src/vclib/opengl2/canvas.cpp
#	vclib/render/src/vclib/opengl2/viewer_canvas.cpp
#	vclib/render/src/vclib/qt/canvas_widget.cpp
#	vclib/render/src/vclib/qt/event_manager_widget.cpp
#	vclib/render/src/vclib/qt/viewer_widget.cpp
#	vclib/render/src/vclib/render/interfaces/viewer_i.cpp
  • Loading branch information
alemuntoni committed Jan 8, 2025
2 parents 3266617 + dc074d1 commit a919011
Show file tree
Hide file tree
Showing 866 changed files with 893 additions and 1,211 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion cmake/examples_and_tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion cmake/vclib_common_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/000-mesh-basic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/000-mesh-basic/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/001-polymesh-basic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/001-polymesh-basic/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/002-mesh-iterators/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/002-mesh-iterators/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/003-mesh-copy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/003-mesh-copy/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/004-mesh-normal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/004-mesh-normal/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/005-mesh-topology/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/005-mesh-topology/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/006-mesh-stat/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/006-mesh-stat/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/007-mesh-conversion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/007-mesh-conversion/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/008-mesh-transform/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/008-mesh-transform/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/009-mesh-custom-components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/009-mesh-custom-components/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/010-mesh-new-user-component/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/010-mesh-new-user-component/bar_component.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/010-mesh-new-user-component/foo_component.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/010-mesh-new-user-component/foo_mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/010-mesh-new-user-component/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/011-mesh-export-to-matrix/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#* VCLib *
#* Visual Computing Library *
#* *
#* Copyright(C) 2021-2024 *
#* Copyright(C) 2021-2025 *
#* Visual Computing Lab *
#* ISTI - Italian National Research Council *
#* *
Expand Down
2 changes: 1 addition & 1 deletion examples/core/011-mesh-export-to-matrix/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* VCLib *
* Visual Computing Library *
* *
* Copyright(C) 2021-2024 *
* Copyright(C) 2021-2025 *
* Visual Computing Lab *
* ISTI - Italian National Research Council *
* *
Expand Down
Loading

0 comments on commit a919011

Please sign in to comment.