diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerpartsim.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h index 0dc4324..c915468 100644 --- a/linden/indra/newview/llviewerpartsim.h +++ b/linden/indra/newview/llviewerpartsim.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llviewerpartsim.h | 2 | * @file llviewerpartsim.h |
3 | * @brief LLViewerPart class header file | 3 | * @brief LLViewerPart class header file |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 7 | * Copyright (c) 2003-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #ifndef LL_LLVIEWERPARTSIM_H | 32 | #ifndef LL_LLVIEWERPARTSIM_H |
@@ -107,6 +110,8 @@ public: | |||
107 | S32 getCount() const { return (S32) mParticles.size(); } | 110 | S32 getCount() const { return (S32) mParticles.size(); } |
108 | LLViewerRegion *getRegion() const { return mRegionp; } | 111 | LLViewerRegion *getRegion() const { return mRegionp; } |
109 | 112 | ||
113 | void removeParticlesByID(const U32 source_id); | ||
114 | |||
110 | LLPointer<LLVOPartGroup> mVOPartGroupp; | 115 | LLPointer<LLVOPartGroup> mVOPartGroupp; |
111 | 116 | ||
112 | BOOL mUniformParticles; | 117 | BOOL mUniformParticles; |
@@ -126,10 +131,14 @@ protected: | |||
126 | 131 | ||
127 | class LLViewerPartSim | 132 | class LLViewerPartSim |
128 | { | 133 | { |
134 | |||
129 | public: | 135 | public: |
130 | LLViewerPartSim(); | 136 | LLViewerPartSim(); |
131 | virtual ~LLViewerPartSim(); | 137 | virtual ~LLViewerPartSim(); |
132 | 138 | ||
139 | typedef std::vector<LLViewerPartGroup *> group_list_t; | ||
140 | typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t; | ||
141 | |||
133 | void shift(const LLVector3 &offset); | 142 | void shift(const LLVector3 &offset); |
134 | 143 | ||
135 | void updateSimulation(); | 144 | void updateSimulation(); |
@@ -140,7 +149,11 @@ public: | |||
140 | 149 | ||
141 | BOOL shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping) | 150 | BOOL shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping) |
142 | void addPart(LLViewerPart* part); | 151 | void addPart(LLViewerPart* part); |
143 | void cleanMutedParticles(const LLUUID& task_id); | 152 | void clearParticlesByID(const U32 system_id); |
153 | void clearParticlesByOwnerID(const LLUUID& task_id); | ||
154 | void removeLastCreatedSource(); | ||
155 | |||
156 | const source_list_t* getParticleSystemList() const { return &mViewerPartSources; } | ||
144 | 157 | ||
145 | friend class LLViewerPartGroup; | 158 | friend class LLViewerPartGroup; |
146 | 159 | ||
@@ -158,8 +171,6 @@ protected: | |||
158 | LLViewerPartGroup *put(LLViewerPart* part); | 171 | LLViewerPartGroup *put(LLViewerPart* part); |
159 | 172 | ||
160 | protected: | 173 | protected: |
161 | typedef std::vector<LLViewerPartGroup *> group_list_t; | ||
162 | typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t; | ||
163 | group_list_t mViewerPartGroups; | 174 | group_list_t mViewerPartGroups; |
164 | source_list_t mViewerPartSources; | 175 | source_list_t mViewerPartSources; |
165 | LLFrameTimer mSimulationTimer; | 176 | LLFrameTimer mSimulationTimer; |