1.1 --- a/scripts/cube.js Tue Apr 26 01:48:56 2011 +0200
1.2 +++ b/scripts/cube.js Tue Apr 26 03:06:56 2011 +0200
1.3 @@ -46,19 +46,56 @@
1.4 this.positionBuffer.itemSize = 3;
1.5 this.positionBuffer.numItems = 24;
1.6
1.7 + this.normalBuffer = gl.createBuffer();
1.8 + gl.bindBuffer(gl.ARRAY_BUFFER, this.normalBuffer);
1.9 + var normals = [// font face
1.10 + 0.0, 0.0, 1.0,
1.11 + 0.0, 0.0, 1.0,
1.12 + 0.0, 0.0, 1.0,
1.13 + 0.0, 0.0, 1.0,
1.14 + // back face
1.15 + 0.0, 0.0, -1.0,
1.16 + 0.0, 0.0, -1.0,
1.17 + 0.0, 0.0, -1.0,
1.18 + 0.0, 0.0, -1.0,
1.19 + // top face
1.20 + 0.0, 1.0, 0.0,
1.21 + 0.0, 1.0, 0.0,
1.22 + 0.0, 1.0, 0.0,
1.23 + 0.0, 1.0, 0.0,
1.24 + // bottom face
1.25 + 0.0, -1.0, 0.0,
1.26 + 0.0, -1.0, 0.0,
1.27 + 0.0, -1.0, 0.0,
1.28 + 0.0, -1.0, 0.0,
1.29 + // right face
1.30 + 1.0, 0.0, 0.0,
1.31 + 1.0, 0.0, 0.0,
1.32 + 1.0, 0.0, 0.0,
1.33 + 1.0, 0.0, 0.0,
1.34 + // left face
1.35 + -1.0, 0.0, 0.0,
1.36 + -1.0, 0.0, 0.0,
1.37 + -1.0, 0.0, 0.0,
1.38 + -1.0, 0.0, 0.0];
1.39 + gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(normals), gl.STATIC_DRAW);
1.40 + this.normalBuffer.itemSize = 3;
1.41 + this.normalBuffer.numItems = 24;
1.42 +
1.43 this.colourBuffer = gl.createBuffer();
1.44 gl.bindBuffer(gl.ARRAY_BUFFER, this.colourBuffer);
1.45 var alpha = 1.0;
1.46 - var colours = [[1.0, 0.0, 0.0, alpha],
1.47 - [0.0, 1.0, 0.0, alpha],
1.48 - [0.0, 0.0, 1.0, alpha],
1.49 - [1.0, 0.0, 1.0, alpha],
1.50 - [1.0, 1.0, 0.0, alpha],
1.51 - [0.0, 1.0, 1.0, alpha]];
1.52 + var uni = [1.0, 1.0, 1.0, alpha];
1.53 + var colours = [[0.0, 0.0, 0.0, alpha],
1.54 + [0.0, 0.0, 0.0, alpha],
1.55 + [0.0, 0.0, 0.0, alpha],
1.56 + [0.0, 0.0, 0.0, alpha],
1.57 + [0.0, 0.0, 0.0, alpha],
1.58 + [0.0, 0.0, 0.0, alpha]];
1.59 var unpackedColours = [];
1.60 for (var i in colours)
1.61 {
1.62 - var colour = colours[i];
1.63 + var colour = uni;//colours[i];
1.64 for (var j = 0; j < 4; j++)
1.65 {
1.66 unpackedColours = unpackedColours.concat(colour);
1.67 @@ -80,39 +117,4 @@
1.68 gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, new Uint16Array(indices), gl.STATIC_DRAW);
1.69 this.indexBuffer.itemSize = 1;
1.70 this.indexBuffer.numItems = 36;
1.71 -
1.72 - this.normalBuffer = gl.createBuffer();
1.73 - gl.bindBuffer(gl.ARRAY_BUFFER, this.normalBuffer);
1.74 - var normals = [// font face
1.75 - 0.0, 0.0, 1.0,
1.76 - 0.0, 0.0, 1.0,
1.77 - 0.0, 0.0, 1.0,
1.78 - // back face
1.79 - 0.0, 0.0, -1.0,
1.80 - 0.0, 0.0, -1.0,
1.81 - 0.0, 0.0, -1.0,
1.82 - 0.0, 0.0, -1.0,
1.83 - // top face
1.84 - 0.0, 1.0, 0.0,
1.85 - 0.0, 1.0, 0.0,
1.86 - 0.0, 1.0, 0.0,
1.87 - 0.0, 1.0, 0.0,
1.88 - // bottom face
1.89 - 0.0, -1.0, 0.0,
1.90 - 0.0, -1.0, 0.0,
1.91 - 0.0, -1.0, 0.0,
1.92 - 0.0, -1.0, 0.0,
1.93 - // right face
1.94 - 1.0, 0.0, 0.0,
1.95 - 1.0, 0.0, 0.0,
1.96 - 1.0, 0.0, 0.0,
1.97 - 1.0, 0.0, 0.0,
1.98 - // left face
1.99 - -1.0, 0.0, 0.0,
1.100 - -1.0, 0.0, 0.0,
1.101 - -1.0, 0.0, 0.0,
1.102 - -1.0, 0.0, 0.0];
1.103 - gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(normals), gl.STATIC_DRAW);
1.104 - this.normalBuffer.itemSize = 3;
1.105 - this.normalBuffer.numItems = 24;
1.106 }
1.107 \ No newline at end of file