Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions lib/g3d/include/nn/g3d/g3d_MaterialObj.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#pragma once

#include <nn/gfx/gfx_Device.h>

namespace nn::g3d {
class MaterialObj {
public:
struct InitializeArgument {
void CalculateMemorySize();
};

bool Initialize(const InitializeArgument&, void*, uint64_t);
void InitializeDependPointer();
int64_t GetBlockBufferAlignment(gfx::TDevice<gfx::ApiVariationNvn8>*) const;
int32_t CalculateBlockBufferSize(gfx::TDevice<gfx::ApiVariationNvn8>*) const;
void SetupBlockBufferImpl(gfx::TDevice<gfx::ApiVariationNvn8>*,
gfx::TMemoryPool<gfx::ApiVariationNvn8>*, int64_t, uint64_t);
void ResetDirtyFlags();
bool SetupBlockBuffer(gfx::TDevice<gfx::ApiVariationNvn8>*,
gfx::TMemoryPool<gfx::ApiVariationNvn8>*, int64_t, uint64_t);
void CleanupBlockBuffer(gfx::TDevice<gfx::ApiVariationNvn8>*);
void CalculateMaterial(int32_t);

template <bool>
void ConvertDirtyParams(void*, uint32_t*);

private:
void* filler[16];
};
} // namespace nn::g3d
15 changes: 13 additions & 2 deletions lib/g3d/include/nn/g3d/g3d_ModelObj.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#include <cstddef>
#include <cstdint>

#include <nn/g3d/g3d_MaterialObj.h>
#include <nn/g3d/g3d_ViewVolume.h>

namespace nn::g3d {

class MaterialObj;
Expand All @@ -13,12 +16,20 @@ class SkeletonObj;
// TODO
class ModelObj {
public:
MaterialObj* FindMaterial(const char* materialName);

SkeletonObj* GetSkeleton() const { return m_Skeleton; }

int32_t GetNumShapes() const { return m_NumShapes; }

int32_t get_8c() const { return _8c; }

uint8_t GetViewDependentModelFlags() const { return m_ViewDependentModelFlags; }

MaterialObj* GetMaterial(int32_t index) const { return &m_Materials[index]; }

const Sphere& GetBounds() const { return *m_Bounds; }

private:
struct InitializeArgument;

Expand All @@ -28,7 +39,7 @@ class ModelObj {
void* _8;
void* _10;
uint8_t _18;
uint8_t _19;
uint8_t m_ViewDependentModelFlags; // TODO: is this right?
uint16_t _1a;
void* _20;
void* _28;
Expand All @@ -37,7 +48,7 @@ class ModelObj {
SkeletonObj* m_Skeleton;
ShapeObj* m_Shapes;
MaterialObj* m_Materials;
void* _50;
Sphere* m_Bounds;
void* m_UserData;
void* _60;
void* _68;
Expand Down
8 changes: 7 additions & 1 deletion lib/g3d/include/nn/g3d/g3d_ViewVolume.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@

namespace nn::g3d {
class Aabb;
class Sphere;

struct Sphere {
float x;
float y;
float z;
float radius;
};

class ViewVolume {
public:
Expand Down
Loading