mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 22:50:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

progress on d_a_obj_ivy_rope (#109)

Browse Source 
* init

* couple more funcs

* progress

* smol progress

* smol progress 2

* Dont get your hopes up, I just had some lingering things :P

* fix merge
This commit is contained in:
Elijah Thomas
2025-05-10 17:23:35 -04:00
committed by GitHub
parent 91e2efd1b2
commit e1aad98a2d
15 changed files with 1509 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+1169 -21
View File
File diff suppressed because it is too large Load Diff
src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
+8 -37
View File
@@ -16,45 +16,16 @@ STATE_DEFINE(dAcOtoD3StoneFigure_c, Eyes);
f32 dAcOtoD3StoneFigure_c::sRadius = 85.0f;
f32 dAcOtoD3StoneFigure_c::sHeight = 290.0f;
// clang-format off
dCcD_SrcCyl dAcOtoD3StoneFigure_c::sCcSrc = {
{
{
0,
0,
{
0,
0,
0
},
0,
0,
0,
0,
0,
0
},
{
~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND),
0x1000111,
{
0x0,
0x06,
0x407
},
0,
0
},
{
0xE9
}
},
{
dAcOtoD3StoneFigure_c::sRadius,
dAcOtoD3StoneFigure_c::sHeight
}
{{0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0},
{~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND),
0x1000111,
{0, 0x06, 0x407},
0,
0},
{0xE9}},
{dAcOtoD3StoneFigure_c::sRadius, dAcOtoD3StoneFigure_c::sHeight}
};
// clang-format on
bool dAcOtoD3StoneFigure_c::createHeap() {
const char *modelName = getModelName();
src/d/a/obj/d_a_obj_arrow.cpp
-1
View File
@@ -16,7 +16,6 @@ STATE_DEFINE(dAcArrow_c, Bound);
// clang-format off
cCcD_SrcGObj dAcArrow_c::sCcSrcInf = {
{AT_TYPE_ARROW, 0x8BB, {0x15,0, 0}, 0, 0, 0, 0, 0, 0},
{
~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_ARROW | AT_TYPE_0x100 | AT_TYPE_WIND | AT_TYPE_SLINGSHOT),
src/m/m3d/m_bline.cpp
+3 -10
View File
@@ -7,7 +7,6 @@
#include "nw4r/g3d/g3d_light.h"
#include "nw4r/g3d/g3d_state.h"
namespace m3d {
blineMat_c::~blineMat_c() {
@@ -61,7 +60,7 @@ void blineMat_c::update() {
getCurrentCamera().GetCameraMtx(&camMtx);
PSMTXInverse(camMtx, camMtx);
PSMTXMultVec(camMtx, mVec3_c::zero, vec);
PSMTXMultVec(camMtx, mVec3_c::Zero, vec);
for (bline_c *line = (bline_c *)nw4r::ut::List_GetNext(&mLines, 0); line != nullptr;
line = (bline_c *)nw4r::ut::List_GetNext(&mLines, line)) {
@@ -85,15 +84,9 @@ void blineMat_c::setupGX(bool bTransparent) {
0, &mask_diff_color, &mask_diff_alpha, &mask_spec_color, &mask_spec_alpha, &ambObj
);
nw4r::ut::Color ambColor(0xFF, 0xFF, 0xFF, 0xFF);
nw4r::ut::Color matColor(0xFF, 0xFF, 0xFF, 0xFF);
GXSetChanMatColor(GX_COLOR0, matColor);
GXSetChanMatColor(GX_COLOR0, nw4r::ut::Color(0xFF, 0xFF, 0xFF, 0xFF));
ambColor.r = ambObj.r;
ambColor.g = ambObj.g;
ambColor.b = ambObj.b;
ambColor.a = ambObj.a;
GXSetChanAmbColor(GX_COLOR0, ambColor);
GXSetChanAmbColor(GX_COLOR0, nw4r::ut::Color(ambObj.r, ambObj.g, ambObj.b, ambObj.a));
GXSetNumChans(1);
GXSetChanCtrl(GX_COLOR0, TRUE, GX_SRC_REG, GX_SRC_REG, (GXLightID)mask_diff_color, GX_DF_CLAMP, GX_AF_NONE);