Skip to content

Commit 402a64a

Browse files
committed
fix: add missing setUniformVec2 function. clean code.
1 parent 637ed66 commit 402a64a

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

vgfw.hpp

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,7 @@ namespace vgfw
952952
RenderContext& setUniform1i(const std::string& name, int32_t);
953953
RenderContext& setUniform1ui(const std::string& name, uint32_t);
954954

955+
RenderContext& setUniformVec2(const std::string& name, const glm::vec2&);
955956
RenderContext& setUniformVec3(const std::string& name, const glm::vec3&);
956957
RenderContext& setUniformVec4(const std::string& name, const glm::vec4&);
957958

@@ -1220,7 +1221,9 @@ namespace vgfw
12201221
int indexInOwnerModel {-1};
12211222
resource::Model* ownerModel {nullptr};
12221223

1223-
void build(renderer::VertexFormat::Builder& vertexFormatBuilder, const glm::vec3& scale, renderer::RenderContext& rc);
1224+
void build(renderer::VertexFormat::Builder& vertexFormatBuilder,
1225+
const glm::vec3& scale,
1226+
renderer::RenderContext& rc);
12241227

12251228
private:
12261229
friend class renderer::RenderContext;
@@ -2479,6 +2482,16 @@ namespace vgfw
24792482
return *this;
24802483
}
24812484

2485+
RenderContext& RenderContext::setUniformVec2(const std::string& name, const glm::vec2& v)
2486+
{
2487+
const auto location = glGetUniformLocation(m_CurrentPipeline.m_Program, name.data());
2488+
if (location != GL_INVALID_INDEX)
2489+
{
2490+
glProgramUniform2fv(m_CurrentPipeline.m_Program, location, 1, glm::value_ptr(v));
2491+
}
2492+
return *this;
2493+
}
2494+
24822495
RenderContext& RenderContext::setUniformVec3(const std::string& name, const glm::vec3& v)
24832496
{
24842497
const auto location = glGetUniformLocation(m_CurrentPipeline.m_Program, name.data());
@@ -3500,7 +3513,9 @@ namespace vgfw
35003513

35013514
namespace resource
35023515
{
3503-
void MeshPrimitive::build(renderer::VertexFormat::Builder& vertexFormatBuilder, const glm::vec3& scale, renderer::RenderContext& rc)
3516+
void MeshPrimitive::build(renderer::VertexFormat::Builder& vertexFormatBuilder,
3517+
const glm::vec3& scale,
3518+
renderer::RenderContext& rc)
35043519
{
35053520
vertexFormat = vertexFormatBuilder.build();
35063521
indexCount = indices.size();
@@ -3714,9 +3729,9 @@ namespace vgfw
37143729
{
37153730
std::string inputfile = modelPath.generic_string();
37163731
tinyobj::ObjReaderConfig readerConfig;
3717-
3718-
// The MTL file path was not correctly parsed when loading the OBJ model, causing the material file to fail to load.
3719-
// Comment out this line to load the MTL file from the same directory as the OBJ file.
3732+
3733+
// The MTL file path was not correctly parsed when loading the OBJ model, causing the material file to fail
3734+
// to load. Comment out this line to load the MTL file from the same directory as the OBJ file.
37203735
// readerConfig.mtl_search_path = "./"; // Path to material files
37213736

37223737
tinyobj::ObjReader reader;

0 commit comments

Comments
 (0)