Rename Grafreed

Normand Briere

2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439

 LA.java
..
..
@@ -160,6 +160,7 @@
160
160
 
161
161
     static cVector xformDir(cVector v, double mat[][])
162
162
     {
163
+                    new Exception().printStackTrace();
163
164
         System.exit(0);
164
165
         cVector temp = new cVector();
165
166
         xformDir(v, mat, temp);
..
..
@@ -306,6 +307,14 @@
306
307
 
307
308
         }
308
309
 
310
+        Grafreed.Assert(Math.abs(src[0][3]) <= 1E-15);
311
+        Grafreed.Assert(Math.abs(src[1][3]) <= 1E-15);
312
+        Grafreed.Assert(Math.abs(src[2][3]) <= 1E-15);
313
+        Grafreed.Assert(Math.abs(src[3][3] - 1) <= 1E-15);
314
+        Grafreed.Assert(Math.abs(dst[0][3]) <= 1E-15);
315
+        Grafreed.Assert(Math.abs(dst[1][3]) <= 1E-15);
316
+        Grafreed.Assert(Math.abs(dst[2][3]) <= 1E-15);
317
+        Grafreed.Assert(Math.abs(dst[3][3] - 1) <= 1E-15);
309
318
     }
310
319
 
311
320
     static double toRadians(double degrees)
..
..
@@ -321,14 +330,14 @@
321
330
         
322
331
         for (int j = 0; j < 4; j++)
323
332
         {
324
-            double[] leftj = left[j];
333
+            double[] rightj = right[j];
325
334
             double[] concat = concatTemp[j];
326
335
             for (int i = 0; i < 4; i++)
327
336
             {
328
337
                 concat[i] = 0;
329
338
                 for (int k = 0; k < 4; k++)
330
339
                 {
331
-                    concat[i] += leftj[k] * right[k][i];
340
+                    concat[i] += left[k][i] * rightj[k];
332
341
                 }
333
342
             }
334
343
         }
..
..
@@ -345,7 +354,7 @@
345
354
         //xlateTemp[0][3] = dx;
346
355
         //xlateTemp[1][3] = dy;
347
356
         //xlateTemp[2][3] = dz;
348
-        matConcat(mat, xlateTemp, mat);
357
+        matConcat(xlateTemp, mat, mat);
349
358
     }
350
359
 
351
360
     static void matHomogene(double mat[][], double dx, double dy, double dz)
..
..
@@ -357,7 +366,7 @@
357
366
         //xlateTemp[0][3] = dx;
358
367
         //xlateTemp[1][3] = dy;
359
368
         //xlateTemp[2][3] = dz;
360
-        matConcat(mat, xlateTemp, mat);
369
+        matConcat(xlateTemp, mat, mat);
361
370
     }
362
371
 
363
372
     static void matTranslateInv(double mat[][], double dx, double dy, double dz)
..
..
@@ -369,7 +378,7 @@
369
378
         //xlateTemp[0][3] = dx;
370
379
         //xlateTemp[1][3] = dy;
371
380
         //xlateTemp[2][3] = dz;
372
-        matConcat(xlateTemp, mat, mat);
381
+        matConcat(mat, xlateTemp, mat);
373
382
     }
374
383
 
375
384
     static void matScale(double mat[][], double sx, double sy, double sz)
..
..
@@ -378,7 +387,8 @@
378
387
         xlateTemp[0][0] = sx;
379
388
         xlateTemp[1][1] = sy;
380
389
         xlateTemp[2][2] = sz;
381
-        matConcat(mat, xlateTemp, mat);
390
+        matConcat(xlateTemp, mat, mat);
391
+        //matConcat(mat, xlateTemp, mat);
382
392
     }
383
393
 
384
394
     static void matXRotate(double mat[][], double radians)
..
..
@@ -387,9 +397,9 @@
387
397
         rotTemp[1][1] = rotTemp[2][2] = (double) Math.cos(radians);
388
398
         rotTemp[2][1] = -(rotTemp[1][2] = (double) Math.sin(radians));
389
399
    //     if (CameraPane.LOCALTRANSFORM)
390
-   //         matConcat(rotTemp, mat, mat);
400
+            matConcat(rotTemp, mat, mat);
391
401
    //     else
392
-            matConcat(mat, rotTemp, mat);
402
+   //         matConcat(mat, rotTemp, mat);
393
403
     }
394
404
 
395
405
     static void matYRotate(double mat[][], double radians)
..
..
@@ -398,9 +408,9 @@
398
408
         rotTemp[0][0] = rotTemp[2][2] = (double) Math.cos(-radians);
399
409
         rotTemp[2][0] = -(rotTemp[0][2] = (double) Math.sin(-radians));
400
410
    //     if (CameraPane.LOCALTRANSFORM)
401
-   //         matConcat(rotTemp, mat, mat);
411
+            matConcat(rotTemp, mat, mat);
402
412
    //     else
403
-            matConcat(mat, rotTemp, mat);
413
+   //         matConcat(mat, rotTemp, mat);
404
414
     }
405
415
 
406
416
     static void matZRotate(double mat[][], double radians)
..
..
@@ -409,9 +419,9 @@
409
419
         rotTemp[0][0] = rotTemp[1][1] = (double) Math.cos(radians);
410
420
         rotTemp[1][0] = -(rotTemp[0][1] = (double) Math.sin(radians));
411
421
    //     if (CameraPane.LOCALTRANSFORM)
412
-   //         matConcat(rotTemp, mat, mat);
422
+            matConcat(rotTemp, mat, mat);
413
423
    //     else
414
-            matConcat(mat, rotTemp, mat);
424
+   //         matConcat(mat, rotTemp, mat);
415
425
     }
416
426
 
417
427
     // Project A onto B
..
..
@@ -614,6 +624,7 @@
614
624
     private static int indxr[] = new int[4];
615
625
     private static int indxc[] = new int[4];
616
626
     
627
+    static double[][] Identity = new double[4][4];
617
628
     
618
629
     static int SIZE = 0; // 65536*64;
619
630
     
..
..
@@ -629,6 +640,8 @@
629
640
             costable[i] = Math.cos(PI2 * i/SIZE);
630
641
             sintable[i] = Math.sin(PI2 * i*i/SIZE/SIZE);
631
642
         }
643
+        
644
+        LA.matIdentity(Identity);
632
645
     }
633
646
     
634
647
     static double cos(double x0)