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
....@@ -149,6 +148,8 @@
149148         defaultcaps.setAccumBlueBits(16);
150149         defaultcaps.setAccumAlphaBits(16);
151150     }
151
+    
152
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152153     
153154     void SetAsGLRenderer(boolean b)
154155     {
....@@ -325,7 +326,7 @@
325326                 cStatic.objectstack[materialdepth++] = obj;
326327                 //System.out.println("material " + material);
327328                 //Applet3D.tracein(this, selected);
328
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
329330                 if (obj instanceof Camera)
330331                 {
331332                     display.options1[0] = material.shift;
....@@ -334,14 +335,28 @@
334335                     display.options1[2] = material.shadowbias;
335336                     display.options1[3] = material.aniso;
336337                     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]);
337343                     display.options2[0] = material.opacity;
338344                     display.options2[1] = material.diffuse;
339345                     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]);
340349 
341350                     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]);
342354                     display.options4[0] = material.cameralight/0.2f;
343355                     display.options4[1] = material.subsurface;
344356                     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]);
345360                     
346361                  //   if (display.CURRENTANTIALIAS > 0)
347362                  //       display.options3[3] /= 4;
....@@ -357,7 +372,7 @@
357372                 /**/
358373                 } else
359374                 {
360
-                    DrawMaterial(material, selected);
375
+                    DrawMaterial(material, selected, obj.projectedVertices);
361376                 }
362377             } else
363378             {
....@@ -381,8 +396,8 @@
381396             cStatic.objectstack[materialdepth++] = obj;
382397             //System.out.println("material " + material);
383398             //Applet3D.tracein("selected ", selected);
384
-            display.vector2buffer = obj.projectedVertices;
385
-            display.DrawMaterial(material, selected);
399
+            //display.vector2buffer = obj.projectedVertices;
400
+            display.DrawMaterial(material, selected, obj.projectedVertices);
386401         }
387402     }
388403     
....@@ -399,8 +414,8 @@
399414                 materialdepth -= 1;
400415                 if (materialdepth > 0)
401416                 {
402
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403
-                    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);
404419                 }
405420             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406421             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -420,8 +435,8 @@
420435             materialdepth -= 1;
421436             if (materialdepth > 0)
422437             {
423
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424
-                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);
425440             }
426441         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427442         //else
....@@ -462,10 +477,12 @@
462477         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463478         {
464479             //gl.glBegin(gl.GL_TRIANGLES);
465
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
480
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
481
+                    // TEST LIVE NORMALS && !obj.dontselect
482
+                    ;
466483             if (!hasnorm)
467484             {
468
-           //     System.out.println("FUCK!!");
485
+           //     System.out.println("Mesh normal");
469486                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470487                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471488                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1207,12 @@
11901207                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911208                                 }
11921209                             }
1210
+                            
11931211                             if (flipV)
11941212                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951213                             else
11961214                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1215
+                            
11971216                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981217                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991218 
....@@ -1213,10 +1232,12 @@
12131232                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141233                                 }
12151234                             }
1235
+                            
12161236                             if (flipV)
12171237                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181238                             else
12191239                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1240
+                            
12201241                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211242                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221243 
....@@ -1244,8 +1265,10 @@
12441265                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451266                                 else
12461267                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1268
+                                
12471269                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481270                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1271
+                                
12491272                                 count2 += 2;
12501273                                 count3 += 3;
12511274                             }
....@@ -1601,7 +1624,7 @@
16011624 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16021625     }
16031626     
1604
-    void DrawMaterial(cMaterial material, boolean selected)
1627
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16051628     {
16061629             CameraPane display = this;
16071630         //new Exception().printStackTrace();
....@@ -1636,7 +1659,7 @@
16361659             colorV[0] = display.modelParams0[0] * material.diffuse;
16371660             colorV[1] = display.modelParams0[1] * material.diffuse;
16381661             colorV[2] = display.modelParams0[2] * material.diffuse;
1639
-            colorV[3] = material.opacity;
1662
+            colorV[3] = 1; // material.opacity;
16401663 
16411664             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16421665             //System.out.println("Opacity = " + opacity);
....@@ -1744,9 +1767,9 @@
17441767         display.modelParams7[2] = 0;
17451768         display.modelParams7[3] = 0;
17461769 
1747
-        display.modelParams6[0] = 100; // criss de bug de bump
1770
+        //display.modelParams6[0] = 100; // criss de bug de bump
17481771         
1749
-        Object3D.cVector2[] extparams = display.vector2buffer;
1772
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17501773         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17511774         {
17521775             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1888,7 +1911,7 @@
18881911     void PushMatrix(double[][] matrix)
18891912     {
18901913     //    GrafreeD.tracein(matrix);
1891
-        PushMatrix(matrix,1);
1914
+        PushMatrix(matrix, 1);
18921915     }
18931916     
18941917     void PushMatrix()
....@@ -2257,7 +2280,7 @@
22572280     
22582281     void ToggleDebug()
22592282     {
2260
-        DEBUG ^= true;
2283
+        Globals.DEBUG ^= true;
22612284     }
22622285 
22632286     void ToggleLookAt()
....@@ -2374,7 +2397,129 @@
23742397     {
23752398         return currentGL;
23762399     }
2377
-    
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
+                
2521
+    }
2522
+
23782523     /**/
23792524     class CacheTexture
23802525     {
....@@ -7919,6 +8064,64 @@
79198064         ReleaseTexture(pigment, false);
79208065     }
79218066     
8067
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
8068
+    {
8069
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8070
+        {
8071
+            return;
8072
+        }
8073
+
8074
+        if (tex == null)
8075
+        {
8076
+            ReleaseTexture(null, false);
8077
+            return;
8078
+        }
8079
+        
8080
+        String pigment = Object3D.GetPigment(tex);
8081
+
8082
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083
+        {
8084
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
8085
+        //    System.out.println("; bump = " + bump);
8086
+        }
8087
+        
8088
+        if (pigment.equals(""))
8089
+        {
8090
+            pigment = null;
8091
+        }
8092
+        
8093
+        ReleaseTexture(pigment, false);
8094
+    }
8095
+    
8096
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
8097
+    {
8098
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8099
+        {
8100
+            return;
8101
+        }
8102
+
8103
+        if (tex == null)
8104
+        {
8105
+            ReleaseTexture(null, true);
8106
+            return;
8107
+        }
8108
+        
8109
+        String bump = Object3D.GetBump(tex);
8110
+
8111
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112
+        {
8113
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
8114
+        //    System.out.println("; bump = " + bump);
8115
+        }
8116
+        
8117
+        if (bump.equals(""))
8118
+        {
8119
+            bump = null;
8120
+        }
8121
+        
8122
+        ReleaseTexture(bump, true);
8123
+    }
8124
+    
79228125     void ReleaseTexture(String tex, boolean bump)
79238126     {
79248127         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8067,6 +8270,93 @@
80678270         return; // true;
80688271     }
80698272     
8273
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8274
+    {
8275
+        if (// DrawMode() != 0 || /*tex == null ||*/
8276
+                ambientOcclusion ) // || !textureon)
8277
+        {
8278
+            return; // false;
8279
+        }
8280
+
8281
+        if (tex == null)
8282
+        {
8283
+            BindTexture(null,false,resolution);
8284
+            return;
8285
+        }
8286
+        
8287
+        String pigment = Object3D.GetPigment(tex);
8288
+
8289
+        usedtextures.put(pigment, pigment);
8290
+        
8291
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292
+        {
8293
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8294
+        //    System.out.println("; bump = " + bump);
8295
+        }
8296
+        
8297
+        if (pigment.equals(""))
8298
+        {
8299
+            pigment = null;
8300
+        }
8301
+        
8302
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303
+        BindTexture(pigment, false, resolution);
8304
+    }
8305
+    
8306
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8307
+    {
8308
+        if (// DrawMode() != 0 || /*tex == null ||*/
8309
+                ambientOcclusion ) // || !textureon)
8310
+        {
8311
+            return; // false;
8312
+        }
8313
+
8314
+        if (tex == null)
8315
+        {
8316
+            BindTexture(null,true,resolution);
8317
+            return;
8318
+        }
8319
+        
8320
+        String bump = Object3D.GetBump(tex);
8321
+
8322
+        usedtextures.put(bump, bump);
8323
+        
8324
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325
+        {
8326
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8327
+        //    System.out.println("; bump = " + bump);
8328
+        }
8329
+        
8330
+        if (bump.equals(""))
8331
+        {
8332
+            bump = null;
8333
+        }
8334
+        
8335
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336
+        BindTexture(bump, true, resolution);
8337
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338
+    }
8339
+    
8340
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8341
+    
8342
+    private boolean FileExists(String tex)
8343
+    {
8344
+        if (missingTextures.contains(tex))
8345
+        {
8346
+            return false;
8347
+        }
8348
+        
8349
+        boolean fileExists = new File(tex).exists();
8350
+        
8351
+        if (!fileExists)
8352
+        {
8353
+            // If file exists, the "new File()" is not executed sgain
8354
+            missingTextures.add(tex);
8355
+        }
8356
+        
8357
+        return fileExists;
8358
+    }
8359
+    
80708360     CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718361     {
80728362         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
....@@ -8075,15 +8365,17 @@
80758365         {
80768366             String texname = tex;
80778367             
8368
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369
+                
80788370 //            String[] split = tex.split("Textures");
80798371 //            if (split.length > 1)
80808372 //                texname = "/Users/nbriere/Textures" + split[split.length-1];
80818373 //            else
80828374 //                if (!texname.startsWith("/"))
80838375 //                    texname = "/Users/nbriere/Textures/" + texname;
8084
-            if (!new File(tex).exists())
8376
+            if (!FileExists(tex))
80858377             {
8086
-                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8378
+                    texname = fallbackTextureName;
80878379             }
80888380             
80898381             if (CACHETEXTURE)
....@@ -8153,7 +8445,7 @@
81538445                                     }
81548446                                 
81558447                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156
-                                    if (!new File(cachename).exists())
8448
+                                    if (!FileExists(cachename))
81578449                                         cachename = texname;
81588450                                     else
81598451                                         processbump = false; // don't process bump map again
....@@ -8175,7 +8467,7 @@
81758467                                     }
81768468                                 
81778469                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178
-                                    if (!new File(cachename).exists())
8470
+                                    if (!FileExists(cachename))
81798471                                         cachename = texname;
81808472                                     else
81818473                                         processbump = false; // don't process bump map again
....@@ -9210,11 +9502,35 @@
92109502         jy8[3] = 0.5f;
92119503     }
92129504     
9213
-    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
92149506     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
92159507     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
92169508     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92179509 
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
+    
92189534     static int imagecount = 0; // movie generation
92199535     
92209536     static int jitter = 0;
....@@ -9310,8 +9626,8 @@
93109626         assert (parentcam != renderCamera);
93119627         
93129628         if (renderCamera != lightCamera)
9313
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9314
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9629
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9630
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93159631         
93169632 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93179633             
....@@ -9326,8 +9642,8 @@
93269642             LA.matCopy(renderCamera.fromScreen, matrix);
93279643             
93289644         if (renderCamera != lightCamera)
9329
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9330
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9645
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9646
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93319647 
93329648 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93339649             
....@@ -10325,6 +10641,7 @@
1032510641                     ANTIALIAS = 0;
1032610642                     //System.out.println("RESTART");
1032710643                     AAtimer.restart();
10644
+                    Globals.TIMERRUNNING = true;
1032810645                 }
1032910646             }
1033010647         }
....@@ -10392,7 +10709,8 @@
1039210709             ambientOcclusion = false;
1039310710         }
1039410711 
10395
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10712
+        if (//Globals.lighttouched &&
10713
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039610714         {
1039710715             //if (RENDERSHADOW) // ?
1039810716             if (!IsFrozen())
....@@ -10525,8 +10843,8 @@
1052510843             
1052610844 //        if (parentcam != renderCamera) // not a light
1052710845         if (cam != lightCamera)
10528
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10529
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10846
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10847
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1053010848             
1053110849             for (int j = 0; j < 4; j++)
1053210850             {
....@@ -10540,8 +10858,8 @@
1054010858             
1054110859 //        if (parentcam != renderCamera) // not a light
1054210860         if (cam != lightCamera)
10543
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10544
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10861
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10862
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054510863         
1054610864             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054710865             
....@@ -10934,8 +11252,8 @@
1093411252                 System.err.println("parentcam != renderCamera");
1093511253 
1093611254 //            if (cam != lightCamera)
10937
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10938
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11255
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11256
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1093911257         }
1094011258         
1094111259         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10956,8 +11274,8 @@
1095611274             if (true) // TODO
1095711275             {
1095811276                 if (cam != lightCamera)
10959
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10960
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11277
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11278
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1096111279             }
1096211280             
1096311281             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11302,8 +11620,29 @@
1130211620 
1130311621     static boolean zoomonce = false;
1130411622     
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
+    
1130511641     void DrawObject(GL gl, boolean draw)
1130611642     {
11643
+        // To clear camera values
11644
+        ResetOptions();
11645
+        
1130711646         //System.out.println("DRAW OBJECT " + mouseDown);
1130811647 //        DrawMode() = SELECTION;
1130911648         //GL gl = getGL();
....@@ -11382,8 +11721,9 @@
1138211721             
1138311722             if (DrawMode() == DEFAULT)
1138411723             {
11385
-                if (DEBUG)
11724
+                if (Globals.DEBUG)
1138611725                 {
11726
+                    CreateSelectedPoint();
1138711727                     float radius = 0.05f;
1138811728                     if (selectedpoint.radius != radius)
1138911729                     {
....@@ -11869,8 +12209,8 @@
1186912209             //obj.TransformToWorld(light, light);
1187012210             for (int i = tp.size(); --i >= 0;)
1187112211             {
11872
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873
-                    LA.xformPos(light, tp.get(i).toParent, light);
12212
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12213
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1187412214             }
1187512215 
1187612216 
....@@ -11887,8 +12227,8 @@
1188712227                 parentcam = cameras[0];
1188812228             }
1188912229             
11890
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11891
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12230
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12231
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1189212232 
1189312233             LA.xformPos(light, renderCamera.toScreen, light);
1189412234             
....@@ -13140,7 +13480,8 @@
1314013480     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1314113481     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1314213482     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13143
-    Object3D.cVector2[] vector2buffer;
13483
+    
13484
+    //Object3D.cVector2[] vector2buffer;
1314413485 
1314513486     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1314613487     // OUT : diff, spec
....@@ -13156,9 +13497,10 @@
1315613497                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1315713498                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1315813499                 //"MOV " + dest + ".w," + "normal.z;" +
13159
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13160
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13161
-                //"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
1316213504                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1316313505                 "RCP " + dest + ".w," + dest + ".w;" +
1316413506                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13663,6 +14005,7 @@
1366314005         else
1366414006         if (evt.getSource() == AAtimer)
1366514007         {
14008
+                    Globals.TIMERRUNNING = false;
1366614009             if (mouseDown)
1366714010             {
1366814011             //new Exception().printStackTrace();
....@@ -13737,6 +14080,7 @@
1373714080             return;
1373814081         
1373914082         AAtimer.restart(); // 
14083
+        Globals.TIMERRUNNING = true;
1374014084 
1374114085 //        waslive = LIVE;
1374214086 //        LIVE = false;
....@@ -13809,9 +14153,12 @@
1380914153     
1381014154     public void mouseDragged(MouseEvent e)
1381114155     {
14156
+        Globals.MOUSEDRAGGED = true;
14157
+        
1381214158         //System.out.println("mouseDragged: " + e);
1381314159         if (isRenderer)
1381414160             movingcamera = true;
14161
+        
1381514162         //if (drawing)
1381614163         //return;
1381714164         if ((e.getModifiersEx() & CTRL) != 0
....@@ -14197,7 +14544,8 @@
1419714544                 info.camera = renderCamera;
1419814545                 info.x = x;
1419914546                 info.y = y;
14200
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14547
+                object.GetWindow().copy
14548
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1420114549             } else
1420214550             {
1420314551                 if (x < startX)
....@@ -14361,7 +14709,9 @@
1436114709         ci.camera = renderCamera;
1436214710         if (!isRenderer)
1436314711         {
14364
-            if (object.editWindow.copy.doEditClick(ci, 0))
14712
+            //ObjEditor editWindow = object.editWindow;
14713
+            //Object3D copy = editWindow.copy;
14714
+            if (object.doEditClick(ci, 0))
1436514715             {
1436614716                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1436714717             } else
....@@ -14373,6 +14723,8 @@
1437314723 
1437414724     public void mouseReleased(MouseEvent e)
1437514725     {
14726
+        Globals.MOUSEDRAGGED = false;
14727
+        
1437614728         movingcamera = false;
1437714729         X = Y = 0;
1437814730         //System.out.println("mouseReleased: " + e);
....@@ -14740,8 +15092,14 @@
1474015092                 RevertCamera();
1474115093                 repaint();
1474215094                 break;
14743
-            case 'L':
1474415095             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':
1474515103                 if (lightMode)
1474615104                 {
1474715105                     lightMode = false;
....@@ -14884,20 +15242,18 @@
1488415242             case '_':
1488515243                 kompactbit = 5;
1488615244                 break;
14887
-            case '+':
14888
-                kompactbit = 6;
14889
-                break;
15245
+//            case '+':
15246
+//                kompactbit = 6;
15247
+//                break;
1489015248             case ' ':
14891
-                lightMode ^= true;
14892
-                Globals.lighttouched = true;
14893
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14894
-                targetLookAt.set(manipCamera.lookAt);
15249
+                ObjEditor.theFrame.ToggleFullScreen();
1489515250                 repaint();
1489615251                 break;
1489715252             //case '`' :
1489815253             case ESC:
1489915254                 RENDERPROGRAM += 1;
1490015255                 RENDERPROGRAM %= 3;
15256
+
1490115257                 repaint();
1490215258                 break;
1490315259             case 'Z':
....@@ -14937,8 +15293,15 @@
1493715293             case DELETE:
1493815294                 ClearSelection();
1493915295                 break;
14940
-                /*
1494115296             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
+                /*
1494215305                 //fontsize += 1;
1494315306                 bbzoom *= 2;
1494415307                 repaint();
....@@ -15189,7 +15552,7 @@
1518915552         }
1519015553          */
1519115554 
15192
-        object.editWindow.EditSelection();
15555
+        object.editWindow.EditSelection(false);
1519315556     }
1519415557 
1519515558     void SelectParent()
....@@ -15488,12 +15851,17 @@
1548815851                 {
1548915852                     switch (object.selection.get(0).hitSomething)
1549015853                     {
15491
-                        case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492
-                        case Object3D.hitRotate: gr.setColor(Color.green); break;
15493
-                        case Object3D.hitScale: gr.setColor(Color.cyan); break;
15854
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15855
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15856
+                            break;
15857
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15858
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15859
+                        break;
15860
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15861
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15862
+                        break;
1549415863                     }
1549515864                     
15496
-                    gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1549715865                 }
1549815866             }
1549915867         }
....@@ -15911,7 +16279,7 @@
1591116279     Object3D object;
1591216280     static Object3D trackedobject;
1591316281     Camera renderCamera; // Light or Eye (or Occlusion)
15914
-    /*static*/ Camera manipCamera; // Light or Eye
16282
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1591516283 	/*static*/ Camera eyeCamera;
1591616284     /*static*/ Camera lightCamera;
1591716285     int cameracount;
....@@ -16196,16 +16564,16 @@
1619616564                 cStatic.objectstack[materialdepth++] = checker;
1619716565                 //System.out.println("material " + material);
1619816566                 //Applet3D.tracein(this, selected);
16199
-                vector2buffer = checker.projectedVertices;
16567
+                //vector2buffer = checker.projectedVertices;
1620016568 
1620116569         //checker.GetMaterial().Draw(this, false); // true);
16202
-        DrawMaterial(checker.GetMaterial(), false); // true);
16570
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1620316571 
1620416572                 materialdepth -= 1;
1620516573                 if (materialdepth > 0)
1620616574                 {
16207
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16208
-                    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);
1620916577                 }
1621016578         //checker.GetMaterial().opacity = 1f;
1621116579         ////checker.GetMaterial().ambient = 1f;
....@@ -16429,6 +16797,8 @@
1642916797 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1643016798 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1643116799                 
16800
+                CreateSelectedPoint();
16801
+                
1643216802                 // Will fit the mesh !!!
1643316803                 selectedpoint.toParent[0][0] = 0.0001;
1643416804                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16543,6 +16913,11 @@
1654316913                 //System.out.println("objects[color] = " + objects[color]);
1654416914                 //objects[color].Select();
1654516915                 indexcount = 0;
16916
+                    ObjEditor window = object.GetWindow();
16917
+                    if (window != null && deselect)
16918
+                    {
16919
+                        window.Select(null, deselect, true);
16920
+                    }
1654616921                 object.Select(color, deselect);
1654716922             }
1654816923 
....@@ -17068,23 +17443,15 @@
1706817443     int AAbuffersize = 0;
1706917444     
1707017445     //double[] selectedpoint = new double[3];
17071
-    static Superellipsoid selectedpoint = new Superellipsoid();
17446
+    static Superellipsoid selectedpoint;
1707217447     static Sphere previousselectedpoint = null;
17073
-    static Sphere debugpointG = new Sphere();
17074
-    static Sphere debugpointP = new Sphere();
17075
-    static Sphere debugpointC = new Sphere();
17076
-    static Sphere debugpointR = new Sphere();
17448
+    static Sphere debugpointG;
17449
+    static Sphere debugpointP;
17450
+    static Sphere debugpointC;
17451
+    static Sphere debugpointR;
1707717452     
1707817453     static Sphere debugpoints[] = new Sphere[8];
1707917454  
17080
-    static
17081
-    {
17082
-        for (int i=0; i<8; i++)
17083
-        {
17084
-            debugpoints[i] = new Sphere();
17085
-        }
17086
-    }
17087
-    
1708817455     static void InitPoints(float radius)
1708917456     {
1709017457         for (int i=0; i<8; i++)