mirror of
https://github.com/projectPiki/pikmin2.git
synced 2025-02-26 00:28:02 +00:00
FORTY PERCENT
This commit is contained in:
HeartPiece
parent
3f7a759ac2
commit
28341571fe
File diff suppressed because it is too large
Load Diff
@ -194,7 +194,7 @@ LIBS = [
|
||||
["JSystem/J2D/J2DOrthoGraph", True],
|
||||
["JSystem/J2D/J2DPerspGraph", True],
|
||||
["JSystem/J2D/J2DGrafContext", True],
|
||||
["JSystem/J2D/J2DPane", False],
|
||||
["JSystem/J2D/J2DPane", True],
|
||||
["JSystem/J2D/J2DPicture", False],
|
||||
["JSystem/J2D/J2DPrint", True],
|
||||
["JSystem/J2D/J2DScreen", False],
|
||||
|
||||
@ -44,25 +44,24 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 23586 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRHeap.cpp">JKernel/JKRHeap.cpp</a> | 23801 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMtxBuffer.cpp">J3D/J3DMtxBuffer.cpp</a> | 23904 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPADynamicsBlock.cpp">JParticle/JPADynamicsBlock.cpp</a> | 24229 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTextBoxEx.cpp">J2D/J2DTextBoxEx.cpp</a> | 24399 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIAnimation.cpp">JAudio//JAI/JAIAnimation.cpp</a> | 24968 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPane.cpp">J2D/J2DPane.cpp</a> | 26158 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 26174 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModel.cpp">J3D/J3DModel.cpp</a> | 28915 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterial.cpp">J3D/J3DMaterial.cpp</a> | 29170 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialAttach.cpp">J3D/J3DMaterialAttach.cpp</a> | 29947 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 31260 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DScreen.cpp">J2D/J2DScreen.cpp</a> | 33868 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-actor.cpp">JStudio_JStage/object-actor.cpp</a> | 35160 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASChannel.cpp">JAudio//JAS/JASChannel.cpp</a> | 35219 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 37460 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAParticle.cpp">JParticle/JPAParticle.cpp</a> | 39432 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39928 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40005 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 41204 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeMtx.cpp">J3D/J3DShapeMtx.cpp</a> | 42377 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 44120 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 46665 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 47976 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 49155 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 49844 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 68579 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69307 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 79855 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81389 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 83566 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 96587 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105536 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 109415 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 144108 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 311971 | | |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 26174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModel.cpp">J3D/J3DModel.cpp</a> | 28915 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterial.cpp">J3D/J3DMaterial.cpp</a> | 29170 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialAttach.cpp">J3D/J3DMaterialAttach.cpp</a> | 29947 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 31260 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DScreen.cpp">J2D/J2DScreen.cpp</a> | 33868 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-actor.cpp">JStudio_JStage/object-actor.cpp</a> | 35160 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASChannel.cpp">JAudio//JAS/JASChannel.cpp</a> | 35219 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 37460 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAParticle.cpp">JParticle/JPAParticle.cpp</a> | 39432 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39928 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40005 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 41204 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeMtx.cpp">J3D/J3DShapeMtx.cpp</a> | 42377 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 44120 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 46665 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 47976 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 49155 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 49844 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 68579 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69307 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 79855 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81389 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 83566 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85174 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 96587 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105536 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 109415 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 144108 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 311971 |
|
||||
|
||||
### <section id="plugProjectEbisawaU">plugProjectEbisawaU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
|
||||
@ -176,8 +176,8 @@ struct Item : public WorkItem<Item, FSM, State> {
|
||||
inline void resetModelMass()
|
||||
{
|
||||
// Dumb, but best I can do since mModelScale needs to be Vec
|
||||
(*(JGeometry::TVec3f*)&mModel->mJ3dModel->mModelScale).set(1.0f);
|
||||
mMass = 0.0f;
|
||||
mModel->mJ3dModel->mModelScale.x = mModel->mJ3dModel->mModelScale.y = mModel->mJ3dModel->mModelScale.z = 1.0f;
|
||||
mMass = 0.0f;
|
||||
}
|
||||
|
||||
// _00 = VTBL
|
||||
|
||||
@ -89,25 +89,25 @@ struct TVec2 {
|
||||
|
||||
template <typename T>
|
||||
struct TVec3 {
|
||||
inline TVec3() { }
|
||||
inline TVec3(T value)
|
||||
: x(value)
|
||||
, y(value)
|
||||
, z(value)
|
||||
{
|
||||
}
|
||||
inline TVec3(T inX, T inY, T inZ)
|
||||
: x(inX)
|
||||
, y(inY)
|
||||
, z(inZ) {};
|
||||
// inline TVec3() { }
|
||||
// inline TVec3(T value)
|
||||
// : x(value)
|
||||
// , y(value)
|
||||
// , z(value)
|
||||
// {
|
||||
// }
|
||||
// inline TVec3(T inX, T inY, T inZ)
|
||||
// : x(inX)
|
||||
// , y(inY)
|
||||
// , z(inZ) {};
|
||||
|
||||
// TODO: Determine if this could've actually existed, or if I'm just making it up.
|
||||
inline TVec3(const TVec3<T>& other)
|
||||
{
|
||||
x = other.x;
|
||||
y = other.y;
|
||||
z = other.z;
|
||||
}
|
||||
// // TODO: Determine if this could've actually existed, or if I'm just making it up.
|
||||
// inline TVec3(const TVec3<T>& other)
|
||||
// {
|
||||
// x = other.x;
|
||||
// y = other.y;
|
||||
// z = other.z;
|
||||
// }
|
||||
|
||||
// TODO: Determine if this could've actually existed, or if I'm just making
|
||||
// it up.
|
||||
@ -163,12 +163,12 @@ struct TVec3 {
|
||||
return other;
|
||||
}
|
||||
|
||||
inline TVec3(Vec& vec)
|
||||
{
|
||||
x = vec.x;
|
||||
y = vec.y;
|
||||
z = vec.z;
|
||||
}
|
||||
// inline TVec3(Vec& vec)
|
||||
// {
|
||||
// x = vec.x;
|
||||
// y = vec.y;
|
||||
// z = vec.z;
|
||||
// }
|
||||
|
||||
void zero() { x = y = z = 0.0f; }
|
||||
|
||||
|
||||
@ -147,7 +147,7 @@ struct JPABaseEmitter {
|
||||
|
||||
inline void setScale(f32 scale)
|
||||
{
|
||||
mGlobalScl = JGeometry::TVec3f(scale);
|
||||
mGlobalScl.set(scale, scale, scale);
|
||||
mGlobalPScl.x = scale;
|
||||
mGlobalPScl.y = scale;
|
||||
}
|
||||
@ -161,7 +161,7 @@ struct JPABaseEmitter {
|
||||
|
||||
inline void setScale(f32 scaleXY, f32 scaleZ)
|
||||
{
|
||||
mGlobalScl = JGeometry::TVec3f(scaleXY, scaleXY, scaleZ);
|
||||
mGlobalScl.set(scaleXY, scaleXY, scaleZ);
|
||||
mGlobalPScl.x = scaleXY;
|
||||
mGlobalPScl.y = scaleXY;
|
||||
}
|
||||
@ -173,7 +173,7 @@ struct JPABaseEmitter {
|
||||
mGlobalScl.z = scale.z;
|
||||
}
|
||||
|
||||
inline void setScaleOnly(f32 scale) { mGlobalScl = JGeometry::TVec3f(scale); }
|
||||
inline void setScaleOnly(f32 scale) { mGlobalScl.set(scale, scale, scale); }
|
||||
|
||||
inline void setGlobalScale(f32 x, f32 y)
|
||||
{
|
||||
|
||||
@ -755,9 +755,11 @@ void J2DPane::setInfluencedAlpha(bool isInfluencedAlpha, bool check)
|
||||
*/
|
||||
JGeometry::TVec3f J2DPane::getGlbVtx(u8 idx) const
|
||||
{
|
||||
JGeometry::TVec3f out;
|
||||
JGeometry::TVec3<f32> out;
|
||||
if (idx >= 4) {
|
||||
out = JGeometry::TVec3f(0.0f);
|
||||
out.x = 0;
|
||||
out.y = 0;
|
||||
out.z = 0;
|
||||
return out;
|
||||
} else {
|
||||
f32 x, y;
|
||||
@ -778,6 +780,29 @@ JGeometry::TVec3f J2DPane::getGlbVtx(u8 idx) const
|
||||
out.z = x * mGlobalMtx[2][0] + y * mGlobalMtx[2][1] + mGlobalMtx[2][3];
|
||||
return out;
|
||||
}
|
||||
// JGeometry::TVec3f out;
|
||||
// if (idx >= 4) {
|
||||
// out = JGeometry::TVec3f(0.0f);
|
||||
// return out;
|
||||
// } else {
|
||||
// f32 x, y;
|
||||
// if (idx & 1) {
|
||||
// x = mBounds.f.x;
|
||||
// } else {
|
||||
// x = mBounds.i.x;
|
||||
// }
|
||||
|
||||
// if (idx & 2) {
|
||||
// y = mBounds.f.y;
|
||||
// } else {
|
||||
// y = mBounds.i.y;
|
||||
// }
|
||||
|
||||
// out.x = x * mGlobalMtx[0][0] + y * mGlobalMtx[0][1] + mGlobalMtx[0][3];
|
||||
// out.y = x * mGlobalMtx[1][0] + y * mGlobalMtx[1][1] + mGlobalMtx[1][3];
|
||||
// out.z = x * mGlobalMtx[2][0] + y * mGlobalMtx[2][1] + mGlobalMtx[2][3];
|
||||
// return out;
|
||||
// }
|
||||
/*
|
||||
clrlwi r6, r5, 0x18
|
||||
stwu r1, -0x20(r1)
|
||||
|
||||
@ -2,7 +2,7 @@ J2D_FILES:=\
|
||||
$(BUILD_DIR)/src/JSystem/J2D/J2DOrthoGraph.o\
|
||||
$(BUILD_DIR)/src/JSystem/J2D/J2DPerspGraph.o\
|
||||
$(BUILD_DIR)/src/JSystem/J2D/J2DGrafContext.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J2D/J2DPane.o\
|
||||
$(BUILD_DIR)/src/JSystem/J2D/J2DPane.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J2D/J2DPicture.o\
|
||||
$(BUILD_DIR)/src/JSystem/J2D/J2DPrint.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J2D/J2DScreen.o\
|
||||
|
||||
@ -106,14 +106,10 @@ void E2DPane_setTreeCallBackMessage(P2DScreen::Mgr* mgr, J2DPane* pane)
|
||||
Vector2f E2DPane_getGlbCenter(J2DPane* pane)
|
||||
{
|
||||
P2ASSERTLINE(115, pane);
|
||||
Vector3f vtx0 = pane->getGlbVtx(0);
|
||||
Vector3f vtx3 = pane->getGlbVtx(3);
|
||||
|
||||
Vector3f middle = (vtx0 + vtx3);
|
||||
Vector3f center;
|
||||
center.set(0.5f);
|
||||
center.scaleXY(middle);
|
||||
return center;
|
||||
JGeometry::TVec3f pos1 = pane->getGlbVtx(0);
|
||||
JGeometry::TVec3f pos2 = pane->getGlbVtx(3);
|
||||
Vector2f argVec((pos1.x + pos2.x) * 0.5f, (pos1.y + pos2.y) * 0.5f);
|
||||
return argVec;
|
||||
}
|
||||
|
||||
} // namespace ebi
|
||||
|
||||
@ -111,7 +111,7 @@ void TForever::setGlobalScale(f32 scale)
|
||||
return;
|
||||
}
|
||||
|
||||
emitter->mGlobalScl = scale;
|
||||
emitter->mGlobalScl.set(scale, scale, scale);
|
||||
emitter->mGlobalPScl.x = scale;
|
||||
emitter->mGlobalPScl.y = scale;
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ void TPkOneEmitterSimple::executeAfter(JPABaseEmitter* emitter)
|
||||
for (int i = 0; i < count; i++) {
|
||||
JPABaseParticle* particle = emitter->createParticle();
|
||||
if (particle) {
|
||||
particle->mOffsetPosition = JGeometry::TVec3f(pos.x, pos.y, pos.z);
|
||||
particle->mOffsetPosition.set(pos.x, pos.y, pos.z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -230,7 +230,8 @@ void TParticle2dMgr::setXfb(const ResTIMG*)
|
||||
*/
|
||||
JPABaseEmitter* TParticle2dMgr::create(u16 p1, Vector2<f32>& p2, u8 p3, u8 p4)
|
||||
{
|
||||
JGeometry::TVec3f vec(p2.x, p2.y, 0.0f);
|
||||
JGeometry::TVec3f vec;
|
||||
vec.set(p2.x, p2.y, 0.0f);
|
||||
return mActiveEmitter->createSimpleEmitterID(vec, p1, p3, p4, nullptr, nullptr);
|
||||
}
|
||||
|
||||
|
||||
@ -58,10 +58,10 @@ void setInfAlpha(J2DPane* pane)
|
||||
*/
|
||||
f32 getPaneCenterX(J2DPane* pane)
|
||||
{
|
||||
Vector3f vec1 = pane->getGlbVtx(0);
|
||||
Vector3f vec2 = pane->getGlbVtx(1);
|
||||
Vector3f vec3 = pane->getGlbVtx(2);
|
||||
Vector3f vec4 = pane->getGlbVtx(3);
|
||||
JGeometry::TVec3f vec1 = pane->getGlbVtx(0);
|
||||
JGeometry::TVec3f vec2 = pane->getGlbVtx(1);
|
||||
JGeometry::TVec3f vec3 = pane->getGlbVtx(2);
|
||||
JGeometry::TVec3f vec4 = pane->getGlbVtx(3);
|
||||
|
||||
return (vec1.x + vec2.x + vec3.x + vec4.x) * 0.25f;
|
||||
}
|
||||
@ -72,10 +72,10 @@ f32 getPaneCenterX(J2DPane* pane)
|
||||
*/
|
||||
f32 getPaneCenterY(J2DPane* pane)
|
||||
{
|
||||
Vector3f vec1 = pane->getGlbVtx(0);
|
||||
Vector3f vec2 = pane->getGlbVtx(1);
|
||||
Vector3f vec3 = pane->getGlbVtx(2);
|
||||
Vector3f vec4 = pane->getGlbVtx(3);
|
||||
JGeometry::TVec3f vec1 = pane->getGlbVtx(0);
|
||||
JGeometry::TVec3f vec2 = pane->getGlbVtx(1);
|
||||
JGeometry::TVec3f vec3 = pane->getGlbVtx(2);
|
||||
JGeometry::TVec3f vec4 = pane->getGlbVtx(3);
|
||||
|
||||
return (vec1.y + vec2.y + vec3.y + vec4.y) * 0.25f;
|
||||
}
|
||||
|
||||
@ -32,8 +32,8 @@ void CallBack_DrawAfter::update() { }
|
||||
void CallBack_DrawAfter::draw(Graphics& gfx, J2DGrafContext& context)
|
||||
{
|
||||
if (mIsVisible) {
|
||||
Vector3f globalVtx0 = _1C->getGlbVtx(0);
|
||||
Vector3f globalVtx3 = _1C->getGlbVtx(3);
|
||||
JGeometry::TVec3f globalVtx0 = _1C->getGlbVtx(0);
|
||||
JGeometry::TVec3f globalVtx3 = _1C->getGlbVtx(3);
|
||||
|
||||
gfx.mOrthoGraph.setPort();
|
||||
|
||||
|
||||
@ -341,10 +341,9 @@ void OtakaraSensor::calcAppear()
|
||||
mScaleMgr->up(0.7f, 40.0f, 0.5f, 0.0f);
|
||||
mAppearTimer = 3.0f;
|
||||
efx2d::T2DSensorGet efx;
|
||||
Vector3f pos1 = mPane1->getGlbVtx(0);
|
||||
Vector3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector3f midPos = pos1 + pos2;
|
||||
Vector2f argVec(midPos.x / 2 + mAppearEfxOffset.x, midPos.y / 2 + mAppearEfxOffset.y);
|
||||
JGeometry::TVec3f pos1 = mPane1->getGlbVtx(0);
|
||||
JGeometry::TVec3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector2f argVec((pos1.x + pos2.x) / 2 + mAppearEfxOffset.x, (pos1.y + pos2.y) / 2 + mAppearEfxOffset.y);
|
||||
efx2d::Arg arg = argVec;
|
||||
efx.create(&arg);
|
||||
ogSound->setGetSensor();
|
||||
@ -360,10 +359,9 @@ void OtakaraSensor::calcAppear()
|
||||
void OtakaraSensor::startGraySensor()
|
||||
{
|
||||
efx2d::T2DSensorComp efx;
|
||||
Vector3f pos1 = mPane1->getGlbVtx(0);
|
||||
Vector3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector3f midPos = pos1 + pos2;
|
||||
Vector2f argVec(midPos.x / 2 + mCompleteEfxOffset.x, midPos.y / 2 + mCompleteEfxOffset.y);
|
||||
JGeometry::TVec3f pos1 = mPane1->getGlbVtx(0);
|
||||
JGeometry::TVec3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector2f argVec((pos1.x + pos2.x) / 2 + mCompleteEfxOffset.x, (pos1.y + pos2.y) / 2 + mCompleteEfxOffset.y);
|
||||
efx2d::Arg arg = argVec;
|
||||
efx.create(&arg);
|
||||
}
|
||||
@ -452,10 +450,9 @@ void OtakaraSensor::calcReaction()
|
||||
if (mAppearTimer <= 0.0f) {
|
||||
mScaleMgr->up(mCurrReactionLevel * 0.1f, 30.0f, 0.8f, 0.0f);
|
||||
efx2d::T2DSensorAct efx;
|
||||
Vector3f pos1 = mPane1->getGlbVtx(0);
|
||||
Vector3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector3f midPos = pos1 + pos2;
|
||||
Vector2f argVec(midPos.x / 2 + mCompleteEfxOffset.x, midPos.y / 2 + mCompleteEfxOffset.y);
|
||||
JGeometry::TVec3f pos1 = mPane1->getGlbVtx(0);
|
||||
JGeometry::TVec3f pos2 = mPane1->getGlbVtx(3);
|
||||
Vector2f argVec((pos1.x + pos2.x) / 2 + mCompleteEfxOffset.x, (pos1.y + pos2.y) / 2 + mCompleteEfxOffset.y);
|
||||
efx2d::Arg arg = argVec;
|
||||
efx.create(&arg);
|
||||
}
|
||||
|
||||
@ -165,10 +165,10 @@ f32 calcSmooth0to1(f32 start, f32 end)
|
||||
*/
|
||||
void calcGlbCenter(J2DPane* pane, Vector2f* center)
|
||||
{
|
||||
Vector3f vec1 = pane->getGlbVtx(0);
|
||||
Vector3f vec2 = pane->getGlbVtx(3);
|
||||
center->x = (vec1.x + vec2.x) / 2;
|
||||
center->y = (vec1.y + vec2.y) / 2;
|
||||
JGeometry::TVec3f vec1 = pane->getGlbVtx(0);
|
||||
JGeometry::TVec3f vec2 = pane->getGlbVtx(3);
|
||||
center->x = (vec1.x + vec2.x) / 2;
|
||||
center->y = (vec1.y + vec2.y) / 2;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -907,3 +907,5 @@ You have 3962 out of 10000 Pokos and 105 out of 201 treasures.",2024-01-23 21:24
|
||||
You have 3964 out of 10000 Pokos and 105 out of 201 treasures.",2024-01-23 21:31:04.196436
|
||||
3980,1851936,0.3980644628781313,105,374065,0.5247413222305767,"
|
||||
You have 3980 out of 10000 Pokos and 105 out of 201 treasures.",2024-01-24 02:26:19.353240
|
||||
4007,1864204,0.40070140866383286,105,374289,0.5250555511912645,"
|
||||
You have 4007 out of 10000 Pokos and 105 out of 201 treasures.",2024-01-24 03:12:58.919692
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user