position -> mPosition

This commit is contained in:
elijah-thomas774
2025-09-16 20:38:42 -04:00
parent 795183d928
commit bc2d023115
74 changed files with 337 additions and 341 deletions
+7 -7
View File
@@ -74,7 +74,7 @@ public:
/* 0xB5 */ s8 viewclip_index;
/* 0xB6 */ u8 subtype;
/* 0xB8 */ mAng3_c mRotation;
/* 0xC0 */ mVec3_c position;
/* 0xC0 */ mVec3_c mPosition;
/* 0xCC */ mVec3_c mScale;
/* 0xD8 */ u32 actor_properties;
/* 0xDC */ dAcRef_c<dAcBase_c> actor_node;
@@ -111,7 +111,7 @@ public:
dAcBase_c();
void setPosition(const mVec3_c &r) {
position = r;
mPosition = r;
}
void setScale(const mVec3_c &r) {
mScale = r;
@@ -121,30 +121,30 @@ public:
}
void copyPosition() {
pos_copy = position;
pos_copy = mPosition;
}
void copyRotation() {
rot_copy = mRotation;
}
mVec3_c &GetPosition() {
return position;
return mPosition;
}
mAng3_c &GetRotation() {
return mRotation;
}
mVec3_c GetPostionDifference(const dAcBase_c &other) {
return position - other.position;
return mPosition - other.mPosition;
}
f32 getSquareDistanceTo(const mVec3_c &point) const {
mVec3_c diff = position - point;
mVec3_c diff = mPosition - point;
return diff.x * diff.x + diff.z * diff.z;
}
f32 getDistanceTo(const mVec3_c &to) const {
return position.distance(to);
return mPosition.distance(to);
}
bool IsOutOfRange(const mVec3_c &point, f32 radius) {
+1 -1
View File
@@ -25,7 +25,7 @@ public:
private:
f32 getYPos() {
return position.y + sHeight;
return mPosition.y + sHeight;
}
const char *getModelName() const;
+6 -6
View File
@@ -177,10 +177,10 @@ public:
return 0;
}
/* vt 0x160 */ virtual f32 getYPos() {
return position.y;
return mPosition.y;
}
/* vt 0x164 */ virtual f32 vt_0x164() {
return position.y;
return mPosition.y;
}
/* vt 0x168 */ virtual f32 getCurrentAnimFrame() const {
return 0.0f;
@@ -198,7 +198,7 @@ public:
return mRotation;
}
/* vt 0x17C */ virtual const mVec3_c &getBellowsPosOrOtherVec3F() const {
return position;
return mPosition;
}
/* vt 0x180 */ virtual void setWindMillPos() {}
/* vt 0x184 */ virtual bool isOffeset0x435eEqual0x20() {
@@ -375,10 +375,10 @@ public:
return mRotation.y;
}
/* vt 0x278 */ virtual const mVec3_c &vt_0x278() const {
return position;
return mPosition;
}
/* vt 0x27C */ virtual const mVec3_c &getSwordPos() const {
return position;
return mPosition;
}
/* vt 0x280 */ virtual UNKWORD vt_0x280() {
return 0;
@@ -387,7 +387,7 @@ public:
return false;
}
/* vt 0x288 */ virtual const mVec3_c &getBugNetPos() const {
return position;
return mPosition;
}
/* vt 0x28C */ virtual bool isUsingBugnet1() {
return false;
+2 -2
View File
@@ -198,11 +198,11 @@ private:
}
f32 getActorGroundPos(dAcObjBase_c *obj) const {
return obj->position.y + mDepth;
return obj->mPosition.y + mDepth;
}
f32 getActorCeilPos(dAcObjBase_c *obj) const {
return obj->position.y + mHeight;
return obj->mPosition.y + mHeight;
}
public: