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

23
indra/newview/llviewerwindow.h
View File

@@ -115,6 +115,7 @@ public:
LLVector2 mSTCoords;
LLCoordScreen mXYCoords;
LLVector3 mNormal;
LLVector4 mTangent;
LLVector3 mBinormal;
BOOL mPickTransparent;
void getSurfaceInfo();
@@ -347,19 +348,19 @@ public:
static void hoverPickCallback(const LLPickInfo& pick_info);
LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
LLVector3* intersection);
LLVector4a* intersection);
LLViewerObject* cursorIntersect(S32 mouse_x = -1, S32 mouse_y = -1, F32 depth = 512.f,
LLViewerObject *this_object = NULL,
S32 this_face = -1,
BOOL pick_transparent = FALSE,
S32* face_hit = NULL,
LLVector3 *intersection = NULL,
LLVector4a *intersection = NULL,
LLVector2 *uv = NULL,
LLVector3 *normal = NULL,
LLVector3 *binormal = NULL,
LLVector3* start = NULL,
LLVector3* end = NULL);
LLVector4a *normal = NULL,
LLVector4a *tangent = NULL,
LLVector4a* start = NULL,
LLVector4a* end = NULL);
// Returns a pointer to the last object hit
@@ -509,13 +510,13 @@ extern LLFrameTimer gAwayTimer; // tracks time before setting the avatar awa
extern LLFrameTimer gAwayTriggerTimer; // how long the avatar has been away
extern LLViewerObject* gDebugRaycastObject;
extern LLVector3 gDebugRaycastIntersection;
extern LLVector4a gDebugRaycastIntersection;
extern LLVector2 gDebugRaycastTexCoord;
extern LLVector3 gDebugRaycastNormal;
extern LLVector3 gDebugRaycastBinormal;
extern LLVector4a gDebugRaycastNormal;
extern LLVector4a gDebugRaycastTangent;
extern S32 gDebugRaycastFaceHit;
extern LLVector3 gDebugRaycastStart;
extern LLVector3 gDebugRaycastEnd;
extern LLVector4a gDebugRaycastStart;
extern LLVector4a gDebugRaycastEnd;
extern BOOL gDisplayCameraPos;
extern BOOL gDisplayWindInfo;