Update code and models

This commit is contained in:
2020-04-02 00:55:18 +02:00
parent b9a007dd51
commit d85c6073ec
10 changed files with 51 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
#ifndef GLOBALCANVASSETTINGS_H
#define GLOBALCANVASSETTINGS_H
#include <glm/glm.hpp>
//#include <glm/glm.hpp>
class GlobalCanvasSettings
{

View File

@@ -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

View File

@@ -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

View File

@@ -3,7 +3,7 @@
#include <string>
#include <epoxy/gl.h>
#include <glm/glm.hpp>
//#include <glm/glm.hpp>
class OpenGlShaderProgram
{