Improved fish

This commit is contained in:
s452662 2022-02-10 20:41:45 +01:00
parent 38c494615d
commit c260a57621
60 changed files with 356 additions and 343 deletions

View File

@ -2,6 +2,6 @@
"ExpandedNodes": [
""
],
"SelectedNode": "\\grk-cw.sln",
"SelectedNode": "\\grk-cw6.sln (grk-cw6.sln)",
"PreviewInSolutionExplorer": false
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}

View File

@ -1,6 +1,6 @@
# This is the CMakeCache file.
# For build in directory: e:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# For build in directory: c:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# 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.
@ -14,16 +14,18 @@
# EXTERNAL cache entries
########################
//Path to a program.
CMAKE_AR:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe
//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 ...
//No help, variable specified on the command line.
CMAKE_BUILD_TYPE:STRING=Debug
//No help, variable specified on the command line.
CMAKE_CXX_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//CXX compiler
CMAKE_CXX_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the CXX compiler during all build types.
CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
@ -43,8 +45,8 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
//Libraries linked by default with all C++ applications.
CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
//No help, variable specified on the command line.
CMAKE_C_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//C compiler
CMAKE_C_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the C compiler during all build types.
CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
@ -80,16 +82,16 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Enable/Disable output of compile commands during generation.
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
//No help, variable specified on the command line.
CMAKE_INSTALL_PREFIX:PATH=E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/install/x64-Debug
CMAKE_INSTALL_PREFIX:PATH=C:/Users/Michal/Source/Repos/GRK2/cw 3/dependencies/glm/out/install/x64-Debug
//Path to a program.
CMAKE_LINKER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/link.exe
CMAKE_LINKER:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe
//make program
CMAKE_MAKE_PROGRAM:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
CMAKE_MAKE_PROGRAM:FILEPATH=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
//Flags used by the linker during the creation of modules during
// all build types.
@ -112,7 +114,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Path to a program.
CMAKE_MT:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/mt.exe
CMAKE_MT:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/mt.exe
//Value Computed by CMake
CMAKE_PROJECT_DESCRIPTION:STATIC=
@ -124,7 +126,7 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
CMAKE_PROJECT_NAME:STATIC=Project
//RC compiler
CMAKE_RC_COMPILER:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/rc.exe
CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/rc.exe
//Flags for Windows Resource Compiler during all build types.
CMAKE_RC_FLAGS:STRING=-DWIN32
@ -201,30 +203,32 @@ EXECUTABLE_OUTPUT_PATH:PATH=
LIBRARY_OUTPUT_PATH:PATH=
//Value Computed by CMake
Project_BINARY_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug
Project_BINARY_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug
//Value Computed by CMake
Project_SOURCE_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm
Project_SOURCE_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm
########################
# INTERNAL cache entries
########################
//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=e:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug
//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=15
CMAKE_CACHE_MINOR_VERSION:INTERNAL=20
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=19080502
CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
CMAKE_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
CMAKE_CPACK_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
CMAKE_CTEST_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
//ADVANCED property for variable: CMAKE_CXX_COMPILER
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_CXX_FLAGS
@ -279,7 +283,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@ -298,6 +302,8 @@ CMAKE_MT-ADVANCED:INTERNAL=1
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Platform information initialized
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
//noop for ranlib
CMAKE_RANLIB:INTERNAL=:
//ADVANCED property for variable: CMAKE_RC_COMPILER
CMAKE_RC_COMPILER-ADVANCED:INTERNAL=1
CMAKE_RC_COMPILER_WORKS:INTERNAL=1
@ -312,7 +318,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.15
CMAKE_ROOT:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

View File

@ -1,16 +1,16 @@
The system is: Windows - 10.0.19043 - AMD64
The system is: Windows - 10.0.19044 - AMD64
Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCCompilerId.c
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCCompilerId.exe
@ -21,20 +21,20 @@ Compilation of the C compiler identification source "CMakeCCompilerId.c" produce
Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CMakeCCompilerId.obj"
The C compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
The C compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCXXCompilerId.cpp
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCXXCompilerId.exe
@ -45,37 +45,21 @@ Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" p
Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CMakeCXXCompilerId.obj"
The CXX compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Determining if the C compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_6201a && [1/2] Building C object CMakeFiles\cmTC_6201a.dir\testCCompiler.c.obj
[2/2] Linking C executable cmTC_6201a.exe
The CXX compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Detecting C compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_6f6f4 && [1/2] Building C object CMakeFiles\cmTC_6f6f4.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_6f6f4.exe
Determining if the CXX compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_15a13 && [1/2] Building CXX object CMakeFiles\cmTC_15a13.dir\testCXXCompiler.cxx.obj
[2/2] Linking CXX executable cmTC_15a13.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_e3f9b && [1/2] Building C object CMakeFiles\cmTC_e3f9b.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_e3f9b.exe
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_6f4ea && [1/2] Building CXX object CMakeFiles\cmTC_6f4ea.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_6f4ea.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_ef941 && [1/2] Building CXX object CMakeFiles\cmTC_ef941.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_ef941.exe

