aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvotree.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-11-05 19:38:17 -0700
committerMcCabe Maxsted2010-11-05 19:38:17 -0700
commitc84c7fa1386665190f9043344d4849fade9c03a1 (patch)
tree83f567443a7f7458136cd89d92fc6f7851a5885b /linden/indra/newview/llvotree.h
parentMerge remote branch 'thickbrick/weekly' into weekly (diff)
downloadmeta-impy-c84c7fa1386665190f9043344d4849fade9c03a1.zip
meta-impy-c84c7fa1386665190f9043344d4849fade9c03a1.tar.gz
meta-impy-c84c7fa1386665190f9043344d4849fade9c03a1.tar.bz2
meta-impy-c84c7fa1386665190f9043344d4849fade9c03a1.tar.xz
Applied patch by Qarl Fizz to allow drag selection on plants. See http://www.qarl.com/qLab/?p=67
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvotree.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 855c612..57116cc 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,7 +39,7 @@
39 39
40class LLFace; 40class LLFace;
41class LLDrawPool; 41class LLDrawPool;
42 42class LLSelectNode;
43 43
44class LLVOTree : public LLViewerObject 44class LLVOTree : public LLViewerObject
45{ 45{
@@ -124,6 +124,9 @@ public:
124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point 124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point
125 ); 125 );
126 126
127 void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
128
129
127 static S32 sMaxTreeSpecies; 130 static S32 sMaxTreeSpecies;
128 131
129 struct TreeSpeciesData 132 struct TreeSpeciesData
@@ -200,6 +203,15 @@ protected:
200 static S32 sLODVertexCount[4]; 203 static S32 sLODVertexCount[4];
201 static S32 sLODSlices[4]; 204 static S32 sLODSlices[4];
202 static F32 sLODAngles[4]; 205 static F32 sLODAngles[4];
206
207private:
208 void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
209 std::vector<LLVector3> &normals,
210 std::vector<S32> &segments,
211 const LLVector3& view_vec,
212 const LLMatrix4& mat,
213 const LLMatrix3& norm_mat);
214
203}; 215};
204 216
205#endif 217#endif