Skip to content

Commit 55df933

Browse files
committed
cleanup
1 parent 64c9041 commit 55df933

File tree

2 files changed

+370
-364
lines changed

2 files changed

+370
-364
lines changed

SunSpider/3d-cube.js

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ function run() {
99
var I = new Array(); // entity matrix
1010
var Origin = new Object();
1111
var Testing = new Object();
12-
var LoopTimer;
1312

1413
var validation = {
1514
20: 2889.0000000000045,
@@ -32,7 +31,7 @@ function run() {
3231
var x = x1;
3332
var y = y1;
3433
var IncX1, IncY1;
35-
var IncX2, IncY2;
34+
var IncX2, IncY2;
3635
var Den;
3736
var Num;
3837
var NumAdd;
@@ -84,13 +83,14 @@ function run() {
8483
}
8584

8685
function CalcNormal(V0, V1, V2) {
87-
var A = new Array(); var B = new Array();
86+
var A = new Array();
87+
var B = new Array();
8888
for (var i = 0; i < 3; i++) {
8989
A[i] = V0[i] - V1[i];
9090
B[i] = V2[i] - V1[i];
9191
}
9292
A = CalcCross(A, B);
93-
var Length = Math.sqrt(A[0]*A[0] + A[1]*A[1] + A[2]*A[2]);
93+
var Length = Math.sqrt(A[0]*A[0] + A[1]*A[1] + A[2]*A[2]);
9494
for (var i = 0; i < 3; i++) A[i] = A[i] / Length;
9595
A[3] = 1;
9696
return A;
@@ -141,10 +141,10 @@ function run() {
141141

142142
function Translate(M, Dx, Dy, Dz) {
143143
var T = [
144-
[1,0,0,Dx],
145-
[0,1,0,Dy],
146-
[0,0,1,Dz],
147-
[0,0,0,1]
144+
[1,0,0,Dx],
145+
[0,1,0,Dy],
146+
[0,0,1,Dz],
147+
[0,0,0,1]
148148
];
149149
return MMulti(T, M);
150150
}
@@ -155,10 +155,10 @@ function run() {
155155
var Cos = Math.cos(a);
156156
var Sin = Math.sin(a);
157157
var R = [
158-
[1,0,0,0],
159-
[0,Cos,-Sin,0],
160-
[0,Sin,Cos,0],
161-
[0,0,0,1]
158+
[1,0,0,0],
159+
[0,Cos,-Sin,0],
160+
[0,Sin,Cos,0],
161+
[0,0,0,1]
162162
];
163163
return MMulti(R, M);
164164
}
@@ -169,10 +169,10 @@ function run() {
169169
var Cos = Math.cos(a);
170170
var Sin = Math.sin(a);
171171
var R = [
172-
[Cos,0,Sin,0],
173-
[0,1,0,0],
174-
[-Sin,0,Cos,0],
175-
[0,0,0,1]
172+
[Cos,0,Sin,0],
173+
[0,1,0,0],
174+
[-Sin,0,Cos,0],
175+
[0,0,0,1]
176176
];
177177
return MMulti(R, M);
178178
}
@@ -183,10 +183,10 @@ function run() {
183183
var Cos = Math.cos(a);
184184
var Sin = Math.sin(a);
185185
var R = [
186-
[Cos,-Sin,0,0],
187-
[Sin,Cos,0,0],
188-
[0,0,1,0],
189-
[0,0,0,1]
186+
[Cos,-Sin,0,0],
187+
[Sin,Cos,0,0],
188+
[0,0,1,0],
189+
[0,0,0,1]
190190
];
191191
return MMulti(R, M);
192192
}
@@ -270,28 +270,28 @@ function run() {
270270

271271
// transformation matrix
272272
MTrans = [
273-
[1,0,0,0],
274-
[0,1,0,0],
275-
[0,0,1,0],
276-
[0,0,0,1]
273+
[1,0,0,0],
274+
[0,1,0,0],
275+
[0,0,1,0],
276+
[0,0,0,1]
277277
];
278-
278+
279279
// position information of qube
280280
MQube = [
281-
[1,0,0,0],
282-
[0,1,0,0],
283-
[0,0,1,0],
284-
[0,0,0,1]
281+
[1,0,0,0],
282+
[0,1,0,0],
283+
[0,0,1,0],
284+
[0,0,0,1]
285285
];
286-
286+
287287
// entity matrix
288288
I = [
289-
[1,0,0,0],
290-
[0,1,0,0],
291-
[0,0,1,0],
292-
[0,0,0,1]
289+
[1,0,0,0],
290+
[0,1,0,0],
291+
[0,0,1,0],
292+
[0,0,0,1]
293293
];
294-
294+
295295
// create qube
296296
Q[0] = new CreateP(-CubeSize,-CubeSize, CubeSize);
297297
Q[1] = new CreateP(-CubeSize, CubeSize, CubeSize);
@@ -301,24 +301,25 @@ function run() {
301301
Q[5] = new CreateP(-CubeSize, CubeSize,-CubeSize);
302302
Q[6] = new CreateP( CubeSize, CubeSize,-CubeSize);
303303
Q[7] = new CreateP( CubeSize,-CubeSize,-CubeSize);
304-
304+
305305
// center of gravity
306306
Q[8] = new CreateP(0, 0, 0);
307-
307+
308308
// anti-clockwise edge check
309309
Q.Edge = [[0,1,2],[3,2,6],[7,6,5],[4,5,1],[4,0,3],[1,5,6]];
310-
310+
311311
// calculate squad normals
312312
Q.Normal = new Array();
313313
for (var i = 0; i < Q.Edge.length; i++) Q.Normal[i] = CalcNormal(Q[Q.Edge[i][0]].V, Q[Q.Edge[i][1]].V, Q[Q.Edge[i][2]].V);
314-
314+
315315
// line drawn ?
316316
Q.Line = [false,false,false,false,false,false,false,false,false,false,false,false];
317-
317+
318318
// create line pixels
319319
Q.NumPx = 9 * 2 * CubeSize;
320-
for (var i = 0; i < Q.NumPx; i++) CreateP(0,0,0);
321-
320+
Q.LinePixels = new Array()
321+
for (var i = 0; i < Q.NumPx; i++) Q.LinePixels.push(new CreateP(0,0,0));
322+
322323
MTrans = Translate(MTrans, Origin.V[0], Origin.V[1], Origin.V[2]);
323324
MQube = MMulti(MTrans, MQube);
324325

@@ -329,7 +330,7 @@ function run() {
329330
DrawQube();
330331
Testing.Init = true;
331332
Loop();
332-
333+
333334
// Perform a simple sum-based verification.
334335
var sum = 0;
335336
for (var i = 0; i < Q.length; ++i) {

0 commit comments

Comments
 (0)