View File

@ -1,3 +1,3 @@
E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir
C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir

View File

@ -1,3 +1,3 @@
Start testing: Feb 09 18:44 Central European Standard Time
Start testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.
----------------------------------------------------------
End testing: Feb 09 18:44 Central European Standard Time
End testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
# Install script for directory: E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm
# Install script for directory: C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/install/x64-Debug")
set(CMAKE_INSTALL_PREFIX "C:/Users/Michal/Source/Repos/GRK2/cw 3/dependencies/glm/out/install/x64-Debug")
endif()
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
@ -40,5 +40,5 @@ endif()
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
"${CMAKE_INSTALL_MANIFEST_FILES}")
file(WRITE "E:/Projects/Visual Studio 2019/GRK/cw 3/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
file(WRITE "C:/Users/Michal/source/repos/GRK2/cw 3/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
"${CMAKE_INSTALL_MANIFEST_CONTENT}")

View File

@ -1 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}

View File

@ -1,6 +1,6 @@
# This is the CMakeCache file.
# For build in directory: e:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# For build in directory: c:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# 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.
@ -14,16 +14,18 @@
# EXTERNAL cache entries
########################
//Path to a program.
CMAKE_AR:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe
//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 ...
//No help, variable specified on the command line.
CMAKE_BUILD_TYPE:STRING=Debug
//No help, variable specified on the command line.
CMAKE_CXX_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//CXX compiler
CMAKE_CXX_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the CXX compiler during all build types.
CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
@ -43,8 +45,8 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
//Libraries linked by default with all C++ applications.
CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
//No help, variable specified on the command line.
CMAKE_C_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//C compiler
CMAKE_C_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the C compiler during all build types.
CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
@ -80,16 +82,16 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Enable/Disable output of compile commands during generation.
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
//No help, variable specified on the command line.
CMAKE_INSTALL_PREFIX:PATH=E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/install/x64-Debug
CMAKE_INSTALL_PREFIX:PATH=C:/Users/Michal/Source/Repos/GRK2/cw 4/dependencies/glm/out/install/x64-Debug
//Path to a program.
CMAKE_LINKER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/link.exe
CMAKE_LINKER:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe
//make program
CMAKE_MAKE_PROGRAM:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
CMAKE_MAKE_PROGRAM:FILEPATH=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
//Flags used by the linker during the creation of modules during
// all build types.
@ -112,7 +114,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Path to a program.
CMAKE_MT:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/mt.exe
CMAKE_MT:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/mt.exe
//Value Computed by CMake
CMAKE_PROJECT_DESCRIPTION:STATIC=
@ -124,7 +126,7 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
CMAKE_PROJECT_NAME:STATIC=Project
//RC compiler
CMAKE_RC_COMPILER:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/rc.exe
CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/rc.exe
//Flags for Windows Resource Compiler during all build types.
CMAKE_RC_FLAGS:STRING=-DWIN32
@ -201,30 +203,32 @@ EXECUTABLE_OUTPUT_PATH:PATH=
LIBRARY_OUTPUT_PATH:PATH=
//Value Computed by CMake
Project_BINARY_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug
Project_BINARY_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug
//Value Computed by CMake
Project_SOURCE_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm
Project_SOURCE_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm
########################
# INTERNAL cache entries
########################
//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=e:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug
//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=15
CMAKE_CACHE_MINOR_VERSION:INTERNAL=20
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=19080502
CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
CMAKE_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
CMAKE_CPACK_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
CMAKE_CTEST_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
//ADVANCED property for variable: CMAKE_CXX_COMPILER
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_CXX_FLAGS
@ -279,7 +283,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@ -298,6 +302,8 @@ CMAKE_MT-ADVANCED:INTERNAL=1
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Platform information initialized
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
//noop for ranlib
CMAKE_RANLIB:INTERNAL=:
//ADVANCED property for variable: CMAKE_RC_COMPILER
CMAKE_RC_COMPILER-ADVANCED:INTERNAL=1
CMAKE_RC_COMPILER_WORKS:INTERNAL=1
@ -312,7 +318,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.15
CMAKE_ROOT:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

View File

@ -1,16 +1,16 @@
The system is: Windows - 10.0.19043 - AMD64
The system is: Windows - 10.0.19044 - AMD64
Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCCompilerId.c
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCCompilerId.exe
@ -21,20 +21,20 @@ Compilation of the C compiler identification source "CMakeCCompilerId.c" produce
Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CMakeCCompilerId.obj"
The C compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
The C compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCXXCompilerId.cpp
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCXXCompilerId.exe
@ -45,37 +45,21 @@ Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" p
Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CMakeCXXCompilerId.obj"
The CXX compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Determining if the C compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_7b1b6 && [1/2] Building C object CMakeFiles\cmTC_7b1b6.dir\testCCompiler.c.obj
[2/2] Linking C executable cmTC_7b1b6.exe
The CXX compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Detecting C compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_59003 && [1/2] Building C object CMakeFiles\cmTC_59003.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_59003.exe
Determining if the CXX compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_ac560 && [1/2] Building CXX object CMakeFiles\cmTC_ac560.dir\testCXXCompiler.cxx.obj
[2/2] Linking CXX executable cmTC_ac560.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_e62e3 && [1/2] Building C object CMakeFiles\cmTC_e62e3.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_e62e3.exe
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_06c3e && [1/2] Building CXX object CMakeFiles\cmTC_06c3e.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_06c3e.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_b87c5 && [1/2] Building CXX object CMakeFiles\cmTC_b87c5.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_b87c5.exe

View File

@ -1,3 +1,3 @@
E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir
C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir

View File

