diff options
| author | Mattias Blum <142374929+mattias-blum@users.noreply.github.com> | 2025-04-11 16:37:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-11 16:37:42 -0400 |
| commit | 5f287fcaeebc6b728e5a94f7039b2d03ffc88c99 (patch) | |
| tree | 2febd80425758cdb261ce2ae2fdf0a740e6c7a93 /include/SSystem | |
| parent | 6aeaaef643db58fd2ed26d78eada3a33666f6a3b (diff) | |
d_camera 28% (#732)
* initial progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* fix outdated member names
* more progress
* more progress
* more progress
* more progress
* more progress
* more progress
* fixed deprecated member references
* more progress
* more progress
* more progress
* fix deprecated member references
* more progress
* more progress
* more progress
* more progress
* more progress
* check in for review
* remove comment
* initial PR changes
* more PR changes
* more PR changes
* added anonymous struct as class member
* reverted changes to `stage_camera2_data_class`
* added `dCamera_event_data`, `dCamera_monitoring_things` and `dCamera_DMC_system` from debug maps
* more progress
* more progress
* realmatch for `camera_draw`
* PR changes
* fix broken merge
* formatting
* Reverted change to `camSphChkdata` that caused `sph_chk_callback` match to regress
* Reverted change to `BG` struct that caused ctor and dtor match to regress
Diffstat (limited to 'include/SSystem')
| -rw-r--r-- | include/SSystem/SComponent/c_angle.h | 17 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_bg_s_chk.h | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index d18cc735..b6910aaa 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -19,7 +19,7 @@ public: cSAngle(s16); cSAngle(float); s16 Val() const { return mAngle; } - // void Set(s16 angle) { this->mAngle = angle; } + //void Set(s16 angle) { this->mAngle = angle; } void Val(const cSAngle&); void Val(s16); void Val(float); @@ -65,9 +65,15 @@ struct cAngle { /* Converts Radian value into Degree value */ static f32 r2d(f32 r) { return Radian_to_Degree(r); } + /* Converts Degree value into Radian value */ + static f32 d2r(f32 d) { return Degree_to_Radian(d); } + /* Converts Degree value to s16 angle */ static s16 d2s(f32 d) { return Degree_to_SAngle(d); } + /* Converts s16 angle to Degree value */ + static f32 s2d(s16 a) { return SAngle_to_Degree(a); } + template <typename T> static T Adjust(T f1, T f2, T f3); }; @@ -112,6 +118,10 @@ public: void Val(const cXyz&); cXyz Xyz() const; void Globe(class cSGlobe*) const; + + void R(f32 i_radial) { mRadial = i_radial; } + void U(cSAngle const& i_angle) { mAngle2 = i_angle.Val(); } + void V(cSAngle const& i_angle) { mAngle1 = i_angle.Val(); } }; class cSGlobe { @@ -135,6 +145,11 @@ public: float R() const { return mRadius; } const cSAngle& V() const { return mAzimuth; } const cSAngle& U() const { return mInclination; } + + void R(f32 i_radius) { mRadius = i_radius; } + void U(cSAngle const& i_azimuth) { mAzimuth = i_azimuth.Val(); } + void V(cSAngle const& i_inclination) { mInclination = i_inclination.Val(); } + cXyz Xyz() const; void Polar(cSPolar*) const; cXyz Norm() const; diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 3a336589..f1008d35 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -23,7 +23,7 @@ public: cBgS_Chk() { mPolyPassChk = NULL; mGrpPassChk = NULL; - mSameActorChk = 1; + mSameActorChk = true; } void SetExtChk(cBgS_Chk& other) { mPolyPassChk = other.mPolyPassChk; |