rename assets
matixezor
@ -1 +1,4 @@
|
|||||||
grafika_projekt.vcxproj -> J:\source\repos\grafika_projekt\Debug\grafika_projekt.exe
|
main.cpp
|
||||||
|
J:\source\repos\grafika_projekt\grafika_projekt\src\main.cpp(108,10): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
|
||||||
|
J:\source\repos\grafika_projekt\grafika_projekt\src\main.cpp(109,10): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
|
||||||
|
grafika_projekt.vcxproj -> J:\source\repos\grafika_projekt\Debug\grafika_projekt.exe
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 723 KiB |
|
Before Width: | Height: | Size: 723 KiB |
|
Before Width: | Height: | Size: 274 KiB |
|
Before Width: | Height: | Size: 274 KiB |
|
Before Width: | Height: | Size: 462 KiB |
|
Before Width: | Height: | Size: 462 KiB |
|
Before Width: | Height: | Size: 588 KiB |
|
Before Width: | Height: | Size: 588 KiB |
|
Before Width: | Height: | Size: 525 KiB |
|
Before Width: | Height: | Size: 525 KiB |
|
Before Width: | Height: | Size: 338 KiB |
|
Before Width: | Height: | Size: 338 KiB |
|
Before Width: | Height: | Size: 289 KiB After Width: | Height: | Size: 289 KiB |
|
Before Width: | Height: | Size: 243 KiB After Width: | Height: | Size: 243 KiB |
|
Before Width: | Height: | Size: 275 KiB After Width: | Height: | Size: 275 KiB |
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 280 KiB |
|
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 298 KiB |
|
Before Width: | Height: | Size: 338 KiB After Width: | Height: | Size: 338 KiB |
|
Before Width: | Height: | Size: 338 KiB |
@ -30,12 +30,12 @@ glm::mat4 cameraMatrix, perspectiveMatrix;
|
|||||||
Core::Shader_Loader shaderLoader;
|
Core::Shader_Loader shaderLoader;
|
||||||
|
|
||||||
std::string skyboxTextures[6] = {
|
std::string skyboxTextures[6] = {
|
||||||
"models/skybox/right1.jpg",
|
"models/skybox/right.jpg",
|
||||||
"models/skybox/left1.jpg",
|
"models/skybox/left.jpg",
|
||||||
"models/skybox/top1.jpg",
|
"models/skybox/top.jpg",
|
||||||
"models/skybox/bottom1.jpg",
|
"models/skybox/bottom.jpg",
|
||||||
"models/skybox/front1.jpg",
|
"models/skybox/front.jpg",
|
||||||
"models/skybox/back1.jpg"
|
"models/skybox/back.jpg"
|
||||||
};
|
};
|
||||||
|
|
||||||
float skyboxVertices[] = {
|
float skyboxVertices[] = {
|
||||||
|
|||||||