@ -1,3 +1,3 @@
Start testing: Feb 09 18:44 Central European Standard Time
Start testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.
----------------------------------------------------------
End testing: Feb 09 18:44 Central European Standard Time
End testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
# Install script for directory: E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm
# Install script for directory: C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/install/x64-Debug")
set(CMAKE_INSTALL_PREFIX "C:/Users/Michal/Source/Repos/GRK2/cw 4/dependencies/glm/out/install/x64-Debug")
endif()
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
@ -40,5 +40,5 @@ endif()
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
"${CMAKE_INSTALL_MANIFEST_FILES}")
file(WRITE "E:/Projects/Visual Studio 2019/GRK/cw 4/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
file(WRITE "C:/Users/Michal/source/repos/GRK2/cw 4/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
"${CMAKE_INSTALL_MANIFEST_CONTENT}")

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2,7 +2,7 @@
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\Users\Michal\source\repos\GRK\Debug\grk-cw6.exe</FullPath>
<FullPath>C:\Users\Michal\source\repos\GRK2\Debug\grk-cw6.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />

View File

@ -1,9 +1 @@
 main_6_1.cpp
E:\Projects\Visual Studio 2019\GRK\cw 6\src\main_6_1.cpp(187,23): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
E:\Projects\Visual Studio 2019\GRK\cw 6\src\main_6_1.cpp(188,23): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
E:\Projects\Visual Studio 2019\GRK\cw 6\src\main_6_1.cpp(388,33): warning C4244: 'argument': conversion from 'double' to 'GLfloat', possible loss of data
E:\Projects\Visual Studio 2019\GRK\cw 6\src\main_6_1.cpp(389,44): warning C4244: 'argument': conversion from 'double' to 'GLfloat', possible loss of data
E:\Projects\Visual Studio 2019\GRK\cw 6\src\main_6_1.cpp(678,12): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
Camera.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
Creating library E:\Projects\Visual Studio 2019\GRK\Debug\grk-cw6.lib and object E:\Projects\Visual Studio 2019\GRK\Debug\grk-cw6.exp
grk-cw6.vcxproj -> E:\Projects\Visual Studio 2019\GRK\Debug\grk-cw6.exe
 grk-cw6.vcxproj -> C:\Users\Michal\source\repos\GRK2\Debug\grk-cw6.exe

View File

@ -1,2 +1,2 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|E:\Projects\Visual Studio 2019\GRK\|
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
Debug|Win32|C:\Users\Michal\source\repos\GRK2\|

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -48,6 +48,13 @@ static GLfloat angle2 = 30; /* in degrees */
CONST int fish1Number = 100;
float fishRotation1[fish1Number];
glm::vec3 fishLocation[fish1Number];
CONST int fish2Number = 100;
float fishRotation2[fish2Number];
glm::vec3 fishLocation2[fish2Number];
@ -58,7 +65,8 @@ GLuint skyboxTexture;
Core::Shader_Loader shaderLoader;
Core::RenderContext shipContext;
Core::RenderContext fishContext;
Core::RenderContext fish1Context;
Core::RenderContext fish2Context;
Core::RenderContext planeContext;
Core::RenderContext sfmCoralContext;
Core::RenderContext smallCoralContext;
@ -84,6 +92,7 @@ glm::quat rotation = glm::quat(1, 0, 0, 0);
GLuint textureAsteroid;
GLuint textureFish01;
GLuint textureFish02;
GLuint groundTexture;
GLuint sfmCoralTexture;
GLuint smallCoralTexture;
@ -462,19 +471,30 @@ void drawScene()
glm::vec3 scale = glm::vec3(0.0001, 0.0001, 0.0001);
modelMatrix = glm::scale(modelMatrix, scale);
drawObjectTexture(fishContext, modelMatrix, textureFish01);
drawObjectTexture(fish1Context, modelMatrix, textureFish01);
bubbleManager();
for (int i = 0; i < 10; i++)
for (int i = 0; i < fish1Number; i++)
{
glm::mat4 modelMatrix = glm::translate(planetLocation[i]);
float time = glutGet(GLUT_ELAPSED_TIME) / 1000.f;
glm::mat4 modelMatrix = glm::translate(fishLocation[i]) * glm::rotate(glm::radians(fishRotation1[i]), glm::vec3(0.f, 1.f, 0.f)) * glm::translate(glm::vec3(time, 0, 0));
// Scaling models
glm::vec3 scale = glm::vec3(0.0001, 0.0001, 0.0001);
glm::vec3 scale = glm::vec3(0.002, 0.002, 0.002);
modelMatrix = glm::scale(modelMatrix, scale);
drawObjectTexture(fishContext, modelMatrix, textureFish01);
drawObjectTexture(fish1Context, modelMatrix, textureFish01);
}
for (int i = 0; i < fish2Number; i++)
{
float time = glutGet(GLUT_ELAPSED_TIME) / 2000.f;
glm::mat4 modelMatrix = glm::translate(fishLocation2[i]) * glm::rotate(glm::radians(fishRotation2[i]), glm::vec3(0.f, 1.f, 0.f)) * glm::translate(glm::vec3(time, 0, 0)) * glm::rotate(glm::radians(90.f), glm::vec3(0.f, 1.f, 0.f));
// Scaling models
glm::vec3 scale = glm::vec3(0.1, 0.1, 0.1);
modelMatrix = glm::scale(modelMatrix, scale);
drawObjectTexture(fish2Context, modelMatrix, textureFish02);
}
int i = 0;
@ -625,7 +645,7 @@ void bubbleManager() {
// Scaling models
glm::vec3 scale = glm::vec3(0.001, 0.001, 0.001);
modelMatrix = glm::scale(modelMatrix, scale);
drawObjectTexture(fishContext, modelMatrix, textureFish01);
drawObjectTexture(fish1Context, modelMatrix, textureFish01);
}
}
@ -856,9 +876,13 @@ void init()
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
loadModelToContext("models/Submarine.3DS", shipContext);
loadModelToContext("models/TropicalFish01.3ds", fishContext);
textureAsteroid = Core::LoadTexture("textures/asteroid.png");
loadModelToContext("models/TropicalFish01.3ds", fish1Context);
loadModelToContext("models/fishModel2.obj", fish2Context);
textureFish01 = Core::LoadTexture("textures/TropicalFish01.jpg");
textureFish02 = Core::LoadTexture("textures/fish_texture.png");
loadModelToContext("models/plane.obj", planeContext);
groundTexture = Core::LoadTexture("textures/sand.jpg");
@ -874,8 +898,27 @@ void init()
loadModelToContext("models/seaweed2.fbx", Coral2Context);
Coral2Texture = Core::LoadTexture("textures/seaweed2_BaseColor.png");
}
for (int i = 0; i < fish1Number; i++)
{
fishLocation[i] = glm::ballRand(59.0);
}
for (int i = 0; i < fish2Number; i++)
{
fishLocation2[i] = glm::ballRand(59.0);
}
for (int i = 0; i < fish1Number; i++) {
fishRotation1[i] = rand() % 360;
}
for (int i = 0; i < fish2Number; i++) {
fishRotation2[i] = rand() % 360;
}
}
void shutdown()
{
shaderLoader.DeleteProgram(programColor);

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

View File

@ -1 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}

