X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.cpp;h=ee1159532728a0a834705fa9de8eb9dd91c35932;hp=5ffe05a4e59f71e305fddcad42ea1dedd264328f;hb=511a2c92fcb9dda82dd5d38b91ea03790d0cb7b2;hpb=0291188124d08368ce28b308482604218bd75393

diff --git a/model.cpp b/model.cpp
index 5ffe05a..ee11595 100644
--- a/model.cpp
+++ b/model.cpp
@@ -146,7 +146,7 @@ void Model::Node::draw(	const std::vector<Mesh> &meshes,
 	for (Node *child: children) child->draw(meshes, materials, skybox, m);
 }
 
-Model::Model(const std::string &path, Program p, Skybox s): program(p), skybox(s) {
+Model::Model(const std::string &path, Program p): program(p) {
 	glUseProgram(p.progId);
 	
 	const aiScene *scene = importer.ReadFile(path, 
@@ -169,7 +169,7 @@ Model::Model(const std::string &path, Program p, Skybox s): program(p), skybox(s
 	root = new Node(*(scene->mRootNode), p.progId);
 }
 
-void Model::draw() const {
+void Model::draw(Skybox skybox) const {
 	glUseProgram(program.progId);
 	root->draw(meshes, materials, skybox);
 	program.validate();