s464869/GRK_Project
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Final version

Browse Source
This commit is contained in:
s464921 2023-02-13 09:51:58 +01:00
parent 79f13b93e5
commit 596f482622
27 changed files with 72 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Release/grk-cw9.exe
View File

Binary file not shown.

BIN
Release/grk-cw9.pdb
View File

Binary file not shown.

BIN
cw 9/Release/Box.obj
View File

Binary file not shown.

BIN
cw 9/Release/Camera.obj
View File

Binary file not shown.

BIN
cw 9/Release/Render_Utils.obj
View File

Binary file not shown.

BIN
cw 9/Release/SOIL.obj
View File

Binary file not shown.

BIN
cw 9/Release/Shader_Loader.obj
View File

Binary file not shown.

BIN
cw 9/Release/Texture.obj
View File

Binary file not shown.

BIN
cw 9/Release/TriangleSoup.obj
View File

Binary file not shown.

2
cw 9/Release/grk-cw9.exe.recipe
View File

@ -2,7 +2,7 @@
<Project> <Project>
<ProjectOutputs> <ProjectOutputs>
<ProjectOutput> <ProjectOutput>
<FullPath>C:\Users\jedrz\Desktop\gr\GRK_Project\Release\grk-cw9.exe</FullPath> <FullPath>C:\Users\jedrz\Desktop\projekt final\GRK_Project\Release\grk-cw9.exe</FullPath>
</ProjectOutput> </ProjectOutput>
</ProjectOutputs> </ProjectOutputs>
<ContentFiles /> <ContentFiles />

BIN
cw 9/Release/grk-cw9.iobj
View File

Binary file not shown.

BIN
cw 9/Release/grk-cw9.ipdb
View File

Binary file not shown.

100
cw 9/Release/grk-cw9.log
View File

