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

Android asset loading for height map

Browse source
This commit is contained in:
saschawillems 2016-06-25 22:49:22 +02:00
parent d0f1ae90e5
commit 5803e166f5
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
terraintessellation/terraintessellation.cpp
View file

@ -342,9 +342,25 @@ public:
uint32_t dim; uint32_t dim;
uint32_t scale; uint32_t scale;
public: public:
#if defined(__ANDROID__)
HeightMap(std::string filename, uint32_t patchsize, AAssetManager* assetManager)
#else
HeightMap(std::string filename, uint32_t patchsize) HeightMap(std::string filename, uint32_t patchsize)
#endif
{ {
#if defined(__ANDROID__)
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 heightTex(gli::load((const char*)textureData, size));
free(textureData);
#else
gli::texture2D heightTex(gli::load(filename)); gli::texture2D heightTex(gli::load(filename));
#endif
dim = static_cast<uint32_t>(heightTex.dimensions().x); dim = static_cast<uint32_t>(heightTex.dimensions().x);
heightdata = new uint16_t[dim * dim]; heightdata = new uint16_t[dim * dim];
memcpy(heightdata, heightTex.data(), heightTex.size()); memcpy(heightdata, heightTex.data(), heightTex.size());
@ -396,7 +412,11 @@ public:
} }
// Calculate normals from height map using a sobel filter // Calculate normals from height map using a sobel filter
#if defined(__ANDROID__)
HeightMap heightMap(getAssetPath() + "textures/terrain_heightmap_r16.ktx", PATCH_SIZE, androidApp->activity->assetManager);
#else
HeightMap heightMap(getAssetPath() + "textures/terrain_heightmap_r16.ktx", PATCH_SIZE); HeightMap heightMap(getAssetPath() + "textures/terrain_heightmap_r16.ktx", PATCH_SIZE);
#endif
for (auto x = 0; x < PATCH_SIZE; x++) for (auto x = 0; x < PATCH_SIZE; x++)
{ {
for (auto y = 0; y < PATCH_SIZE; y++) for (auto y = 0; y < PATCH_SIZE; y++)