diff options
author | Alex Sakhartchouk <alexst@google.com> | 2011-01-07 11:12:08 -0800 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2011-01-07 11:16:08 -0800 |
commit | 5224a27798f89093b13722b41143551a057ce550 (patch) | |
tree | a72c0a36261432c883e8342c64fc6a9f175dfde5 /rsFileA3D.h | |
parent | 2cbfc4ca83ef045f004b52cd3a89934ae0318c12 (diff) | |
download | rs-5224a27798f89093b13722b41143551a057ce550.tar.gz |
Additional loading methods for fonts and a3d files.
Cleaned up error messages.
Change-Id: Id33b7149671df23c37cc11375d844a7837dac750
Change-Id: I6663ce54f7b9bbaf285935ca658d93ba417f8179
Diffstat (limited to 'rsFileA3D.h')
-rw-r--r-- | rsFileA3D.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rsFileA3D.h b/rsFileA3D.h index 3ece4c94..056b5af4 100644 --- a/rsFileA3D.h +++ b/rsFileA3D.h @@ -21,6 +21,7 @@ #include "rsMesh.h" #include <utils/String8.h> +#include <utils/Asset.h> #include "rsStream.h" #include <stdio.h> @@ -59,6 +60,7 @@ public: }; bool load(FILE *f); + bool load(Asset *asset); bool load(const void *data, size_t length); size_t getNumIndexEntries() const; @@ -83,6 +85,7 @@ protected: const uint8_t * mData; void * mAlloc; uint64_t mDataSize; + Asset *mAsset; OStream *mWriteStream; Vector<A3DIndexEntry*> mWriteIndex; |