Add Juno

objects/juno/Juno.mtl

+# Blender MTL File: 'JunoOBJ.blend'
+# Material Count: 9
+
+newmtl black_krinkle
+Ns 100.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.003917 0.003917 0.003917
+Ks 0.192187 0.192187 0.192187
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+norm texture/foil_n.png
+
+newmtl foil_ant
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/foil_silver_ramp.png
+norm texture/foil_antenna2_n.png
+
+newmtl foil_gold
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.557647 0.412941 0.056471
+Ks 0.866667 0.850980 0.658824
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/foil_gold_ramp.png
+norm texture/foil_n.png
+
+newmtl foil_silver
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.578934 0.578934 0.578934
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/foil_silver_ramp.png
+norm texture/foil_n.png
+
+newmtl new
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.138215 0.137052 0.143085
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 0.000000
+illum 1
+map_Kd texture/foil_silver_ramp.png
+norm texture/foil_antenna2_n.png
+
+newmtl shiny_panels
+Ns 1000.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.671875 0.616273 0.231092
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/Juno_Texture_Solar.png
+
+newmtl solar_panels
+Ns 754.901961
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.424119 0.160458
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/Juno_Texture_Solar2.png
+
+newmtl tex_01
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd texture/Juno_Texture.png
+
+newmtl tex_01_A
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 0.000000
+illum 2
+map_Kd texture/Juno_Texture.png

src/application.cpp

@@ -93,7 +93,9 @@ void Application::render() {
 	glBindVertexArray(teapot.vao());
 	glDrawElementsInstanced(teapot.mode(), teapot.indicesCount(), GL_UNSIGNED_INT, nullptr, 2048);
 
-	pioneerModelMatrix = glm::rotate(pioneerModelMatrix, 0.005f , glm::vec3(0.0f, 1.0f, 0.0f));
+	pioneerModelMatrix = glm::rotate(pioneerModelMatrix, 0.005f, glm::vec3(1.0f, 0.0f, 0.0f));
+	pioneerModelMatrix = glm::rotate(pioneerModelMatrix, 0.005f, glm::vec3(0.0f, 1.0f, 0.0f));
+	pioneerModelMatrix = glm::rotate(pioneerModelMatrix, 0.005f, glm::vec3(0.0f, 0.0f, 1.0f));
 	for (auto& mesh : pioneer.meshes()) {
 		GLuint program = mesh->material() && mesh->material()->normalTexture()
 		    ? normalMappedObjectProgram.id()

src/application.hpp

@@ -68,7 +68,7 @@ private:
 	Mesh teapot = Mesh::teapot();
 	Mesh polarTeapot = Mesh::polarTeapot();
 
-	Scene pioneer = Scene("objects/cassini/cassini.obj");
+	Scene pioneer = Scene("objects/juno/Juno.obj");
 
 	ObjectUBO jupiterObject;
 	ObjectUBO dustObject;