clara/bluenoise-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bulk update nvpro-samples 03/07/23

Browse source
This commit is contained in:
Mathias Heyer 2023-03-07 11:38:33 -08:00
parent 525becc66c
commit 76c602f568
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/obj_loader.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,8 +29,7 @@ void ObjLoader::loadModel(const std::string& filename)
reader.ParseFromFile(filename); reader.ParseFromFile(filename);
if(!reader.Valid()) if(!reader.Valid())
{ {
LOGE(reader.Error().c_str()); LOGE("Cannot load %s: %s", filename.c_str(), reader.Error().c_str());
std::cerr << "Cannot load: " << filename << std::endl;
assert(reader.Valid()); assert(reader.Valid());
} }

6
ray_tracing_gltf/hello_vulkan.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2014-2023, NVIDIA CORPORATION. All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -196,8 +196,8 @@ void HelloVulkan::loadScene(const std::string& filename)
{ {
assert(!"Error while loading scene"); assert(!"Error while loading scene");
} }
LOGW(warn.c_str()); LOGW("%s", warn.c_str());
LOGE(error.c_str()); LOGE("%s", error.c_str());
m_gltfScene.importMaterials(tmodel); m_gltfScene.importMaterials(tmodel);