Commits

Jason McKesson committed 9e1bb26 Merge

Merge

Comments (0)

Files changed (10)

 website/*
 glload/*.sln
 glload/*.vcproj
+*.blend?

Documents/Texturing.xml

             is that they aren't <emphasis>that</emphasis> important. What you have learned is how to
             think about solving graphics problems without textures.</para>
         <para>Many graphics texts overemphasize the importance of textures. This is mostly a legacy
-            of the past. In the older days, before real programmable hardware, you needed textures
-            to do anything of real importance in graphics rendering. Textures were used to simulate
-            lighting and various other effects. If you wanted to do anything like per-fragment
-            lighting, you had to use textures to do it.</para>
+            of the past. In the older days, before the availability real programmable hardware, you
+            needed textures to do anything of real importance in graphics rendering. Textures were
+            used to simulate lighting and various other effects. If you wanted to do anything like
+            per-fragment lighting, you had to use textures to do it.</para>
         <para>Yes, textures are important for creating details in rendered images. They are
             important for being able to vary material parameters over a polygonal surface. And they
             have value in other areas as well. But there is so much more to rendering than textures,

Documents/Tutorial Documents.xpr

         <file name="meshFormat.rnc"/>
         <file name="Outline.xml"/>
         <file name="preface.xml"/>
+        <file name="Texturing.xml"/>
         <file name="Tutorials.xml"/>
     </projectTree>
 </project>

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.