Merge pull request #313 from robojumper/vec-mtx-cleanup

Cleanup

1 files changed, 2 insertions, 24 deletions

diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp
index 5b90f05d..4d205d2c 100644
--- a/src/JSystem/JParticle/JPAParticle.cpp
+++ b/src/JSystem/JParticle/JPAParticle.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAParticle
-//
-
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPABaseShape.h"
 #include "JSystem/JParticle/JPAChildShape.h"
@@ -11,13 +6,10 @@
 #include "JSystem/JParticle/JPAExtraShape.h"
 #include "egg/math/eggVector.h"
 
-/* 8027EFA4-8027EFEC 2798E4 0048+00 0/0 11/11 1/1 .text            __dt__19JPAParticleCallBackFv */
 JPAParticleCallBack::~JPAParticleCallBack() {
     /* empty function */
 }
 
-/* 8027EFEC-8027F8C8 27992C 08DC+00 0/0 1/1 0/0 .text
- * init_p__15JPABaseParticleFP18JPAEmitterWorkData              */
 void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
     JPABaseEmitter* emtr = work->mpEmtr;
     JPAExtraShape* esp = work->mpRes->getEsp();
@@ -128,8 +120,6 @@ void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
     }
 }
 
-/* 8027F8C8-8027FFD0 27A208 0708+00 0/0 1/1 0/0 .text
- * init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent) {
     JPABaseEmitter* emtr = work->mpEmtr;
     JPAChildShape* csp = work->mpRes->getCsp();
@@ -214,8 +204,6 @@ void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent)
     mTexAnmIdx = 0;
 }
 
-/* 8027FFD0-80280260 27A910 0290+00 0/0 1/1 0/0 .text
- * calc_p__15JPABaseParticleFP18JPAEmitterWorkData              */
 bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
     if (++mAge >= mLifeTime) {
         return true;
@@ -262,8 +250,6 @@ bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
     return false;
 }
 
-/* 80280260-802804C8 27ABA0 0268+00 0/0 1/1 0/0 .text
- * calc_c__15JPABaseParticleFP18JPAEmitterWorkData              */
 bool JPABaseParticle::calc_c(JPAEmitterWorkData* work) {
     if (++mAge >= mLifeTime) {
         return true;
@@ -306,8 +292,6 @@ bool JPABaseParticle::calc_c(JPAEmitterWorkData* work) {
     return false;
 }
 
-/* 802804C8-80280548 27AE08 0080+00 1/1 0/0 0/0 .text
- * canCreateChild__15JPABaseParticleFP18JPAEmitterWorkData      */
 bool JPABaseParticle::canCreateChild(JPAEmitterWorkData* work) {
     JPAChildShape* csp = work->mpRes->getCsp();
     bool ret = false;
@@ -318,16 +302,10 @@ bool JPABaseParticle::canCreateChild(JPAEmitterWorkData* work) {
     return ret;
 }
 
-/* 80280548-80280568 27AE88 0020+00 0/0 3/3 0/0 .text
- * getWidth__15JPABaseParticleCFPC14JPABaseEmitter              */
 f32 JPABaseParticle::getWidth(JPABaseEmitter const* emtr) const {
-    f32 scale = 2.0f * mParticleScaleX;
-    return scale * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.x;
+    return mParticleScaleX * 2.0f * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.x;
 }
 
-/* 80280568-80280588 27AEA8 0020+00 0/0 3/3 0/0 .text
- * getHeight__15JPABaseParticleCFPC14JPABaseEmitter             */
 f32 JPABaseParticle::getHeight(JPABaseEmitter const* emtr) const {
-    f32 scale = 2.0f * mParticleScaleY;
-    return scale * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.y;
+    return mParticleScaleY * 2.0f * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.y;
 }