diff --git a/.gitignore b/.gitignore index 1f5050f..4c891a1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ cmake-build-*/ conan-cache/ # other -include/glad -#!include/glad/include +include/glad/* +!include/glad/CMakeLists.txt #!include/glad/src include/glfw include/imgui @@ -22,7 +22,7 @@ _deps/ *.bkp DartConfiguration.tcl imgui.ini -.*CMakeCache.txt.* +.*CMakeCache.txt CMakePresets.json diff --git a/README.md b/README.md index 8ad2755..8c9509c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # fraktals -images +![Alt Text](preview.gif) ## About fraktals @@ -8,9 +8,9 @@ fraktals is an efficient fractals explorer program. It provides * browsing feature * step-by-step fractal algorithm operations * procedural and parallel computation -<---* step back & fast foward ---> -<---* +30 2D and 3D fractals ---> -<---* save to image or gif ---> + + + ## Getting Started diff --git a/README_building.md b/README_building.md index 2239dc4..dfdc562 100644 --- a/README_building.md +++ b/README_building.md @@ -55,35 +55,31 @@ A full build has different steps: To configure the project, use `cmake` or `cmake-gui`. #### (2.a) Configuring via cmake: -With Cmake directly: -``` - cmake -S . -B ./build -``` -Cmake will automatically create the `./build` folder if it does not exist, and it wil configure the project. + +TODO + #### (2.b) Configuring via cmake-gui: -Open the GUI in the root folder: +Open the GUI in the project root folder: ``` cmake-gui . ``` -Set the build directory: - -![build_dir](https://user-images.githubusercontent.com/16418197/82524586-fa48e380-9af4-11ea-8514-4e18a063d8eb.jpg) - -Configure the generator (set the various flags to your needs): +Set the build directory to `out`, disable warnings-as-errors and generate. For further debugging set the sanitizers, same goes for optimization. -![generate](https://user-images.githubusercontent.com/16418197/82781591-c97feb80-9e1f-11ea-86c8-f2748b96f516.png) - -Generate: - -![generate](https://user-images.githubusercontent.com/16418197/82781591-c97feb80-9e1f-11ea-86c8-f2748b96f516.png) +![build_dir](cmake-gui.png) ### (3) Build the project Build the project for all targets: ``` - cmake --build ./build + cmake --build out/build/unixlike-clang-debug/ ``` +or + +``` +TODO +``` ### Editing and git directives +TODO diff --git a/cmake-gui.png b/cmake-gui.png new file mode 100644 index 0000000..8cf80f0 Binary files /dev/null and b/cmake-gui.png differ diff --git a/include/glad/CMakeLists.txt b/include/glad/CMakeLists.txt new file mode 100644 index 0000000..62141a5 --- /dev/null +++ b/include/glad/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.0) +project(Glad) + +add_library( + glad + ./include/glad/glad.h + ./src/glad.c + ./include/KHR/khrplatform.h +) + +target_include_directories(glad PUBLIC include) \ No newline at end of file diff --git a/preview.gif b/preview.gif new file mode 100644 index 0000000..a157ecb Binary files /dev/null and b/preview.gif differ diff --git a/src/CMakeCache.txt b/src/CMakeCache.txt deleted file mode 100644 index f4f726f..0000000 --- a/src/CMakeCache.txt +++ /dev/null @@ -1,1063 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: /home/gio/code/fraktals/src -# It was generated by CMake: /usr/bin/cmake -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//Build shared libraries -BUILD_SHARED_LIBS:BOOL=OFF - -//The directory containing a CMake configuration file for CLI11. -CLI11_DIR:PATH=/usr/share/cmake/CLI11 - -//Path to a program. -CMAKE_ADDR2LINE:FILEPATH=/usr/bin/addr2line - -//Path to a program. -CMAKE_AR:FILEPATH=/usr/bin/ar - -//For backwards compatibility, what version of CMake commands and -// syntax should this version of CMake try to support. -CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4 - -//Choose the type of build, options are: None Debug Release RelWithDebInfo -// MinSizeRel ... -CMAKE_BUILD_TYPE:STRING= - -//Enable/Disable color output during build. -CMAKE_COLOR_MAKEFILE:BOOL=ON - -//CXX compiler -CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ - -//A wrapper around 'ar' adding the appropriate '--plugin' option -// for the GCC compiler -CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar - -//A wrapper around 'ranlib' adding the appropriate '--plugin' option -// for the GCC compiler -CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib - -//Flags used by the CXX compiler during all build types. -CMAKE_CXX_FLAGS:STRING= - -//Flags used by the CXX compiler during DEBUG builds. -CMAKE_CXX_FLAGS_DEBUG:STRING=-g - -//Flags used by the CXX compiler during MINSIZEREL builds. -CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the CXX compiler during RELEASE builds. -CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the CXX compiler during RELWITHDEBINFO builds. -CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG - -//C compiler -CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc - -//A wrapper around 'ar' adding the appropriate '--plugin' option -// for the GCC compiler -CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar - -//A wrapper around 'ranlib' adding the appropriate '--plugin' option -// for the GCC compiler -CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib - -//Flags used by the C compiler during all build types. -CMAKE_C_FLAGS:STRING= - -//Flags used by the C compiler during DEBUG builds. -CMAKE_C_FLAGS_DEBUG:STRING=-g - -//Flags used by the C compiler during MINSIZEREL builds. -CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the C compiler during RELEASE builds. -CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the C compiler during RELWITHDEBINFO builds. -CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG - -//Path to a program. -CMAKE_DLLTOOL:FILEPATH=CMAKE_DLLTOOL-NOTFOUND - -//Flags used by the linker during all build types. -CMAKE_EXE_LINKER_FLAGS:STRING= - -//Flags used by the linker during DEBUG builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during MINSIZEREL builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during RELEASE builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during RELWITHDEBINFO builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL= - -//Value Computed by CMake. -CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/gio/code/fraktals/src/CMakeFiles/pkgRedirects - -//User executables (bin) -CMAKE_INSTALL_BINDIR:PATH=bin - -//Read-only architecture-independent data (DATAROOTDIR) -CMAKE_INSTALL_DATADIR:PATH= - -//Read-only architecture-independent data root (share) -CMAKE_INSTALL_DATAROOTDIR:PATH=share - -//Documentation root (DATAROOTDIR/doc/PROJECT_NAME) -CMAKE_INSTALL_DOCDIR:PATH= - -//C header files (include) -CMAKE_INSTALL_INCLUDEDIR:PATH=include - -//Info documentation (DATAROOTDIR/info) -CMAKE_INSTALL_INFODIR:PATH= - -//Object code libraries (lib) -CMAKE_INSTALL_LIBDIR:PATH=lib - -//Program executables (libexec) -CMAKE_INSTALL_LIBEXECDIR:PATH=libexec - -//Locale-dependent data (DATAROOTDIR/locale) -CMAKE_INSTALL_LOCALEDIR:PATH= - -//Modifiable single-machine data (var) -CMAKE_INSTALL_LOCALSTATEDIR:PATH=var - -//Man documentation (DATAROOTDIR/man) -CMAKE_INSTALL_MANDIR:PATH= - -//C header files for non-gcc (/usr/include) -CMAKE_INSTALL_OLDINCLUDEDIR:PATH=/usr/include - -//Install path prefix, prepended onto install directories. -CMAKE_INSTALL_PREFIX:PATH=/usr/local - -//Run-time variable data (LOCALSTATEDIR/run) -CMAKE_INSTALL_RUNSTATEDIR:PATH= - -//System admin executables (sbin) -CMAKE_INSTALL_SBINDIR:PATH=sbin - -//Modifiable architecture-independent data (com) -CMAKE_INSTALL_SHAREDSTATEDIR:PATH=com - -//Read-only single-machine data (etc) -CMAKE_INSTALL_SYSCONFDIR:PATH=etc - -//Path to a program. -CMAKE_LINKER:FILEPATH=/usr/bin/ld - -//Path to a program. -CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make - -//Flags used by the linker during the creation of modules during -// all build types. -CMAKE_MODULE_LINKER_FLAGS:STRING= - -//Flags used by the linker during the creation of modules during -// DEBUG builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during the creation of modules during -// MINSIZEREL builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during the creation of modules during -// RELEASE builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during the creation of modules during -// RELWITHDEBINFO builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Path to a program. -CMAKE_NM:FILEPATH=/usr/bin/nm - -//Path to a program. -CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy - -//Path to a program. -CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump - -//Value Computed by CMake -CMAKE_PROJECT_DESCRIPTION:STATIC= - -//Value Computed by CMake -CMAKE_PROJECT_HOMEPAGE_URL:STATIC= - -//Value Computed by CMake -CMAKE_PROJECT_NAME:STATIC=Project - -//Value Computed by CMake -CMAKE_PROJECT_VERSION:STATIC=3.4.0 - -//Value Computed by CMake -CMAKE_PROJECT_VERSION_MAJOR:STATIC=3 - -//Value Computed by CMake -CMAKE_PROJECT_VERSION_MINOR:STATIC=4 - -//Value Computed by CMake -CMAKE_PROJECT_VERSION_PATCH:STATIC=0 - -//Value Computed by CMake -CMAKE_PROJECT_VERSION_TWEAK:STATIC= - -//Path to a program. -CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib - -//Path to a program. -CMAKE_READELF:FILEPATH=/usr/bin/readelf - -//Flags used by the linker during the creation of shared libraries -// during all build types. -CMAKE_SHARED_LINKER_FLAGS:STRING= - -//Flags used by the linker during the creation of shared libraries -// during DEBUG builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during the creation of shared libraries -// during MINSIZEREL builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during the creation of shared libraries -// during RELEASE builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during the creation of shared libraries -// during RELWITHDEBINFO builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//If set, runtime paths are not added when installing shared libraries, -// but are added when building. -CMAKE_SKIP_INSTALL_RPATH:BOOL=NO - -//If set, runtime paths are not added when using shared libraries. -CMAKE_SKIP_RPATH:BOOL=NO - -//Flags used by the linker during the creation of static libraries -// during all build types. -CMAKE_STATIC_LINKER_FLAGS:STRING= - -//Flags used by the linker during the creation of static libraries -// during DEBUG builds. -CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during the creation of static libraries -// during MINSIZEREL builds. -CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during the creation of static libraries -// during RELEASE builds. -CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during the creation of static libraries -// during RELWITHDEBINFO builds. -CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Path to a program. -CMAKE_STRIP:FILEPATH=/usr/bin/strip - -//If this value is on, makefiles will be generated without the -// .SILENT directive, and all commands will be echoed to the console -// during the make. This is useful for debugging only. With Visual -// Studio IDE projects all commands are done without /nologo. -CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE - -//Single output directory for building all executables. -EXECUTABLE_OUTPUT_PATH:PATH= - -//Path to a file. -FREETYPE_INCLUDE_DIR_freetype2:PATH=/usr/include/freetype2 - -//Path to a file. -FREETYPE_INCLUDE_DIR_ft2build:PATH=/usr/include/freetype2 - -//Path to a library. -FREETYPE_LIBRARY_DEBUG:FILEPATH=FREETYPE_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -FREETYPE_LIBRARY_RELEASE:FILEPATH=/usr/lib/libfreetype.so - -//Path to a file. -Fontconfig_INCLUDE_DIR:PATH=/usr/include - -//Path to a library. -Fontconfig_LIBRARY:FILEPATH=/usr/lib/libfontconfig.so - -//Value Computed by CMake -GLFW_BINARY_DIR:STATIC=/home/gio/code/fraktals/include/glfw - -//Build support for Wayland -GLFW_BUILD_WAYLAND:BOOL=OFF - -//Build support for X11 -GLFW_BUILD_X11:BOOL=ON - -//Value Computed by CMake -GLFW_IS_TOP_LEVEL:STATIC=OFF - -//Library type override for GLFW (SHARED, STATIC, OBJECT, or empty -// to follow BUILD_SHARED_LIBS) -GLFW_LIBRARY_TYPE:STRING= - -//Value Computed by CMake -GLFW_SOURCE_DIR:STATIC=/home/gio/code/fraktals/include/glfw - -//Single output directory for building all libraries. -LIBRARY_OUTPUT_PATH:PATH= - -//Path to a library. -MATH_LIBRARY:FILEPATH=/usr/lib/libm.so - -//Arguments to supply to pkg-config -PKG_CONFIG_ARGN:STRING= - -//pkg-config executable -PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config - -//Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/gio/code/fraktals/src - -//Value Computed by CMake -Project_IS_TOP_LEVEL:STATIC=ON - -//Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/gio/code/fraktals/src - -//Path to a library. -RT_LIBRARY:FILEPATH=/usr/lib/librt.a - -//Path to a file. -X11_ICE_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_ICE_LIB:FILEPATH=/usr/lib/libICE.so - -//Path to a file. -X11_SM_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_SM_LIB:FILEPATH=/usr/lib/libSM.so - -//Path to a file. -X11_X11_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_X11_LIB:FILEPATH=/usr/lib/libX11.so - -//Path to a file. -X11_X11_xcb_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_X11_xcb_LIB:FILEPATH=/usr/lib/libX11-xcb.so - -//Path to a file. -X11_XRes_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_XRes_LIB:FILEPATH=/usr/lib/libXRes.so - -//Path to a file. -X11_XShm_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_XSync_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xau_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xau_LIB:FILEPATH=/usr/lib/libXau.so - -//Path to a file. -X11_Xaw_INCLUDE_PATH:PATH=X11_Xaw_INCLUDE_PATH-NOTFOUND - -//Path to a library. -X11_Xaw_LIB:FILEPATH=/usr/lib/libXaw.so - -//Path to a file. -X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xcomposite_LIB:FILEPATH=/usr/lib/libXcomposite.so - -//Path to a file. -X11_Xcursor_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xcursor_LIB:FILEPATH=/usr/lib/libXcursor.so - -//Path to a file. -X11_Xdamage_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xdamage_LIB:FILEPATH=/usr/lib/libXdamage.so - -//Path to a file. -X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xdmcp_LIB:FILEPATH=/usr/lib/libXdmcp.so - -//Path to a file. -X11_Xext_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xext_LIB:FILEPATH=/usr/lib/libXext.so - -//Path to a file. -X11_Xfixes_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xfixes_LIB:FILEPATH=/usr/lib/libXfixes.so - -//Path to a file. -X11_Xft_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xft_LIB:FILEPATH=/usr/lib/libXft.so - -//Path to a file. -X11_Xi_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xi_LIB:FILEPATH=/usr/lib/libXi.so - -//Path to a file. -X11_Xinerama_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xinerama_LIB:FILEPATH=/usr/lib/libXinerama.so - -//Path to a file. -X11_Xkb_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xkblib_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xlib_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xmu_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xmu_LIB:FILEPATH=/usr/lib/libXmu.so - -//Path to a file. -X11_Xpm_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xpm_LIB:FILEPATH=/usr/lib/libXpm.so - -//Path to a file. -X11_Xrandr_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xrandr_LIB:FILEPATH=/usr/lib/libXrandr.so - -//Path to a file. -X11_Xrender_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xrender_LIB:FILEPATH=/usr/lib/libXrender.so - -//Path to a file. -X11_Xshape_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xss_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xss_LIB:FILEPATH=/usr/lib/libXss.so - -//Path to a file. -X11_Xt_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xt_LIB:FILEPATH=/usr/lib/libXt.so - -//Path to a file. -X11_Xtst_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xtst_LIB:FILEPATH=/usr/lib/libXtst.so - -//Path to a file. -X11_Xutil_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_Xv_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xv_LIB:FILEPATH=/usr/lib/libXv.so - -//Path to a file. -X11_Xxf86misc_INCLUDE_PATH:PATH=X11_Xxf86misc_INCLUDE_PATH-NOTFOUND - -//Path to a library. -X11_Xxf86misc_LIB:FILEPATH=X11_Xxf86misc_LIB-NOTFOUND - -//Path to a file. -X11_Xxf86vm_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_Xxf86vm_LIB:FILEPATH=/usr/lib/libXxf86vm.so - -//Path to a file. -X11_dpms_INCLUDE_PATH:PATH=/usr/include - -//Path to a file. -X11_xcb_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_LIB:FILEPATH=/usr/lib/libxcb.so - -//Path to a file. -X11_xcb_icccm_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_icccm_LIB:FILEPATH=/usr/lib/libxcb-icccm.so - -//Path to a file. -X11_xcb_keysyms_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_keysyms_LIB:FILEPATH=/usr/lib/libxcb-keysyms.so - -//Path to a file. -X11_xcb_randr_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_randr_LIB:FILEPATH=/usr/lib/libxcb-randr.so - -//Path to a file. -X11_xcb_util_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_util_LIB:FILEPATH=/usr/lib/libxcb-util.so - -//Path to a file. -X11_xcb_xfixes_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_xfixes_LIB:FILEPATH=/usr/lib/libxcb-xfixes.so - -//Path to a library. -X11_xcb_xkb_LIB:FILEPATH=/usr/lib/libxcb-xkb.so - -//Path to a file. -X11_xcb_xtest_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xcb_xtest_LIB:FILEPATH=/usr/lib/libxcb-xtest.so - -//Path to a file. -X11_xkbcommon_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xkbcommon_LIB:FILEPATH=/usr/lib/libxkbcommon.so - -//Path to a file. -X11_xkbcommon_X11_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xkbcommon_X11_LIB:FILEPATH=/usr/lib/libxkbcommon-x11.so - -//Path to a file. -X11_xkbfile_INCLUDE_PATH:PATH=/usr/include - -//Path to a library. -X11_xkbfile_LIB:FILEPATH=/usr/lib/libxkbfile.so - -//The directory containing a CMake configuration file for fmt. -fmt_DIR:PATH=/usr/lib64/cmake/fmt - -//The directory containing a CMake configuration file for glm. -glm_DIR:PATH=/usr/lib64/cmake/glm - -//The directory containing a CMake configuration file for imgui. -imgui_DIR:PATH=/usr/share/imgui - -//Path to a library. -pkgcfg_lib_PKG_FONTCONFIG_fontconfig:FILEPATH=/usr/lib/libfontconfig.so - -//Path to a library. -pkgcfg_lib_PKG_FONTCONFIG_freetype:FILEPATH=/usr/lib/libfreetype.so - -//The directory containing a CMake configuration file for spdlog. -spdlog_DIR:PATH=/usr/lib64/cmake/spdlog - - -######################## -# INTERNAL cache entries -######################## - -//ADVANCED property for variable: CMAKE_ADDR2LINE -CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_AR -CMAKE_AR-ADVANCED:INTERNAL=1 -//This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/gio/code/fraktals/src -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=24 -//Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 -//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE -CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/usr/bin/cmake -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest -//ADVANCED property for variable: CMAKE_CXX_COMPILER -CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR -CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB -CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_FLAGS -CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG -CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE -CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_COMPILER -CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_COMPILER_AR -CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB -CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_FLAGS -CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG -CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL -CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE -CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO -CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_DLLTOOL -CMAKE_DLLTOOL-ADVANCED:INTERNAL=1 -//Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake -//Executable file format -CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF -//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS -CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG -CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE -CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS -CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 -//Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL= -//Name of generator. -CMAKE_GENERATOR:INTERNAL=Unix Makefiles -//Generator instance identifier. -CMAKE_GENERATOR_INSTANCE:INTERNAL= -//Name of generator platform. -CMAKE_GENERATOR_PLATFORM:INTERNAL= -//Name of generator toolset. -CMAKE_GENERATOR_TOOLSET:INTERNAL= -//Have function connect -CMAKE_HAVE_CONNECT:INTERNAL=1 -//Have function gethostbyname -CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1 -//Test CMAKE_HAVE_LIBC_PTHREAD -CMAKE_HAVE_LIBC_PTHREAD:INTERNAL=1 -//Have function remove -CMAKE_HAVE_REMOVE:INTERNAL=1 -//Have function shmat -CMAKE_HAVE_SHMAT:INTERNAL=1 -//Source directory with the top level CMakeLists.txt file for this -// project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/gio/code/fraktals/src -//ADVANCED property for variable: CMAKE_INSTALL_BINDIR -CMAKE_INSTALL_BINDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_DATADIR -CMAKE_INSTALL_DATADIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_DATAROOTDIR -CMAKE_INSTALL_DATAROOTDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_DOCDIR -CMAKE_INSTALL_DOCDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_INCLUDEDIR -CMAKE_INSTALL_INCLUDEDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_INFODIR -CMAKE_INSTALL_INFODIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_LIBDIR -CMAKE_INSTALL_LIBDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_LIBEXECDIR -CMAKE_INSTALL_LIBEXECDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_LOCALEDIR -CMAKE_INSTALL_LOCALEDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_LOCALSTATEDIR -CMAKE_INSTALL_LOCALSTATEDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_MANDIR -CMAKE_INSTALL_MANDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_OLDINCLUDEDIR -CMAKE_INSTALL_OLDINCLUDEDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_RUNSTATEDIR -CMAKE_INSTALL_RUNSTATEDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_SBINDIR -CMAKE_INSTALL_SBINDIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_INSTALL_SHAREDSTATEDIR -CMAKE_INSTALL_SHAREDSTATEDIR-ADVANCED:INTERNAL=1 -//Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 -//ADVANCED property for variable: CMAKE_INSTALL_SYSCONFDIR -CMAKE_INSTALL_SYSCONFDIR-ADVANCED:INTERNAL=1 -//Have library ICE -CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1 -//ADVANCED property for variable: CMAKE_LINKER -CMAKE_LINKER-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MAKE_PROGRAM -CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS -CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG -CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE -CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_NM -CMAKE_NM-ADVANCED:INTERNAL=1 -//number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3 -//ADVANCED property for variable: CMAKE_OBJCOPY -CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_OBJDUMP -CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 -//Platform information initialized -CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_RANLIB -CMAKE_RANLIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_READELF -CMAKE_READELF-ADVANCED:INTERNAL=1 -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/share/cmake -//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS -CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG -CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE -CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH -CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_SKIP_RPATH -CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS -CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG -CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL -CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE -CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: CMAKE_STRIP -CMAKE_STRIP-ADVANCED:INTERNAL=1 -//uname command -CMAKE_UNAME:INTERNAL=/usr/bin/uname -//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE -CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -//Details about finding Threads -FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] -//Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/include][/usr/lib/libX11.so][c ][v()] -//ADVANCED property for variable: FREETYPE_INCLUDE_DIR_freetype2 -FREETYPE_INCLUDE_DIR_freetype2-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: FREETYPE_INCLUDE_DIR_ft2build -FREETYPE_INCLUDE_DIR_ft2build-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: FREETYPE_LIBRARY_DEBUG -FREETYPE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: FREETYPE_LIBRARY_RELEASE -FREETYPE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: Fontconfig_INCLUDE_DIR -Fontconfig_INCLUDE_DIR-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: Fontconfig_LIBRARY -Fontconfig_LIBRARY-ADVANCED:INTERNAL=1 -//Build the GLFW documentation -GLFW_BUILD_DOCS:INTERNAL=OFF -//Build the GLFW example programs -GLFW_BUILD_EXAMPLES:INTERNAL=OFF -//Build the GLFW test programs -GLFW_BUILD_TESTS:INTERNAL=OFF -//Generate installation target -GLFW_INSTALL:INTERNAL=OFF -//GLFW pkg-config Libs.private -GLFW_PKG_CONFIG_LIBS_PRIVATE:INTERNAL= -lrt -lm -ldl -//GLFW pkg-config Requires.private -GLFW_PKG_CONFIG_REQUIRES_PRIVATE:INTERNAL= -//ADVANCED property for variable: MATH_LIBRARY -MATH_LIBRARY-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: PKG_CONFIG_ARGN -PKG_CONFIG_ARGN-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: PKG_CONFIG_EXECUTABLE -PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1 -PKG_FONTCONFIG_CFLAGS:INTERNAL=-I/usr/include/freetype2;-I/usr/include/libpng16;-I/usr/include/harfbuzz;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/sysprof-4;-pthread -PKG_FONTCONFIG_CFLAGS_I:INTERNAL= -PKG_FONTCONFIG_CFLAGS_OTHER:INTERNAL=-pthread -PKG_FONTCONFIG_FOUND:INTERNAL=1 -PKG_FONTCONFIG_INCLUDEDIR:INTERNAL=/usr/include -PKG_FONTCONFIG_INCLUDE_DIRS:INTERNAL=/usr/include/freetype2;/usr/include/libpng16;/usr/include/harfbuzz;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/sysprof-4 -PKG_FONTCONFIG_LDFLAGS:INTERNAL=-L/usr/lib;-lfontconfig;-lfreetype -PKG_FONTCONFIG_LDFLAGS_OTHER:INTERNAL= -PKG_FONTCONFIG_LIBDIR:INTERNAL=/usr/lib -PKG_FONTCONFIG_LIBRARIES:INTERNAL=fontconfig;freetype -PKG_FONTCONFIG_LIBRARY_DIRS:INTERNAL=/usr/lib -PKG_FONTCONFIG_LIBS:INTERNAL= -PKG_FONTCONFIG_LIBS_L:INTERNAL= -PKG_FONTCONFIG_LIBS_OTHER:INTERNAL= -PKG_FONTCONFIG_LIBS_PATHS:INTERNAL= -PKG_FONTCONFIG_MODULE_NAME:INTERNAL=fontconfig -PKG_FONTCONFIG_PREFIX:INTERNAL=/usr -PKG_FONTCONFIG_STATIC_CFLAGS:INTERNAL=-I/usr/include/freetype2;-I/usr/include/libpng16;-I/usr/include/harfbuzz;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/sysprof-4;-pthread -PKG_FONTCONFIG_STATIC_CFLAGS_I:INTERNAL= -PKG_FONTCONFIG_STATIC_CFLAGS_OTHER:INTERNAL=-pthread -PKG_FONTCONFIG_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/freetype2;/usr/include/libpng16;/usr/include/harfbuzz;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/sysprof-4 -PKG_FONTCONFIG_STATIC_LDFLAGS:INTERNAL=-L/usr/lib;-lfontconfig;-pthread;-lfreetype;-lbz2;-L/usr/lib;-L/usr/lib;-lz;-lpng16;-lm;-lz;-lm;-L/usr/lib;-L/usr/lib;-lz;-lharfbuzz;-pthread;-lm;-L/usr/lib;-lgraphite2;-lglib-2.0;-lm;-L/usr/lib;-lpcre2-8;-lsysprof-capture-4;-pthread;-lbrotlidec;-L/usr/lib;-lbrotlicommon;-L/usr/lib;-lexpat;-lm -PKG_FONTCONFIG_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread;-pthread;-pthread -PKG_FONTCONFIG_STATIC_LIBDIR:INTERNAL= -PKG_FONTCONFIG_STATIC_LIBRARIES:INTERNAL=fontconfig;freetype;bz2;z;png16;m;z;m;z;harfbuzz;m;graphite2;glib-2.0;m;pcre2-8;sysprof-capture-4;brotlidec;brotlicommon;expat;m -PKG_FONTCONFIG_STATIC_LIBRARY_DIRS:INTERNAL=/usr/lib;/usr/lib;/usr/lib;/usr/lib;/usr/lib;/usr/lib;/usr/lib;/usr/lib;/usr/lib -PKG_FONTCONFIG_STATIC_LIBS:INTERNAL= -PKG_FONTCONFIG_STATIC_LIBS_L:INTERNAL= -PKG_FONTCONFIG_STATIC_LIBS_OTHER:INTERNAL= -PKG_FONTCONFIG_STATIC_LIBS_PATHS:INTERNAL= -PKG_FONTCONFIG_VERSION:INTERNAL=2.14.0 -PKG_FONTCONFIG_fontconfig_INCLUDEDIR:INTERNAL= -PKG_FONTCONFIG_fontconfig_LIBDIR:INTERNAL= -PKG_FONTCONFIG_fontconfig_PREFIX:INTERNAL= -PKG_FONTCONFIG_fontconfig_VERSION:INTERNAL= -//ADVANCED property for variable: RT_LIBRARY -RT_LIBRARY-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_ICE_INCLUDE_PATH -X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_ICE_LIB -X11_ICE_LIB-ADVANCED:INTERNAL=1 -//Have library /usr/lib/libX11.so;/usr/lib/libXext.so -X11_LIB_X11_SOLO:INTERNAL=1 -//ADVANCED property for variable: X11_SM_INCLUDE_PATH -X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_SM_LIB -X11_SM_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_X11_INCLUDE_PATH -X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_X11_LIB -X11_X11_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_X11_xcb_INCLUDE_PATH -X11_X11_xcb_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_X11_xcb_LIB -X11_X11_xcb_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_XRes_INCLUDE_PATH -X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_XRes_LIB -X11_XRes_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_XShm_INCLUDE_PATH -X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_XSync_INCLUDE_PATH -X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xaccessrules_INCLUDE_PATH -X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xaccessstr_INCLUDE_PATH -X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xau_INCLUDE_PATH -X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xau_LIB -X11_Xau_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xaw_INCLUDE_PATH -X11_Xaw_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xaw_LIB -X11_Xaw_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xcomposite_INCLUDE_PATH -X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xcomposite_LIB -X11_Xcomposite_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xcursor_INCLUDE_PATH -X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xcursor_LIB -X11_Xcursor_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xdamage_INCLUDE_PATH -X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xdamage_LIB -X11_Xdamage_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xdmcp_INCLUDE_PATH -X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xdmcp_LIB -X11_Xdmcp_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xext_INCLUDE_PATH -X11_Xext_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xext_LIB -X11_Xext_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xfixes_INCLUDE_PATH -X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xfixes_LIB -X11_Xfixes_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xft_INCLUDE_PATH -X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xft_LIB -X11_Xft_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xi_INCLUDE_PATH -X11_Xi_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xi_LIB -X11_Xi_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xinerama_INCLUDE_PATH -X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xinerama_LIB -X11_Xinerama_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xkb_INCLUDE_PATH -X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH -X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH -X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xmu_INCLUDE_PATH -X11_Xmu_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xmu_LIB -X11_Xmu_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH -X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xpm_LIB -X11_Xpm_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xrandr_INCLUDE_PATH -X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xrandr_LIB -X11_Xrandr_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xrender_INCLUDE_PATH -X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xrender_LIB -X11_Xrender_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xshape_INCLUDE_PATH -X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xss_INCLUDE_PATH -X11_Xss_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xss_LIB -X11_Xss_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xt_INCLUDE_PATH -X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xt_LIB -X11_Xt_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xtst_INCLUDE_PATH -X11_Xtst_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xtst_LIB -X11_Xtst_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xutil_INCLUDE_PATH -X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xv_INCLUDE_PATH -X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xv_LIB -X11_Xv_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xxf86misc_INCLUDE_PATH -X11_Xxf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xxf86misc_LIB -X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xxf86vm_INCLUDE_PATH -X11_Xxf86vm_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_Xxf86vm_LIB -X11_Xxf86vm_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_dpms_INCLUDE_PATH -X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_INCLUDE_PATH -X11_xcb_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_LIB -X11_xcb_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_icccm_INCLUDE_PATH -X11_xcb_icccm_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_icccm_LIB -X11_xcb_icccm_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_keysyms_INCLUDE_PATH -X11_xcb_keysyms_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_keysyms_LIB -X11_xcb_keysyms_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_randr_INCLUDE_PATH -X11_xcb_randr_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_randr_LIB -X11_xcb_randr_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_util_INCLUDE_PATH -X11_xcb_util_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_util_LIB -X11_xcb_util_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_xfixes_INCLUDE_PATH -X11_xcb_xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_xfixes_LIB -X11_xcb_xfixes_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_xkb_LIB -X11_xcb_xkb_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_xtest_INCLUDE_PATH -X11_xcb_xtest_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xcb_xtest_LIB -X11_xcb_xtest_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbcommon_INCLUDE_PATH -X11_xkbcommon_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbcommon_LIB -X11_xkbcommon_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbcommon_X11_INCLUDE_PATH -X11_xkbcommon_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbcommon_X11_LIB -X11_xkbcommon_X11_LIB-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbfile_INCLUDE_PATH -X11_xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: X11_xkbfile_LIB -X11_xkbfile_LIB-ADVANCED:INTERNAL=1 -//linker supports push/pop state -_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED:INTERNAL=TRUE -//CMAKE_INSTALL_PREFIX during last run -_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX:INTERNAL=/usr/local -__pkg_config_arguments_PKG_FONTCONFIG:INTERNAL=QUIET;fontconfig -__pkg_config_checked_PKG_FONTCONFIG:INTERNAL=1 -//ADVANCED property for variable: pkgcfg_lib_PKG_FONTCONFIG_fontconfig -pkgcfg_lib_PKG_FONTCONFIG_fontconfig-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: pkgcfg_lib_PKG_FONTCONFIG_freetype -pkgcfg_lib_PKG_FONTCONFIG_freetype-ADVANCED:INTERNAL=1 -prefix_result:INTERNAL=/usr/lib - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1cb81c..866b5cb 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,9 +53,24 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE "GLFW_INCLUDE_NONE") # glad set(GLAD_DIR "${LIB_DIR}/glad") -add_library("glad" "${GLAD_DIR}/src/glad.c") -target_include_directories("glad" PRIVATE "${GLAD_DIR}/include") -target_include_directories(${PROJECT_NAME} PRIVATE "${GLAD_DIR}/include") +#add_library("glad" "${GLAD_DIR}/src/glad.c") + +#add_library(glad ${GLAD_DIR}/include/glad/glad.h ${GLAD_DIR}/src/glad.c) +#add_library( +# glad +# ${GLAD_DIR}/include/glad/glad.h +# ${GLAD_DIR}/src/glad.c +# ${GLAD_DIR}/include/KHR/khrplatform.h +#) +#target_include_directories("glad" PRIVATE "${GLAD_DIR}/include") +add_subdirectory(${GLAD_DIR} ${GLAD_DIR}) + + +# copy shaders +add_custom_target(copy_assets + COMMAND ${CMAKE_COMMAND} -E copy_directory ../../../../src/shaders/ ${CMAKE_CURRENT_BINARY_DIR}/shaders +) +add_dependencies(${PROJECT_NAME} copy_assets) # linkng static and global dependences target_link_libraries(${PROJECT_NAME} @@ -64,7 +79,6 @@ target_link_libraries(${PROJECT_NAME} CLI11::CLI11 fmt::fmt spdlog::spdlog - #imgui::imgui glm::glm "glad" "glfw" "${GLFW_LIBRARIES}") \ No newline at end of file diff --git a/src/callback_functions.cpp b/src/callback_functions.cpp index 916a0ab..601da6a 100755 --- a/src/callback_functions.cpp +++ b/src/callback_functions.cpp @@ -1,101 +1,101 @@ -#include +#include #include #include -#include +#include /* #include "../libs/glfw/include/GLFW/glfw3.h" #include "../libs/glm/glm/glm.hpp" */ -#include "globals.hpp" #include "callback_functions.hpp" +#include "globals.hpp" #include "koch.hpp" variable_wrapper::variable_wrapper() : projection_mat(glm::mat4(1.0f)), model_mat(glm::mat4(1.0f)), - view_mat(glm::mat4(1.0f)), window_height(500), window_width(700), fractal(0) + view_mat(glm::mat4(1.0f)), window_height(500), window_width(700), + fractal(0) { - } -variable_wrapper::~variable_wrapper() -{ - -} +variable_wrapper::~variable_wrapper() {} void callback_resize_func(GLFWwindow* main_window, int width, int height) { glViewport(0, 0, width, height); } -//void move_on_line(float delta) +// void move_on_line(float delta) //{ -// glm::vec3 mouse((float)mouse_xpos, (float)window_height - (float)mouse_ypos, 100.0f); +// glm::vec3 mouse((float)mouse_xpos, (float)window_height - +// (float)mouse_ypos, 100.0f); // -// // fails when matrix is non-invertible, determinant is zero -// glm::vec3 world_proj = glm::unProject(mouse, view_mat, projection_mat, glm::vec4(0.0f, 0.0f, (float)window_width, (float)window_height)); +// // fails when matrix is non-invertible, determinant is zero +// glm::vec3 world_proj = glm::unProject(mouse, view_mat, projection_mat, +// glm::vec4(0.0f, 0.0f, (float)window_width, (float)window_height)); // -// glm::vec3 eye = glm::vec3(glm::inverse(view_mat)[3]); +// glm::vec3 eye = glm::vec3(glm::inverse(view_mat)[3]); // -// glm::vec3 ray = glm::normalize(world_proj - eye); +// glm::vec3 ray = glm::normalize(world_proj - eye); // -// glm::mat4 inv_view = glm::translate(glm::mat4(1.0f), ray*delta) * glm::inverse(view_mat); +// glm::mat4 inv_view = glm::translate(glm::mat4(1.0f), ray*delta) * +// glm::inverse(view_mat); // -// view_mat = glm::inverse(inv_view); +// view_mat = glm::inverse(inv_view); // -//} +// } -void mouse_callback(GLFWwindow *main_window, double xpos, double ypos) +void mouse_callback(GLFWwindow* main_window, double xpos, double ypos) { - void *data = glfwGetWindowUserPointer(main_window); - variable_wrapper *wrapper = reinterpret_cast(data); + void* data = glfwGetWindowUserPointer(main_window); + variable_wrapper* wrapper = reinterpret_cast(data); wrapper->mouse_xpos = xpos; wrapper->mouse_ypos = ypos; } -void scroll_callback(GLFWwindow *main_window, double x, double y) +void scroll_callback(GLFWwindow* main_window, double x, double y) { - void *data = glfwGetWindowUserPointer(main_window); - variable_wrapper *wrapper = reinterpret_cast(data); + void* data = glfwGetWindowUserPointer(main_window); + variable_wrapper* wrapper = reinterpret_cast(data); - wrapper->old_mouse_x_offset = wrapper->mouse_x_offset; - wrapper->old_mouse_y_offset = wrapper->mouse_y_offset; + wrapper->old_mouse_x_offset = wrapper->mouse_x_offset; + wrapper->old_mouse_y_offset = wrapper->mouse_y_offset; wrapper->mouse_y_offset -= y; wrapper->mouse_x_offset -= x; - switch (wrapper->fractal) { - case 0: - koch_mouse_scrollback(wrapper); - break; - - default: - break; + case 0: + koch_mouse_scrollback(wrapper); + break; + + default: + break; } - //move_on_line(yoffset*0.001f); + // move_on_line(yoffset*0.001f); } -void key_callback(GLFWwindow* main_window, int key, int scancode, int action, int mods) +void key_callback(GLFWwindow* main_window, int key, int scancode, int action, + int mods) { - void *data = glfwGetWindowUserPointer(main_window); - variable_wrapper *wrapper = reinterpret_cast(data); + void* data = glfwGetWindowUserPointer(main_window); + variable_wrapper* wrapper = reinterpret_cast(data); switch (key) { - case GLFW_KEY_Q: - glfwSetWindowShouldClose(main_window, true); - break; - default: - break; + case GLFW_KEY_Q: + glfwSetWindowShouldClose(main_window, true); + break; + default: + break; } switch (wrapper->fractal) { - case 0: - koch_keyboard_input(wrapper, key, action, mods); - break; - default: - break; + case 0: + koch_keyboard_input(wrapper, key, action, mods); + break; + default: + break; } } diff --git a/src/callback_functions.hpp b/src/callback_functions.hpp index 755f1e4..574e1b3 100755 --- a/src/callback_functions.hpp +++ b/src/callback_functions.hpp @@ -1,9 +1,9 @@ #ifndef CALLBACK_FUNCTIONS_HPP #define CALLBACK_FUNCTIONS_HPP -#include -#include #include +#include +#include /* #include "../libs/glfw/include/GLFW/glfw3.h" #include "../libs/glm/glm/glm.hpp" @@ -12,44 +12,44 @@ class variable_wrapper { - public: - int fractal; - - int window_width; - int window_height; - double mouse_xpos; - double mouse_ypos; - double old_mouse_x_offset; - double mouse_y_offset; - double old_mouse_y_offset; - double mouse_x_offset; - - glm::mat4 model_mat; - glm::mat4 projection_mat; - glm::mat4 view_mat; - float fov; - - bool koch_next_iteration; - int koch_mode; - int koch_last_mode; - bool koch_switch_mode; - bool koch_status_calculating; - bool koch_grid; +public: + int fractal; + + int window_width; + int window_height; + double mouse_xpos; + double mouse_ypos; + double old_mouse_x_offset; + double mouse_y_offset; + double old_mouse_y_offset; + double mouse_x_offset; + + glm::mat4 model_mat; + glm::mat4 projection_mat; + glm::mat4 view_mat; + float fov; + + bool koch_next_iteration; + int koch_mode; + int koch_last_mode; + bool koch_switch_mode; + bool koch_status_calculating; + bool koch_grid; variable_wrapper(); ~variable_wrapper(); }; - void callback_resize_func(GLFWwindow* main_window, int width, int height); -void key_callback(GLFWwindow* main_window, int key, int scancode, int action, int mods); +void key_callback(GLFWwindow* main_window, int key, int scancode, int action, + int mods); -//void move_on_line(float delta); +// void move_on_line(float delta); -void mouse_callback(GLFWwindow *main_window, double xpos, double ypos); +void mouse_callback(GLFWwindow* main_window, double xpos, double ypos); -void scroll_callback(GLFWwindow *main_window, double x, double y); +void scroll_callback(GLFWwindow* main_window, double x, double y); #endif \ No newline at end of file diff --git a/src/koch.cpp b/src/koch.cpp index c3b51e0..19db74b 100755 --- a/src/koch.cpp +++ b/src/koch.cpp @@ -585,9 +585,8 @@ koch::koch(variable_wrapper& koch_wrapper) : iterations(0), point_counter(0), processor_count(std::thread::hardware_concurrency()), cos60(0.5), sin60(std::numbers::sqrt3 / 2), finished(true), - stop_VBO(false), vertex_shader_paths{"../scr/shaders/koch.vert"}, - fragment_shader_paths{"../scr/shaders/koch.frag", - "../scr/shaders/2D_grid.frag"}, + stop_VBO(false), vertex_shader_paths{"./shaders/koch.vert"}, + fragment_shader_paths{"./shaders/koch.frag", "./shaders/2D_grid.frag"}, koch_shaders(vertex_shader_paths, fragment_shader_paths), wrapper(koch_wrapper) { diff --git a/src/shader.cpp b/src/shader.cpp index c7639bf..6e7b363 100755 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -1,8 +1,8 @@ -#include -#include #include -#include #include +#include +#include +#include #include "globals.hpp" #include "shader.hpp" @@ -20,7 +20,7 @@ std::string shader::openfile(std::string dir) file.close(); return buffer.str(); } - catch(const std::ifstream::failure& e) + catch (const std::ifstream::failure& e) { std::cerr << "ERROR::SHADER::FILE_NOT_SUCCESFULLY_READ" << '\n'; return nullptr; @@ -32,17 +32,17 @@ unsigned int shader::compile_shader(std::string source, int type) unsigned int shader; switch (type) { - case 1: - shader = glCreateShader(GL_VERTEX_SHADER); - break; - case 2: - shader = glCreateShader(GL_FRAGMENT_SHADER); - break; - default: - // throw exection - break; + case 1: + shader = glCreateShader(GL_VERTEX_SHADER); + break; + case 2: + shader = glCreateShader(GL_FRAGMENT_SHADER); + break; + default: + // throw exection + break; } - const char *source_pointer = source.c_str(); + const char* source_pointer = source.c_str(); glShaderSource(shader, 1, &source_pointer, NULL); glCompileShader(shader); @@ -52,21 +52,23 @@ unsigned int shader::compile_shader(std::string source, int type) if (!success) { glGetShaderInfoLog(shader, 1024, NULL, log); - std::cerr << "ERROR IN SHADER COMPILATION:" << type << "\n" << log << '\n'; + std::cerr << "ERROR IN SHADER COMPILATION:" << type << "\n" + << log << '\n'; // exception } return shader; } -unsigned int shader::link_shader_program(unsigned int vertex = 0, unsigned int fragment = 0) +unsigned int shader::link_shader_program(unsigned int vertex = 0, + unsigned int fragment = 0) { // assert both shaders are not zero unsigned int shader_prog = glCreateProgram(); - if(vertex != 0) + if (vertex != 0) glAttachShader(shader_prog, vertex); - if(fragment != 0) + if (fragment != 0) glAttachShader(shader_prog, fragment); glLinkProgram(shader_prog); @@ -75,27 +77,25 @@ unsigned int shader::link_shader_program(unsigned int vertex = 0, unsigned int f glGetProgramiv(shader_prog, GL_LINK_STATUS, &success); if (!success) { - glGetProgramInfoLog(shader_prog, 512, NULL, log); - std::cerr << "ERROR::SHADER::PROGRAM::LINKING_FAILED\n" << log << '\n'; - // exeception + glGetProgramInfoLog(shader_prog, 512, NULL, log); + std::cerr << "ERROR::SHADER::PROGRAM::LINKING_FAILED\n" << log << '\n'; + // exeception } return shader_prog; } -void shader::use(unsigned int id) -{ - glUseProgram(id); -} +void shader::use(unsigned int id) { glUseProgram(id); } -shader::shader(std::vector vertex_paths, std::vector fragment_paths) +shader::shader(std::vector vertex_paths, + std::vector fragment_paths) { - for(std::string file : vertex_paths) + for (std::string file : vertex_paths) { std::string source = openfile(file); unsigned int ID = compile_shader(source, 1); vertex_shader_ID_list.push_back(ID); } - for(std::string file : fragment_paths) + for (std::string file : fragment_paths) { std::string source = openfile(file); unsigned int ID = compile_shader(source, 2); diff --git a/src/shader.hpp b/src/shader.hpp index 9e29dd7..bbc93d9 100755 --- a/src/shader.hpp +++ b/src/shader.hpp @@ -7,25 +7,27 @@ class shader { public: - unsigned int current_shader_ID; - std::vector vertex_shader_ID_list; - std::vector fragment_shader_ID_list; + unsigned int current_shader_ID; + std::vector vertex_shader_ID_list; + std::vector fragment_shader_ID_list; - std::vector shader_program_IDs; - std::vector has_initialized; - // keep track of linking initialization + std::vector shader_program_IDs; + std::vector has_initialized; + // keep track of linking initialization - std::string openfile(std::string dir); + std::string openfile(std::string dir); - unsigned int compile_shader(std::string source, int type); + unsigned int compile_shader(std::string source, int type); - unsigned int link_shader_program(unsigned int vertex, unsigned int fragment); + unsigned int link_shader_program(unsigned int vertex, + unsigned int fragment); - void use(unsigned int id); + void use(unsigned int id); - shader(std::vector vertex_paths, std::vector fragment_paths); + shader(std::vector vertex_paths, + std::vector fragment_paths); - ~shader(); + ~shader(); }; #endif \ No newline at end of file