diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index 7f79608..7ce9981 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -85,14 +85,14 @@ void SceneViewer::initializeGL() { fragmentShader_ter.dispose(); - Model* backpackModel = new Model("D:\\ProgrammingFile\\SceneEditor\\Models\\backpack\\backpack.obj"); + Model* backpackModel = new Model("../Models/backpack/backpack.obj"); Logger::info("Model loaded"); Renderable backpack(backpackModel); _objects.push_back(backpack); - sky = new skybox("D:/ProgrammingFile/SceneEditor/skybox"); + sky = new skybox("../skybox"); - ter = new Terrain(); + ter = new Terrain("../terrain"); _camera.setPosition(glm::vec3(0.0f, 0.0f, 5.0f)); } diff --git a/FinalProject/terrain.cpp b/FinalProject/terrain.cpp index ad202ea..f369ea4 100644 --- a/FinalProject/terrain.cpp +++ b/FinalProject/terrain.cpp @@ -4,12 +4,12 @@ #include #include -Terrain::Terrain(int rows, int cols):row_num(rows),col_num(cols) { +Terrain::Terrain(std::string path){ Vertex.clear(); Indicess.clear(); int imgW, imgH, imgChannel; - unsigned char* data = stbi_load("D:/ProgrammingFile/SceneEditor/terrain/heightmap.jpg", &imgW, &imgH, &imgChannel, 1); + unsigned char* data = stbi_load((path + "/heightmap.jpg").c_str(), &imgW, &imgH, &imgChannel, 1); int index1 = 0, index = 0; @@ -83,7 +83,7 @@ Terrain::Terrain(int rows, int cols):row_num(rows),col_num(cols) { OPENGL_EXTRA_FUNCTIONS->glBindVertexArray(0); //textureID = loadTexture2(texName, GL_REPEAT, GL_REPEAT, GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR); - tex = loadTexture("D:/ProgrammingFile/SceneEditor/terrain/rock.jpg"); + tex = loadTexture(path + "/texture.jpg"); } diff --git a/FinalProject/terrain.h b/FinalProject/terrain.h index bfcc8c9..aa5aa85 100644 --- a/FinalProject/terrain.h +++ b/FinalProject/terrain.h @@ -10,10 +10,9 @@ private: std::vector Vertex; std::vector Indicess; unsigned int VAO, VBO, EBO; - int row_num, col_num; public: - unsigned int dep, tex; - Terrain(int rows = 200, int cols = 200); + unsigned int tex; + Terrain(std::string path); void render(); unsigned int loadTexture(std::string path); }; \ No newline at end of file diff --git a/terrain/rock.jpg b/terrain/texture.jpg similarity index 100% rename from terrain/rock.jpg rename to terrain/texture.jpg