Some reorganizing to proper folders.

This commit is contained in:
shibbo 2020-01-21 22:41:21 -05:00
parent 635b99e61e
commit 7f49c97a55
26 changed files with 24 additions and 24 deletions

View File

@ -1,7 +1,7 @@
#ifndef ACTORPADANDCAMERACTRL_H
#define ACTORPADANDCAMERACTRL_H
#include "Model/ModelManager.h"
#include "Actor/Model/ModelManager.h"
#include "JGeometry/TVec3.h"
class ActorPadAndCameraCtrl

View File

@ -17,7 +17,7 @@
#include "Actor/Switch/StageSwitch.h"
#include "Collision/Binder.h"
#include "JGeometry/TVec3.h"
#include "Model/ModelManager.h"
#include "Actor/Model/ModelManager.h"
class LiveActor : public NameObj
{

View File

@ -1,7 +1,7 @@
#ifndef DISPLAYLISTMAKER_H
#define DISPLAYLISTMAKER_H
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class DisplayListMaker

View File

@ -7,8 +7,8 @@
#include "Animation/BtkPlayer.h"
#include "Animation/BtpPlayer.h"
#include "Animation/BvaPlayer.h"
#include "Model/DisplayList/DisplayListMaker.h"
#include "Model/J3D/J3DModel.h"
#include "Actor/Model/DisplayListMaker.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class ModelManager

View File

@ -2,8 +2,8 @@
#define ANMPLAYER_H
#include "System/Resource/ResourceInfo.h"
#include "Model/J3D/J3DAnimation.h"
#include "Model/J3D/J3DModelData.h"
#include "J3DGraphBase/J3DAnimation.h"
#include "J3DGraphBase/J3DModelData.h"
class AnmPlayerBase
{

View File

@ -2,7 +2,7 @@
#define BPKPLAYER_H
#include "Animation/AnmPlayer.h"
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class BpkPlayer : public MaterialAnmPlayerBase

View File

@ -2,7 +2,7 @@
#define BRKPLAYER_H
#include "Animation/AnmPlayer.h"
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class BrkPlayer : public MaterialAnmPlayerBase

View File

@ -2,7 +2,7 @@
#define BTKPLAYER_H
#include "Animation/AnmPlayer.h"
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class BtkPlayer : public MaterialAnmPlayerBase

View File

@ -2,7 +2,7 @@
#define BTPPLAYER_H
#include "Animation/AnmPlayer.h"
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "System/Resource/ResourceHolder.h"
class BtpPlayer : public MaterialAnmPlayerBase

View File

@ -2,7 +2,7 @@
#define BVAPLAYER_H
#include "Animation/AnmPlayer.h"
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
class BvaPlayer : public AnmPlayerBase
{

View File

@ -2,7 +2,7 @@
#define J3DJOINT_H
#include "types.h"
#include "Model/J3D/J3DTransform.h"
#include "J3DGraphBase/J3DTransform.h"
class J3DJoint
{

View File

@ -1,8 +1,8 @@
#ifndef J3DMODEL_H
#define J3DMODEL_H
#include "Model/J3D/J3DModelData.h"
#include "Model/J3D/J3DMtxBuffer.h"
#include "J3DGraphBase/J3DModelData.h"
#include "J3DGraphBase/J3DMtxBuffer.h"
#include "os/mtx.h"
class J3DModel

View File

@ -2,9 +2,9 @@
#define J3DMODELDATA_H
#include "types.h"
#include "Model/J3D/J3DJointTree.h"
#include "Model/J3D/J3DMaterialAttach.h"
#include "Model/J3D/J3DVertex.h"
#include "J3DGraphBase/J3DJointTree.h"
#include "J3DGraphBase/J3DMaterialAttach.h"
#include "J3DGraphBase/J3DVertex.h"
class J3DShapeTable
{

View File

@ -2,7 +2,7 @@
#define J3DMTXBUFFER_H
#include "types.h"
#include "Model/J3D/J3DModelData.h"
#include "J3DGraphBase/J3DModelData.h"
class J3DMtxBuffer
{

View File

@ -1,7 +1,7 @@
#ifndef J3DPACKET_H
#define J3DPACKET_H
#include "Model/J3D/J3DDrawBuffer.h"
#include "J3DGraphBase/J3DDrawBuffer.h"
#include "OS/GD/GDBase.h"
#include "types.h"

View File

@ -18,7 +18,7 @@ namespace JGeometry
{
public:
void identity();
void mult(const JGeometry::TVec3<T> &, JGeometry::TVec3<T> &);
void mult(const JGeometry::TVec3<f32> &, JGeometry::TVec3<f32> &);
void concat(const T &);
operator Mtx*() { return reinterpret_cast<Mtx*>(this); }

View File

@ -1,4 +1,4 @@
#include "Model/J3D/J3DModel.h"
#include "J3DGraphBase/J3DModel.h"
#include "os/mtx.h"
void J3DModel::initialize()

View File

@ -1,4 +1,4 @@
#include "Model/J3D/J3DPacket.h"
#include "J3DGraphBase/J3DPacket.h"
#include "OS/OSInterrupt.h"
#include "OS/GX/GXDisplayList.h"

View File

@ -1,4 +1,4 @@
#include "Model/J3D/J3DSys.h"
#include "J3DGraphBase/J3DSys.h"
void J3DSys::loadPosMtxIndx(s32 unk1, u16 unk2) const
{