diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
commit | d8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (patch) | |
tree | 2e7966158d684828422c2b9f0d4129fa1ef1b395 /indra/newview/llvopartgroup.h | |
parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (diff) | |
parent | 171089207b528ab80a954292c127ba77254ee927 (diff) |
Merge
Diffstat (limited to 'indra/newview/llvopartgroup.h')
-rwxr-xr-x | indra/newview/llvopartgroup.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h index 42c1252d01..2befb01823 100755 --- a/indra/newview/llvopartgroup.h +++ b/indra/newview/llvopartgroup.h @@ -69,11 +69,23 @@ public: virtual void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax); virtual U32 getPartitionType() const; + /*virtual*/ BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, + S32 face, + BOOL pick_transparent, + S32* face_hit, + LLVector4a* intersection, + LLVector2* tex_coord, + LLVector4a* normal, + LLVector4a* tangent); + /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); /*virtual*/ void updateTextures(); /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); + void getGeometry(const LLViewerPart& part, + LLStrider<LLVector4a>& verticesp); + void getGeometry(S32 idx, LLStrider<LLVector4a>& verticesp, LLStrider<LLVector3>& normalsp, @@ -83,6 +95,9 @@ public: void updateFaceSize(S32 idx) { } F32 getPartSize(S32 idx); + LLUUID getPartOwner(S32 idx); + LLUUID getPartSource(S32 idx); + void setViewerPartGroup(LLViewerPartGroup *part_groupp) { mViewerPartGroupp = part_groupp; } LLViewerPartGroup* getViewerPartGroup() { return mViewerPartGroupp; } |