diff --git a/modules/scene/src/vkcv/scene/Mesh.cpp b/modules/scene/src/vkcv/scene/Mesh.cpp index 8f134cdf1181e58d90a4a5c0699c3a4d3174cad9..12402f10701f6ef1f7ad66ef7972c93672f231d2 100644 --- a/modules/scene/src/vkcv/scene/Mesh.cpp +++ b/modules/scene/src/vkcv/scene/Mesh.cpp @@ -81,13 +81,12 @@ namespace vkcv::scene { static glm::vec3 projectPoint(const glm::mat4& transform, const glm::vec3& point) { const glm::vec4 position = transform * glm::vec4(point, 1.0f); - - //std::cout << "POS: " << position.x << " " << position.y << " " << position.z << " " << position.w << std::endl; + const float perspective = std::abs(position[3]); return glm::vec3( - position[0] / position[3], - position[1] / position[3], - position[2] / position[3] + position[0] / perspective, + position[1] / perspective, + position[2] / perspective ); } @@ -120,8 +119,7 @@ namespace vkcv::scene { } if (!checkFrustum(aabb)) { - m_drawcalls[i].instanceCount = 2; - //continue; + continue; } matrices.push_back(transform); diff --git a/modules/scene/src/vkcv/scene/Scene.cpp b/modules/scene/src/vkcv/scene/Scene.cpp index e85bb5c900815e7a19e703ea48c645f0b28b5467..aa8c83b4a5f9f280c81c4e78f01f5f3d52615c5d 100644 --- a/modules/scene/src/vkcv/scene/Scene.cpp +++ b/modules/scene/src/vkcv/scene/Scene.cpp @@ -66,10 +66,6 @@ namespace vkcv::scene { return m_materials[index].m_data; } - std::ostream& operator << (std::ostream& out, const glm::vec3& vec) { - return out << vec.x << " " << vec.y << " " << vec.z; - } - void Scene::recordDrawcalls(CommandStreamHandle &cmdStream, const camera::Camera &camera, const PassHandle &pass, @@ -78,8 +74,6 @@ namespace vkcv::scene { std::vector<glm::mat4> matrices; std::vector<DrawcallInfo> drawcalls; - std::cout << camera.getPosition() << " | " << camera.getFront() << std::endl; - const glm::mat4 viewProjection = camera.getMVP(); for (auto& node : m_nodes) { diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp index 37d3d35b7f0c3cbed09d6c472cc07ea561e16d27..0f81990bdddfffb4c6a59541311a7ee5e19837e9 100644 --- a/projects/first_scene/src/main.cpp +++ b/projects/first_scene/src/main.cpp @@ -26,12 +26,7 @@ int main(int argc, const char** argv) { uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT); uint32_t camIndex1 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL); - glm::vec3 pos (-7.96175f, 0.889579f, -0.514462f); - glm::vec3 front (-0.504636f, -0.603207f, 0.617643f); - cameraManager.getCamera(camIndex0).setPosition(pos); - cameraManager.getCamera(camIndex0).setFront(front); - - //cameraManager.getCamera(camIndex0).setPosition(glm::vec3(0, 0, -3)); + cameraManager.getCamera(camIndex0).setPosition(glm::vec3(-8, 1, -0.5)); cameraManager.getCamera(camIndex0).setNearFar(0.1f, 30.0f); cameraManager.getCamera(camIndex1).setNearFar(0.1f, 30.0f); @@ -46,7 +41,7 @@ int main(int argc, const char** argv) { ); vkcv::scene::Scene scene = vkcv::scene::Scene::load(core, std::filesystem::path( - argc > 1 ? argv[1] : "resources/Sponza/SponzaFloor.gltf" + argc > 1 ? argv[1] : "resources/Sponza/Sponza.gltf" )); const vkcv::AttachmentDescription present_color_attachment(