diff --git a/sources/main.cpp b/sources/main.cpp index d36e257..9fdf5f4 100755 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -320,28 +320,26 @@ /* end cube */ /* begin import */ - //char* modelfile = "obj/sample2.obj"; - char* modelfile = "obj/shuttle.obj"; - //char* modelfile = "obj/sample2.obj"; - //char* modelfile = "obj/sample.obj"; - //char* modelfile = "obj/untitled.obj"; - //char* modelfile = "obj/teapot.obj"; - //char* modelfile = "obj/castle.obj"; - //char* modelfile = "obj/chaiselongue.obj"; + char* modelfile = "obj/chaiselongue.obj"; Model* myModel = importModel(modelfile); printf("imported %s : %d faces\n", modelfile, myModel->numFaces()); Vec myCen = Vec(5,-10,5); myModel->setCenter(myCen); - myModel->setMaterial(Color(1,0,1), Color(1,0,1)); + myModel->setMaterial(Color(0,0,1), Color(1,1,1)); myModel->setPosition(myCen); //myModel->showNormals(); myModel->setDelta(PI/2.0); userAnim->addThing((Thing*)myModel); - //myModel->vardump(""); - + Model* shuttle = importModel("obj/shuttle.obj"); + + shuttle->setDelta(PI/2.0); + myModel->setMaterial(Color(1,1,1), Color(1,0,1)); + + userAnim->addThing((Thing*)shuttle); + /* end import */ // Prepare configuration: @@ -559,6 +557,8 @@ //draw imported model myModel->draw(); + shuttle->draw(); + ////////////////