Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement d_wood (bushes) for Wind Waker #712

Merged
merged 24 commits into from
Oct 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
22c92a3
Update zww_extractor.ts to create the output directory if it does not…
themikelester Oct 18, 2024
d1a3701
Merge branch 'magcius:master' into master
themikelester Oct 18, 2024
a28b3f5
zww_extractor.ts now copies the res/* into the output directory
themikelester Oct 18, 2024
ca68e17
Add d_wood.o symbols to zww_extractor.ts
themikelester Oct 18, 2024
94ee660
Added d_wood.ts. Basic bush rendering.
themikelester Oct 18, 2024
b626b94
Merge branch 'master' of https://github.com/themikelester/noclip.website
themikelester Oct 18, 2024
a5799f0
Add cLib_chaseS() function to SComponent
themikelester Oct 21, 2024
a3efb18
Add mDoMtx_copy() to m_do_mtx
themikelester Oct 21, 2024
5c67def
Update d_wood.ts to about 70%
themikelester Oct 21, 2024
283aac3
d_wood alpha improvements
themikelester Oct 21, 2024
0744eba
Add frustum culling to d_wood
themikelester Oct 22, 2024
bc9d19b
d_wood: const enum fixup
themikelester Oct 23, 2024
e21426c
Revert "zww_extractor.ts now copies the res/* into the output directory"
themikelester Oct 23, 2024
9981b0b
d_wood: Cleanup sway attribute data and naming
themikelester Oct 23, 2024
805a1d0
Remove cLib_chaseS implementation, use cLib_chaseF instead
themikelester Oct 23, 2024
4f57aaf
d_wood: Add public/private to all member functions
themikelester Oct 23, 2024
6bf9d19
d_wood: don't cache globals, pass it as a param everywhere it's needed
themikelester Oct 23, 2024
d46ece9
d_wood: Fix shadow scale. Use math helpers for simpler matrix calcula…
themikelester Oct 24, 2024
c6f5bbc
d_wood: Correctly use the g_dTree_shadowTexCoord
themikelester Oct 24, 2024
fc9ff95
d_wood: Remove unnecessary transpose
themikelester Oct 24, 2024
b191a8a
d_wood: Replace Room_c linked list with a 2D array
themikelester Oct 24, 2024
acf6ac3
d_wood: Remove byte offset comments from classes
themikelester Oct 24, 2024
c01ae25
d_wood: Remove some unused animations
themikelester Oct 24, 2024
5209d78
d_wood: Whoops. Fix some build errors related to extra params
themikelester Oct 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
d_wood: Remove byte offset comments from classes
themikelester committed Oct 24, 2024
commit acf6ac3337e1bbdf7a4c5a7e37d82cd540dbbda4
30 changes: 15 additions & 15 deletions src/ZeldaWindWaker/d_wood.ts
Original file line number Diff line number Diff line change
@@ -323,26 +323,26 @@ class WoodModel {
// Classes
//-----------------------------------------
class Anm_c {
/* 0x00 */ mModelMtx: mat4 = mat4.create();
/* 0x30 */ mTrunkModelMtx: mat4 = mat4.create();
mModelMtx: mat4 = mat4.create();
mTrunkModelMtx: mat4 = mat4.create();

/* 0x60 */ mMode: AnimMode_e = AnimMode_e._Max;
mMode: AnimMode_e = AnimMode_e._Max;

/* 0x64 */ mCountdown: number;
/* 0x66 */ mWindDir: number; // The direction towards the actor who instigated this animation
/* 0x68 */ mWindPow: number; // 0.0 - 1.0
/* 0x6c */ mPosOffsetY: number;
/* 0x70 */ mPosOffsetZ: number;
/* 0x74 */ mVelY: number;
mCountdown: number;
mWindDir: number; // The direction towards the actor who instigated this animation
mWindPow: number; // 0.0 - 1.0
mPosOffsetY: number;
mPosOffsetZ: number;
mVelY: number;

/* 0x78 */ mPhaseY: number[] = [0, 0];
/* 0x7c */ mPhaseX: number[] = [0, 0];
/* 0x80 */ mAmpY: number[] = [0, 0];
/* 0x84 */ mAmpX: number[] = [0, 0];
mPhaseY: number[] = [0, 0];
mPhaseX: number[] = [0, 0];
mAmpY: number[] = [0, 0];
mAmpX: number[] = [0, 0];

/* 0x88 */ mNextAnimIdx: number; // Corresponds to the index in Packet_c::mAnm;
mNextAnimIdx: number; // Corresponds to the index in Packet_c::mAnm;

/* 0x8A */ mAlpha: number = 0xFF;
mAlpha: number = 0xFF;

public play(packet: Packet_c): void {
switch (this.mMode) {