Mercurial > hg > Game > WebGL
comparison drawObj/drawObj.html @ 6:a6215e33597a
add Musi.xml
author | Syusaku Morita <e105716@ie.u-ryukyu.ac.jp> |
---|---|
date | Thu, 19 Apr 2012 16:02:19 +0900 |
parents | 85896f291a95 |
children | ceaf668dd4b2 |
comparison
equal
deleted
inserted
replaced
5:85896f291a95 | 6:a6215e33597a |
---|---|
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 object = modelMap["Cube"]; | 73 modelMap.load("./xml/Musi.xml"); |
74 object = modelMap["Musi"]; | |
74 | 75 |
75 return gl; | 76 return gl; |
76 } | 77 } |
77 | 78 |
78 function XMLModelMap(gl) { | 79 function XMLModelMap(gl) { |