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

Updated to api changes for recent gli and glm versions

Browse source
This commit is contained in:
saschawillems 2017-01-21 21:31:26 +01:00
parent ed8e8410b3
commit 90b8c82f75
8 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/vulkanheightmap.hpp
View file

@ -83,12 +83,12 @@ namespace vkTools
void *textureData = malloc(size);
AAsset_read(asset, textureData, size);
AAsset_close(asset);
gli::texture2D heightTex(gli::load((const char*)textureData, size));
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.extent().x);
heightdata = new uint16_t[dim * dim];
memcpy(heightdata, heightTex.data(), heightTex.size());
this->scale = dim / patchsize;