blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 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;
....@@ -359,7 +358,7 @@
359358                 /**/
360359                 } else
361360                 {
362
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
363362                 }
364363             } else
365364             {
....@@ -383,8 +382,8 @@
383382             cStatic.objectstack[materialdepth++] = obj;
384383             //System.out.println("material " + material);
385384             //Applet3D.tracein("selected ", selected);
386
-            display.vector2buffer = obj.projectedVertices;
387
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
388387         }
389388     }
390389     
....@@ -401,8 +400,8 @@
401400                 materialdepth -= 1;
402401                 if (materialdepth > 0)
403402                 {
404
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
403
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406405                 }
407406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -422,8 +421,8 @@
422421             materialdepth -= 1;
423422             if (materialdepth > 0)
424423             {
425
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
424
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427426             }
428427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429428         //else
....@@ -464,10 +463,12 @@
464463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465464         {
466465             //gl.glBegin(gl.GL_TRIANGLES);
467
-            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
466
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
467
+                    // TEST LIVE NORMALS && !obj.dontselect
468
+                    ;
468469             if (!hasnorm)
469470             {
470
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
471472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
472473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
473474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1192,10 +1193,12 @@
11921193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11931194                                 }
11941195                             }
1196
+                            
11951197                             if (flipV)
11961198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11971199                             else
11981200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11991202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12001203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12011204 
....@@ -1215,10 +1218,12 @@
12151218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12161219                                 }
12171220                             }
1221
+                            
12181222                             if (flipV)
12191223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12201224                             else
12211225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12221227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12231228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12241229 
....@@ -1246,8 +1251,10 @@
12461251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12471252                                 else
12481253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12491255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12501256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12511258                                 count2 += 2;
12521259                                 count3 += 3;
12531260                             }
....@@ -1603,7 +1610,7 @@
16031610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16041611     }
16051612     
1606
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16071614     {
16081615             CameraPane display = this;
16091616         //new Exception().printStackTrace();
....@@ -1638,7 +1645,7 @@
16381645             colorV[0] = display.modelParams0[0] * material.diffuse;
16391646             colorV[1] = display.modelParams0[1] * material.diffuse;
16401647             colorV[2] = display.modelParams0[2] * material.diffuse;
1641
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16421649 
16431650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16441651             //System.out.println("Opacity = " + opacity);
....@@ -1746,9 +1753,9 @@
17461753         display.modelParams7[2] = 0;
17471754         display.modelParams7[3] = 0;
17481755 
1749
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17501757         
1751
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17521759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17531760         {
17541761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1890,7 +1897,7 @@
18901897     void PushMatrix(double[][] matrix)
18911898     {
18921899     //    GrafreeD.tracein(matrix);
1893
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18941901     }
18951902     
18961903     void PushMatrix()
....@@ -2259,7 +2266,7 @@
22592266     
22602267     void ToggleDebug()
22612268     {
2262
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22632270     }
22642271 
22652272     void ToggleLookAt()
....@@ -7921,6 +7928,64 @@
79217928         ReleaseTexture(pigment, false);
79227929     }
79237930     
7931
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7932
+    {
7933
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7934
+        {
7935
+            return;
7936
+        }
7937
+
7938
+        if (tex == null)
7939
+        {
7940
+            ReleaseTexture(null, false);
7941
+            return;
7942
+        }
7943
+        
7944
+        String pigment = Object3D.GetPigment(tex);
7945
+
7946
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947
+        {
7948
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7949
+        //    System.out.println("; bump = " + bump);
7950
+        }
7951
+        
7952
+        if (pigment.equals(""))
7953
+        {
7954
+            pigment = null;
7955
+        }
7956
+        
7957
+        ReleaseTexture(pigment, false);
7958
+    }
7959
+    
7960
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7961
+    {
7962
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7963
+        {
7964
+            return;
7965
+        }
7966
+
7967
+        if (tex == null)
7968
+        {
7969
+            ReleaseTexture(null, true);
7970
+            return;
7971
+        }
7972
+        
7973
+        String bump = Object3D.GetBump(tex);
7974
+
7975
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976
+        {
7977
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7978
+        //    System.out.println("; bump = " + bump);
7979
+        }
7980
+        
7981
+        if (bump.equals(""))
7982
+        {
7983
+            bump = null;
7984
+        }
7985
+        
7986
+        ReleaseTexture(bump, true);
7987
+    }
7988
+    
79247989     void ReleaseTexture(String tex, boolean bump)
79257990     {
79267991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8067,6 +8132,73 @@
80678132         GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
80688133             
80698134         return; // true;
8135
+    }
8136
+    
8137
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8138
+    {
8139
+        if (// DrawMode() != 0 || /*tex == null ||*/
8140
+                ambientOcclusion ) // || !textureon)
8141
+        {
8142
+            return; // false;
8143
+        }
8144
+
8145
+        if (tex == null)
8146
+        {
8147
+            BindTexture(null,false,resolution);
8148
+            return;
8149
+        }
8150
+        
8151
+        String pigment = Object3D.GetPigment(tex);
8152
+
8153
+        usedtextures.put(pigment, pigment);
8154
+        
8155
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156
+        {
8157
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8158
+        //    System.out.println("; bump = " + bump);
8159
+        }
8160
+        
8161
+        if (pigment.equals(""))
8162
+        {
8163
+            pigment = null;
8164
+        }
8165
+        
8166
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167
+        BindTexture(pigment, false, resolution);
8168
+    }
8169
+    
8170
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8171
+    {
8172
+        if (// DrawMode() != 0 || /*tex == null ||*/
8173
+                ambientOcclusion ) // || !textureon)
8174
+        {
8175
+            return; // false;
8176
+        }
8177
+
8178
+        if (tex == null)
8179
+        {
8180
+            BindTexture(null,true,resolution);
8181
+            return;
8182
+        }
8183
+        
8184
+        String bump = Object3D.GetBump(tex);
8185
+
8186
+        usedtextures.put(bump, bump);
8187
+        
8188
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189
+        {
8190
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8191
+        //    System.out.println("; bump = " + bump);
8192
+        }
8193
+        
8194
+        if (bump.equals(""))
8195
+        {
8196
+            bump = null;
8197
+        }
8198
+        
8199
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200
+        BindTexture(bump, true, resolution);
8201
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
80708202     }
80718203     
80728204     java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
....@@ -9335,7 +9467,7 @@
93359467         
93369468         if (renderCamera != lightCamera)
93379469         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9338
-            LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93399471         
93409472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93419473             
....@@ -9351,7 +9483,7 @@
93519483             
93529484         if (renderCamera != lightCamera)
93539485         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9354
-            LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93559487 
93569488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93579489             
....@@ -10349,6 +10481,7 @@
1034910481                     ANTIALIAS = 0;
1035010482                     //System.out.println("RESTART");
1035110483                     AAtimer.restart();
10484
+                    Globals.TIMERRUNNING = true;
1035210485                 }
1035310486             }
1035410487         }
....@@ -10416,7 +10549,8 @@
1041610549             ambientOcclusion = false;
1041710550         }
1041810551 
10419
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552
+        if (//Globals.lighttouched &&
10553
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1042010554         {
1042110555             //if (RENDERSHADOW) // ?
1042210556             if (!IsFrozen())
....@@ -10550,7 +10684,7 @@
1055010684 //        if (parentcam != renderCamera) // not a light
1055110685         if (cam != lightCamera)
1055210686             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10553
-                LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1055410688             
1055510689             for (int j = 0; j < 4; j++)
1055610690             {
....@@ -10565,7 +10699,7 @@
1056510699 //        if (parentcam != renderCamera) // not a light
1056610700         if (cam != lightCamera)
1056710701             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10568
-                LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1056910703         
1057010704             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1057110705             
....@@ -10959,7 +11093,7 @@
1095911093 
1096011094 //            if (cam != lightCamera)
1096111095             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10962
-                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11096
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1096311097         }
1096411098         
1096511099         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10981,7 +11115,7 @@
1098111115             {
1098211116                 if (cam != lightCamera)
1098311117                 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10984
-                   LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
11118
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1098511119             }
1098611120             
1098711121             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11326,6 +11460,24 @@
1132611460 
1132711461     static boolean zoomonce = false;
1132811462     
11463
+    static void CreateSelectedPoint()
11464
+    {
11465
+        if (selectedpoint == null)
11466
+        {
11467
+            debugpointG = new Sphere();
11468
+            debugpointP = new Sphere();
11469
+            debugpointC = new Sphere();
11470
+            debugpointR = new Sphere();
11471
+            
11472
+            selectedpoint = new Superellipsoid();
11473
+            
11474
+            for (int i=0; i<8; i++)
11475
+            {
11476
+                debugpoints[i] = new Sphere();
11477
+            }
11478
+        }
11479
+    }
11480
+    
1132911481     void DrawObject(GL gl, boolean draw)
1133011482     {
1133111483         //System.out.println("DRAW OBJECT " + mouseDown);
....@@ -11406,8 +11558,9 @@
1140611558             
1140711559             if (DrawMode() == DEFAULT)
1140811560             {
11409
-                if (DEBUG)
11561
+                if (Globals.DEBUG)
1141011562                 {
11563
+                    CreateSelectedPoint();
1141111564                     float radius = 0.05f;
1141211565                     if (selectedpoint.radius != radius)
1141311566                     {
....@@ -11894,7 +12047,7 @@
1189412047             for (int i = tp.size(); --i >= 0;)
1189512048             {
1189612049                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897
-                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12050
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1189812051             }
1189912052 
1190012053 
....@@ -11912,7 +12065,7 @@
1191212065             }
1191312066             
1191412067         //for (int count = parentcam.GetTransformCount(); --count>=0;)
11915
-            LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
12068
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1191612069 
1191712070             LA.xformPos(light, renderCamera.toScreen, light);
1191812071             
....@@ -13164,7 +13317,8 @@
1316413317     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1316513318     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1316613319     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167
-    Object3D.cVector2[] vector2buffer;
13320
+    
13321
+    //Object3D.cVector2[] vector2buffer;
1316813322 
1316913323     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1317013324     // OUT : diff, spec
....@@ -13687,6 +13841,7 @@
1368713841         else
1368813842         if (evt.getSource() == AAtimer)
1368913843         {
13844
+                    Globals.TIMERRUNNING = false;
1369013845             if (mouseDown)
1369113846             {
1369213847             //new Exception().printStackTrace();
....@@ -13761,6 +13916,7 @@
1376113916             return;
1376213917         
1376313918         AAtimer.restart(); // 
13919
+        Globals.TIMERRUNNING = true;
1376413920 
1376513921 //        waslive = LIVE;
1376613922 //        LIVE = false;
....@@ -13833,6 +13989,8 @@
1383313989     
1383413990     public void mouseDragged(MouseEvent e)
1383513991     {
13992
+        Globals.MOUSEDRAGGED = true;
13993
+        
1383613994         //System.out.println("mouseDragged: " + e);
1383713995         if (isRenderer)
1383813996             movingcamera = true;
....@@ -14222,7 +14380,8 @@
1422214380                 info.camera = renderCamera;
1422314381                 info.x = x;
1422414382                 info.y = y;
14225
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14383
+                object.GetWindow().copy
14384
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1422614385             } else
1422714386             {
1422814387                 if (x < startX)
....@@ -14386,7 +14545,9 @@
1438614545         ci.camera = renderCamera;
1438714546         if (!isRenderer)
1438814547         {
14389
-            if (object.editWindow.copy.doEditClick(ci, 0))
14548
+            //ObjEditor editWindow = object.editWindow;
14549
+            //Object3D copy = editWindow.copy;
14550
+            if (object.doEditClick(ci, 0))
1439014551             {
1439114552                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1439214553             } else
....@@ -14398,6 +14559,8 @@
1439814559 
1439914560     public void mouseReleased(MouseEvent e)
1440014561     {
14562
+        Globals.MOUSEDRAGGED = false;
14563
+        
1440114564         movingcamera = false;
1440214565         X = Y = 0;
1440314566         //System.out.println("mouseReleased: " + e);
....@@ -14765,8 +14928,14 @@
1476514928                 RevertCamera();
1476614929                 repaint();
1476714930                 break;
14768
-            case 'L':
1476914931             case 'l':
14932
+                lightMode ^= true;
14933
+                Globals.lighttouched = true;
14934
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14935
+                targetLookAt.set(manipCamera.lookAt);
14936
+                repaint();
14937
+                break;
14938
+            case 'L':
1477014939                 if (lightMode)
1477114940                 {
1477214941                     lightMode = false;
....@@ -14913,16 +15082,14 @@
1491315082                 kompactbit = 6;
1491415083                 break;
1491515084             case ' ':
14916
-                lightMode ^= true;
14917
-                Globals.lighttouched = true;
14918
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14919
-                targetLookAt.set(manipCamera.lookAt);
15085
+                ObjEditor.theFrame.ToggleFullScreen();
1492015086                 repaint();
1492115087                 break;
1492215088             //case '`' :
1492315089             case ESC:
1492415090                 RENDERPROGRAM += 1;
1492515091                 RENDERPROGRAM %= 3;
15092
+
1492615093                 repaint();
1492715094                 break;
1492815095             case 'Z':
....@@ -15214,7 +15381,7 @@
1521415381         }
1521515382          */
1521615383 
15217
-        object.editWindow.EditSelection();
15384
+        object.editWindow.EditSelection(false);
1521815385     }
1521915386 
1522015387     void SelectParent()
....@@ -15513,12 +15680,17 @@
1551315680                 {
1551415681                     switch (object.selection.get(0).hitSomething)
1551515682                     {
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;
15683
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15684
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
+                            break;
15686
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15687
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
+                        break;
15689
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15690
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15691
+                        break;
1551915692                     }
1552015693                     
15521
-                    gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1552215694                 }
1552315695             }
1552415696         }
....@@ -16221,16 +16393,16 @@
1622116393                 cStatic.objectstack[materialdepth++] = checker;
1622216394                 //System.out.println("material " + material);
1622316395                 //Applet3D.tracein(this, selected);
16224
-                vector2buffer = checker.projectedVertices;
16396
+                //vector2buffer = checker.projectedVertices;
1622516397 
1622616398         //checker.GetMaterial().Draw(this, false); // true);
16227
-        DrawMaterial(checker.GetMaterial(), false); // true);
16399
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1622816400 
1622916401                 materialdepth -= 1;
1623016402                 if (materialdepth > 0)
1623116403                 {
16232
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16233
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16404
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16405
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1623416406                 }
1623516407         //checker.GetMaterial().opacity = 1f;
1623616408         ////checker.GetMaterial().ambient = 1f;
....@@ -16453,6 +16625,8 @@
1645316625 //                System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1645416626 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1645516627 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16628
+                
16629
+                CreateSelectedPoint();
1645616630                 
1645716631                 // Will fit the mesh !!!
1645816632                 selectedpoint.toParent[0][0] = 0.0001;
....@@ -17093,23 +17267,15 @@
1709317267     int AAbuffersize = 0;
1709417268     
1709517269     //double[] selectedpoint = new double[3];
17096
-    static Superellipsoid selectedpoint = new Superellipsoid();
17270
+    static Superellipsoid selectedpoint;
1709717271     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();
17272
+    static Sphere debugpointG;
17273
+    static Sphere debugpointP;
17274
+    static Sphere debugpointC;
17275
+    static Sphere debugpointR;
1710217276     
1710317277     static Sphere debugpoints[] = new Sphere[8];
1710417278  
17105
-    static
17106
-    {
17107
-        for (int i=0; i<8; i++)
17108
-        {
17109
-            debugpoints[i] = new Sphere();
17110
-        }
17111
-    }
17112
-    
1711317279     static void InitPoints(float radius)
1711417280     {
1711517281         for (int i=0; i<8; i++)