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 | b0253ea6969bdd27bf574e0da7fa91aa6d09f44f (patch) | |
| tree | 2c2c89870052eb05e3d150d8710c7df4d1f3646a /libs/rs/rsFileA3D.h | |
| parent | 60525c824ccf11302a9b8343e72eba259485edea (diff) | |
| download | frameworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.zip frameworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.tar.gz frameworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.tar.bz2 | |
Additional loading methods for fonts and a3d files.
Cleaned up error messages.
Change-Id: Id33b7149671df23c37cc11375d844a7837dac750
Change-Id: I6663ce54f7b9bbaf285935ca658d93ba417f8179
Diffstat (limited to 'libs/rs/rsFileA3D.h')
| -rw-r--r-- | libs/rs/rsFileA3D.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/rs/rsFileA3D.h b/libs/rs/rsFileA3D.h index 3ece4c9..056b5af 100644 --- a/libs/rs/rsFileA3D.h +++ b/libs/rs/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; |