View File

@ -1,6 +1,6 @@
# This is the CMakeCache file.
# For build in directory: e:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# For build in directory: c:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug
# It was generated by CMake: D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# 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.
@ -14,16 +14,18 @@
# EXTERNAL cache entries
########################
//Path to a program.
CMAKE_AR:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe
//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 ...
//No help, variable specified on the command line.
CMAKE_BUILD_TYPE:STRING=Debug
//No help, variable specified on the command line.
CMAKE_CXX_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//CXX compiler
CMAKE_CXX_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the CXX compiler during all build types.
CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
@ -43,8 +45,8 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
//Libraries linked by default with all C++ applications.
CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
//No help, variable specified on the command line.
CMAKE_C_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//C compiler
CMAKE_C_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the C compiler during all build types.
CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
@ -80,16 +82,16 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Enable/Disable output of compile commands during generation.
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
//No help, variable specified on the command line.
CMAKE_INSTALL_PREFIX:PATH=E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/install/x64-Debug
CMAKE_INSTALL_PREFIX:PATH=C:/Users/Michal/Source/Repos/GRK2/dependencies/glm/out/install/x64-Debug
//Path to a program.
CMAKE_LINKER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/link.exe
CMAKE_LINKER:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe
//make program
CMAKE_MAKE_PROGRAM:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
CMAKE_MAKE_PROGRAM:FILEPATH=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
//Flags used by the linker during the creation of modules during
// all build types.
@ -112,7 +114,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Path to a program.
CMAKE_MT:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/mt.exe
CMAKE_MT:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/mt.exe
//Value Computed by CMake
CMAKE_PROJECT_DESCRIPTION:STATIC=
@ -124,7 +126,7 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
CMAKE_PROJECT_NAME:STATIC=Project
//RC compiler
CMAKE_RC_COMPILER:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/rc.exe
CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/rc.exe
//Flags for Windows Resource Compiler during all build types.
CMAKE_RC_FLAGS:STRING=-DWIN32
@ -201,30 +203,32 @@ EXECUTABLE_OUTPUT_PATH:PATH=
LIBRARY_OUTPUT_PATH:PATH=
//Value Computed by CMake
Project_BINARY_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug
Project_BINARY_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug
//Value Computed by CMake
Project_SOURCE_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/dependencies/glm
Project_SOURCE_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/dependencies/glm
########################
# INTERNAL cache entries
########################
//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=e:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug
//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=15
CMAKE_CACHE_MINOR_VERSION:INTERNAL=20
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=19080502
CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
CMAKE_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
CMAKE_CPACK_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
CMAKE_CTEST_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
//ADVANCED property for variable: CMAKE_CXX_COMPILER
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_CXX_FLAGS
@ -279,7 +283,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=E:/Projects/Visual Studio 2019/GRK/dependencies/glm
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/Michal/source/repos/GRK2/dependencies/glm
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@ -298,6 +302,8 @@ CMAKE_MT-ADVANCED:INTERNAL=1
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Platform information initialized
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
//noop for ranlib
CMAKE_RANLIB:INTERNAL=:
//ADVANCED property for variable: CMAKE_RC_COMPILER
CMAKE_RC_COMPILER-ADVANCED:INTERNAL=1
CMAKE_RC_COMPILER_WORKS:INTERNAL=1
@ -312,7 +318,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.15
CMAKE_ROOT:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

View File