@ -1,86 +1,86 @@
 main.cpp  main.cpp
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
C:\Users\jedrz\Desktop\gr\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” C:\Users\jedrz\Desktop\projekt final\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(342,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(342,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(370,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(372,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(395,38): warning C4305: "=": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(397,38): warning C4305: "=": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(424,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(426,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(641,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(644,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(649,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(657,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(649,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(657,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(664,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(669,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(682,98): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(687,98): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(685,68): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(690,68): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(730,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(735,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(744,99): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(749,99): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(747,69): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(752,69): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(792,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(797,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(806,99): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(811,99): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(809,69): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(814,69): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(933,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(938,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(934,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(939,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(935,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(940,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(938,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(943,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(939,25): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(944,25): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(993,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(998,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(994,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(999,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(995,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1000,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(998,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1003,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(999,23): warning C4305: "inicjowanie": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1004,23): warning C4305: "inicjowanie": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1101,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1106,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1115,108): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1120,108): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1128,85): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1133,85): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1154,73): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1159,73): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1158,81): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1163,81): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1159,93): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1164,93): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1160,83): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1165,83): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1161,83): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1166,83): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1257,108): warning C4305: "argument": obcięcie z "double" do "T" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1264,108): warning C4305: "argument": obcięcie z "double" do "T"
with with
[ [
T=float T=float
] ]
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1597,21): warning C4305: "-=": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1610,21): warning C4305: "-=": obcięcie z "double" do "float"
C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1599,21): warning C4305: "+=": obcięcie z "double" do "float" C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1612,21): warning C4305: "+=": obcięcie z "double" do "float"
Trwa generowanie kodu Trwa generowanie kodu
102 of 727 functions (14.0%) were compiled, the rest were copied from previous compilation. 99 of 727 functions (13.6%) were compiled, the rest were copied from previous compilation.
1 functions were new in current compilation 0 functions were new in current compilation
11 functions had inline decision re-evaluated but remain unchanged 24 functions had inline decision re-evaluated but remain unchanged
Zakończono generowanie kodu Zakończono generowanie kodu
grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\gr\GRK_Project\Release\grk-cw9.exe grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\projekt final\GRK_Project\Release\grk-cw9.exe

BIN
cw 9/Release/grk-cw9.tlog/CL.command.1.tlog
View File

Binary file not shown.

BIN
cw 9/Release/grk-cw9.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
cw 9/Release/grk-cw9.tlog/CL.write.1.tlog
View File

Binary file not shown.

2
cw 9/Release/grk-cw9.tlog/grk-cw9.lastbuildstate
View File

@ -1,2 +1,2 @@
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0: PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
Release|Win32|C:\Users\jedrz\Desktop\gr\GRK_Project\| Release|Win32|C:\Users\jedrz\Desktop\projekt final\GRK_Project\|

BIN
cw 9/Release/grk-cw9.tlog/link.command.1.tlog
View File

Binary file not shown.

BIN
cw 9/Release/grk-cw9.tlog/link.read.1.tlog
View File

Binary file not shown.

BIN
cw 9/Release/grk-cw9.tlog/link.write.1.tlog
View File

Binary file not shown.

BIN
cw 9/Release/image_DXT.obj
View File

Binary file not shown.

BIN
cw 9/Release/image_helper.obj
View File

Binary file not shown.

BIN
cw 9/Release/main.obj
View File

Binary file not shown.

BIN
cw 9/Release/stb_image_aug.obj
View File

Binary file not shown.

22
cw 9/src/ex_9_1.hpp
View File

@ -360,6 +360,8 @@ float deltaTime = 0.f;
void bubbleManager(); void bubbleManager();
void bubbleManagerInRoom(); void bubbleManagerInRoom();
bool bubble = false;
unsigned int loadSkybox(std::vector<std::string> faces1) unsigned int loadSkybox(std::vector<std::string> faces1)
{ {
unsigned int textureID; unsigned int textureID;
@ -637,6 +639,7 @@ void drawBubbleColor(Core::RenderContext context, glm::mat4 modelMatrix, glm::ve
glUseProgram(0); glUseProgram(0);
} }
void drawBubble(glm::mat4 transformSphere) { void drawBubble(glm::mat4 transformSphere) {
float time = glfwGetTime(); float time = glfwGetTime();
glUseProgram(programBubble); glUseProgram(programBubble);
@ -645,7 +648,12 @@ void drawBubble(glm::mat4 transformSphere) {
glm::mat4 viewProjectionMatrix = perspectiveMatrix * cameraMatrix; glm::mat4 viewProjectionMatrix = perspectiveMatrix * cameraMatrix;
glm::mat4 transformation = viewProjectionMatrix * transformSphere; glm::mat4 transformation = viewProjectionMatrix * transformSphere;
glm::mat3 bubbleSkyboxViewMatrix = glm::mat3(perspectiveMatrix * glm::mat4(glm::mat3(cameraMatrix))); glm::mat3 bubbleSkyboxViewMatrix = glm::mat3(perspectiveMatrix * glm::mat4(glm::mat3(cameraMatrix)));
if (bubble == false) {
glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformSphere);
}
else {
glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformation); glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformation);
}
glUniform3f(glGetUniformLocation(programBubble, "iResolution"), WIDTH, HEIGHT, 1.0); glUniform3f(glGetUniformLocation(programBubble, "iResolution"), WIDTH, HEIGHT, 1.0);
glUniform1f(glGetUniformLocation(programBubble, "time"), time); glUniform1f(glGetUniformLocation(programBubble, "time"), time);
@ -993,7 +1001,7 @@ void bubbleMovementInRoom(int i) {
float bubbleWobbling = 0.0005; float bubbleWobbling = 0.0005;
float bubbleUp = 0.05; float bubbleUp = 0.02;
//printf(xDir ? "true\n" : "false\n"); //printf(xDir ? "true\n" : "false\n");
//printf(zDir ? "true\n" : "false\n"); //printf(zDir ? "true\n" : "false\n");
@ -1107,13 +1115,13 @@ void renderScene(GLFWwindow* window)
renderShadowapLamp(); renderShadowapLamp();
//space lamp //space lamp
/*glUseProgram(programSun); glUseProgram(programSun);
glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix(); glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)); glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1));
glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation); glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation);
glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2); glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2);
glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition); glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition);
Core::DrawContext(sphereContext);*/ Core::DrawContext(sphereContext);
drawSkybox(models::cubeContext, createPerspectiveMatrix() * glm::mat4(glm::mat3(createCameraMatrix())), skyboxTexture); drawSkybox(models::cubeContext, createPerspectiveMatrix() * glm::mat4(glm::mat3(createCameraMatrix())), skyboxTexture);
glUseProgram(program); glUseProgram(program);
glm::mat4 transform(1.0f); glm::mat4 transform(1.0f);
@ -1212,10 +1220,12 @@ void renderScene(GLFWwindow* window)
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, depthMap3); glBindTexture(GL_TEXTURE_2D, depthMap3);
Core::DrawContext(models::testContext);*/ Core::DrawContext(models::testContext);*/
bubbleManagerInRoom(); bubbleManagerInRoom();
bubbleManager(); bubbleManager();
glUseProgram(0); glUseProgram(0);
glfwSwapBuffers(window); glfwSwapBuffers(window);
} }
@ -1564,6 +1574,12 @@ void processInput(GLFWwindow* window)
texture::screen = Core::LoadTexture("textures/visual.png"); texture::screen = Core::LoadTexture("textures/visual.png");
PlaySound(TEXT("sound/ocean.wav"), NULL, SND_ASYNC|SND_LOOP); PlaySound(TEXT("sound/ocean.wav"), NULL, SND_ASYNC|SND_LOOP);
} }
if (glfwGetKey(window, GLFW_KEY_N) == GLFW_PRESS) {
bubble = false;
}
if (glfwGetKey(window, GLFW_KEY_M) == GLFW_PRESS) {
bubble = true;
}
if (glfwGetKey(window, GLFW_KEY_B) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_B) == GLFW_PRESS) {
for (int i = 0; i < bubblenumber; i++) for (int i = 0; i < bubblenumber; i++)

BIN
cw 9/textures/bubbleSkybox/back.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 88 KiB

BIN
cw 9/textures/bubbleSkybox/front.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 50 KiB