mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-03 08:43:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_map_global OK

Browse Source
This commit is contained in:
robojumper
2025-09-28 01:33:33 +02:00
parent 3c4bfedd5d
commit 6cc3cfaadc
9 changed files with 206 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/d_lyt_map.cpp
+35 -6
View File
@@ -3,8 +3,10 @@
#include "common.h"
#include "d/d_cursor_hit_check.h"
#include "d/d_d2d.h"
#include "d/d_pad.h"
#include "d/d_pad_nav.h"
#include "d/lyt/d2d.h"
#include "d/snd/d_snd_small_effect_mgr.h"
#include "egg/core/eggColorFader.h"
#include "m/m_video.h"
#include "sized_string.h"
@@ -182,6 +184,7 @@ void dLytMapFader_c::draw() {
#define LYT_MAP_PIN_ICON_ANIM_SCALE 0
#define LYT_MAP_PIN_ICON_ANIM_ERASE 1
#define LYT_MAP_PIN_ICON_ANIM_LOOP 2
#define LYT_MAP_PIN_ICON_NUM_ANIMS 3
void dLytMapPinIcon_c::initializeState_Wait() {
mLyt.calc();
@@ -208,7 +211,7 @@ void dLytMapPinIcon_c::executeState_Wait() {
void dLytMapPinIcon_c::finalizeState_Wait() {}
void dLytMapPinIcon_c::initializeState_ToSelect() {
d2d::AnmGroup_c *m = &mAnmGroups[1];
d2d::AnmGroup_c *m = &mAnmGroups[LYT_MAP_PIN_ICON_ANIM_ERASE];
m->bind(false);
m->setFrame(0.0f);
}
@@ -220,7 +223,33 @@ void dLytMapPinIcon_c::finalizeState_ToSelect() {
}
void dLytMapPinIcon_c::initializeState_Select() {}
void dLytMapPinIcon_c::executeState_Select() {}
void dLytMapPinIcon_c::executeState_Select() {
if (field_0x1D0->field_0x05 && dPad::getDownTrigC()) {
removeBeacon();
field_0x1D0->field_0x04 = false;
d2d::AnmGroup_c *m = &mAnmGroups[LYT_MAP_PIN_ICON_ANIM_ERASE];
if (m->isBound()) {
m->unbind();
}
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_MAP_BEACON_REMOVE);
mStateMgr.changeState(StateID_Remove);
return;
}
if (field_0x1BC == 0) {
d2d::AnmGroup_c *m = &mAnmGroups[LYT_MAP_PIN_ICON_ANIM_ERASE];
m->bind(false);
m->setFrame(0.0f);
mLyt.calc();
m->unbind();
mStateMgr.changeState(StateID_ToUnselect);
} else {
d2d::AnmGroup_c *m = &mAnmGroups[LYT_MAP_PIN_ICON_ANIM_ERASE];
if (m->isBound()) {
m->play();
}
}
}
void dLytMapPinIcon_c::finalizeState_Select() {}
void dLytMapPinIcon_c::initializeState_ToUnselect() {}
@@ -255,7 +284,7 @@ bool dLytMapPinIcon_c::build(d2d::ResAccIf_c *resAcc) {
d2d::AnmGroup_c *pAnmGroups = mAnmGroups;
for (int i = 0; i < 3; i++) {
for (int i = 0; i < LYT_MAP_PIN_ICON_NUM_ANIMS; i++) {
pAnmGroups[i].init(sMapPinIconBrlanMap[i].mFile, resAcc, mLyt.getLayout(), sMapPinIconBrlanMap[i].mName);
pAnmGroups[i].bind(false);
pAnmGroups[i].setFrame(0.0f);
@@ -263,7 +292,7 @@ bool dLytMapPinIcon_c::build(d2d::ResAccIf_c *resAcc) {
mLyt.calc();
for (int i = 0; i < 3; i++) {
for (int i = 0; i < LYT_MAP_PIN_ICON_NUM_ANIMS; i++) {
pAnmGroups[i].unbind();
}
@@ -285,7 +314,7 @@ bool dLytMapPinIcon_c::build(d2d::ResAccIf_c *resAcc) {
bool dLytMapPinIcon_c::remove() {
dCsMgr_c::GetInstance()->unregistCursorTarget(&mCsHitCheck);
for (int i = 0; i < 3; i++) {
for (int i = 0; i < LYT_MAP_PIN_ICON_NUM_ANIMS; i++) {
mAnmGroups[i].remove();
}
return true;
@@ -295,7 +324,7 @@ bool dLytMapPinIcon_c::execute() {
fn_8012EC30();
mStateMgr.executeState();
field_0x1BC = 0;
mAnmGroups[2].setFrame(field_0x1DC);
mAnmGroups[LYT_MAP_PIN_ICON_ANIM_LOOP].setFrame(field_0x1DC);
// TODO something MapCapture
mLyt.calc();
mCsHitCheck.resetCachedHitboxes();
src/d/lyt/d_lyt_map_global.cpp
+88
View File
@@ -0,0 +1,88 @@
#include "d/lyt/d_lyt_map_global.h"
#include "m/m_vec.h"
dLytMapGlobal_c *dLytMapGlobal_c::sInstance;
dLytMapGlobal_c::dLytMapGlobal_c()
: field_0x00(0.0f, 0.0f, 0.0f),
field_0x0C(0.0f, 0.0f),
mMapRotationCenter(0.0f, 0.0f, 0.0f),
field_0x20(0.0f, 0.0f),
field_0x28(0.0f),
field_0x2C(0.0f),
mMapRotation(0),
field_0x40(1.0f),
field_0x44(1.0f),
field_0x48(0),
field_0x4C(0),
field_0x4D(0),
field_0x4E(0),
field_0x4F(0),
field_0x50(0) {
sInstance = this;
}
void dLytMapGlobal_c::projectOntoMap(
mVec2_c &result, const mVec3_c &position, const mVec3_c &v1, const mVec3_c &mapRotationCenter, const mAng &rot,
f32 f1, f32 f2
) const {
// Initializing like this fixes regswaps, even if it's not needed...
mVec3_c work(0.0f, 0.0f, 0.0f);
work.x = position.x - mapRotationCenter.x;
work.z = position.z - mapRotationCenter.z;
work.y = 0.0f;
work.rotY(-rot);
work.x += mapRotationCenter.x - v1.x;
work.z += mapRotationCenter.z - v1.z;
work.x *= f2 * f1;
work.z *= f2 * f1;
work.x *= field_0x28;
result.x = work.x;
result.y = -work.z;
}
void dLytMapGlobal_c::projectOntoMap(mVec2_c &result, const mVec3_c &position) const {
projectOntoMap(result, position, field_0x00, mMapRotationCenter, mMapRotation, field_0x44, field_0x40);
}
void dLytMapGlobal_c::unprojectFromMap(mVec3_c &result, const mVec2_c &position) const {
unprojectFromMap(
result, position, field_0x20, field_0x00, mMapRotationCenter, mMapRotation, field_0x44, field_0x40
);
}
void dLytMapGlobal_c::unprojectFromMap(mVec3_c &result, const mVec2_c &position, const mAng &rot) const {
unprojectFromMap(result, position, field_0x20, field_0x00, mMapRotationCenter, rot, field_0x44, field_0x40);
}
void dLytMapGlobal_c::unprojectFromMap(mVec3_c &result, const mVec2_c &position, const mVec3_c &v2, const mAng &rot)
const {
unprojectFromMap(result, position, field_0x20, v2, mMapRotationCenter, rot, field_0x44, field_0x40);
}
void dLytMapGlobal_c::unprojectFromMap(
mVec3_c &result, const mVec2_c &position, const mVec2_c &v1, const mVec3_c &v2, const mVec3_c &mapRotationCenter,
const mAng &rot, f32 f1, f32 f2
) const {
mVec3_c work(0.0f, 0.0f, 0.0f);
f1 *= f2;
f32 tmp = 1.0f / f1;
mVec2_c diff = position - v1;
work.x = diff.x * tmp * (1.0f / field_0x28);
work.z = -diff.y * tmp;
work = work + v2;
work = work - mapRotationCenter;
work.rotY(rot);
work += mapRotationCenter;
result = work;
}