@ -1,16 +1,16 @@
The system is: Windows - 10.0.19043 - AMD64
The system is: Windows - 10.0.19044 - AMD64
Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCCompilerId.c
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCCompilerId.exe
@ -21,20 +21,20 @@ Compilation of the C compiler identification source "CMakeCCompilerId.c" produce
Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CMakeCCompilerId.obj"
The C compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
The C compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCXXCompilerId.cpp
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCXXCompilerId.exe
@ -45,37 +45,21 @@ Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" p
Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CMakeCXXCompilerId.obj"
The CXX compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Determining if the C compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_71440 && [1/2] Building C object CMakeFiles\cmTC_71440.dir\testCCompiler.c.obj
[2/2] Linking C executable cmTC_71440.exe
The CXX compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Detecting C compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_9242c && [1/2] Building C object CMakeFiles\cmTC_9242c.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_9242c.exe
Determining if the CXX compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_7ad86 && [1/2] Building CXX object CMakeFiles\cmTC_7ad86.dir\testCXXCompiler.cxx.obj
[2/2] Linking CXX executable cmTC_7ad86.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_6b373 && [1/2] Building C object CMakeFiles\cmTC_6b373.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_6b373.exe
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_86fb1 && [1/2] Building CXX object CMakeFiles\cmTC_86fb1.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_86fb1.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_ce6be && [1/2] Building CXX object CMakeFiles\cmTC_ce6be.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_ce6be.exe

View File

@ -1,3 +1,3 @@
E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir
C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/glm_dummy.dir
C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/edit_cache.dir
C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir

View File

@ -1,3 +1,3 @@
Start testing: Feb 09 18:44 Central European Standard Time
Start testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.
----------------------------------------------------------
End testing: Feb 09 18:44 Central European Standard Time
End testing: Feb 10 19:07 Œrodkowoeuropejski czas stand.

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
# Install script for directory: E:/Projects/Visual Studio 2019/GRK/dependencies/glm
# Install script for directory: C:/Users/Michal/source/repos/GRK2/dependencies/glm
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/install/x64-Debug")
set(CMAKE_INSTALL_PREFIX "C:/Users/Michal/Source/Repos/GRK2/dependencies/glm/out/install/x64-Debug")
endif()
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
@ -40,5 +40,5 @@ endif()
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
"${CMAKE_INSTALL_MANIFEST_FILES}")
file(WRITE "E:/Projects/Visual Studio 2019/GRK/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
file(WRITE "C:/Users/Michal/source/repos/GRK2/dependencies/glm/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}"
"${CMAKE_INSTALL_MANIFEST_CONTENT}")

View File

@ -1 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}

View File

@ -1,6 +1,6 @@
# This is the CMakeCache file.
# For build in directory: e:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
# It was generated by CMake: E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# For build in directory: c:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
# It was generated by CMake: D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# 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.
@ -14,12 +14,14 @@
# EXTERNAL cache entries
########################
//Choose the type of build, options are: None Debug Release RelWithDebInfo
// MinSizeRel ...
CMAKE_BUILD_TYPE:STRING=Debug
//Path to a program.
CMAKE_AR:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe
//No help, variable specified on the command line.
CMAKE_CXX_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
CMAKE_BUILD_TYPE:STRING=Debug
//CXX compiler
CMAKE_CXX_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the CXX compiler during all build types.
CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
@ -39,8 +41,8 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
//Libraries linked by default with all C++ applications.
CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
//No help, variable specified on the command line.
CMAKE_C_COMPILER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
//C compiler
CMAKE_C_COMPILER:STRING=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
//Flags used by the C compiler during all build types.
CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
@ -76,16 +78,16 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Enable/Disable output of compile commands during generation.
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
//No help, variable specified on the command line.
CMAKE_INSTALL_PREFIX:PATH=E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/install/x64-Debug
CMAKE_INSTALL_PREFIX:PATH=C:/Users/Michal/Source/Repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/install/x64-Debug
//Path to a program.
CMAKE_LINKER:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/link.exe
CMAKE_LINKER:FILEPATH=D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe
//make program
CMAKE_MAKE_PROGRAM:FILEPATH=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
CMAKE_MAKE_PROGRAM:FILEPATH=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe
//Flags used by the linker during the creation of modules during
// all build types.
@ -108,7 +110,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
//Path to a program.
CMAKE_MT:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/mt.exe
CMAKE_MT:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/mt.exe
//Value Computed by CMake
CMAKE_PROJECT_DESCRIPTION:STATIC=
@ -120,7 +122,7 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
CMAKE_PROJECT_NAME:STATIC=PhysX
//RC compiler
CMAKE_RC_COMPILER:FILEPATH=E:/Windows Kits/10/bin/10.0.18362.0/x64/rc.exe
CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/rc.exe
//Flags for Windows Resource Compiler during all build types.
CMAKE_RC_FLAGS:STRING=-DWIN32
@ -200,30 +202,32 @@ PX_GENERATE_STATIC_LIBRARIES:BOOL=OFF
PX_SCALAR_MATH:BOOL=OFF
//Value Computed by CMake
PhysX_BINARY_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
PhysX_BINARY_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
//Value Computed by CMake
PhysX_SOURCE_DIR:STATIC=E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake
PhysX_SOURCE_DIR:STATIC=C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake
########################
# INTERNAL cache entries
########################
//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=e:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug
//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=15
CMAKE_CACHE_MINOR_VERSION:INTERNAL=20
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=19080502
CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
CMAKE_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
CMAKE_CPACK_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
CMAKE_CTEST_COMMAND:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
//ADVANCED property for variable: CMAKE_CXX_COMPILER
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_CXX_FLAGS
@ -278,7 +282,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake
CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@ -297,6 +301,8 @@ CMAKE_MT-ADVANCED:INTERNAL=1
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Platform information initialized
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
//noop for ranlib
CMAKE_RANLIB:INTERNAL=:
//ADVANCED property for variable: CMAKE_RC_COMPILER
CMAKE_RC_COMPILER-ADVANCED:INTERNAL=1
CMAKE_RC_COMPILER_WORKS:INTERNAL=1
@ -311,7 +317,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.15
CMAKE_ROOT:INTERNAL=D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG

