diff --git a/Template/gameMap.cpp b/Template/gameMap.cpp index a90abac..1a4bd20 100644 --- a/Template/gameMap.cpp +++ b/Template/gameMap.cpp @@ -105,11 +105,30 @@ void TGameMap::LoadMap() Land->SetTexture(std::string("landscapes/out.bmp")); Land->Scale(0.005f); - StaticModelArr.reserve(1); - StaticModelArr.resize(1); + StaticModelArr.resize(3); StaticModelArr[0].LoadModel("bt_box_yellow.lm1"); - //StaticModelArr[0].SetShaderTranslateVector(vec3(-1.0f, 0.23f, 6.3f)); + StaticModelArr[1].LoadModel("bt_box_red.lm1"); + StaticModelArr[2].LoadModel("bt_box_blue.lm1"); + + StaticModelArr[0].ScaleModel(2.0); + StaticModelArr[0].RotateModel(mat3(vec4(0.0, sin(pi/6), 0.0, cos(pi/6)))); + StaticModelArr[0].MoveModel(vec3(-1.0f, 0.13f, 4.3f)); + StaticModelArr[1].ScaleModel(2.0); + StaticModelArr[1].RotateModel(mat3(vec4(-sin(pi / 3), 0.0, 0.0, cos(pi / 3)))); + StaticModelArr[1].RotateModel(mat3(vec4(0.0, -sin(pi / 4), 0.0, cos(pi / 4)))); + StaticModelArr[1].MoveModel(vec3(-6.0f, 0.0f, 8.8f)); + + StaticModelArr[2].ScaleModel(2.0); + StaticModelArr[2].MoveModel(vec3(-1.5f, 0.23f, 7.8f)); + + + + StaticModelArr[0].UpdateVBO(); + StaticModelArr[1].UpdateVBO(); + StaticModelArr[2].UpdateVBO(); + + //StaticModelArr[0].SetShaderTranslateVector(vec3(-1.0f, 0.23f, 6.3f)); PlayerChar = new TLiteModel; PlayerChar->LoadModel("bt_cone.lm1"); diff --git a/Template/log.txt b/Template/log.txt index 93edda9..e932b67 100644 --- a/Template/log.txt +++ b/Template/log.txt @@ -1,133 +1,139 @@ -2024-Jun-09 01:08:21: Log started -2024-Jun-09 01:08:21: OpenGL Window created -2024-Jun-09 01:08:21: Script manager ready -2024-Jun-09 01:08:21: Render::OpenGL glVersion = 4.6.0 - Build 31.0.101.4887 -2024-Jun-09 01:08:21: Render::OpenGL glVersion above 2.0 ok -2024-Jun-09 01:08:21: Render::OpenGL GL_ARB_framebuffer_object supported ok -2024-Jun-09 01:08:21: Render::OpenGL GL_ARB_uniform_buffer_object supported ok -2024-Jun-09 01:08:21: Prepare to add shader GUI -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Log started +2024-Jun-09 01:35:24: OpenGL Window created +2024-Jun-09 01:35:24: Script manager ready +2024-Jun-09 01:35:24: Render::OpenGL glVersion = 4.6.0 - Build 31.0.101.4887 +2024-Jun-09 01:35:24: Render::OpenGL glVersion above 2.0 ok +2024-Jun-09 01:35:24: Render::OpenGL GL_ARB_framebuffer_object supported ok +2024-Jun-09 01:35:24: Render::OpenGL GL_ARB_uniform_buffer_object supported ok +2024-Jun-09 01:35:24: Prepare to add shader GUI +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 3 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: GUI -2024-Jun-09 01:08:21: Prepare to add shader Parallax -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 3 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: GUI +2024-Jun-09 01:35:24: Prepare to add shader Parallax +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing WARNING: 0:27: 'assign' : implicit type conversion allowed from GLSL 1.20 WARNING: 0:27: 'assign' : implicit type conversion allowed from GLSL 1.20 WARNING: 0:27: 'assign' : implicit type conversion allowed -2024-Jun-09 01:08:21: Shader program is - 6 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Parallax -2024-Jun-09 01:08:21: Prepare to add shader Directlight -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 6 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Parallax +2024-Jun-09 01:35:24: Prepare to add shader Directlight +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 9 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Directlight -2024-Jun-09 01:08:21: Prepare to add shader Env -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 9 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Directlight +2024-Jun-09 01:35:24: Prepare to add shader Env +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 12 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Env -2024-Jun-09 01:08:21: Prepare to add shader EnvReverse -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 12 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Env +2024-Jun-09 01:35:24: Prepare to add shader EnvReverse +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 15 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: EnvReverse -2024-Jun-09 01:08:21: Prepare to add shader Water -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 15 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: EnvReverse +2024-Jun-09 01:35:24: Prepare to add shader Water +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing WARNING: 0:29: 'assign' : implicit type conversion allowed from GLSL 1.20 -2024-Jun-09 01:08:21: Shader program is - 18 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Water -2024-Jun-09 01:08:21: Prepare to add shader Frame -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 18 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Water +2024-Jun-09 01:35:24: Prepare to add shader Frame +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 21 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Frame -2024-Jun-09 01:08:21: Prepare to add shader Lightview -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:5: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 21 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Frame +2024-Jun-09 01:35:24: Prepare to add shader Lightview +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:5: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 24 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Lightview -2024-Jun-09 01:08:21: Prepare to add shader Simple3D -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: Shader program is - 24 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Lightview +2024-Jun-09 01:35:24: Prepare to add shader Simple3D +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader WARNING: 0:1: '' : #version directive missing -2024-Jun-09 01:08:21: Shader program is - 27 -2024-Jun-09 01:08:21: ResourceManager::ShaderManager::Shader -2024-Jun-09 01:08:21: ResourceManager::ShaderManager shader loaded: Simple3D -2024-Jun-09 01:08:21: ResourceManager::TexList Texture added: bt_box_yellow.bmp with id = 1 -2024-Jun-09 01:08:21: ResourceManager::TexList Texture added: bt_box_norm.bmp32 with id = 2 -2024-Jun-09 01:08:21: Lite model added successfully: models/bt_box_yellow.lm1 -2024-Jun-09 01:08:21: ResourceManager::TexList Texture added: bt_cone.bmp with id = 3 -2024-Jun-09 01:08:21: Lite model added successfully: models/bt_cone.lm1 -2024-Jun-09 01:08:22: Lite model added successfully: models/girl.lm1 -2024-Jun-09 01:08:22: Lite model added successfully: models/bonemodel.lm1 -2024-Jun-09 01:08:23: ResourceManager::TexList Texture added: out.bmp with id = 4 -2024-Jun-09 01:08:23: FrameManager:: frame buffer added: Skybox -2024-Jun-09 01:08:23: ResourceManager::TexList Texture added: normalmap.bmp with id = 6 -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posx.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negx.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posy.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negy.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posz.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negz.bmp -2024-Jun-09 01:08:23: ResourceManager::TexList texture added succesfuly: posx.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_rt.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_lf.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_dn.bmp -2024-Jun-09 01:08:23: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_up.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_bk.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_ft.bmp -2024-Jun-09 01:08:24: ResourceManager::TexList texture added succesfuly: yavin_rt.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_rt.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_lf.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_up.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_dn.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_bk.bmp -2024-Jun-09 01:08:24: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_ft.bmp -2024-Jun-09 01:08:25: ResourceManager::TexList texture added succesfuly: space_rt.bmp -2024-Jun-09 01:08:25: FrameManager:: frame buffer added: ScreenBlur -2024-Jun-09 01:08:25: FrameManager:: frame buffer added: ShadowBufferGlobal -2024-Jun-09 01:08:25: FrameManager:: frame buffer added: ShadowBufferLocal +2024-Jun-09 01:35:24: Shader program is - 27 +2024-Jun-09 01:35:24: ResourceManager::ShaderManager::Shader +2024-Jun-09 01:35:24: ResourceManager::ShaderManager shader loaded: Simple3D +2024-Jun-09 01:35:24: ResourceManager::TexList Texture added: bt_box_yellow.bmp with id = 1 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture added: bt_box_norm.bmp32 with id = 2 +2024-Jun-09 01:35:24: Lite model added successfully: models/bt_box_yellow.lm1 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture added: bt_box_red000.bmp with id = 3 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture reference added: bt_box_norm.bmp32 +2024-Jun-09 01:35:24: Lite model added successfully: models/bt_box_red.lm1 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture added: bt_box_blue00.bmp with id = 4 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture reference added: bt_box_norm.bmp32 +2024-Jun-09 01:35:24: Lite model added successfully: models/bt_box_blue.lm1 +2024-Jun-09 01:35:24: ResourceManager::TexList Texture added: bt_cone.bmp with id = 5 +2024-Jun-09 01:35:24: Lite model added successfully: models/bt_cone.lm1 +2024-Jun-09 01:35:24: Lite model added successfully: models/girl.lm1 +2024-Jun-09 01:35:25: Lite model added successfully: models/bonemodel.lm1 +2024-Jun-09 01:35:26: ResourceManager::TexList Texture added: out.bmp with id = 6 +2024-Jun-09 01:35:26: FrameManager:: frame buffer added: Skybox +2024-Jun-09 01:35:26: ResourceManager::TexList Texture added: normalmap.bmp with id = 8 +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posx.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negx.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posy.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negy.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/posz.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/negz.bmp +2024-Jun-09 01:35:26: ResourceManager::TexList texture added succesfuly: posx.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_rt.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_lf.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_dn.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_up.bmp +2024-Jun-09 01:35:26: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_bk.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/yavin_ft.bmp +2024-Jun-09 01:35:27: ResourceManager::TexList texture added succesfuly: yavin_rt.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_rt.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_lf.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_up.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_dn.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_bk.bmp +2024-Jun-09 01:35:27: Going to add texture: C:\Work\OldProjects\ho3\resources\../resources/sky/space_ft.bmp +2024-Jun-09 01:35:27: ResourceManager::TexList texture added succesfuly: space_rt.bmp +2024-Jun-09 01:35:27: FrameManager:: frame buffer added: ScreenBlur +2024-Jun-09 01:35:27: FrameManager:: frame buffer added: ShadowBufferGlobal +2024-Jun-09 01:35:27: FrameManager:: frame buffer added: ShadowBufferLocal diff --git a/Template/main.cpp b/Template/main.cpp index 3c9089c..77e76ef 100644 --- a/Template/main.cpp +++ b/Template/main.cpp @@ -185,6 +185,8 @@ void TMyApplication::InnerInit() ResourceManager->ModelManager.AddLiteModel("models/bt_box_yellow.lm1"); + ResourceManager->ModelManager.AddLiteModel("models/bt_box_red.lm1"); + ResourceManager->ModelManager.AddLiteModel("models/bt_box_blue.lm1"); ResourceManager->ModelManager.AddLiteModel("models/bt_cone.lm1"); ResourceManager->ModelManager.AddLiteModel("models/girl.lm1"); diff --git a/resources/models/bt_box_blue.lm1 b/resources/models/bt_box_blue.lm1 new file mode 100644 index 0000000..eb76420 Binary files /dev/null and b/resources/models/bt_box_blue.lm1 differ diff --git a/resources/models/bt_box_blue00.bmp b/resources/models/bt_box_blue00.bmp new file mode 100644 index 0000000..86b1834 Binary files /dev/null and b/resources/models/bt_box_blue00.bmp differ diff --git a/resources/models/bt_box_red.lm1 b/resources/models/bt_box_red.lm1 new file mode 100644 index 0000000..071ab0f Binary files /dev/null and b/resources/models/bt_box_red.lm1 differ diff --git a/resources/models/bt_box_red000.bmp b/resources/models/bt_box_red000.bmp new file mode 100644 index 0000000..c7e8ba3 Binary files /dev/null and b/resources/models/bt_box_red000.bmp differ