Skip to content
Snippets Groups Projects
Commit 8e5fbbbd authored by Saif Eddine Askri's avatar Saif Eddine Askri
Browse files

praktikum2 (done)

parent 173576ac
Branches
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 979 additions and 262 deletions
assets/shaders/fragment.glsl
+ 5
− 8
View file @ 8e5fbbbd
#version 330 core #version 330 core
in vec3 colorVS; in vec3 colorVS;
in mat3 animationMatrix;
//fragment shader output
out vec4 color; out vec4 color;
void main() {
void main(){ vec3 animatedColor = animationMatrix * colorVS;
color = vec4(animatedColor, 1.0);
color = vec4(colorVS.x, colorVS.y, colorVS.z, 1.0); }
\ No newline at end of file
}
assets/shaders/vertex.glsl
+ 3
− 0
View file @ 8e5fbbbd
...@@ -4,10 +4,13 @@ layout (location = 0) in vec3 pos; ...@@ -4,10 +4,13 @@ layout (location = 0) in vec3 pos;
layout (location = 1) in vec3 colorRGB; layout (location = 1) in vec3 colorRGB;
out vec3 colorVS; out vec3 colorVS;
out mat3 animationMatrix;
uniform mat4 model; uniform mat4 model;
uniform mat3 animationMatrixFromUniform;
void main(){ void main(){
colorVS = colorRGB; colorVS = colorRGB;
animationMatrix = animationMatrixFromUniform;
gl_Position = model * vec4(pos.x, pos.y, pos.z, 1.0); gl_Position = model * vec4(pos.x, pos.y, pos.z, 1.0);
} }
cmake-build-debug/.cmake/api/v1/reply/index-2025-05-03T08-58-18-0963.json → cmake-build-debug/.cmake/api/v1/reply/index-2025-05-10T19-06-07-0649.json
+ 2
− 2
View file @ 8e5fbbbd
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
}, },
{ {
"jsonFile" : "cmakeFiles-v1-914e5676005382199598.json", "jsonFile" : "cmakeFiles-v1-eb33f1f0715d04736bf2.json",
"kind" : "cmakeFiles", "kind" : "cmakeFiles",
"version" : "version" :
{ {
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
}, },
"cmakeFiles-v1" : "cmakeFiles-v1" :
{ {
"jsonFile" : "cmakeFiles-v1-914e5676005382199598.json", "jsonFile" : "cmakeFiles-v1-eb33f1f0715d04736bf2.json",
"kind" : "cmakeFiles", "kind" : "cmakeFiles",
"version" : "version" :
{ {
......
cmake-build-debug/.ninja_deps
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/.ninja_log
+ 32
− 38
View file @ 8e5fbbbd
# ninja log v5 # ninja log v5
2882 6792 7679659060057445 CMakeFiles/OpenGL_Praktikum.dir/framework/OBJLoader.cpp.obj d2f9fcf70f53a76f 3253 7539 7686065174954045 CMakeFiles/OpenGL_Praktikum.dir/framework/OBJLoader.cpp.obj d2f9fcf70f53a76f
14 2068 7679659012872476 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/SceneElements/Transform.cpp.obj 79d1706bd494aca2 11 2397 7686065123684395 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/SceneElements/Transform.cpp.obj 79d1706bd494aca2
2 2404 7679659016234802 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/Assets/ShaderProgram.cpp.obj 636d8f8ef2520675 6831 8361 7686065183312964 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_tls.c.obj 37adbcd9a1b59fc1
8585 8686 7679659079074389 libs/glfw-3.2.1/src/libglfw3.a 7f148bdc7acbce15 2402 5124 7686065150930272 CMakeFiles/OpenGL_Praktikum.dir/framework/Input.cpp.obj 3aa35e4a541b37cb
14 2181 7680127839681680 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Window.cpp.obj ab9d4e71a8c90cb0 17 2775 7686065127464165 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/Assets/ShaderProgram.cpp.obj 636d8f8ef2520675
9 2998 7679659022168460 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/Assets/AssetManager.cpp.obj a3cf3a9a87bd79b4 9748 9859 7686065198313281 libs/glfw-3.2.1/src/libglfw3.a 7f148bdc7acbce15
4575 6081 7679659053007093 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_window.c.obj f3663704c5e7b483 28 3252 7686065132231581 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Window.cpp.obj ab9d4e71a8c90cb0
25 3020 7679659022383581 CMakeFiles/OpenGL_Praktikum.dir/framework/OpenGLWindow.cpp.obj 34ea2011e57f2170 3 3331 7686065132987911 CMakeFiles/OpenGL_Praktikum.dir/src/Framework/Assets/AssetManager.cpp.obj a3cf3a9a87bd79b4
7 1980 7680546988533112 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj a89dc091bea583c7 22 3445 7686065134113940 CMakeFiles/OpenGL_Praktikum.dir/framework/OpenGLWindow.cpp.obj 34ea2011e57f2170
7404 9595 7679659088112295 libs/glew-2.1.0/build/cmake/CMakeFiles/glew_s.dir/__/__/src/glew.c.obj 49302988e0a6d721 7540 9264 7686065192309264 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_window.c.obj f3663704c5e7b483
3021 4471 7679659036920002 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/context.c.obj 25e8349415fc9756 8 2508 7686071019642495 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj a89dc091bea583c7
6081 7579 7679659068000747 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/window.c.obj 4f7adc10a9b5c100 8264 10755 7686065207221889 libs/glew-2.1.0/build/cmake/CMakeFiles/glew_s.dir/__/__/src/glew.c.obj 49302988e0a6d721
2072 4482 7679659037011572 CMakeFiles/OpenGL_Praktikum.dir/framework/glerror.cpp.obj 283e4f1da4998727 3446 5087 7686065150584678 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/context.c.obj 25e8349415fc9756
6792 8142 7679659073635816 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/vulkan.c.obj d183a1e3d22ea511 6279 7932 7686065179033527 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/window.c.obj 4f7adc10a9b5c100
3211 4575 7679659037961859 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/init.c.obj c23d9b4a554c4f26 3713 5273 7686065152431421 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/init.c.obj c23d9b4a554c4f26
2405 4904 7679659041247449 CMakeFiles/OpenGL_Praktikum.dir/framework/Input.cpp.obj 3aa35e4a541b37cb 2777 5359 7686065153297237 CMakeFiles/OpenGL_Praktikum.dir/framework/glerror.cpp.obj 283e4f1da4998727
4472 5841 7679659050610482 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_tls.c.obj 37adbcd9a1b59fc1 5360 6841 7686065168085346 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/vulkan.c.obj d183a1e3d22ea511
19 2059 7680127838466645 CMakeFiles/OpenGL_Praktikum.dir/src/main.cpp.obj 195d9e105c20c9dc 3331 6279 7686065162499084 CMakeFiles/OpenGL_Praktikum.dir/src/main.cpp.obj 195d9e105c20c9dc
4482 5810 7679659050307522 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_time.c.obj a83aac5291489e 5088 6646 7686065166162948 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/monitor.c.obj 7ef9e67f35f28cd5
4904 6287 7679659055074854 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/egl_context.c.obj a926327ff0927a5f 8245 9748 7686065197204313 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/input.c.obj e27f20b419f1800e
5683 7088 7679659063074061 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/wgl_context.c.obj 6893a4a99f5b69c5 5125 6673 7686065166335158 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_joystick.c.obj 82d66a06693256c5
5841 7250 7679659064709339 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/monitor.c.obj 7ef9e67f35f28cd5 5273 6831 7686065167859215 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_monitor.c.obj c9b9fd7628118e17
5810 7269 7679659064869333 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/input.c.obj e27f20b419f1800e 6673 8245 7686065182160366 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_time.c.obj a83aac5291489e
7270 7404 7679659066278733 libs/glew-2.1.0/build/cmake/CMakeFiles/glew_s.dir/__/glew.rc.obj b31ab018f98307f0 6647 8264 7686065182351706 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_init.c.obj 7901c8c502250812
6287 7708 7679659069295843 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_init.c.obj 7901c8c502250812 6842 8491 7686065184420325 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/egl_context.c.obj a926327ff0927a5f
7579 7873 7679659070944232 libs/stb/CMakeFiles/stb.dir/stb_image_write.c.obj 3526fea5ed75b7b5 8361 8516 7686065184908185 libs/glew-2.1.0/build/cmake/CMakeFiles/glew_s.dir/__/glew.rc.obj b31ab018f98307f0
7088 8483 7679659077036547 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_monitor.c.obj c9b9fd7628118e17 8516 8843 7686065188136532 libs/stb/CMakeFiles/stb.dir/stb_image_write.c.obj 3526fea5ed75b7b5
7708 8572 7679659077894579 libs/stb/CMakeFiles/stb.dir/stb_image.c.obj e492735f915a3aa 7932 9454 7686065194250355 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/wgl_context.c.obj 6893a4a99f5b69c5
7250 8584 7679659078055622 libs/glfw-3.2.1/src/CMakeFiles/glfw.dir/win32_joystick.c.obj 82d66a06693256c5 8492 9494 7686065194635396 libs/stb/CMakeFiles/stb.dir/stb_image.c.obj e492735f915a3aa
8572 8673 7679659078942705 libs/stb/libstb.a 5abafcb88860c9c8 9494 9620 7686065195935485 libs/stb/libstb.a 5abafcb88860c9c8
9595 9690 7679659089107791 lib/libglew32d.a bc6e147c3a6b7648 10756 10849 7686065208208944 lib/libglew32d.a bc6e147c3a6b7648
1980 2487 7680546993551144 OpenGL_Praktikum.exe 9fec4fbaeb613d2c 2508 3061 7686071025109340 OpenGL_Praktikum.exe 9fec4fbaeb613d2c
8 2413 7680547136335636 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj a89dc091bea583c7
2414 2964 7680547141798125 OpenGL_Praktikum.exe 9fec4fbaeb613d2c
7 2027 7680547270091627 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj a89dc091bea583c7
2028 2585 7680547275633075 OpenGL_Praktikum.exe 9fec4fbaeb613d2c
7 1925 7680547351739533 CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj a89dc091bea583c7
1926 2441 7680547356856641 OpenGL_Praktikum.exe 9fec4fbaeb613d2c
cmake-build-debug/CMakeFiles/3.27.8/CMakeDetermineCompilerABI_C.bin
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/3.27.8/CMakeDetermineCompilerABI_CXX.bin
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/3.27.8/CompilerIdC/a.exe
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/3.27.8/CompilerIdCXX/a.exe
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
+ 527
− 88
View file @ 8e5fbbbd
This diff is collapsed.
cmake-build-debug/CMakeFiles/OpenGL_Praktikum.dir/src/Game/Scene.cpp.obj
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/OpenGL_Praktikum.dir/src/Game/Window.cpp.obj
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/CMakeFiles/clion-Debug-log.txt
+ 1
− 27
View file @ 8e5fbbbd
...@@ -7,18 +7,6 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): ...@@ -7,18 +7,6 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
CMake that the project does not need compatibility with older versions. CMake that the project does not need compatibility with older versions.
-- The C compiler identification is GNU 13.1.0
-- The CXX compiler identification is GNU 13.1.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: C:/Program Files/JetBrains/CLion 2023.3.3/bin/mingw/bin/gcc.exe - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: C:/Program Files/JetBrains/CLion 2023.3.3/bin/mingw/bin/g++.exe - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Deprecation Warning at libs/CMakeLists.txt:1 (cmake_minimum_required): CMake Deprecation Warning at libs/CMakeLists.txt:1 (cmake_minimum_required):
Compatibility with CMake < 3.5 will be removed from a future version of Compatibility with CMake < 3.5 will be removed from a future version of
CMake. CMake.
...@@ -63,20 +51,7 @@ CMake Deprecation Warning at libs/glfw-3.2.1/CMakeLists.txt:10 (cmake_policy): ...@@ -63,20 +51,7 @@ CMake Deprecation Warning at libs/glfw-3.2.1/CMakeLists.txt:10 (cmake_policy):
behavior and not rely on setting a policy to OLD. behavior and not rely on setting a policy to OLD.
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
-- Found Threads: TRUE
-- Could NOT find Vulkan (missing: VULKAN_LIBRARY VULKAN_INCLUDE_DIR) -- Could NOT find Vulkan (missing: VULKAN_LIBRARY VULKAN_INCLUDE_DIR)
-- Looking for dinput.h
-- Looking for dinput.h - found
-- Looking for xinput.h
-- Looking for xinput.h - found
-- Performing Test _GLFW_HAS_DEP
-- Performing Test _GLFW_HAS_DEP - Success
-- Performing Test _GLFW_HAS_ASLR
-- Performing Test _GLFW_HAS_ASLR - Success
-- Performing Test _GLFW_HAS_64ASLR
-- Performing Test _GLFW_HAS_64ASLR - Success
-- Using Win32 for window creation -- Using Win32 for window creation
CMake Deprecation Warning at libs/glew-2.1.0/build/cmake/CMakeLists.txt:7 (cmake_minimum_required): CMake Deprecation Warning at libs/glew-2.1.0/build/cmake/CMakeLists.txt:7 (cmake_minimum_required):
Compatibility with CMake < 3.5 will be removed from a future version of Compatibility with CMake < 3.5 will be removed from a future version of
...@@ -86,7 +61,6 @@ CMake Deprecation Warning at libs/glew-2.1.0/build/cmake/CMakeLists.txt:7 (cmake ...@@ -86,7 +61,6 @@ CMake Deprecation Warning at libs/glew-2.1.0/build/cmake/CMakeLists.txt:7 (cmake
CMake that the project does not need compatibility with older versions. CMake that the project does not need compatibility with older versions.
-- Found OpenGL: opengl32
CMake Deprecation Warning at libs/stb/CMakeLists.txt:1 (cmake_minimum_required): CMake Deprecation Warning at libs/stb/CMakeLists.txt:1 (cmake_minimum_required):
Compatibility with CMake < 3.5 will be removed from a future version of Compatibility with CMake < 3.5 will be removed from a future version of
CMake. CMake.
...@@ -95,6 +69,6 @@ CMake Deprecation Warning at libs/stb/CMakeLists.txt:1 (cmake_minimum_required): ...@@ -95,6 +69,6 @@ CMake Deprecation Warning at libs/stb/CMakeLists.txt:1 (cmake_minimum_required):
CMake that the project does not need compatibility with older versions. CMake that the project does not need compatibility with older versions.
-- Configuring done (4.7s) -- Configuring done (0.3s)
-- Generating done (0.1s) -- Generating done (0.1s)
-- Build files have been written to: C:/Users/saifa/Desktop/Visual Computing/repo/cmake-build-debug -- Build files have been written to: C:/Users/saifa/Desktop/Visual Computing/repo/cmake-build-debug
cmake-build-debug/OpenGL_Praktikum.exe
+ 0
− 0
View file @ 8e5fbbbd
No preview for this file type
cmake-build-debug/Testing/Temporary/LastTest.log
+ 2
− 2
View file @ 8e5fbbbd
Start testing: May 04 11:38 Mitteleuropische Sommerzeit Start testing: May 10 21:06 Mitteleuropische Sommerzeit
---------------------------------------------------------- ----------------------------------------------------------
End testing: May 04 11:38 Mitteleuropische Sommerzeit End testing: May 10 21:06 Mitteleuropische Sommerzeit
cmake-build-debug/assets/shaders/fragment.glsl
+ 5
− 8
View file @ 8e5fbbbd
#version 330 core #version 330 core
in vec3 colorVS; in vec3 colorVS;
in mat3 animationMatrix;
//fragment shader output
out vec4 color; out vec4 color;
void main() {
void main(){ vec3 animatedColor = animationMatrix * colorVS;
color = vec4(animatedColor, 1.0);
color = vec4(colorVS.x, colorVS.y, colorVS.z, 1.0); }
\ No newline at end of file
}
cmake-build-debug/assets/shaders/vertex.glsl
+ 3
− 0
View file @ 8e5fbbbd
...@@ -4,10 +4,13 @@ layout (location = 0) in vec3 pos; ...@@ -4,10 +4,13 @@ layout (location = 0) in vec3 pos;
layout (location = 1) in vec3 colorRGB; layout (location = 1) in vec3 colorRGB;
out vec3 colorVS; out vec3 colorVS;
out mat3 animationMatrix;
uniform mat4 model; uniform mat4 model;
uniform mat3 animationMatrixFromUniform;
void main(){ void main(){
colorVS = colorRGB; colorVS = colorRGB;
animationMatrix = animationMatrixFromUniform;
gl_Position = model * vec4(pos.x, pos.y, pos.z, 1.0); gl_Position = model * vec4(pos.x, pos.y, pos.z, 1.0);
} }
cmake-build-debug/build.ninja
+ 8
− 78
View file @ 8e5fbbbd
This diff is collapsed.
cmake-build-debug/perflog.csv
+ 10
− 11
View file @ 8e5fbbbd
3437.83,6875.66,0.290881,0.145441 6.96119,11.3009,143.654,88.4885
7.03837,17.5981,142.078,56.8243 6.92979,8.0036,144.305,124.944
7.02545,17.5247,142.34,57.0623 6.93685,8.7478,144.158,114.314
7.03604,16.4961,142.125,60.6204 6.9352,10.9572,144.192,91.2642
6.93478,9.9698,144.201,100.303 7.0332,12.9953,142.183,76.9509
6.93484,7.5306,144.2,132.792 6.93524,9.5856,144.191,104.323
6.93977,7.7186,144.097,129.557 6.9374,7.3916,144.146,135.289
6.9374,7.7073,144.146,129.747 7.03401,13.3142,142.166,75.1078
6.93775,7.5473,144.139,132.498 6.9315,7.7876,144.269,128.409
6.93178,8.2401,144.263,121.358 6.93496,7.4632,144.197,133.991
7.17298,13.2487,139.412,75.4791
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment