blame | history | patch | commit | commitdiff
Normand Briere
2019-07-07 46dbce888e7c3eff8969f1ddbe22e144410b67f4 
 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
....@@ -464,10 +477,12 @@
464477         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465478         {
466479             //gl.glBegin(gl.GL_TRIANGLES);
467
-            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
+                    ;
468483             if (!hasnorm)
469484             {
470
-           //     System.out.println("FUCK!!");
485
+           //     System.out.println("Mesh normal");
471486                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
472487                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
473488                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1192,10 +1207,12 @@
11921207                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11931208                                 }
11941209                             }
1210
+                            
11951211                             if (flipV)
11961212                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11971213                             else
11981214                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1215
+                            
11991216                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12001217                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12011218 
....@@ -1215,10 +1232,12 @@
12151232                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12161233                                 }
12171234                             }
1235
+                            
12181236                             if (flipV)
12191237                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12201238                             else
12211239                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1240
+                            
12221241                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12231242                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12241243 
....@@ -1246,8 +1265,10 @@
12461265                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12471266                                 else
12481267                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1268
+                                
12491269                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12501270                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1271
+                                
12511272                                 count2 += 2;
12521273                                 count3 += 3;
12531274                             }
....@@ -1603,7 +1624,7 @@
16031624 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16041625     }
16051626     
1606
-    void DrawMaterial(cMaterial material, boolean selected)
1627
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16071628     {
16081629             CameraPane display = this;
16091630         //new Exception().printStackTrace();
....@@ -1638,7 +1659,7 @@
16381659             colorV[0] = display.modelParams0[0] * material.diffuse;
16391660             colorV[1] = display.modelParams0[1] * material.diffuse;
16401661             colorV[2] = display.modelParams0[2] * material.diffuse;
1641
-            colorV[3] = material.opacity;
1662
+            colorV[3] = 1; // material.opacity;
16421663 
16431664             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16441665             //System.out.println("Opacity = " + opacity);
....@@ -1746,9 +1767,9 @@
17461767         display.modelParams7[2] = 0;
17471768         display.modelParams7[3] = 0;
17481769 
1749
-        display.modelParams6[0] = 100; // criss de bug de bump
1770
+        //display.modelParams6[0] = 100; // criss de bug de bump
17501771         
1751
-        Object3D.cVector2[] extparams = display.vector2buffer;
1772
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17521773         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17531774         {
17541775             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1890,7 +1911,7 @@
18901911     void PushMatrix(double[][] matrix)
18911912     {
18921913     //    GrafreeD.tracein(matrix);
1893
-        PushMatrix(matrix,1);
1914
+        PushMatrix(matrix, 1);
18941915     }
18951916     
18961917     void PushMatrix()
....@@ -2044,7 +2065,7 @@
20442065             //System.err.println("Oeil on");
20452066             OEIL = true;
20462067             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2068
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20482069             //pingthread.StepToTarget(true);
20492070         }
20502071         
....@@ -2259,7 +2280,7 @@
22592280     
22602281     void ToggleDebug()
22612282     {
2262
-        DEBUG ^= true;
2283
+        Globals.DEBUG ^= true;
22632284     }
22642285 
22652286     void ToggleLookAt()
....@@ -7921,6 +7942,64 @@
79217942         ReleaseTexture(pigment, false);
79227943     }
79237944     
7945
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7946
+    {
7947
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7948
+        {
7949
+            return;
7950
+        }
7951
+
7952
+        if (tex == null)
7953
+        {
7954
+            ReleaseTexture(null, false);
7955
+            return;
7956
+        }
7957
+        
7958
+        String pigment = Object3D.GetPigment(tex);
7959
+
7960
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7961
+        {
7962
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7963
+        //    System.out.println("; bump = " + bump);
7964
+        }
7965
+        
7966
+        if (pigment.equals(""))
7967
+        {
7968
+            pigment = null;
7969
+        }
7970
+        
7971
+        ReleaseTexture(pigment, false);
7972
+    }
7973
+    
7974
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7975
+    {
7976
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7977
+        {
7978
+            return;
7979
+        }
7980
+
7981
+        if (tex == null)
7982
+        {
7983
+            ReleaseTexture(null, true);
7984
+            return;
7985
+        }
7986
+        
7987
+        String bump = Object3D.GetBump(tex);
7988
+
7989
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7990
+        {
7991
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7992
+        //    System.out.println("; bump = " + bump);
7993
+        }
7994
+        
7995
+        if (bump.equals(""))
7996
+        {
7997
+            bump = null;
7998
+        }
7999
+        
8000
+        ReleaseTexture(bump, true);
8001
+    }
8002
+    
79248003     void ReleaseTexture(String tex, boolean bump)
79258004     {
79268005         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8067,6 +8146,73 @@
80678146         GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
80688147             
80698148         return; // true;
8149
+    }
8150
+    
8151
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8152
+    {
8153
+        if (// DrawMode() != 0 || /*tex == null ||*/
8154
+                ambientOcclusion ) // || !textureon)
8155
+        {
8156
+            return; // false;
8157
+        }
8158
+
8159
+        if (tex == null)
8160
+        {
8161
+            BindTexture(null,false,resolution);
8162
+            return;
8163
+        }
8164
+        
8165
+        String pigment = Object3D.GetPigment(tex);
8166
+
8167
+        usedtextures.put(pigment, pigment);
8168
+        
8169
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8170
+        {
8171
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8172
+        //    System.out.println("; bump = " + bump);
8173
+        }
8174
+        
8175
+        if (pigment.equals(""))
8176
+        {
8177
+            pigment = null;
8178
+        }
8179
+        
8180
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8181
+        BindTexture(pigment, false, resolution);
8182
+    }
8183
+    
8184
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8185
+    {
8186
+        if (// DrawMode() != 0 || /*tex == null ||*/
8187
+                ambientOcclusion ) // || !textureon)
8188
+        {
8189
+            return; // false;
8190
+        }
8191
+
8192
+        if (tex == null)
8193
+        {
8194
+            BindTexture(null,true,resolution);
8195
+            return;
8196
+        }
8197
+        
8198
+        String bump = Object3D.GetBump(tex);
8199
+
8200
+        usedtextures.put(bump, bump);
8201
+        
8202
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8203
+        {
8204
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8205
+        //    System.out.println("; bump = " + bump);
8206
+        }
8207
+        
8208
+        if (bump.equals(""))
8209
+        {
8210
+            bump = null;
8211
+        }
8212
+        
8213
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8214
+        BindTexture(bump, true, resolution);
8215
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
80708216     }
80718217     
80728218     java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
....@@ -9234,11 +9380,35 @@
92349380         jy8[3] = 0.5f;
92359381     }
92369382     
9237
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9383
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
92389384     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
92399385     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
92409386     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92419387 
9388
+    void ResetOptions()
9389
+    {
9390
+        options1[0] = 100;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
9393
+        options1[3] = 0;
9394
+        options1[4] = 0;
9395
+        
9396
+        options2[0] = 0;
9397
+        options2[1] = 0.75f;
9398
+        options2[2] = 0;
9399
+        options2[3] = 0;
9400
+        
9401
+        options3[0] = 1;
9402
+        options3[1] = 1;
9403
+        options3[2] = 1;
9404
+        options3[3] = 0;
9405
+        
9406
+        options4[0] = 1;
9407
+        options4[1] = 0;
9408
+        options4[2] = 1;
9409
+        options4[3] = 0;
9410
+    }
9411
+    
92429412     static int imagecount = 0; // movie generation
92439413     
92449414     static int jitter = 0;
....@@ -9335,7 +9505,7 @@
93359505         
93369506         if (renderCamera != lightCamera)
93379507         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9338
-            LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9508
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93399509         
93409510 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93419511             
....@@ -9351,7 +9521,7 @@
93519521             
93529522         if (renderCamera != lightCamera)
93539523         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9354
-            LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9524
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93559525 
93569526 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93579527             
....@@ -10349,6 +10519,7 @@
1034910519                     ANTIALIAS = 0;
1035010520                     //System.out.println("RESTART");
1035110521                     AAtimer.restart();
10522
+                    Globals.TIMERRUNNING = true;
1035210523                 }
1035310524             }
1035410525         }
....@@ -10416,7 +10587,8 @@
1041610587             ambientOcclusion = false;
1041710588         }
1041810589 
10419
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10590
+        if (//Globals.lighttouched &&
10591
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1042010592         {
1042110593             //if (RENDERSHADOW) // ?
1042210594             if (!IsFrozen())
....@@ -10550,7 +10722,7 @@
1055010722 //        if (parentcam != renderCamera) // not a light
1055110723         if (cam != lightCamera)
1055210724             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10553
-                LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10725
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1055410726             
1055510727             for (int j = 0; j < 4; j++)
1055610728             {
....@@ -10565,7 +10737,7 @@
1056510737 //        if (parentcam != renderCamera) // not a light
1056610738         if (cam != lightCamera)
1056710739             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10568
-                LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10740
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1056910741         
1057010742             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1057110743             
....@@ -10959,7 +11131,7 @@
1095911131 
1096011132 //            if (cam != lightCamera)
1096111133             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10962
-                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11134
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1096311135         }
1096411136         
1096511137         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10981,7 +11153,7 @@
1098111153             {
1098211154                 if (cam != lightCamera)
1098311155                 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10984
-                   LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
11156
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1098511157             }
1098611158             
1098711159             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11326,15 +11498,36 @@
1132611498 
1132711499     static boolean zoomonce = false;
1132811500     
11501
+    static void CreateSelectedPoint()
11502
+    {
11503
+        if (selectedpoint == null)
11504
+        {
11505
+            debugpointG = new Sphere();
11506
+            debugpointP = new Sphere();
11507
+            debugpointC = new Sphere();
11508
+            debugpointR = new Sphere();
11509
+            
11510
+            selectedpoint = new Superellipsoid();
11511
+            
11512
+            for (int i=0; i<8; i++)
11513
+            {
11514
+                debugpoints[i] = new Sphere();
11515
+            }
11516
+        }
11517
+    }
11518
+    
1132911519     void DrawObject(GL gl, boolean draw)
1133011520     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
1133111524         //System.out.println("DRAW OBJECT " + mouseDown);
1133211525 //        DrawMode() = SELECTION;
1133311526         //GL gl = getGL();
1133411527         if ((TRACK || SHADOWTRACK) || zoomonce)
1133511528         {
1133611529             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1133811531             pingthread.StepToTarget(true); // true);
1133911532        //     zoomonce = false;
1134011533         }
....@@ -11406,8 +11599,9 @@
1140611599             
1140711600             if (DrawMode() == DEFAULT)
1140811601             {
11409
-                if (DEBUG)
11602
+                if (Globals.DEBUG)
1141011603                 {
11604
+                    CreateSelectedPoint();
1141111605                     float radius = 0.05f;
1141211606                     if (selectedpoint.radius != radius)
1141311607                     {
....@@ -11912,7 +12106,7 @@
1191212106             }
1191312107             
1191412108         //for (int count = parentcam.GetTransformCount(); --count>=0;)
11915
-            LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
12109
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1191612110 
1191712111             LA.xformPos(light, renderCamera.toScreen, light);
1191812112             
....@@ -13164,7 +13358,8 @@
1316413358     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1316513359     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1316613360     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167
-    Object3D.cVector2[] vector2buffer;
13361
+    
13362
+    //Object3D.cVector2[] vector2buffer;
1316813363 
1316913364     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1317013365     // OUT : diff, spec
....@@ -13180,9 +13375,10 @@
1318013375                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1318113376                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1318213377                 //"MOV " + dest + ".w," + "normal.z;" +
13183
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185
-                //"MOV " + dest + ".z," + "params2.w;" + 
13378
+//            "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13379
+//            "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13380
+                
13381
+                "MOV " + dest + ".z," + "params2.w;" + // EXACT
1318613382                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1318713383                 "RCP " + dest + ".w," + dest + ".w;" +
1318813384                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13687,6 +13883,7 @@
1368713883         else
1368813884         if (evt.getSource() == AAtimer)
1368913885         {
13886
+                    Globals.TIMERRUNNING = false;
1369013887             if (mouseDown)
1369113888             {
1369213889             //new Exception().printStackTrace();
....@@ -13746,7 +13943,7 @@
1374613943             
1374713944 // fev 2014???
1374813945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1375013947             pingthread.StepToTarget(true); // true);
1375113948         }
1375213949     //    if (!LIVE)
....@@ -13761,6 +13958,7 @@
1376113958             return;
1376213959         
1376313960         AAtimer.restart(); // 
13961
+        Globals.TIMERRUNNING = true;
1376413962 
1376513963 //        waslive = LIVE;
1376613964 //        LIVE = false;
....@@ -13833,6 +14031,8 @@
1383314031     
1383414032     public void mouseDragged(MouseEvent e)
1383514033     {
14034
+        Globals.MOUSEDRAGGED = true;
14035
+        
1383614036         //System.out.println("mouseDragged: " + e);
1383714037         if (isRenderer)
1383814038             movingcamera = true;
....@@ -14222,7 +14422,8 @@
1422214422                 info.camera = renderCamera;
1422314423                 info.x = x;
1422414424                 info.y = y;
14225
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14425
+                object.GetWindow().copy
14426
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1422614427             } else
1422714428             {
1422814429                 if (x < startX)
....@@ -14386,7 +14587,9 @@
1438614587         ci.camera = renderCamera;
1438714588         if (!isRenderer)
1438814589         {
14389
-            if (object.editWindow.copy.doEditClick(ci, 0))
14590
+            //ObjEditor editWindow = object.editWindow;
14591
+            //Object3D copy = editWindow.copy;
14592
+            if (object.doEditClick(ci, 0))
1439014593             {
1439114594                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1439214595             } else
....@@ -14398,8 +14601,11 @@
1439814601 
1439914602     public void mouseReleased(MouseEvent e)
1440014603     {
14604
+        Globals.MOUSEDRAGGED = false;
14605
+        
1440114606         movingcamera = false;
14402
-        X = Y = 0;
14607
+        X = 0; // getBounds().width/2;
14608
+        Y = 0; // getBounds().height/2;
1440314609         //System.out.println("mouseReleased: " + e);
1440414610         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1440514611     }
....@@ -14765,8 +14971,14 @@
1476514971                 RevertCamera();
1476614972                 repaint();
1476714973                 break;
14768
-            case 'L':
1476914974             case 'l':
14975
+                lightMode ^= true;
14976
+                Globals.lighttouched = true;
14977
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14978
+                targetLookAt.set(manipCamera.lookAt);
14979
+                repaint();
14980
+                break;
14981
+            case 'L':
1477014982                 if (lightMode)
1477114983                 {
1477214984                     lightMode = false;
....@@ -14909,20 +15121,18 @@
1490915121             case '_':
1491015122                 kompactbit = 5;
1491115123                 break;
14912
-            case '+':
14913
-                kompactbit = 6;
14914
-                break;
15124
+//            case '+':
15125
+//                kompactbit = 6;
15126
+//                break;
1491515127             case ' ':
14916
-                lightMode ^= true;
14917
-                Globals.lighttouched = true;
14918
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14919
-                targetLookAt.set(manipCamera.lookAt);
15128
+                ObjEditor.theFrame.ToggleFullScreen();
1492015129                 repaint();
1492115130                 break;
1492215131             //case '`' :
1492315132             case ESC:
1492415133                 RENDERPROGRAM += 1;
1492515134                 RENDERPROGRAM %= 3;
15135
+
1492615136                 repaint();
1492715137                 break;
1492815138             case 'Z':
....@@ -14962,8 +15172,9 @@
1496215172             case DELETE:
1496315173                 ClearSelection();
1496415174                 break;
14965
-                /*
1496615175             case '+':
15176
+                
15177
+                /*
1496715178                 //fontsize += 1;
1496815179                 bbzoom *= 2;
1496915180                 repaint();
....@@ -14980,17 +15191,17 @@
1498015191             case '=':
1498115192                 IncDepth();
1498215193                 //fontsize += 1;
14983
-                object.editWindow.refreshContents(true);
15194
+                object.GetWindow().refreshContents(true);
1498415195                 maskbit = 6;
1498515196                 break;
1498615197             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1498715198                 DecDepth();
1498815199                 maskbit = 5;
1498915200                 //if(fontsize > 1) fontsize -= 1;
14990
-                if (object.editWindow == null)
14991
-                    new Exception().printStackTrace();
14992
-                else
14993
-                    object.editWindow.refreshContents(true);
15201
+//                if (object.editWindow == null)
15202
+//                    new Exception().printStackTrace();
15203
+//                else
15204
+                    object.GetWindow().refreshContents(true);
1499415205                 break;
1499515206             case '{':
1499615207                 manipCamera.shaper_fovy /= 1.1;
....@@ -15214,7 +15425,7 @@
1521415425         }
1521515426          */
1521615427 
15217
-        object.editWindow.EditSelection();
15428
+        object.GetWindow().EditSelection(false);
1521815429     }
1521915430 
1522015431     void SelectParent()
....@@ -15231,10 +15442,10 @@
1523115442             {
1523215443                 //selectees.remove(i);
1523315444                 System.out.println("select parent of " + elem);
15234
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15445
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1523515446             } else
1523615447             {
15237
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15448
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1523815449             }
1523915450 
1524015451             first = false;
....@@ -15276,12 +15487,12 @@
1527615487                 for (int j = 0; j < group.children.size(); j++)
1527715488                 {
1527815489                     elem = (Object3D) group.children.elementAt(j);
15279
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15490
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1528015491                     first = false;
1528115492                 }
1528215493             } else
1528315494             {
15284
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15495
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1528515496             }
1528615497 
1528715498             first = false;
....@@ -15292,21 +15503,21 @@
1529215503     {
1529315504         //Composite group = (Composite) object;
1529415505         Object3D group = object;
15295
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15506
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1529615507     }
1529715508 
1529815509     void ResetTransform(int mask)
1529915510     {
1530015511         //Composite group = (Composite) object;
1530115512         Object3D group = object;
15302
-        group.editWindow.ResetTransform(mask);
15513
+        group.GetWindow().ResetTransform(mask);
1530315514     }
1530415515 
1530515516     void FlipTransform()
1530615517     {
1530715518         //Composite group = (Composite) object;
1530815519         Object3D group = object;
15309
-        group.editWindow.FlipTransform();
15520
+        group.GetWindow().FlipTransform();
1531015521 //        group.editWindow.ReduceMesh(true);
1531115522     }
1531215523 
....@@ -15314,7 +15525,7 @@
1531415525     {
1531515526         //Composite group = (Composite) object;
1531615527         Object3D group = object;
15317
-        group.editWindow.PrintMemory();
15528
+        group.GetWindow().PrintMemory();
1531815529 //        group.editWindow.ReduceMesh(true);
1531915530     }
1532015531     
....@@ -15322,7 +15533,7 @@
1532215533     {
1532315534         //Composite group = (Composite) object;
1532415535         Object3D group = object;
15325
-        group.editWindow.ResetCentroid();
15536
+        group.GetWindow().ResetCentroid();
1532615537     }
1532715538 
1532815539     void IncDepth()
....@@ -15507,18 +15718,42 @@
1550715718              */
1550815719             if (!isRenderer)
1550915720             {
15510
-                object.drawEditHandles(info, 0);
15511
-                
15512
-                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15721
+                if (object.selection.Size() > 0)
1551315722                 {
15514
-                    switch (object.selection.get(0).hitSomething)
15723
+                    int hitSomething = object.selection.get(0).hitSomething;
15724
+
15725
+                    info.DX = 0;
15726
+                    info.DY = 0;
15727
+                    info.W = 1;
15728
+                    if (hitSomething == Object3D.hitCenter)
1551515729                     {
15516
-                        case Object3D.hitCenter: gr.setColor(Color.pink); break;
15517
-                        case Object3D.hitRotate: gr.setColor(Color.green); break;
15518
-                        case Object3D.hitScale: gr.setColor(Color.cyan); break;
15730
+                        info.DX = X;
15731
+                        if (X != 0)
15732
+                            info.DX -= info.bounds.width/2;
15733
+
15734
+                        info.DY = Y;
15735
+                        if (Y != 0)
15736
+                            info.DY -= info.bounds.height/2;
1551915737                     }
15520
-                    
15521
-                    gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15738
+
15739
+                    object.drawEditHandles(info, 0);
15740
+
15741
+                    if (drag && (X != 0 || Y != 0))
15742
+                    {
15743
+                        switch (hitSomething)
15744
+                        {
15745
+                            case Object3D.hitCenter: gr.setColor(Color.pink);
15746
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15747
+                                break;
15748
+                            case Object3D.hitRotate: gr.setColor(Color.yellow);
15749
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15750
+                            break;
15751
+                            case Object3D.hitScale: gr.setColor(Color.cyan);
15752
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15753
+                            break;
15754
+                        }
15755
+
15756
+                    }
1552215757                 }
1552315758             }
1552415759         }
....@@ -16221,16 +16456,16 @@
1622116456                 cStatic.objectstack[materialdepth++] = checker;
1622216457                 //System.out.println("material " + material);
1622316458                 //Applet3D.tracein(this, selected);
16224
-                vector2buffer = checker.projectedVertices;
16459
+                //vector2buffer = checker.projectedVertices;
1622516460 
1622616461         //checker.GetMaterial().Draw(this, false); // true);
16227
-        DrawMaterial(checker.GetMaterial(), false); // true);
16462
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1622816463 
1622916464                 materialdepth -= 1;
1623016465                 if (materialdepth > 0)
1623116466                 {
16232
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16233
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16467
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16468
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1623416469                 }
1623516470         //checker.GetMaterial().opacity = 1f;
1623616471         ////checker.GetMaterial().ambient = 1f;
....@@ -16454,6 +16689,8 @@
1645416689 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1645516690 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1645616691                 
16692
+                CreateSelectedPoint();
16693
+                
1645716694                 // Will fit the mesh !!!
1645816695                 selectedpoint.toParent[0][0] = 0.0001;
1645916696                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16507,7 +16744,7 @@
1650716744                 }
1650816745                 
1650916746                 if (!movingcamera && !PAINTMODE)
16510
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16747
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1651116748                 
1651216749                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1651316750                 {
....@@ -16519,17 +16756,17 @@
1651916756                     
1652016757                     group.add(paintobj); // link
1652116758                     
16522
-                    object.editWindow.SnapObject(group);
16759
+                    object.GetWindow().SnapObject(group);
1652316760                     
16524
-                    Object3D folder = object.editWindow.copy;
16761
+                    Object3D folder = object.GetWindow().copy;
1652516762                     
16526
-                    if (object.editWindow.copy.selection.Size() > 0)
16527
-                        folder = object.editWindow.copy.selection.elementAt(0);
16763
+                    if (object.GetWindow().copy.selection.Size() > 0)
16764
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1652816765                     
1652916766                     folder.add(group);
1653016767                     
16531
-                    object.editWindow.ResetModel();
16532
-                    object.editWindow.refreshContents();
16768
+                    object.GetWindow().ResetModel();
16769
+                    object.GetWindow().refreshContents();
1653316770                 }
1653416771                 else
1653516772                     paintcount = 0;
....@@ -16568,6 +16805,11 @@
1656816805                 //System.out.println("objects[color] = " + objects[color]);
1656916806                 //objects[color].Select();
1657016807                 indexcount = 0;
16808
+                    ObjEditor window = object.GetWindow();
16809
+                    if (window != null && deselect)
16810
+                    {
16811
+                        window.Select(null, deselect, true);
16812
+                    }
1657116813                 object.Select(color, deselect);
1657216814             }
1657316815 
....@@ -17093,23 +17335,15 @@
1709317335     int AAbuffersize = 0;
1709417336     
1709517337     //double[] selectedpoint = new double[3];
17096
-    static Superellipsoid selectedpoint = new Superellipsoid();
17338
+    static Superellipsoid selectedpoint;
1709717339     static Sphere previousselectedpoint = null;
17098
-    static Sphere debugpointG = new Sphere();
17099
-    static Sphere debugpointP = new Sphere();
17100
-    static Sphere debugpointC = new Sphere();
17101
-    static Sphere debugpointR = new Sphere();
17340
+    static Sphere debugpointG;
17341
+    static Sphere debugpointP;
17342
+    static Sphere debugpointC;
17343
+    static Sphere debugpointR;
1710217344     
1710317345     static Sphere debugpoints[] = new Sphere[8];
1710417346  
17105
-    static
17106
-    {
17107
-        for (int i=0; i<8; i++)
17108
-        {
17109
-            debugpoints[i] = new Sphere();
17110
-        }
17111
-    }
17112
-    
1711317347     static void InitPoints(float radius)
1711417348     {
1711517349         for (int i=0; i<8; i++)