mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 21:11:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

delete unused asm, c_m3d_g

Browse Source
This commit is contained in:
lepelog
2021-04-08 16:01:29 +02:00
parent d9859d41ed
commit 643048cff7
403 changed files with 369 additions and 7412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_angle.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_ANGLE_H
#define C_ANGLE_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class cSAngle {
private:
include/SSystem/SComponent/c_list.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_LIST_H
#define C_LIST_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
typedef struct node_list_class {
node_class* mpHead;
include/SSystem/SComponent/c_list_iter.h
+1 -1
View File
@@ -1,9 +1,9 @@
#ifndef C_LIST_ITER_H
#define C_LIST_ITER_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node_iter.h"
#include "dolphin/types.h"
int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);
include/SSystem/SComponent/c_m3d.h
+83 -3
View File
@@ -1,6 +1,86 @@
#ifndef C_M3D_H
#define C_M3D_H
#ifndef C_M3D_H_
#define C_M3D_H_
#include "dolphin/types.h"
#endif /* C_M3D_H */
class cM3dGAab;
class cM3dGCps;
class cM3dGCyl;
class cM3dGLin;
class cM3dGPla;
class cM3dGSph;
class cM3dGTri;
class csXyz;
class cXyz;
struct cM3d_Range;
struct Vec;
extern f32 G_CM3D_F_ABS_MIN;
void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*);
void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*);
f32 cM3d_Len2dSq(f32, f32, f32, f32);
bool cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32*, f32*, f32*);
bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, f32*);
f32 cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*);
f32 cM3d_VectorProduct2d(f32, f32, f32, f32, f32, f32);
void cM3d_VectorProduct(const cXyz*, const cXyz*, const cXyz*, cXyz*);
void cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, f32*);
bool cM3d_Cross_AabAab(const cM3dGAab*, const cM3dGAab*);
bool cM3d_Cross_AabCyl(const cM3dGAab*, const cM3dGCyl*);
bool cM3d_Cross_AabSph(const cM3dGAab*, const cM3dGSph*);
int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, f32*, f32*);
bool cM3d_CrossInfLineVsInfPlane_proc(f32, f32, const Vec*, const Vec*, Vec*);
bool cM3d_Cross_LinPla(const cM3dGLin*, const cM3dGPla*, Vec*, bool, bool);
bool cM3d_Cross_MinMaxBoxLine(const Vec*, const Vec*, const Vec*, const Vec*);
bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, f32);
bool cM3d_InclusionCheckPosIn3PosBox2d(f32, f32, f32, f32, f32, f32, f32, f32, f32);
bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, f32);
bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*);
bool cM3d_CrossX_LinTri_proc(const cM3dGTri*, const Vec*);
bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*);
bool cM3d_CrossY_LinTri_proc(const cM3dGTri*, const Vec*);
bool cM3d_CrossY_Tri(const Vec&, const Vec&, const Vec&, const cM3dGPla&, const Vec*);
bool cM3d_CrossY_Tri_Front(const Vec&, const Vec&, const Vec&, const Vec*);
bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32*);
bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32);
bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, f32*);
bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, f32);
bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*);
bool cM3d_CrossZ_LinTri_proc(const cM3dGTri*, const Vec*);
bool cM3d_Cross_LinTri(const cM3dGLin*, const cM3dGTri*, Vec*, bool, bool);
bool cM3d_Cross_LinTri_Easy(const cM3dGTri*, const Vec*);
bool cM3d_Cross_SphPnt(const cM3dGSph*, const Vec*);
bool cM3d_Cross_LinSph(const cM3dGLin*, const cM3dGSph*, Vec*);
int cM3d_Cross_LinSph_CrossPos(const cM3dGSph&, const cM3dGLin&, Vec*, Vec*);
bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, f32*);
bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, f32*);
bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*);
bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*, f32*);
bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*);
void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph*, const cM3dGTri*, Vec*);
bool cM3d_Cross_SphTri(const cM3dGSph*, const cM3dGTri*, Vec*);
bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, f32*);
bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, Vec*);
bool cM3d_Cross_CylTri(const cM3dGCyl*, const cM3dGTri*, Vec*);
int cM3d_Cross_CylLin(const cM3dGCyl*, const cM3dGLin*, Vec*, Vec*);
int cM3d_Cross_CylPntPnt(const cM3dGCyl*, const Vec*, const Vec*, Vec*, Vec*);
bool cM3d_Cross_CylPnt(const cM3dGCyl*, const Vec*);
bool cM3d_Cross_CpsCps(const cM3dGCps&, const cM3dGCps&, Vec*);
bool cM3d_Cross_CpsCyl(const cM3dGCps&, const cM3dGCyl&, Vec*);
bool cM3d_Cross_CpsSph_CrossPos(const cM3dGCps&, const cM3dGSph&, const Vec&, Vec*);
bool cM3d_Cross_CpsSph(const cM3dGCps&, const cM3dGSph&, Vec*);
bool cM3d_Cross_TriTri(const cM3dGTri&, const cM3dGTri&, Vec*);
bool cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*);
void cM3d_CalcVecAngle(const Vec&, short*, short*);
void cM3d_CalcVecZAngle(const Vec&, csXyz*);
void cM3d_PlaneCrossLineProcWork(f32, f32, f32, f32, f32, f32, f32, f32*, f32*);
int cM3d_2PlaneCrossLine(const cM3dGPla&, const cM3dGPla&, cM3dGLin*);
bool cM3d_3PlaneCrossPos(const cM3dGPla&, const cM3dGPla&, const cM3dGPla&, Vec*);
f32 cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*);
f32 cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*);
int cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*);
void cM3d_CrawVec(const Vec&, const Vec&, Vec*);
#endif
include/SSystem/SComponent/c_m3d_g_aab.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_M3D_G_AAB_H
#define C_M3D_G_AAB_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
// Axis aligned bounding box
class cM3dGAab {
include/SSystem/SComponent/c_m3d_g_cps.h
+7 -1
View File
@@ -1,9 +1,9 @@
#ifndef C_M3D_G_CPS_H
#define C_M3D_G_CPS_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_m3d_g_lin.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
struct cM3dGCpsS {
Vec mStart;
@@ -21,6 +21,12 @@ public:
void Set(const cXyz&, const cXyz&, f32);
void Set(const cM3dGCpsS&);
void SetCps(const cM3dGCps&);
virtual void unk1(void) = 0;
virtual void unk2(void) = 0;
virtual void unk3(void) = 0;
virtual void unk4(void) = 0;
virtual void unk5(void) = 0;
virtual void unk6(void) = 0;
};
#endif /* C_M3D_G_CPS_H */
include/SSystem/SComponent/c_m3d_g_cyl.h
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef C_M3D_G_CYL_H
#define C_M3D_G_CYL_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
// Cylinder
struct cM3dGCylS {
@@ -15,7 +15,7 @@ class cM3dGSph;
class cM3dGCyl : public cM3dGCylS {
public:
cM3dGCyl(const cXyz*, f32, f32);
~cM3dGCyl();
virtual ~cM3dGCyl();
void Set(const cM3dGCylS&);
void Set(const cXyz&, f32, f32);
void SetC(const cXyz&);
include/SSystem/SComponent/c_m3d_g_lin.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_M3D_G_LIN_H
#define C_M3D_G_LIN_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "mtx_vec.h"
// Line
include/SSystem/SComponent/c_m3d_g_pla.h
+22 -3
View File
@@ -1,6 +1,25 @@
#ifndef C_M3D_G_PLA_H
#define C_M3D_G_PLA_H
#ifndef C_M3C_G_PLA_H_
#define C_M3C_G_PLA_H_
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#endif /* C_M3D_G_PLA_H */
// Plane with a normal
class cM3dGPla {
public:
cXyz mNormal;
f32 mD;
cM3dGPla(const cXyz*, f32);
virtual ~cM3dGPla();
bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const;
void SetupNP0(const Vec&, const Vec&);
void SetupNP(const Vec&, const Vec&);
bool getCrossY(const cXyz&, f32*) const;
bool getCrossYLessD(const Vec&, f32*) const;
void Set(const cM3dGPla*);
f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); }
const cXyz& GetNP() const { return mNormal; }
f32 GetD() const { return mD; }
};
#endif
include/SSystem/SComponent/c_m3d_g_sph.h
+35 -3
View File
@@ -1,6 +1,38 @@
#ifndef C_M3D_G_SPH_H
#define C_M3D_G_SPH_H
#ifndef C_M3D_G_SPH_H_
#define C_M3D_G_SPH_H_
#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#endif /* C_M3D_G_SPH_H */
struct cM3dGSphS {
Vec mCenter;
f32 mRadius;
};
class cM3dGSph {
private:
public:
cXyz mCenter;
f32 mRadius;
void SetC(const cXyz&);
void Set(const cXyz&, f32);
void Set(const cM3dGSphS&);
void SetR(f32);
bool cross(const cM3dGSph*, cXyz*) const;
bool cross(const cM3dGCyl*, cXyz*) const;
void GetMinMaxCube(cXyz&, cXyz&) const;
const cXyz& GetC(void) const { return mCenter; }
const f32 GetR(void) const { return mRadius; }
f32 GetCX(void) const { return mCenter.GetX(); }
f32 GetCY(void) const { return mCenter.GetY(); }
f32 GetCZ(void) const { return mCenter.GetZ(); }
};
// additional symbols needed for cM3dGSph
extern "C" {
void Set__8cM3dGSphFRC4cXyzf(void);
}
#endif
include/SSystem/SComponent/c_m3d_g_tri.h
+20 -3
View File
@@ -1,6 +1,23 @@
#ifndef C_M3D_G_TRI_H
#define C_M3D_G_TRI_H
#ifndef C_M3D_G_TRI_H_
#define C_M3D_G_TRI_H_
#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#endif /* C_M3D_G_TRI_H */
class cM3dGTri {
// private:
public:
cM3dGPla mPlane;
cXyz mA;
cXyz mB;
cXyz mC;
bool cross(const cM3dGCyl*, Vec*) const;
void setPos(const Vec*, const Vec*, const Vec*);
void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*);
void set(const Vec*, const Vec*, const Vec*, const Vec*);
};
#endif
include/SSystem/SComponent/c_malloc.h
+3 -3
View File
@@ -5,14 +5,14 @@
// TODO: move to correct include
struct JKRHeap {
/* 802CE4D4 */ void *alloc(u32, int);
/* 802CE4D4 */ void* alloc(u32, int);
/* 802CE548 */ void free(void*);
};
struct cMl {
static JKRHeap *Heap;
static JKRHeap* Heap;
/* 80263220 */ static void init(JKRHeap*);
/* 80263228 */ static void *memalignB(int, u32);
/* 80263228 */ static void* memalignB(int, u32);
/* 80263260 */ static void free(void*);
};
include/SSystem/SComponent/c_node_iter.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_NODE_ITER_H
#define C_NODE_ITER_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);
include/SSystem/SComponent/c_tag.h
+1 -1
View File
@@ -1,10 +1,10 @@
#ifndef C_TAG_H
#define C_TAG_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node.h"
#include "SSystem/SComponent/c_tree.h"
#include "dolphin/types.h"
typedef struct create_tag_class {
node_class mpNode;
include/SSystem/SComponent/c_tag_iter.h
+1 -2
View File
@@ -1,9 +1,9 @@
#ifndef C_TAG_ITER_H
#define C_TAG_ITER_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_node_iter.h"
#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
typedef struct method_filter {
cNdIt_MethodFunc mpMethodFunc;
@@ -18,5 +18,4 @@ typedef struct judge_filter {
int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter);
void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter);
#endif /* C_TAG_ITER_H */
include/SSystem/SComponent/c_tree.h
+1 -1
View File
@@ -1,9 +1,9 @@
#ifndef C_TREE_H
#define C_TREE_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
typedef struct node_lists_tree_class {
node_list_class* mpLists;
include/SSystem/SComponent/c_tree_iter.h
+1 -2
View File
@@ -1,12 +1,11 @@
#ifndef C_TREE_ITER_H
#define C_TREE_ITER_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_node_iter.h"
#include "SSystem/SComponent/c_tree.h"
#include "dolphin/types.h"
int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);
#endif /* C_TREE_ITER_H */