Minor fixes to include paths and CMakeLists
Removed draw call from model constructor with filename
This commit is contained in:
parent
4050410039
commit
0fea63c566
3 changed files with 15 additions and 3 deletions
|
@ -11,7 +11,20 @@ if(NOT ${OPENGL_GLU_FOUND})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(tests_opengl
|
add_executable(tests_opengl
|
||||||
src/main.cpp src/displayers.h src/displayers.cpp src/DataHandling/Texture.cpp src/DataHandling/Texture.h src/DataHandling/Model3D.cpp src/DataHandling/Model3D.h src/types.h)
|
src/main.cpp
|
||||||
|
src/displayers.h
|
||||||
|
src/displayers.cpp
|
||||||
|
src/DataHandling/Texture.cpp
|
||||||
|
src/DataHandling/Texture.h
|
||||||
|
src/DataHandling/Model3D.cpp
|
||||||
|
src/DataHandling/Model3D.h
|
||||||
|
src/types.h)
|
||||||
|
|
||||||
|
target_link_directories(tests_opengl PRIVATE
|
||||||
|
src)
|
||||||
|
|
||||||
|
target_include_directories(tests_opengl PRIVATE
|
||||||
|
src)
|
||||||
|
|
||||||
target_link_libraries(tests_opengl
|
target_link_libraries(tests_opengl
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
|
|
|
@ -11,7 +11,6 @@ Model3D::Model3D() : vertex_count(0), face_count(0), texture_count(0), is_textur
|
||||||
Model3D::Model3D(const std::string& file_name) : Model3D()
|
Model3D::Model3D(const std::string& file_name) : Model3D()
|
||||||
{
|
{
|
||||||
load_ascii_off_file(file_name);
|
load_ascii_off_file(file_name);
|
||||||
draw_model();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Model3D::~Model3D()
|
Model3D::~Model3D()
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "GL/glut.h"
|
#include "GL/glut.h"
|
||||||
|
|
||||||
#include "../types.h"
|
#include "types.h"
|
||||||
#include "Texture.h"
|
#include "Texture.h"
|
||||||
|
|
||||||
class Model3D {
|
class Model3D {
|
||||||
|
|
Loading…
Add table
Reference in a new issue