Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GameFrameworkNx: Add member variables #141

Merged
merged 4 commits into from
Jul 25, 2024
Merged

GameFrameworkNx: Add member variables #141

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86bcd2f
Add member variables for GameFrameworkNx
Jul 23, 2024
4d98f33
PR:suggestions and lint
Jul 25, 2024
fca5752
pr:manual formatting
Jul 25, 2024
10fc197
pr:clean
Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions include/framework/nx/seadGameFrameworkNx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
#pragma once

#include <framework/seadGameFramework.h>
#include <gfx/seadFrameBuffer.h>
#include <math/seadVector.h>
#include <nvn/nvn.h>
#include <thread/seadThread.h>

namespace sead
{

class DisplayBufferNvn;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if I prefer this over just an include though I don't think that should block this PR, @leoetlino I would like your opinion

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just did that from habit since we do that for smo


namespace nn
{
namespace mem
{
class StandardAllocator;
}
namespace vi
{
class Layer;
}
} // namespace nn

class GameFrameworkNx : public GameFramework
{
SEAD_RTTI_OVERRIDE(GameFrameworkNx, GameFramework)
public:
struct CreateArg;
struct CreateArg
{
s32 mVBlankWaitInterval;
char _8[68];
};

GameFrameworkNx(const CreateArg&);
~GameFrameworkNx() override;
Expand Down Expand Up @@ -42,7 +62,22 @@ class GameFrameworkNx : public GameFramework
float calcFps();
void setCaption(const SafeString&);

// missing member variables
private:
CreateArg mCreateArg;
char _E8[8];
u64 mSystemTick;
FrameBuffer* mMethodFrameBuffer;
LogicalFrameBuffer mMethodLogicalFrameBuffer;
char _120[8];
DisplayBufferNvn* mDisplayBuffer;
char _130[72];
nn::mem::StandardAllocator* mGraphicsDevToolsAllocator;
char _180[40];
nn::vi::Layer* mDisplay;
char _1B0[96];
};

static_assert(sizeof(sead::GameFrameworkNx) == 0x210, "GameFrameworkNx size");
static_assert(sizeof(sead::GameFrameworkNx::CreateArg) == 0x48, "GameFrameworkNx::CreateArg size");
LynxDev2 marked this conversation as resolved.
Show resolved Hide resolved

} // namespace sead
Loading