Changed assets and shader path functions, removed asset download script
This commit is contained in:
parent
99b226237a
commit
c13ba757b7
4 changed files with 26 additions and 42 deletions
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Assorted commonly used Vulkan helper functions
|
||||
*
|
||||
* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de
|
||||
*
|
||||
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
|
||||
*/
|
||||
* Assorted commonly used Vulkan helper functions
|
||||
*
|
||||
* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
|
||||
*
|
||||
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
|
||||
*/
|
||||
|
||||
#include "VulkanTools.h"
|
||||
|
||||
|
|
@ -14,10 +14,24 @@ const std::string getAssetPath()
|
|||
{
|
||||
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
|
||||
return "";
|
||||
#elif defined(VK_EXAMPLE_DATA_DIR)
|
||||
return VK_EXAMPLE_DATA_DIR;
|
||||
#elif defined(DVK_EXAMPLE_ASSETS_DIR)
|
||||
return DVK_EXAMPLE_ASSETS_DIR;
|
||||
#else
|
||||
return "./../data/";
|
||||
return "./../assets/";
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !(defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK))
|
||||
// iOS & macOS: VulkanExampleBase::getAssetPath() implemented externally to allow access to Objective-C components
|
||||
const std::string getShaderBasePath()
|
||||
{
|
||||
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
|
||||
return "shaders/";
|
||||
#elif defined(DVK_EXAMPLE_SHADERS_DIR)
|
||||
return DVK_EXAMPLE_SHADERS_DIR;
|
||||
#else
|
||||
return "./../shaders/";
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue