eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 02:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid Clang compilation warnings

Browse Source
This commit is contained in:
brunoherbelin
2020-03-31 20:52:00 +02:00
parent 2fc01e8435
commit da8e124ad1
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Primitives.cpp
View File

@@ -121,7 +121,7 @@ void MediaRectangle::update( float dt )
LineStrip::LineStrip(std::vector<glm::vec3> points, glm::vec3 color) LineStrip::LineStrip(std::vector<glm::vec3> points, glm::vec3 color)
{ {
for(int i = 0; i < points.size(); ++i) for(size_t i = 0; i < points.size(); ++i)
{ {
points_.push_back( points[i] ); points_.push_back( points[i] );
colors_.push_back( color ); colors_.push_back( color );

6
Primitives.h
View File

@@ -14,7 +14,7 @@ class TexturedRectangle : public Primitive {
public: public:
TexturedRectangle(const std::string& resourcepath); TexturedRectangle(const std::string& resourcepath);
void draw(glm::mat4 modelview, glm::mat4 projection); void draw(glm::mat4 modelview, glm::mat4 projection) override;
void accept(Visitor& v) override { v.visit(*this); } void accept(Visitor& v) override { v.visit(*this); }
std::string getResourcePath() { return texturepath_; } std::string getResourcePath() { return texturepath_; }
@@ -34,8 +34,8 @@ public:
MediaRectangle(const std::string& mediapath); MediaRectangle(const std::string& mediapath);
~MediaRectangle(); ~MediaRectangle();
void update ( float dt ); void update ( float dt ) override;
void draw(glm::mat4 modelview, glm::mat4 projection); void draw(glm::mat4 modelview, glm::mat4 projection) override;
void accept(Visitor& v) override { v.visit(*this); } void accept(Visitor& v) override { v.visit(*this); }
std::string getMediaPath() { return mediapath_; } std::string getMediaPath() { return mediapath_; }

10
Scene.h
View File

@@ -41,8 +41,8 @@ public:
Primitive() : Node(), shader_(nullptr), vao_(0), arrayBuffer_(0), elementBuffer_(0), drawingPrimitive_(0) {} Primitive() : Node(), shader_(nullptr), vao_(0), arrayBuffer_(0), elementBuffer_(0), drawingPrimitive_(0) {}
virtual ~Primitive(); virtual ~Primitive();
virtual void init (); virtual void init () override;
virtual void draw ( glm::mat4 modelview, glm::mat4 projection); virtual void draw ( glm::mat4 modelview, glm::mat4 projection) override;
virtual void accept(Visitor& v) override { v.visit(*this); } virtual void accept(Visitor& v) override { v.visit(*this); }
Shader *getShader() { return shader_; } Shader *getShader() { return shader_; }
@@ -68,9 +68,9 @@ public:
Group() : Node() {} Group() : Node() {}
virtual ~Group(); virtual ~Group();
virtual void init (); virtual void init () override;
virtual void update ( float dt ); virtual void update ( float dt ) override;
virtual void draw ( glm::mat4 modelview, glm::mat4 projection); virtual void draw ( glm::mat4 modelview, glm::mat4 projection) override;
virtual void accept(Visitor& v) override { v.visit(*this); } virtual void accept(Visitor& v) override { v.visit(*this); }
virtual void addChild ( Node *child ); virtual void addChild ( Node *child );

4
Shader.cpp
View File

@@ -132,12 +132,12 @@ void ShadingProgram::checkCompileErr()
glGetShaderiv(vertex_id_, GL_COMPILE_STATUS, &success); glGetShaderiv(vertex_id_, GL_COMPILE_STATUS, &success);
if (!success) { if (!success) {
glGetShaderInfoLog(vertex_id_, 1024, NULL, infoLog); glGetShaderInfoLog(vertex_id_, 1024, NULL, infoLog);
Log::Warning("Error compiling Vertex ShadingProgram:\n%s \n%s", infoLog, vertex_code_); Log::Warning("Error compiling Vertex ShadingProgram:\n%s \n%s", infoLog, vertex_code_.c_str());
} }
glGetShaderiv(fragment_id_, GL_COMPILE_STATUS, &success); glGetShaderiv(fragment_id_, GL_COMPILE_STATUS, &success);
if (!success) { if (!success) {
glGetShaderInfoLog(fragment_id_, 1024, NULL, infoLog); glGetShaderInfoLog(fragment_id_, 1024, NULL, infoLog);
Log::Warning("Error compiling Fragment ShadingProgram:\n%s \n%s", infoLog, vertex_code_); Log::Warning("Error compiling Fragment ShadingProgram:\n%s \n%s", infoLog, vertex_code_.c_str());
} }
} }