Skip to content

Commit e3415be

Browse files
committed
fix bugs
1 parent 7288d93 commit e3415be

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

glutil-shaderprog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ ShaderProgram._compileShaders=function(context, vertexShader, fragmentShader){
302302
var lines=text.split("\n")
303303
// add line numbers
304304
for(var i=0;i<lines.length;i++){
305-
lines[i]=(i+1)+" "+lines[i]
305+
lines[i]="/* "+(i+1)+" */ "+lines[i]
306306
}
307307
console.log(lines.join("\n"));
308308
console.log((kind==context.VERTEX_SHADER ? "vertex: " : "fragment: ")+

glutil-transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ Transform.prototype.getMatrix=function(){
265265
this.matrix=[1,0,0,0,0,1,0,0,0,0,1,0,
266266
this.position[0],
267267
this.position[1],
268-
this.position[2],0];
268+
this.position[2],1];
269269
// 2. rotation
270270
if(!GLMath.quatIsIdentity(this.rotation)){
271271
this.matrix=GLMath.mat4multiply(this.matrix,

glutil_min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

squares.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@
1313
at: http://upokecenter.dreamhosters.com/articles/donate-now-2/
1414
*/
1515

16-
function createQuad(x,y,width,height){
17-
var builder=new Mesh();
18-
builder.mode(Mesh.QUAD_STRIP);
19-
var x2=x+width;
20-
var y2=y+height;
21-
builder.vertex3(x,y,0);
22-
builder.vertex3(x,y2,0);
23-
var slices=10;
24-
for(var i=1;i<=slices;i++){
25-
builder.vertex3(x+(x2-x)*i/slices,y,0);
26-
builder.vertex3(x+(x2-x)*i/slices,y2,0);
27-
}
28-
return builder.recalcNormals();
29-
};
30-
3116
var scene3d=null;
3217
var currentFilter=null;
3318

0 commit comments

Comments
 (0)