mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 19:01:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_dr equivalent, update dtk-template (#2327)

Browse Source 
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup

* b_dr equivalent

* update dtk-template

* rename j3dframectrl mode enum
This commit is contained in:
TakaRikka
2025-03-14 01:46:21 -07:00
committed by GitHub
parent 34c5d8272e
commit 60748d0924
70 changed files with 5468 additions and 4064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_the.cpp
+31 -31
View File
@@ -531,7 +531,7 @@ int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
*/
bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
J3DAnmTransform* anm = NULL;
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -555,7 +555,7 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_F_TALK_B:
res = setExpressionBtp(4);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_F_TALK_C:
res = setExpressionBtp(5);
@@ -568,27 +568,27 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
break;
case ANM_FH_SMILE:
res = setExpressionBtp(8);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_CHUCKLE:
res = setExpressionBtp(9);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_B:
res = setExpressionBtp(10);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_C:
res = setExpressionBtp(11);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_LAUGH:
res = setExpressionBtp(12);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_FH_TALK_R:
res = setExpressionBtp(13);
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
anm = NULL;
@@ -621,10 +621,10 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
l_btpGetParamList[i_idx].fileIdx);
}
int attr = J3DFrameCtrl::LOOP_ONCE_e;
int attr = J3DFrameCtrl::EMode_NONE;
switch (i_idx) {
case 0:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 1:
break;
@@ -633,7 +633,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
case 3:
break;
case 4:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 5:
break;
@@ -642,22 +642,22 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
case 7:
break;
case 8:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 9:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 10:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 11:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 12:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case 13:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
default:
anm = NULL;
@@ -682,7 +682,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
bool daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
J3DAnmTransformKey* anm_trans = NULL;
J3DAnmTextureSRTKey* anm_tex = NULL;
int attr = J3DFrameCtrl::LOOP_REPEAT_e;
int attr = J3DFrameCtrl::EMode_LOOP;
mAnmFlags &= ~ANM_MOTION_FLAGS;
if (l_bckGetParamList[i_idx].fileIdx >= 0) {
@@ -692,43 +692,43 @@ bool daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
switch (i_idx) {
case ANM_WAIT_A:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_WAIT_LOOKING:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_TO_WAIT_B:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_WAIT_B:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_WAIT_LOOKUP:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_TALK_R:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_TALKING_R:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_LOOK_A:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_LOOK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KUNE_WAIT_A:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_KUNE_TALK:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
case ANM_KUNE_WAIT_B:
attr = J3DFrameCtrl::LOOP_REPEAT_e;
attr = J3DFrameCtrl::EMode_LOOP;
break;
case ANM_KUNE_SHISHI:
attr = J3DFrameCtrl::LOOP_ONCE_e;
attr = J3DFrameCtrl::EMode_NONE;
break;
default:
anm_trans = NULL;