diff --git a/LoadingModels/main.cpp b/LoadingModels/main.cpp index f4e1f66..6b36085 100644 --- a/LoadingModels/main.cpp +++ b/LoadingModels/main.cpp @@ -28,7 +28,7 @@ std::stacktransforms; GLuint pyrTex; Sphere sphere(48); -Torus torus(0.5,0.2,48); +Torus torus(1.9,0.4,48); void setupVertices(void) { glGenVertexArrays(1, vao); @@ -99,7 +99,7 @@ void setupVertices(void) { } void setupTextures(){ - pyrTex=utils::loadTexture("earth.jpg"); + pyrTex=utils::loadTexture("saturn.jpg"); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D,pyrTex); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); @@ -171,7 +171,14 @@ void display(GLFWwindow* window, double currentTime) { mMat=glm::translate(glm::mat4(1.0f),{0.f,0.f,0.f}); mMat=glm::rotate(mMat,float(currentTime/4),{0.f,1.f,0.4f}); - mMat=glm::scale(mMat,{5,5,5}); + mMat=glm::scale(mMat,{3,3,3}); + mvMat=vMat*mMat; + + DrawSphere(); + + mMat=glm::translate(glm::mat4(1.0f),{0.f,0.f,0.f}); + mMat=glm::rotate(mMat,float(currentTime/4),{0.f,1.f,0.4f}); + mMat=glm::scale(mMat,{3,0.1,3}); mvMat=vMat*mMat; DrawTorus(); diff --git a/LoadingModels/saturn.jpg b/LoadingModels/saturn.jpg new file mode 100644 index 0000000..c0d3f5f Binary files /dev/null and b/LoadingModels/saturn.jpg differ