Update code and models
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef GLOBALCANVASSETTINGS_H
|
||||
#define GLOBALCANVASSETTINGS_H
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
//#include <glm/glm.hpp>
|
||||
|
||||
class GlobalCanvasSettings
|
||||
{
|
||||
|
@@ -4,8 +4,8 @@
|
||||
#include <opengl-playground/opengltexture.hpp>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
//#include <glm/glm.hpp>
|
||||
#include <iostream>
|
||||
|
||||
class Material
|
||||
{
|
||||
@@ -42,6 +42,8 @@ class Material
|
||||
glm::vec3 diff_color;
|
||||
glm::vec3 ambient_color;
|
||||
glm::vec3 specular_color;
|
||||
|
||||
friend std::ostream &operator<<(std::ostream &os, Material const &material);
|
||||
};
|
||||
|
||||
#endif // MATERIAL_H
|
||||
|
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <epoxy/gl.h>
|
||||
#include <opengl-playground/openglshader.hpp>
|
||||
#include <glm/glm.hpp>
|
||||
//#include <glm/glm.hpp>
|
||||
#include <memory>
|
||||
|
||||
class OpenGlGraphics
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <epoxy/gl.h>
|
||||
#include <glm/glm.hpp>
|
||||
//#include <glm/glm.hpp>
|
||||
|
||||
class OpenGlShaderProgram
|
||||
{
|
||||
|
Reference in New Issue
Block a user