Mercurial > hg > Game > WebGL

comparison drawObj/drawObj.html @ 7:ceaf668dd4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit`\
author dimolto
date Thu, 19 Apr 2012 16:28:41 +0900
parents a6215e33597a
children 49b0d0c7d613
comparison
equal deleted inserted replaced
6:a6215e33597a 7:ceaf668dd4b2
67 gl.uniform1i(gl.getUniformLocation(gl.program, "sampler2d"), 0); 67 gl.uniform1i(gl.getUniformLocation(gl.program, "sampler2d"), 0);
68 68
69 gl.enable(gl.TEXTURE_2D); 69 gl.enable(gl.TEXTURE_2D);
70 70
71 modelMap = new XMLModelMap(gl); 71 modelMap = new XMLModelMap(gl);
72 // modelMap.load("./xml/Cube.xml"); 72 // modelMap.load("./xml/Cube.xml");
73 modelMap.load("./xml/Musi.xml"); 73 modelMap.load("./xml/musi.xml");
74 // modelMap.load("./xml/test.xml");
74 object = modelMap["Musi"]; 75 object = modelMap["Musi"];
75 76
76 return gl; 77 return gl;
77 } 78 }
78 79