Merge branch '63-laden-mehrer-meshes-mit-materials-und-textures' of...

Merge branch '63-laden-mehrer-meshes-mit-materials-und-textures' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into 63-laden-mehrer-meshes-mit-materials-und-textures

modules/asset_loader/src/vkcv/asset/asset_loader.cpp

@@ -287,12 +287,6 @@ int loadScene(const std::string &path, Scene &scene){
         for(int k = 0; k < sceneObjects.textures.size(); k++){
             const fx::gltf::Texture &tex = sceneObjects.textures[k];
             const fx::gltf::Image &img = sceneObjects.images[tex.source];
-#ifndef NDEBUG
-            printf("texture name=%s sampler=%u source=%u\n",
-                   tex.name.c_str(), tex.sampler, tex.source);
-            printf("image   name=%s uri=%s mime=%s\n", img.name.c_str(),
-                   img.uri.c_str(), img.mimeType.c_str());
-#endif
             std::string img_uri = dir + "/" + img.uri;
             int w, h, c;
             uint8_t *data = stbi_load(img_uri.c_str(), &w, &h, &c, 4);
@@ -358,8 +352,6 @@ int loadScene(const std::string &path, Scene &scene){
                }
 
             });
-            printf("baseColor index=%d normal=%d metallic factor=%f\n",
-                   materials[l].baseColor, materials[l].normal, materials[l].metallicFactor);
         }
     }
 

projects/first_scene/src/main.cpp

@@ -29,7 +29,6 @@ int main(int argc, const char** argv) {
 		true
 	);
 
-	//vkcv::CameraManager cameraManager(window, static_cast<float>(window.getWidth()), static_cast<float>(window.getHeight()));
 	vkcv::camera::CameraManager cameraManager(window);
 	uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT);
 	uint32_t camIndex1 = cameraManager.addCamera(vkcv::camera::ControllerType::TRACKBALL);
@@ -110,7 +109,6 @@ int main(int argc, const char** argv) {
 		vertexBufferIndex++;
 	}
 
-	// an example attachment for passes that output to the window
 	const vkcv::AttachmentDescription present_color_attachment(
 		vkcv::AttachmentOperation::STORE,
 		vkcv::AttachmentOperation::CLEAR,
@@ -134,8 +132,6 @@ int main(int argc, const char** argv) {
 	vkcv::ShaderProgram sceneShaderProgram{};
 	sceneShaderProgram.addShader(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/vert.spv"));
 	sceneShaderProgram.addShader(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/frag.spv"));
-	//sceneShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX);
-	//sceneShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT);
 
 	const std::vector<vkcv::VertexAttachment> vertexAttachments = sceneShaderProgram.getVertexAttachments();
 	std::vector<vkcv::VertexBinding> bindings;