Skip to content

Static image function member #196

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Static image function member #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3df2009
Merge branch 'ntut-open-source-club:main' into main
c1ydehhx Apr 11, 2024
ca7d3fd
Merge remote-tracking branch 'origin/main'
c1ydehhx Jun 16, 2024
f638a7c
Chore: Make image to static
c1ydehhx Jun 16, 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
6 changes: 3 additions & 3 deletions include/Util/Image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ class Image : public Core::Drawable {
void Draw(const Core::Matrices &data) override;

private:
void InitProgram();
void InitVertexArray();
void InitUniformBuffer();
static void InitProgram();
static void InitVertexArray();
static void InitUniformBuffer();

static constexpr int UNIFORM_SURFACE_LOCATION = 0;

Expand Down
4 changes: 2 additions & 2 deletions src/Util/Image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ namespace Util {
Image::Image(const std::string &filepath)
: m_Path(filepath) {
if (s_Program == nullptr) {
InitProgram();
Image::InitProgram();
}
if (s_VertexArray == nullptr) {
InitVertexArray();
Image::InitVertexArray();
}

m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
Expand Down