s452716/GRK_game_scene
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add 2 more things on the tvShelf, separate foor and door frame(new door)

Browse Source
This commit is contained in:
Danila 2023-02-03 12:52:51 +01:00
parent c1379056b6
commit 2e849decc9
11 changed files with 83075 additions and 3185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cw 9/models/door.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
# www.blender.org
newmtl 01_-_Default
Ns 200.000000
Ka 1.000000 1.000000 1.000000
Kd 0.007843 0.007843 0.007843
Ks 1.000000 1.000000 1.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2

32886
cw 9/models/door.obj
View File

File diff suppressed because it is too large Load Diff

13
cw 9/models/doorFrame.mtl Normal file
View File

@ -0,0 +1,13 @@
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
# www.blender.org
newmtl wood_243
Ns 200.000000
Ka 1.000000 1.000000 1.000000
Ks 1.000000 1.000000 1.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
map_Kd -o 1 2.18557e-08 0 -s 0.0653595 3.33333 1 D:/Kaplama Resimleri/Dogal Ahşap Kaplamaları/doğal bambu.jpg
map_Bump -o 1 2.18557e-08 0 -s 0.0653595 3.33333 1 -bm 1.000000 C:/Users/prima/Documents/JAVA/blender/wood_86_diffuse.jpg

5413
cw 9/models/doorFrame.obj Normal file
View File

File diff suppressed because it is too large Load Diff

12
cw 9/models/sphere1.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
# www.blender.org
newmtl Gibas_Inciucio_201_21_mat1_mtl_1
Ns 10.000005
Ka 1.000000 1.000000 1.000000
Kd 0.784300 0.545100 0.262700
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.500000
d 1.000000
illum 1

24094
cw 9/models/sphere1.obj Normal file
View File

File diff suppressed because it is too large Load Diff

12
cw 9/models/vase1.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
# www.blender.org
newmtl Contemporary_Vase
Ns 0.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1

11868
cw 9/models/vase1.obj Normal file
View File

File diff suppressed because it is too large Load Diff

12
cw 9/models/vase2.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
# www.blender.org
newmtl Pomeroy_Olivia
Ns 0.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1

11921
cw 9/models/vase2.obj Normal file
View File

File diff suppressed because it is too large Load Diff

17
cw 9/src/ex_9_1.hpp
View File

@ -36,6 +36,7 @@ namespace models {
Core::RenderContext tvTableContext;
Core::RenderContext tableContext;
Core::RenderContext doorContext;
Core::RenderContext doorFrameContext;
Core::RenderContext drawerContext;
Core::RenderContext tvContext;
Core::RenderContext xThingContext;
@ -46,6 +47,9 @@ namespace models {
Core::RenderContext windowContext;
Core::RenderContext testContext;
Core::RenderContext vase1Context;
Core::RenderContext vase2Context;
Core::RenderContext laserContext1;
Core::RenderContext laserContext2;
@ -304,9 +308,13 @@ void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
drawObjectDepth(sphereContext,
lightVP, glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::eulerAngleY(time) * glm::translate(glm::vec3(1.f, 0, 0)) * glm::scale(glm::vec3(0.1f)));
drawObjectDepth(models::vase1Context, lightVP, glm::mat4());
drawObjectDepth(models::vase2Context, lightVP, glm::mat4());
drawObjectDepth(models::tvTableContext, lightVP, glm::mat4());
drawObjectDepth(models::tableContext, lightVP, glm::mat4());
drawObjectDepth(models::doorContext, lightVP, glm::mat4());
drawObjectDepth(models::doorFrameContext, lightVP, glm::mat4());
drawObjectDepth(models::drawerContext, lightVP, glm::mat4());
drawObjectDepth(models::tvContext, lightVP, glm::mat4());
drawObjectDepth(models::xThingContext, lightVP, glm::mat4());
@ -446,11 +454,14 @@ void renderScene(GLFWwindow* window)
drawObjectPBR(models::booksContext, glm::mat4(), glm::vec3(0.420f, 0.212f, 0.089f), 0.2f, 0.0f);
drawObjectPBR(models::vase1Context, glm::mat4(), glm::vec3(0.320f, 0.11f, 0.131f), 0.2f, 0.0f);
drawObjectPBR(models::vase2Context, glm::mat4(), glm::vec3(0.4f, 0.2f, 0.1f), 0.2f, 0.0f);
drawObjectPBR(models::sofaContext, glm::mat4(), glm::vec3(0.620f, 0.313f, 0.131f), 0.2f, 0.0f);
drawObjectPBR(models::tvTableContext, glm::mat4(), glm::vec3(0.4f, 0.4f, 0.4f), 0.4f, 0.0f);
drawObjectPBR(models::tableContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
drawObjectPBR(models::doorContext, glm::mat4()/*glm::rotate(glm::mat4(), time * glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f))*/, glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
drawObjectPBR(models::doorFrameContext, glm::mat4(), glm::vec3(0.45f, 0.120f, 0.057f), 0.26f, 0.0f);
drawObjectPBR(models::drawerContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
drawObjectPBR(models::tvContext, glm::mat4(), glm::vec3(1.f, 1.f, 1.f), 0.5f, 1.0f);
drawObjectPBR(models::xThingContext, glm::mat4(), glm::vec3(0.10039f, 0.018356f, 0.001935f), 0.1f, 0.0f);
@ -656,7 +667,13 @@ void init(GLFWwindow* window)
loadModelToContext("./models/sofa.obj", models::sofaContext);
loadModelToContext("./models/tvTable.obj", models::tvTableContext);
loadModelToContext("./models/table.obj", models::tableContext);
//loadModelToContext("./models/doorFrame.obj", models::doorFrameContext);
loadModelToContext("./models/door.obj", models::doorContext);
loadModelToContext("./models/vase1.obj", models::vase1Context);
loadModelToContext("./models/vase2.obj", models::vase2Context);
loadModelToContext("./models/table.obj", models::drawerContext);
loadModelToContext("./models/TV.obj", models::tvContext);
loadModelToContext("./models/x.obj", models::xThingContext);