2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 08:06:08 +00:00

Start wiring up wgpu+winit

This commit is contained in:
2022-01-31 19:06:54 -05:00
parent 5491fd75cf
commit e48435f11e
209 changed files with 24234 additions and 8085 deletions

View File

@@ -5,7 +5,7 @@
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
//#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CMatrix4f.hpp>
@@ -13,7 +13,7 @@
namespace metaforce {
class CWorldShadowShader {
boo::ObjToken<boo::ITextureR> m_tex;
std::shared_ptr<aurora::TextureHandle> m_tex;
std::optional<CTexturedQuadFilter> m_prevQuad;
u32 m_w, m_h;
@@ -21,10 +21,10 @@ class CWorldShadowShader {
zeus::CMatrix4f m_matrix;
zeus::CColor m_color;
};
boo::ObjToken<boo::IGraphicsBufferD> m_vbo;
boo::ObjToken<boo::IGraphicsBufferD> m_uniBuf;
boo::ObjToken<boo::IShaderDataBinding> m_dataBind;
boo::ObjToken<boo::IShaderDataBinding> m_zDataBind;
// boo::ObjToken<boo::IGraphicsBufferD> m_vbo;
// boo::ObjToken<boo::IGraphicsBufferD> m_uniBuf;
// boo::ObjToken<boo::IShaderDataBinding> m_dataBind;
// boo::ObjToken<boo::IShaderDataBinding> m_zDataBind;
Uniform m_uniform;
public:
@@ -40,7 +40,7 @@ public:
u32 GetWidth() const { return m_w; }
u32 GetHeight() const { return m_h; }
const boo::ObjToken<boo::ITextureR>& GetTexture() const { return m_tex; }
const std::shared_ptr<aurora::TextureHandle>& GetTexture() const { return m_tex; }
};
} // namespace metaforce