change project structure
This commit is contained in:
parent
eb729f3bc0
commit
6d279358ab
@ -41,6 +41,10 @@ include_directories(${SNDFILE_INCLUDE_DIRS})
|
|||||||
pkg_search_module(FFTW3F REQUIRED fftw3f)
|
pkg_search_module(FFTW3F REQUIRED fftw3f)
|
||||||
include_directories(${FFTW3F_INCLUDE_DIRS})
|
include_directories(${FFTW3F_INCLUDE_DIRS})
|
||||||
|
|
||||||
aux_source_directory(src SOURCE_FILES)
|
aux_source_directory(src MAIN_SOURCE_FILES)
|
||||||
add_executable(glTest ${SOURCE_FILES})
|
aux_source_directory(src/Audio AUDIO_SOURCE_FILES)
|
||||||
|
aux_source_directory(src/GLObjects GLOBJECTS_SOURCE_FILES)
|
||||||
|
aux_source_directory(src/Shaders SHADERS_SOURCE_FILES)
|
||||||
|
|
||||||
|
add_executable(glTest ${MAIN_SOURCE_FILES} ${AUDIO_SOURCE_FILES} ${GLOBJECTS_SOURCE_FILES} ${SHADERS_SOURCE_FILES})
|
||||||
target_link_libraries(glTest ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} ${GLEW_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${SNDFILE_LIBRARIES} ${FFTW3F_LIBRARIES})
|
target_link_libraries(glTest ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} ${GLEW_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${SNDFILE_LIBRARIES} ${FFTW3F_LIBRARIES})
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#define GLTEST_GLOBJECT_H
|
#define GLTEST_GLOBJECT_H
|
||||||
|
|
||||||
#include "IGLObject.h"
|
#include "IGLObject.h"
|
||||||
#include "ShaderProgram.h"
|
#include "../Shaders/ShaderProgram.h"
|
||||||
#include "vertex.h"
|
#include "vertex.h"
|
||||||
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
@ -6,7 +6,7 @@
|
|||||||
#define GLTEST_MESH_H
|
#define GLTEST_MESH_H
|
||||||
|
|
||||||
#include "vertex.h"
|
#include "vertex.h"
|
||||||
#include "ShaderProgram.h"
|
#include "../Shaders/ShaderProgram.h"
|
||||||
#include "GLObject.h"
|
#include "GLObject.h"
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
21
src/main.cpp
21
src/main.cpp
@ -1,22 +1,15 @@
|
|||||||
#include <GL/glew.h>
|
#include "Shaders/ShaderProgram.h"
|
||||||
|
#include "GLObjects/WaveMesh.h"
|
||||||
|
#include "Audio/AudioPlayer.h"
|
||||||
|
#include "GLObjects/SpectralMesh.h"
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
#include "ShaderProgram.h"
|
#include <glm/gtc/type_ptr.hpp>
|
||||||
#include "WaveMesh.h"
|
|
||||||
#include "AudioPlayer.h"
|
|
||||||
#include "SpectralMesh.h"
|
|
||||||
|
|
||||||
#include <portaudio.h>
|
|
||||||
#include <sndfile.h>
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cmath>
|
|
||||||
|
|
||||||
#include <glm/gtc/matrix_transform.hpp>
|
|
||||||
#include <glm/gtc/type_ptr.hpp>
|
|
||||||
|
|
||||||
|
|
||||||
glm::vec3 eye(0.0f, 0.0f, 4.0f), at(0.0f, 0.0f, 0.0f), up(0.0f, 1.0f, 0.0f);
|
glm::vec3 eye(0.0f, 0.0f, 4.0f), at(0.0f, 0.0f, 0.0f), up(0.0f, 1.0f, 0.0f);
|
||||||
glm::mat4 mView = glm::lookAt(eye, at, up);
|
glm::mat4 mView = glm::lookAt(eye, at, up);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user