diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h index 5d4c66d..0c7e5a8 100644 --- a/base/vulkanexamplebase.h +++ b/base/vulkanexamplebase.h @@ -121,7 +121,7 @@ public: bool headless = false; // 无头开关 bool outputPNGimage = false; bool enableSaveToImageSequeue = true; // 图片序列开关(暂时弃用) - uint32_t outputFrameCount = 500; // 图片序列结束帧 + uint32_t outputFrameCount = 100; // 图片序列结束帧 bool takeScreenShot = false; // 截屏(暂时弃用) uint32_t startFrameCount = 1; // 图片序列开始帧 diff --git a/data/environments/1.ktx b/data/environments/1.ktx deleted file mode 100644 index 12adba1..0000000 Binary files a/data/environments/1.ktx and /dev/null differ diff --git a/data/environments/bridge.hdr b/data/environments/bridge.hdr deleted file mode 100644 index 8bbd727..0000000 Binary files a/data/environments/bridge.hdr and /dev/null differ diff --git a/data/environments/industrial_sunset_puresky_4k_hdr16f_cube.ktx b/data/environments/industrial_sunset_puresky_4k_hdr16f_cube.ktx new file mode 100644 index 0000000..e616535 Binary files /dev/null and b/data/environments/industrial_sunset_puresky_4k_hdr16f_cube.ktx differ diff --git a/data/environments/kloofendal_43d_clear_puresky_hdr16f_cube.ktx b/data/environments/kloofendal_43d_clear_puresky_hdr16f_cube.ktx new file mode 100644 index 0000000..8cd3998 Binary files /dev/null and b/data/environments/kloofendal_43d_clear_puresky_hdr16f_cube.ktx differ diff --git a/data/models/product_cosmetics.glb b/data/models/product_cosmetics.glb new file mode 100644 index 0000000..6db67b0 Binary files /dev/null and b/data/models/product_cosmetics.glb differ diff --git a/data/models/sauvage_perfume.glb b/data/models/sauvage_perfume.glb new file mode 100644 index 0000000..c1610b3 Binary files /dev/null and b/data/models/sauvage_perfume.glb differ diff --git a/data/output/video/device0/result.mp4 b/data/output/video/device0/result.mp4 index b6fa27f..6927580 100644 Binary files a/data/output/video/device0/result.mp4 and b/data/output/video/device0/result.mp4 differ diff --git a/src/render/render.cpp b/src/render/render.cpp index 821d28d..37b8227 100644 --- a/src/render/render.cpp +++ b/src/render/render.cpp @@ -1487,7 +1487,7 @@ PlumageRender::PlumageRender() glm::vec3 translate = -glm::vec3(models.scene.aabb[3][0], models.scene.aabb[3][1], models.scene.aabb[3][2]); translate += -0.5f * glm::vec3(models.scene.aabb[0][0], models.scene.aabb[1][1], models.scene.aabb[2][2]); - camera.setPosition(glm::vec3(0, 0, -modelSize - 2)); + //camera.setPosition(glm::vec3(0, 0, -modelSize - 2)); shaderDataScene.model = glm::mat4(1.0f); shaderDataScene.model[0][0] = scale; diff --git a/src/render/render.h b/src/render/render.h index 812c6fc..8de5dc1 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -82,7 +82,7 @@ public: float exposure = 4.5f; float gamma = 2.2f; float prefilteredCubeMipLevels; - float scaleIBLAmbient = 1.0f; + float scaleIBLAmbient = 2.0f; float debugViewInputs = 0; float debugViewEquation = 0; } shaderData; @@ -144,7 +144,7 @@ public: struct FilePath { //model path - std::string glTFModelFilePath = getAssetPath() + "models/DamagedHelmet/DamagedHelmet.gltf"; + std::string glTFModelFilePath = getAssetPath() + "models/sauvage_perfume.glb"; std::string modelVertShaderPath = getAssetPath() + "buster_drone/shaders/glsl/mesh.vert.spv"; std::string modelFragShaderPath = getAssetPath() + "buster_drone/shaders/glsl/mesh.frag.spv"; @@ -157,7 +157,7 @@ public: std::string skyboxVertShaderPath = getAssetPath() + "shaders/skybox.vert.spv"; std::string skyboxFragShaderPath = getAssetPath() + "shaders/skybox.frag.spv"; - std::string iblTexturesFilePath = getAssetPath() + "textures/hdr/pisa_cube.ktx"; + std::string iblTexturesFilePath = getAssetPath() + "textures/hdr/gcanyon_cube.ktx"; //tonemapping std::string tonemappingVertShaderPath = getAssetPath() + "buster_drone/shaders/glsl/genbrdflut.vert.spv"; std::string tonemappingEnableFragShaderPath = getAssetPath() + "buster_drone/shaders/glsl/tonemapping_enable.frag.spv"; @@ -174,7 +174,7 @@ public: std::string brdfVertShaderPath = getAssetPath() + "shaders/genbrdflut.vert.spv"; std::string brdfFragShaderPath = getAssetPath() + "shaders/genbrdflut.frag.spv"; // environment map texture - std::string envMapFilePath = getAssetPath() + "environments/papermill.ktx"; + std::string envMapFilePath = getAssetPath() + "environments/kloofendal_43d_clear_puresky_hdr16f_cube.ktx"; std::string emptyEnvmapFilePath = getAssetPath() + "textures/empty.ktx"; // pbr shader std::string pbrVertShaderPath = getAssetPath() + "shaders/pbr.vert.spv";