blame | history | patch | commit | commitdiff
Normand Briere
2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd 
 CameraPane.java
....@@ -37,7 +37,6 @@
3737     static boolean[] selectedstack = new boolean[65536];
3838     static int materialdepth = 0;
3939 
40
-    static boolean DEBUG = false;
4140     static boolean FRUSTUM = false; // still bogus true; // frustum culling
4241 
4342     // camera change fix
....@@ -327,7 +326,7 @@
327326                 cStatic.objectstack[materialdepth++] = obj;
328327                 //System.out.println("material " + material);
329328                 //Applet3D.tracein(this, selected);
330
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
331330                 if (obj instanceof Camera)
332331                 {
333332                     display.options1[0] = material.shift;
....@@ -336,14 +335,28 @@
336335                     display.options1[2] = material.shadowbias;
337336                     display.options1[3] = material.aniso;
338337                     display.options1[4] = material.anisoV;
338
+//                System.out.println("display.options1[0] " + display.options1[0]);
339
+//                System.out.println("display.options1[1] " + display.options1[1]);
340
+//                System.out.println("display.options1[2] " + display.options1[2]);
341
+//                System.out.println("display.options1[3] " + display.options1[3]);
342
+//                System.out.println("display.options1[4] " + display.options1[4]);
339343                     display.options2[0] = material.opacity;
340344                     display.options2[1] = material.diffuse;
341345                     display.options2[2] = material.factor;
346
+//                System.out.println("display.options2[0] " + display.options2[0]);
347
+//                System.out.println("display.options2[1] " + display.options2[1]);
348
+//                System.out.println("display.options2[2] " + display.options2[2]);
342349 
343350                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
351
+//                System.out.println("display.options3[0] " + display.options3[0]);
352
+//                System.out.println("display.options3[1] " + display.options3[1]);
353
+//                System.out.println("display.options3[2] " + display.options3[2]);
344354                     display.options4[0] = material.cameralight/0.2f;
345355                     display.options4[1] = material.subsurface;
346356                     display.options4[2] = material.sheen;
357
+//                System.out.println("display.options4[0] " + display.options4[0]);
358
+//                System.out.println("display.options4[1] " + display.options4[1]);
359
+//                System.out.println("display.options4[2] " + display.options4[2]);
347360                     
348361                  //   if (display.CURRENTANTIALIAS > 0)
349362                  //       display.options3[3] /= 4;
....@@ -359,7 +372,7 @@
359372                 /**/
360373                 } else
361374                 {
362
-                    DrawMaterial(material, selected);
375
+                    DrawMaterial(material, selected, obj.projectedVertices);
363376                 }
364377             } else
365378             {
....@@ -383,8 +396,8 @@
383396             cStatic.objectstack[materialdepth++] = obj;
384397             //System.out.println("material " + material);
385398             //Applet3D.tracein("selected ", selected);
386
-            display.vector2buffer = obj.projectedVertices;
387
-            display.DrawMaterial(material, selected);
399
+            //display.vector2buffer = obj.projectedVertices;
400
+            display.DrawMaterial(material, selected, obj.projectedVertices);
388401         }
389402     }
390403     
....@@ -401,8 +414,8 @@
401414                 materialdepth -= 1;
402415                 if (materialdepth > 0)
403416                 {
404
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
417
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
418
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406419                 }
407420             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408421             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -422,8 +435,8 @@
422435             materialdepth -= 1;
423436             if (materialdepth > 0)
424437             {
425
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
438
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
439
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427440             }
428441         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429442         //else
....@@ -1611,7 +1624,7 @@
16111624 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16121625     }
16131626     
1614
-    void DrawMaterial(cMaterial material, boolean selected)
1627
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16151628     {
16161629             CameraPane display = this;
16171630         //new Exception().printStackTrace();
....@@ -1646,7 +1659,7 @@
16461659             colorV[0] = display.modelParams0[0] * material.diffuse;
16471660             colorV[1] = display.modelParams0[1] * material.diffuse;
16481661             colorV[2] = display.modelParams0[2] * material.diffuse;
1649
-            colorV[3] = material.opacity;
1662
+            colorV[3] = 1; // material.opacity;
16501663 
16511664             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16521665             //System.out.println("Opacity = " + opacity);
....@@ -1754,9 +1767,9 @@
17541767         display.modelParams7[2] = 0;
17551768         display.modelParams7[3] = 0;
17561769 
1757
-        display.modelParams6[0] = 100; // criss de bug de bump
1770
+        //display.modelParams6[0] = 100; // criss de bug de bump
17581771         
1759
-        Object3D.cVector2[] extparams = display.vector2buffer;
1772
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17601773         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17611774         {
17621775             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -2267,7 +2280,7 @@
22672280     
22682281     void ToggleDebug()
22692282     {
2270
-        DEBUG ^= true;
2283
+        Globals.DEBUG ^= true;
22712284     }
22722285 
22732286     void ToggleLookAt()
....@@ -2383,6 +2396,128 @@
23832396     public GL GetGL() // INTERFACE
23842397     {
23852398         return currentGL;
2399
+    }
2400
+
2401
+    private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
2402
+    {
2403
+        java.net.URL u;
2404
+        InputStream is = null;
2405
+        DataInputStream dis;
2406
+        java.util.zip.ZipInputStream zis;
2407
+        //String s;
2408
+
2409
+                System.out.println("GetRemoteZip " + name);
2410
+                
2411
+          int total = 0; // dis.available();
2412
+
2413
+          byte[] bytes = new byte[16384];
2414
+          
2415
+        try
2416
+        {
2417
+          u = new java.net.URL(url + name);
2418
+          is = u.openStream();
2419
+          
2420
+                System.out.println(url + name);
2421
+                
2422
+          if (unzip)
2423
+          {
2424
+              //dis = new DataInputStream(new BufferedInputStream(is));
2425
+              zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
2426
+              //while ((s = dis.readLine()) != null)
2427
+
2428
+                if (save)
2429
+              new java.io.File(name).mkdirs();
2430
+          
2431
+    //      FileOutputStream stream = new FileOutputStream("test.zip");
2432
+    //
2433
+    //      int count;
2434
+    //      
2435
+    //      while ((count = dis.read(bytes)) != -1)
2436
+    //      {
2437
+    //        //System.out.println(s);
2438
+    //        System.out.println(count);
2439
+    //          total += count;
2440
+    //          stream.write(bytes);
2441
+    //      }
2442
+    //      
2443
+    //      stream.close();
2444
+          
2445
+           // now iterate through each item in the stream. The get next
2446
+            // entry call will return a ZipEntry for each file in the
2447
+            // stream
2448
+            java.util.zip.ZipEntry entry;
2449
+            while((entry = zis.getNextEntry())!=null)
2450
+            {
2451
+                if (entry.getName().endsWith(".gsm"))
2452
+                {
2453
+                    continue;
2454
+                }
2455
+                
2456
+                String s = String.format("Entry: %s len %d added %TD",
2457
+                                entry.getName(), entry.getSize(),
2458
+                                new java.util.Date(entry.getTime()));
2459
+                System.out.println(s);
2460
+
2461
+                if (save)
2462
+                {
2463
+                    // Once we get the entry from the stream, the stream is
2464
+                    // positioned read to read the raw data, and we keep
2465
+                    // reading until read returns 0 or less.
2466
+                    String outpath = name + "/" + entry.getName();
2467
+                    FileOutputStream output = null;
2468
+                    try
2469
+                    {
2470
+                        output = new FileOutputStream(outpath);
2471
+                        int len = 0;
2472
+                        while ((len = zis.read(bytes)) > 0)
2473
+                        {
2474
+                            output.write(bytes, 0, len);
2475
+                        }
2476
+                    }
2477
+                    finally
2478
+                    {
2479
+                        // we must always close the output file
2480
+                        if(output!=null) output.close();
2481
+                    }
2482
+                }
2483
+            }
2484
+          }
2485
+        }
2486
+        catch (java.net.MalformedURLException mue)
2487
+        {
2488
+          System.err.println("Ouch - a MalformedURLException happened.");
2489
+          mue.printStackTrace();
2490
+          //System.exit(2);
2491
+        }
2492
+        catch (IOException ioe)
2493
+        {
2494
+          //System.err.println("Oops - an IOException happened.");
2495
+          //ioe.printStackTrace();
2496
+          //System.exit(3);
2497
+        }
2498
+        finally
2499
+        {
2500
+          try
2501
+          {
2502
+              if (is != null)
2503
+                    is.close();
2504
+          }
2505
+          catch (IOException ioe)
2506
+          {
2507
+          }
2508
+        }
2509
+                    
2510
+        //  System.out.println("length = " + total);
2511
+          
2512
+//                try
2513
+//                {
2514
+//                    Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
2515
+//                }
2516
+//                catch (Exception e)
2517
+//                {
2518
+//                    e.printStackTrace();
2519
+//                }
2520
+                
23862521     }
23872522 
23882523     /**/
....@@ -9367,11 +9502,35 @@
93679502         jy8[3] = 0.5f;
93689503     }
93699504     
9370
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9505
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
93719506     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
93729507     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
93739508     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
93749509 
9510
+    void ResetOptions()
9511
+    {
9512
+        options1[0] = 100;
9513
+        options1[1] = 0.025f;
9514
+        options1[2] = 0.01f;
9515
+        options1[3] = 0;
9516
+        options1[4] = 0;
9517
+        
9518
+        options2[0] = 0;
9519
+        options2[1] = 0.75f;
9520
+        options2[2] = 0;
9521
+        options2[3] = 0;
9522
+        
9523
+        options3[0] = 1;
9524
+        options3[1] = 1;
9525
+        options3[2] = 1;
9526
+        options3[3] = 0;
9527
+        
9528
+        options4[0] = 1;
9529
+        options4[1] = 0;
9530
+        options4[2] = 1;
9531
+        options4[3] = 0;
9532
+    }
9533
+    
93759534     static int imagecount = 0; // movie generation
93769535     
93779536     static int jitter = 0;
....@@ -10482,6 +10641,7 @@
1048210641                     ANTIALIAS = 0;
1048310642                     //System.out.println("RESTART");
1048410643                     AAtimer.restart();
10644
+                    Globals.TIMERRUNNING = true;
1048510645                 }
1048610646             }
1048710647         }
....@@ -10549,7 +10709,8 @@
1054910709             ambientOcclusion = false;
1055010710         }
1055110711 
10552
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10712
+        if (//Globals.lighttouched &&
10713
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1055310714         {
1055410715             //if (RENDERSHADOW) // ?
1055510716             if (!IsFrozen())
....@@ -11459,8 +11620,29 @@
1145911620 
1146011621     static boolean zoomonce = false;
1146111622     
11623
+    static void CreateSelectedPoint()
11624
+    {
11625
+        if (selectedpoint == null)
11626
+        {
11627
+            debugpointG = new Sphere();
11628
+            debugpointP = new Sphere();
11629
+            debugpointC = new Sphere();
11630
+            debugpointR = new Sphere();
11631
+            
11632
+            selectedpoint = new Superellipsoid();
11633
+            
11634
+            for (int i=0; i<8; i++)
11635
+            {
11636
+                debugpoints[i] = new Sphere();
11637
+            }
11638
+        }
11639
+    }
11640
+    
1146211641     void DrawObject(GL gl, boolean draw)
1146311642     {
11643
+        // To clear camera values
11644
+        ResetOptions();
11645
+        
1146411646         //System.out.println("DRAW OBJECT " + mouseDown);
1146511647 //        DrawMode() = SELECTION;
1146611648         //GL gl = getGL();
....@@ -11539,8 +11721,9 @@
1153911721             
1154011722             if (DrawMode() == DEFAULT)
1154111723             {
11542
-                if (DEBUG)
11724
+                if (Globals.DEBUG)
1154311725                 {
11726
+                    CreateSelectedPoint();
1154411727                     float radius = 0.05f;
1154511728                     if (selectedpoint.radius != radius)
1154611729                     {
....@@ -12027,7 +12210,7 @@
1202712210             for (int i = tp.size(); --i >= 0;)
1202812211             {
1202912212                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12213
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1203112214             }
1203212215 
1203312216 
....@@ -13297,7 +13480,8 @@
1329713480     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1329813481     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1329913482     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300
-    Object3D.cVector2[] vector2buffer;
13483
+    
13484
+    //Object3D.cVector2[] vector2buffer;
1330113485 
1330213486     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1330313487     // OUT : diff, spec
....@@ -13313,9 +13497,10 @@
1331313497                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1331413498                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1331513499                 //"MOV " + dest + ".w," + "normal.z;" +
13316
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13317
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13318
-                //"MOV " + dest + ".z," + "params2.w;" + 
13500
+//            "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13501
+//            "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13502
+                
13503
+                "MOV " + dest + ".z," + "params2.w;" + // EXACT
1331913504                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1332013505                 "RCP " + dest + ".w," + dest + ".w;" +
1332113506                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13820,6 +14005,7 @@
1382014005         else
1382114006         if (evt.getSource() == AAtimer)
1382214007         {
14008
+                    Globals.TIMERRUNNING = false;
1382314009             if (mouseDown)
1382414010             {
1382514011             //new Exception().printStackTrace();
....@@ -13894,6 +14080,7 @@
1389414080             return;
1389514081         
1389614082         AAtimer.restart(); // 
14083
+        Globals.TIMERRUNNING = true;
1389714084 
1389814085 //        waslive = LIVE;
1389914086 //        LIVE = false;
....@@ -14357,7 +14544,8 @@
1435714544                 info.camera = renderCamera;
1435814545                 info.x = x;
1435914546                 info.y = y;
14360
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14547
+                object.GetWindow().copy
14548
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1436114549             } else
1436214550             {
1436314551                 if (x < startX)
....@@ -14521,7 +14709,9 @@
1452114709         ci.camera = renderCamera;
1452214710         if (!isRenderer)
1452314711         {
14524
-            if (object.editWindow.copy.doEditClick(ci, 0))
14712
+            //ObjEditor editWindow = object.editWindow;
14713
+            //Object3D copy = editWindow.copy;
14714
+            if (object.doEditClick(ci, 0))
1452514715             {
1452614716                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1452714717             } else
....@@ -14902,8 +15092,14 @@
1490215092                 RevertCamera();
1490315093                 repaint();
1490415094                 break;
14905
-            case 'L':
1490615095             case 'l':
15096
+                lightMode ^= true;
15097
+                Globals.lighttouched = true;
15098
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15099
+                targetLookAt.set(manipCamera.lookAt);
15100
+                repaint();
15101
+                break;
15102
+            case 'L':
1490715103                 if (lightMode)
1490815104                 {
1490915105                     lightMode = false;
....@@ -15046,20 +15242,18 @@
1504615242             case '_':
1504715243                 kompactbit = 5;
1504815244                 break;
15049
-            case '+':
15050
-                kompactbit = 6;
15051
-                break;
15245
+//            case '+':
15246
+//                kompactbit = 6;
15247
+//                break;
1505215248             case ' ':
15053
-                lightMode ^= true;
15054
-                Globals.lighttouched = true;
15055
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15056
-                targetLookAt.set(manipCamera.lookAt);
15249
+                ObjEditor.theFrame.ToggleFullScreen();
1505715250                 repaint();
1505815251                 break;
1505915252             //case '`' :
1506015253             case ESC:
1506115254                 RENDERPROGRAM += 1;
1506215255                 RENDERPROGRAM %= 3;
15256
+
1506315257                 repaint();
1506415258                 break;
1506515259             case 'Z':
....@@ -15099,8 +15293,15 @@
1509915293             case DELETE:
1510015294                 ClearSelection();
1510115295                 break;
15102
-                /*
1510315296             case '+':
15297
+                
15298
+        //for (int i=0; i<0x7FFFFFFF; i++)
15299
+        {
15300
+            //String.format("%08X", i); //  "7caca905"
15301
+            GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
15302
+        }
15303
+      
15304
+                /*
1510415305                 //fontsize += 1;
1510515306                 bbzoom *= 2;
1510615307                 repaint();
....@@ -15351,7 +15552,7 @@
1535115552         }
1535215553          */
1535315554 
15354
-        object.editWindow.EditSelection();
15555
+        object.editWindow.EditSelection(false);
1535515556     }
1535615557 
1535715558     void SelectParent()
....@@ -16363,16 +16564,16 @@
1636316564                 cStatic.objectstack[materialdepth++] = checker;
1636416565                 //System.out.println("material " + material);
1636516566                 //Applet3D.tracein(this, selected);
16366
-                vector2buffer = checker.projectedVertices;
16567
+                //vector2buffer = checker.projectedVertices;
1636716568 
1636816569         //checker.GetMaterial().Draw(this, false); // true);
16369
-        DrawMaterial(checker.GetMaterial(), false); // true);
16570
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1637016571 
1637116572                 materialdepth -= 1;
1637216573                 if (materialdepth > 0)
1637316574                 {
16374
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16575
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16576
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1637616577                 }
1637716578         //checker.GetMaterial().opacity = 1f;
1637816579         ////checker.GetMaterial().ambient = 1f;
....@@ -16596,6 +16797,8 @@
1659616797 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1659716798 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1659816799                 
16800
+                CreateSelectedPoint();
16801
+                
1659916802                 // Will fit the mesh !!!
1660016803                 selectedpoint.toParent[0][0] = 0.0001;
1660116804                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16710,6 +16913,11 @@
1671016913                 //System.out.println("objects[color] = " + objects[color]);
1671116914                 //objects[color].Select();
1671216915                 indexcount = 0;
16916
+                    ObjEditor window = object.GetWindow();
16917
+                    if (window != null && deselect)
16918
+                    {
16919
+                        window.Select(null, deselect, true);
16920
+                    }
1671316921                 object.Select(color, deselect);
1671416922             }
1671516923 
....@@ -17235,23 +17443,15 @@
1723517443     int AAbuffersize = 0;
1723617444     
1723717445     //double[] selectedpoint = new double[3];
17238
-    static Superellipsoid selectedpoint = new Superellipsoid();
17446
+    static Superellipsoid selectedpoint;
1723917447     static Sphere previousselectedpoint = null;
17240
-    static Sphere debugpointG = new Sphere();
17241
-    static Sphere debugpointP = new Sphere();
17242
-    static Sphere debugpointC = new Sphere();
17243
-    static Sphere debugpointR = new Sphere();
17448
+    static Sphere debugpointG;
17449
+    static Sphere debugpointP;
17450
+    static Sphere debugpointC;
17451
+    static Sphere debugpointR;
1724417452     
1724517453     static Sphere debugpoints[] = new Sphere[8];
1724617454  
17247
-    static
17248
-    {
17249
-        for (int i=0; i<8; i++)
17250
-        {
17251
-            debugpoints[i] = new Sphere();
17252
-        }
17253
-    }
17254
-    
1725517455     static void InitPoints(float radius)
1725617456     {
1725717457         for (int i=0; i<8; i++)