summaryrefslogtreecommitdiff
path: root/src/glwidget.h
diff options
context:
space:
mode:
authorjjesswan <jessica_wan@brown.edu>2024-05-07 06:02:29 -0400
committerjjesswan <jessica_wan@brown.edu>2024-05-07 06:02:29 -0400
commit6a45579dbbf991c0e12ce59958e3b533d19fc9d4 (patch)
tree83ad11d63c0a1d1c89b9469455ecbda4531fe6ac /src/glwidget.h
parentcb868acadcae4e3f497ecdabeca507f3e73e01c7 (diff)
rotating skyboxgit add -A
Diffstat (limited to 'src/glwidget.h')
-rwxr-xr-xsrc/glwidget.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/glwidget.h b/src/glwidget.h
index 42cfd83..006f027 100755
--- a/src/glwidget.h
+++ b/src/glwidget.h
@@ -1,8 +1,8 @@
#pragma once
-#ifdef __APPLE__
-#define GL_SILENCE_DEPRECATION
-#endif
+#include "skybox.h"
+#include <GL/glew.h>
+
#include "arap.h"
#include "graphics/camera.h"
@@ -52,6 +52,8 @@ private:
void paintCaustics();
TextureData loadTextureFromFile(const char *path);
+ GLuint loadCubeMap(std::vector<const char*> textureFiles);
+
private slots:
// Physics Tick
@@ -66,6 +68,8 @@ private:
Shader *m_colorShader;
Shader *m_foamShader;
+ Shader *m_skyboxShader;
+
GLuint m_fullscreen_vbo;
@@ -110,4 +114,6 @@ private:
bool m_rightCapture;
SelectMode m_rightClickSelectMode;
int m_lastSelectedVertex = -1;
+
+ skybox m_skybox;
};