diff --git a/.gitignore b/.gitignore index e3709844..68a6e62b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /CMakeLists.txt.user /extern/* +/doc/* +/doc diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b59f5fd..106f20c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,8 @@ endif() include(cmake/alp_add_git_repository.cmake) alp_add_git_repository(renderer_static_data URL https://github.com/AlpineMapsOrg/renderer_static_data.git COMMITISH origin/main DO_NOT_ADD_SUBPROJECT) alp_add_git_repository(alpineapp_fonts URL https://github.com/AlpineMapsOrg/fonts.git COMMITISH origin/main DO_NOT_ADD_SUBPROJECT) +alp_add_git_repository(doc URL https://github.com/AlpineMapsOrg/documentation.git COMMITISH origin/main DO_NOT_ADD_SUBPROJECT DESTINATION_PATH doc) + if (ANDROID) alp_add_git_repository(android_openssl URL https://github.com/KDAB/android_openssl.git COMMITISH origin/master DO_NOT_ADD_SUBPROJECT) diff --git a/cmake/alp_add_git_repository.cmake b/cmake/alp_add_git_repository.cmake index 4e36360b..4938457f 100644 --- a/cmake/alp_add_git_repository.cmake +++ b/cmake/alp_add_git_repository.cmake @@ -26,13 +26,17 @@ find_package(Git 2.22 REQUIRED) function(alp_add_git_repository name) set(options DO_NOT_ADD_SUBPROJECT) - set(oneValueArgs URL COMMITISH) + set(oneValueArgs URL COMMITISH DESTINATION_PATH) set(multiValueArgs ) cmake_parse_arguments(PARSE_ARGV 1 PARAM "${options}" "${oneValueArgs}" "${multiValueArgs}") file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR} ) set(repo_dir ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR}/${name}) set(short_repo_dir ${ALP_EXTERN_DIR}/${name}) + if (DEFINED PARAM_DESTINATION_PATH AND NOT PARAM_DESTINATION_PATH STREQUAL "") + set(repo_dir ${CMAKE_SOURCE_DIR}/${PARAM_DESTINATION_PATH}) + set(short_repo_dir ${PARAM_DESTINATION_PATH}) + endif() set(${name}_SOURCE_DIR "${repo_dir}" PARENT_SCOPE) @@ -70,8 +74,7 @@ function(alp_add_git_repository name) endif() else() message(STATUS "Clonging ${PARAM_URL} to ${short_repo_dir}.") - execute_process(COMMAND ${GIT_EXECUTABLE} clone --recurse-submodules ${PARAM_URL} ${name} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR} + execute_process(COMMAND ${GIT_EXECUTABLE} clone --recurse-submodules ${PARAM_URL} ${repo_dir} RESULT_VARIABLE GIT_CLONE_RESULT) if (NOT ${GIT_CLONE_RESULT}) execute_process(COMMAND ${GIT_EXECUTABLE} checkout --quiet ${PARAM_COMMITISH} diff --git a/doc/gl_renderer_design.svg b/doc/gl_renderer_design.svg deleted file mode 100644 index 3edf5969..00000000 --- a/doc/gl_renderer_design.svg +++ /dev/null @@ -1,3723 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - State diagram:https://webgl2fundamentals.org/webgl/lessons/resources/webgl-state-diagram.html#no-helpStackOverflow about what is the state of VAOs (index buffer, pointers and formats to vertex data buffers):https://stackoverflow.com/questions/20908828/are-vertexarrayobjects-used-in-practiceStackOverflow on replacing (the old) glVertexAttribPointer with a set of new functions, that set format and pointer separately:https://stackoverflow.com/questions/21153729/glbindvertexbuffer-vs-glbindbuffer/21154258https://stackoverflow.com/questions/37972229/glvertexattribpointer-and-glvertexattribformat-whats-the-differenceMore mildely related:State change is expensive, try reducing: https://www.youtube.com/watch?v=-bCeNzgiJ8I - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/report_fancy_alpine_maps.pdf b/doc/report_fancy_alpine_maps.pdf deleted file mode 100644 index 6c25ff6f..00000000 Binary files a/doc/report_fancy_alpine_maps.pdf and /dev/null differ