Commits

Jason McKesson committed 49b82f5

Tut14: Now using Infinity symbol for mesh. Has proper texture coordinates.

Comments (0)

Files changed (7)

Meshes/ConvCollada.lua

 end
 
 
-local colladaDoc = wx.wxXmlDocument(inputFile);
+local colladaDoc, test = wx.wxXmlDocument(inputFile);
 assert(colladaDoc, "Could not load XML file \"" .. inputFile .. "\"");
-assert(colladaDoc:GetRoot(), "Could not load XML file \"" .. inputFile .. "\"");
+print(inputFile);
+assert(colladaDoc:IsOk(), "Could not load XML file \"" .. inputFile .. "\"");
 
 local xColladaElem = colladaDoc:GetRoot();
 

Meshes/stdmap.txt

 VERTEX=0
 NORMAL=2
-COLOR=1
+COLOR=1
+TEXCOORD=5

Tut 14 Textures Are Not Pictures/Basic Texture.cpp

 
 	try
 	{
-		g_pObjectMesh = new Framework::Mesh("UnitSphere.xml");
+		g_pObjectMesh = new Framework::Mesh("Infinity.xml");
 		g_pCubeMesh = new Framework::Mesh("UnitCube.xml");
 	}
 	catch(std::exception &except)
 			Framework::MatrixStackPusher push(modelMatrix);
 
 			modelMatrix.Translate(glm::vec3(CalcLightPosition()));
-			modelMatrix.Scale(0.5f);
+			modelMatrix.Scale(0.25f);
 
 			glUseProgram(g_Unlit.theProgram);
 			glUniformMatrix4fv(g_Unlit.modelToCameraMatrixUnif, 1, GL_FALSE,
 
 			modelMatrix.SetIdentity();
 			modelMatrix.Translate(glm::vec3(0.0f, 0.0f, -g_mousePole.GetLookAtDistance()));
+			modelMatrix.Scale(0.25f);
 
 			glDisable(GL_DEPTH_TEST);
 			glDepthMask(GL_FALSE);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.