Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llvotree.h
This commit is contained in:
Latif Khalifa
2013-10-10 00:03:36 +02:00
parent b2979ca3a4 7a913af2c7
commit d98402b13f
57 changed files with 2099 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llvotree.cpp
View File

@@ -1303,8 +1303,8 @@ void LLVOTree::updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
mDrawable->setPositionGroup(pos);
}
BOOL LLVOTree::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
BOOL LLVOTree::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
LLVector4a* intersection,LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent)
{
@@ -1333,16 +1333,19 @@ BOOL LLVOTree::lineSegmentIntersect(const LLVector3& start, const LLVector3& end
LLVector3 pos, norm;
if (linesegment_tetrahedron(start, end, center, size, quat, pos, norm))
LLVector3 start3(start.getF32ptr());
LLVector3 end3(end.getF32ptr());
if (linesegment_tetrahedron(start3, end3, center, size, quat, pos, norm))
{
if (intersection)
{
*intersection = pos;
intersection->load3(pos.mV);
}
if (normal)
{
*normal = norm;
normal->load3(norm.mV);
}
return TRUE;
}