Second Life viewer sources 1.20.2

1 files changed, 17 insertions, 25 deletions

diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index 0f30edf..040d108 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -98,9 +98,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp)
         llassert(source_objp);
         mSourceObjectp = source_objp;
         mPosAgent = mSourceObjectp->getPositionAgent();
-        LLUUID id;
-        id.set( gViewerArt.getString("pixiesmall.tga") );
-        mImagep = gImageList.getImage(id);
+        mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
         mImagep->bind();
         mImagep->setClamp(TRUE, TRUE);
 }
@@ -123,7 +121,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
         F32 old_update_time = mLastUpdateTime;
         mLastUpdateTime += dt;
 
-        F32 ref_rate_travelspeed = llmin(gWorldPointer->mPartSim.getRefRate(), 1.f);
+        F32 ref_rate_travelspeed = llmin(LLViewerPartSim::getInstance()->getRefRate(), 1.f);
         
         F32 dt_update = mLastUpdateTime - mLastPartTime;
 
@@ -213,7 +211,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                         mRotation.setQuat(0, 0, 0);
                 }
                 
-                if (gWorldPointer->mPartSim.aboveParticleLimit())
+                if (LLViewerPartSim::getInstance()->aboveParticleLimit())
                 {
                         // Don't bother doing any more updates if we're above the particle limit,
                         // just give up.
@@ -235,7 +233,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                     (mPartSysData.mPartData.mStartScale[1]
                                      + mPartSysData.mPartData.mEndScale[1])/2));
                 
-                F32 pixel_meter_ratio = gCamera->getPixelMeterRatio();
+                F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio();
 
                 // Maximum distance at which spawned particles will be viewable
                 F32 max_dist = max_short_side * pixel_meter_ratio; 
@@ -250,7 +248,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                 }
 
                 // Distance from camera
-                F32 dist = (mPosAgent - gCamera->getOrigin()).magVec();
+                F32 dist = (mPosAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
 
                 // Particle size vs distance vs maxage throttling
 
@@ -267,14 +265,14 @@ void LLViewerPartSourceScript::update(const F32 dt)
                 }
                 
                 if(mDelay)
-                {
+                {                       
                         limited_rate = llmax(limited_rate, 0.01f * mDelay--) ;
                 }
 
                 S32 i;
                 for (i = 0; i < mPartSysData.mBurstPartCount; i++)
                 {
-                        if (ll_frand() < llmax(1.0f - gWorldPointer->mPartSim.getBurstRate(), limited_rate))
+                        if (ll_frand() < llmax(1.0f - LLViewerPartSim::getInstance()->getBurstRate(), limited_rate))
                         {
                                 // Limit particle generation
                                 continue;
@@ -385,7 +383,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 mPartSysData.mBurstRadius = 0; 
                         }
 
-                        gWorldPointer->mPartSim.addPart(part);
+                        LLViewerPartSim::getInstance()->addPart(part);
                 }
 
                 mLastPartTime = mLastUpdateTime;
@@ -528,9 +526,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!mImagep)
         {
-                LLUUID id;
-                id.set( gViewerArt.getString("pixiesmall.tga") );
-                mImagep = gImageList.getImage(id);
+                mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
         }
 
         const F32 RATE = 0.025f;
@@ -544,7 +540,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
         if (dt_update > RATE)
         {
                 mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                 {
                         // Particle simulation says we have too many particles, skip all this
                         return;
@@ -567,7 +563,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
                 part->mScale.mV[1] = 0.25f;
                 part->mParameter = ll_frand(F_TWO_PI);
 
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
         }
 }
 
@@ -691,7 +687,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
         if (dt_update > RATE)
         {
                 mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                 {
                         // Particle simulation says we have too many particles, skip all this
                         return;
@@ -699,9 +695,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
 
                 if (!mImagep)
                 {
-                        LLUUID id;
-                        id.set( gViewerArt.getString("pixiesmall.tga") );
-                        mImagep = gImageList.getImage(id);
+                        mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
                 }
 
                 LLPointer<LLViewerPart> part = new LLViewerPart();
@@ -724,7 +718,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
                 part->mPosAgent = mPosAgent;
                 part->mVelocity = mTargetPosAgent - mPosAgent;
 
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
         }
 }
 
@@ -787,9 +781,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!mImagep)
         {
-                LLUUID id;
-                id.set( gViewerArt.getString("pixiesmall.tga") );
-                mImagep = gImageList.getImage(id);
+                mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
         }
 
 
@@ -813,7 +805,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
         if (dt_update > RATE)
         {
                 mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                 {
                         // Particle simulation says we have too many particles, skip all this
                         return;
@@ -836,7 +828,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
                 part->mScale.mV[1] = 0.25f;
                 part->mParameter = ll_frand(F_TWO_PI);
 
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
         }
 }