diff options
Diffstat (limited to 'examples/opengl/cube')
-rw-r--r-- | examples/opengl/cube/CMakeLists.txt | 35 | ||||
-rw-r--r-- | examples/opengl/cube/cube.png | bin | 30341 -> 88913 bytes | |||
-rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 17 |
3 files changed, 27 insertions, 25 deletions
diff --git a/examples/opengl/cube/CMakeLists.txt b/examples/opengl/cube/CMakeLists.txt index 00ec882c1f..7486d058a4 100644 --- a/examples/opengl/cube/CMakeLists.txt +++ b/examples/opengl/cube/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(cube LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opengl/cube") - find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL OpenGLWidgets Widgets) +qt_standard_project_setup() + qt_add_executable(cube geometryengine.cpp geometryengine.h main.cpp @@ -25,12 +19,12 @@ set_target_properties(cube PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(cube PUBLIC - Qt::Core - Qt::Gui - Qt::OpenGL - Qt::OpenGLWidgets - Qt::Widgets +target_link_libraries(cube PRIVATE + Qt6::Core + Qt6::Gui + Qt6::OpenGL + Qt6::OpenGLWidgets + Qt6::Widgets ) # Resources: @@ -58,7 +52,14 @@ qt6_add_resources(cube "textures" ) install(TARGETS cube - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET cube + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/opengl/cube/cube.png b/examples/opengl/cube/cube.png Binary files differindex 42c8c51b3a..c3abbfe84d 100644 --- a/examples/opengl/cube/cube.png +++ b/examples/opengl/cube/cube.png diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 485bca54f4..e67c93da5a 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -72,14 +72,6 @@ void MainWidget::initializeGL() initShaders(); initTextures(); -//! [2] - // Enable depth buffer - glEnable(GL_DEPTH_TEST); - - // Enable back face culling - glEnable(GL_CULL_FACE); -//! [2] - geometries = new GeometryEngine; // Use QBasicTimer because its faster than QTimer @@ -147,7 +139,16 @@ void MainWidget::paintGL() // Clear color and depth buffer glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +//! [2] + // Enable depth buffer + glEnable(GL_DEPTH_TEST); + + // Enable back face culling + glEnable(GL_CULL_FACE); +//! [2] + texture->bind(); + program.bind(); //! [6] // Calculate model view transformation |