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
....@@ -1611,7 +1610,7 @@
16111610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16121611     }
16131612     
1614
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16151614     {
16161615             CameraPane display = this;
16171616         //new Exception().printStackTrace();
....@@ -1646,7 +1645,7 @@
16461645             colorV[0] = display.modelParams0[0] * material.diffuse;
16471646             colorV[1] = display.modelParams0[1] * material.diffuse;
16481647             colorV[2] = display.modelParams0[2] * material.diffuse;
1649
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16501649 
16511650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16521651             //System.out.println("Opacity = " + opacity);
....@@ -1754,9 +1753,9 @@
17541753         display.modelParams7[2] = 0;
17551754         display.modelParams7[3] = 0;
17561755 
1757
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17581757         
1759
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17601759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17611760         {
17621761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -2267,7 +2266,7 @@
22672266     
22682267     void ToggleDebug()
22692268     {
2270
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22712270     }
22722271 
22732272     void ToggleLookAt()
....@@ -10482,6 +10481,7 @@
1048210481                     ANTIALIAS = 0;
1048310482                     //System.out.println("RESTART");
1048410483                     AAtimer.restart();
10484
+                    Globals.TIMERRUNNING = true;
1048510485                 }
1048610486             }
1048710487         }
....@@ -10549,7 +10549,8 @@
1054910549             ambientOcclusion = false;
1055010550         }
1055110551 
10552
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552
+        if (//Globals.lighttouched &&
10553
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1055310554         {
1055410555             //if (RENDERSHADOW) // ?
1055510556             if (!IsFrozen())
....@@ -11459,6 +11460,24 @@
1145911460 
1146011461     static boolean zoomonce = false;
1146111462     
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
+    
1146211481     void DrawObject(GL gl, boolean draw)
1146311482     {
1146411483         //System.out.println("DRAW OBJECT " + mouseDown);
....@@ -11539,8 +11558,9 @@
1153911558             
1154011559             if (DrawMode() == DEFAULT)
1154111560             {
11542
-                if (DEBUG)
11561
+                if (Globals.DEBUG)
1154311562                 {
11563
+                    CreateSelectedPoint();
1154411564                     float radius = 0.05f;
1154511565                     if (selectedpoint.radius != radius)
1154611566                     {
....@@ -13297,7 +13317,8 @@
1329713317     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1329813318     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1329913319     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300
-    Object3D.cVector2[] vector2buffer;
13320
+    
13321
+    //Object3D.cVector2[] vector2buffer;
1330113322 
1330213323     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1330313324     // OUT : diff, spec
....@@ -13820,6 +13841,7 @@
1382013841         else
1382113842         if (evt.getSource() == AAtimer)
1382213843         {
13844
+                    Globals.TIMERRUNNING = false;
1382313845             if (mouseDown)
1382413846             {
1382513847             //new Exception().printStackTrace();
....@@ -13894,6 +13916,7 @@
1389413916             return;
1389513917         
1389613918         AAtimer.restart(); // 
13919
+        Globals.TIMERRUNNING = true;
1389713920 
1389813921 //        waslive = LIVE;
1389913922 //        LIVE = false;
....@@ -14357,7 +14380,8 @@
1435714380                 info.camera = renderCamera;
1435814381                 info.x = x;
1435914382                 info.y = y;
14360
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14383
+                object.GetWindow().copy
14384
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1436114385             } else
1436214386             {
1436314387                 if (x < startX)
....@@ -14521,7 +14545,9 @@
1452114545         ci.camera = renderCamera;
1452214546         if (!isRenderer)
1452314547         {
14524
-            if (object.editWindow.copy.doEditClick(ci, 0))
14548
+            //ObjEditor editWindow = object.editWindow;
14549
+            //Object3D copy = editWindow.copy;
14550
+            if (object.doEditClick(ci, 0))
1452514551             {
1452614552                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1452714553             } else
....@@ -14902,8 +14928,14 @@
1490214928                 RevertCamera();
1490314929                 repaint();
1490414930                 break;
14905
-            case 'L':
1490614931             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':
1490714939                 if (lightMode)
1490814940                 {
1490914941                     lightMode = false;
....@@ -15050,16 +15082,14 @@
1505015082                 kompactbit = 6;
1505115083                 break;
1505215084             case ' ':
15053
-                lightMode ^= true;
15054
-                Globals.lighttouched = true;
15055
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15056
-                targetLookAt.set(manipCamera.lookAt);
15085
+                ObjEditor.theFrame.ToggleFullScreen();
1505715086                 repaint();
1505815087                 break;
1505915088             //case '`' :
1506015089             case ESC:
1506115090                 RENDERPROGRAM += 1;
1506215091                 RENDERPROGRAM %= 3;
15092
+
1506315093                 repaint();
1506415094                 break;
1506515095             case 'Z':
....@@ -15351,7 +15381,7 @@
1535115381         }
1535215382          */
1535315383 
15354
-        object.editWindow.EditSelection();
15384
+        object.editWindow.EditSelection(false);
1535515385     }
1535615386 
1535715387     void SelectParent()
....@@ -16363,16 +16393,16 @@
1636316393                 cStatic.objectstack[materialdepth++] = checker;
1636416394                 //System.out.println("material " + material);
1636516395                 //Applet3D.tracein(this, selected);
16366
-                vector2buffer = checker.projectedVertices;
16396
+                //vector2buffer = checker.projectedVertices;
1636716397 
1636816398         //checker.GetMaterial().Draw(this, false); // true);
16369
-        DrawMaterial(checker.GetMaterial(), false); // true);
16399
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1637016400 
1637116401                 materialdepth -= 1;
1637216402                 if (materialdepth > 0)
1637316403                 {
16374
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375
-                    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);
1637616406                 }
1637716407         //checker.GetMaterial().opacity = 1f;
1637816408         ////checker.GetMaterial().ambient = 1f;
....@@ -16595,6 +16625,8 @@
1659516625 //                System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1659616626 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1659716627 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16628
+                
16629
+                CreateSelectedPoint();
1659816630                 
1659916631                 // Will fit the mesh !!!
1660016632                 selectedpoint.toParent[0][0] = 0.0001;
....@@ -17235,23 +17267,15 @@
1723517267     int AAbuffersize = 0;
1723617268     
1723717269     //double[] selectedpoint = new double[3];
17238
-    static Superellipsoid selectedpoint = new Superellipsoid();
17270
+    static Superellipsoid selectedpoint;
1723917271     static Sphere previousselectedpoint = null;
17240
-    static Sphere debugpointG = new Sphere();
17241
-    static Sphere debugpointP = new Sphere();
17242
-    static Sphere debugpointC = new Sphere();
17243
-    static Sphere debugpointR = new Sphere();
17272
+    static Sphere debugpointG;
17273
+    static Sphere debugpointP;
17274
+    static Sphere debugpointC;
17275
+    static Sphere debugpointR;
1724417276     
1724517277     static Sphere debugpoints[] = new Sphere[8];
1724617278  
17247
-    static
17248
-    {
17249
-        for (int i=0; i<8; i++)
17250
-        {
17251
-            debugpoints[i] = new Sphere();
17252
-        }
17253
-    }
17254
-    
1725517279     static void InitPoints(float radius)
1725617280     {
1725717281         for (int i=0; i<8; i++)