View File

@ -1,16 +1,16 @@
The system is: Windows - 10.0.19043 - AMD64
The system is: Windows - 10.0.19044 - AMD64
Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCCompilerId.c
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCCompilerId.exe
@ -21,20 +21,20 @@ Compilation of the C compiler identification source "CMakeCCompilerId.c" produce
Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CMakeCCompilerId.obj"
The C compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
The C compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe"
Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
Compiler: E:/Programy/Microsofta Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/HostX64/x64/cl.exe
Compiler: D:/Visual Studio/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe
Build flags:
Id flags:
The output was:
0
Microsoft (R) C/C++ Optimizing Compiler Version 19.23.28107 for x64
Copyright (C) Microsoft Corporation. All rights reserved.
Microsoft (R) C/C++ wersja kompilatora optymalizującego 19.29.30133 dla x64
Copyright (C) Microsoft Corporation. Wszystkie prawa zastrzeżone.
CMakeCXXCompilerId.cpp
Microsoft (R) Incremental Linker Version 14.23.28107.0
Microsoft (R) Incremental Linker Version 14.29.30133.0
Copyright (C) Microsoft Corporation. All rights reserved.
/out:CMakeCXXCompilerId.exe
@ -45,37 +45,21 @@ Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" p
Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CMakeCXXCompilerId.obj"
The CXX compiler identification is MSVC, found in "E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/3.15.19080502-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Determining if the C compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_8092c && [1/2] Building C object CMakeFiles\cmTC_8092c.dir\testCCompiler.c.obj
[2/2] Linking C executable cmTC_8092c.exe
The CXX compiler identification is MSVC, found in "C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe"
Detecting C compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_74345 && [1/2] Building C object CMakeFiles\cmTC_74345.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_74345.exe
Determining if the CXX compiler works passed with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_dba18 && [1/2] Building CXX object CMakeFiles\cmTC_dba18.dir\testCXXCompiler.cxx.obj
[2/2] Linking CXX executable cmTC_dba18.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_b6046 && [1/2] Building C object CMakeFiles\cmTC_b6046.dir\CMakeCCompilerABI.c.obj
[2/2] Linking C executable cmTC_b6046.exe
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: E:/Projects/Visual Studio 2019/GRK/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Change Dir: C:/Users/Michal/source/repos/GRK2/dependencies/physx-4.1/source/compiler/cmake/out/build/x64-Debug/CMakeFiles/CMakeTmp
Run Build Command(s):E:/Programy/Microsofta Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_a96f6 && [1/2] Building CXX object CMakeFiles\cmTC_a96f6.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_a96f6.exe
Run Build Command(s):D:/Visual Studio/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe cmTC_842ad && [1/2] Building CXX object CMakeFiles\cmTC_842ad.dir\CMakeCXXCompilerABI.cpp.obj
[2/2] Linking CXX executable cmTC_842ad.exe