claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android support for mesh example, some fixes for other android projects (#97)

Browse source
This commit is contained in:
saschawillems 2016-03-22 22:28:08 +01:00
parent 01c12ef327
commit 8ef51855eb
30 changed files with 175 additions and 13275 deletions
Download patch file Download diff file Expand all files Collapse all files

34
base/vulkanTextureLoader.hpp
View file

@ -11,6 +11,10 @@
#include <vulkan/vulkan.h>
#include <gli/gli.hpp>
#if defined(__ANDROID__)
#include <android/asset_manager.h>
#endif
namespace vkTools
{
@ -52,24 +56,44 @@ namespace vkTools
return false;
}
public:
#if defined(__ANDROID__)
AAssetManager* assetManager = nullptr;
#endif
// Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture)
void loadTexture(std::string filename, VkFormat format, VulkanTexture *texture)
{
loadTexture(filename, format, texture, false);
}
// Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear)
void loadTexture(std::string filename, VkFormat format, VulkanTexture *texture, bool forceLinear)
{
loadTexture(filename, format, texture, false, VK_IMAGE_USAGE_SAMPLED_BIT);
}
// Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear, VkImageUsageFlags imageUsageFlags)
void loadTexture(std::string filename, VkFormat format, VulkanTexture *texture, bool forceLinear, VkImageUsageFlags imageUsageFlags)
{
std::cout << "Loading \"" << filename << "\"..." << std::endl;
#if defined(__ANDROID__)
assert(assetManager != nullptr);
gli::texture2D tex2D(gli::load(filename));
// Textures are stored inside the apk on Android (compressed)
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(assetManager, filename.c_str(), AASSET_MODE_STREAMING);
assert(asset);
size_t size = AAsset_getLength(asset);
assert(size > 0);
void *textureData = malloc(size);
AAsset_read(asset, textureData, size);
AAsset_close(asset);
gli::texture2D tex2D(gli::load((const char*)textureData, size));
free(textureData);
#else
gli::texture2D tex2D(gli::load(filename.c_str()));
#endif
assert(!tex2D.empty());
texture->width = (uint32_t)tex2D[0].dimensions().x;