aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvotree.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvotree.h')
-rw-r--r--linden/indra/newview/llvotree.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 180e5b0..f34371e 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2002&license=viewergpl$ 5 * $LicenseInfo:firstyear=2002&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2002-2008, Linden Research, Inc. 7 * Copyright (c) 2002-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,17 @@ public:
80 80
81 U32 drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth, F32 scale, F32 twist, F32 droop, F32 branches, F32 alpha); 81 U32 drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth, F32 scale, F32 twist, F32 droop, F32 branches, F32 alpha);
82 82
83
84 /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
85 S32 face = -1, // which face to check, -1 = ALL_SIDES
86 BOOL pick_transparent = FALSE,
87 S32* face_hit = NULL, // which face was hit
88 LLVector3* intersection = NULL, // return the intersection point
89 LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point
90 LLVector3* normal = NULL, // return the surface normal at the intersection point
91 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point
92 );
93
83 static S32 sMaxTreeSpecies; 94 static S32 sMaxTreeSpecies;
84 95
85 struct TreeSpeciesData 96 struct TreeSpeciesData