mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-02 08:11:58 -04:00
general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)
* typedef for cPhs_Step * make sdk includes consistent * d_menu_quit / d_msg_scrn_explain debug * d_a_obj_testcube mostly done * d_debug_pad mostly done * jstudio tool library headers * some JStudioCameraEditor headers * d_jcam_editor mostly done * try fixing some shield regressions * d_bg_parts mostly done * fix merge errors * debug fix
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef JSTUDIO_MATH_H
|
||||
#define JSTUDIO_MATH_H
|
||||
|
||||
#include "dolphin/mtx.h"
|
||||
#include <dolphin/mtx.h>
|
||||
#include <cmath>
|
||||
|
||||
#define m_PI_D 3.141592653589793
|
||||
|
||||
@@ -120,6 +120,12 @@ public:
|
||||
virtual void do_data(void const*, u32, void const*, u32);
|
||||
|
||||
TAdaptor* getAdaptor() const { return mpAdaptor; }
|
||||
|
||||
void setAdaptor(TAdaptor* pAdaptor) {
|
||||
mpAdaptor = pAdaptor;
|
||||
prepareAdaptor();
|
||||
}
|
||||
|
||||
TControl* getControl() { return (TControl*)stb::TObject::getControl(); }
|
||||
const TControl* getControl() const { return (const TControl*)stb::TObject::getControl(); }
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef OBJECT_ID_H
|
||||
#define OBJECT_ID_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include <dolphin/types.h>
|
||||
|
||||
namespace JStudio {
|
||||
namespace object {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef STB_DATA_H
|
||||
#define STB_DATA_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include <dolphin/types.h>
|
||||
|
||||
namespace JStudio {
|
||||
namespace stb {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/JGadget/linklist.h"
|
||||
#include "JSystem/JStudio/JStudio/object-id.h"
|
||||
#include "JSystem/JStudio/JStudio/stb-data-parse.h"
|
||||
#include "dolphin/os.h"
|
||||
#include <dolphin/os.h>
|
||||
|
||||
namespace JStudio {
|
||||
class TObject;
|
||||
|
||||
Reference in New Issue
Block a user