From ae035a0d66604e25b1277c4fa303aea8d798e719 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 22 Apr 2014 08:58:38 -0700 Subject: Modify importer to (optionally) improve debug output, perform name-based LOD association, and handle models with many materials. --- indra/llmath/llvolume.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/llmath/llvolume.h') diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 975227ea58..d2cb052043 100755 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -969,6 +969,7 @@ protected: ~LLVolume(); // use unref public: + typedef std::vector face_list_t; struct FaceParams { @@ -1041,6 +1042,10 @@ public: // conversion if *(LLVolume*) to LLVolume& const LLVolumeFace &getVolumeFace(const S32 f) const {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE + LLVolumeFace &getVolumeFace(const S32 f) {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE + + face_list_t& getVolumeFaces() { return mVolumeFaces; } + U32 mFaceMask; // bit array of which faces exist in this volume LLVector3 mLODScaleBias; // vector for biasing LOD based on scale -- cgit v1.2.3 From 5cbcff7b4045e5246eee5c86f789394510cb0669 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 22 Apr 2014 22:19:39 -0700 Subject: Appease GCC 4.6.1 syntax problems with uintptr_t in alignment asserts --- indra/llmath/llvolume.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llmath/llvolume.h') diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index d2cb052043..3d7d4b40d1 100755 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -1083,7 +1083,6 @@ public: BOOL mGenerateSingleFace; - typedef std::vector face_list_t; face_list_t mVolumeFaces; public: -- cgit v1.2.3