blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 26b24f5b623e709a88e91e9bce0864f9d5e8f084 
 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
....@@ -2259,7 +2266,7 @@
22592266     
22602267     void ToggleDebug()
22612268     {
2262
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22632270     }
22642271 
22652272     void ToggleLookAt()
....@@ -10474,6 +10481,7 @@
1047410481                     ANTIALIAS = 0;
1047510482                     //System.out.println("RESTART");
1047610483                     AAtimer.restart();
10484
+                    Globals.TIMERRUNNING = true;
1047710485                 }
1047810486             }
1047910487         }
....@@ -10541,7 +10549,8 @@
1054110549             ambientOcclusion = false;
1054210550         }
1054310551 
10544
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552
+        if (//Globals.lighttouched &&
10553
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1054510554         {
1054610555             //if (RENDERSHADOW) // ?
1054710556             if (!IsFrozen())
....@@ -11451,6 +11460,24 @@
1145111460 
1145211461     static boolean zoomonce = false;
1145311462     
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
+    
1145411481     void DrawObject(GL gl, boolean draw)
1145511482     {
1145611483         //System.out.println("DRAW OBJECT " + mouseDown);
....@@ -11531,8 +11558,9 @@
1153111558             
1153211559             if (DrawMode() == DEFAULT)
1153311560             {
11534
-                if (DEBUG)
11561
+                if (Globals.DEBUG)
1153511562                 {
11563
+                    CreateSelectedPoint();
1153611564                     float radius = 0.05f;
1153711565                     if (selectedpoint.radius != radius)
1153811566                     {
....@@ -13289,7 +13317,8 @@
1328913317     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1329013318     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1329113319     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292
-    Object3D.cVector2[] vector2buffer;
13320
+    
13321
+    //Object3D.cVector2[] vector2buffer;
1329313322 
1329413323     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1329513324     // OUT : diff, spec
....@@ -13812,6 +13841,7 @@
1381213841         else
1381313842         if (evt.getSource() == AAtimer)
1381413843         {
13844
+                    Globals.TIMERRUNNING = false;
1381513845             if (mouseDown)
1381613846             {
1381713847             //new Exception().printStackTrace();
....@@ -13886,6 +13916,7 @@
1388613916             return;
1388713917         
1388813918         AAtimer.restart(); // 
13919
+        Globals.TIMERRUNNING = true;
1388913920 
1389013921 //        waslive = LIVE;
1389113922 //        LIVE = false;
....@@ -14349,7 +14380,8 @@
1434914380                 info.camera = renderCamera;
1435014381                 info.x = x;
1435114382                 info.y = y;
14352
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14383
+                object.GetWindow().copy
14384
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1435314385             } else
1435414386             {
1435514387                 if (x < startX)
....@@ -14513,7 +14545,9 @@
1451314545         ci.camera = renderCamera;
1451414546         if (!isRenderer)
1451514547         {
14516
-            if (object.editWindow.copy.doEditClick(ci, 0))
14548
+            //ObjEditor editWindow = object.editWindow;
14549
+            //Object3D copy = editWindow.copy;
14550
+            if (object.doEditClick(ci, 0))
1451714551             {
1451814552                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1451914553             } else
....@@ -14894,8 +14928,14 @@
1489414928                 RevertCamera();
1489514929                 repaint();
1489614930                 break;
14897
-            case 'L':
1489814931             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':
1489914939                 if (lightMode)
1490014940                 {
1490114941                     lightMode = false;
....@@ -15042,16 +15082,14 @@
1504215082                 kompactbit = 6;
1504315083                 break;
1504415084             case ' ':
15045
-                lightMode ^= true;
15046
-                Globals.lighttouched = true;
15047
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15048
-                targetLookAt.set(manipCamera.lookAt);
15085
+                ObjEditor.theFrame.ToggleFullScreen();
1504915086                 repaint();
1505015087                 break;
1505115088             //case '`' :
1505215089             case ESC:
1505315090                 RENDERPROGRAM += 1;
1505415091                 RENDERPROGRAM %= 3;
15092
+
1505515093                 repaint();
1505615094                 break;
1505715095             case 'Z':
....@@ -15343,7 +15381,7 @@
1534315381         }
1534415382          */
1534515383 
15346
-        object.editWindow.EditSelection();
15384
+        object.editWindow.EditSelection(false);
1534715385     }
1534815386 
1534915387     void SelectParent()
....@@ -16355,16 +16393,16 @@
1635516393                 cStatic.objectstack[materialdepth++] = checker;
1635616394                 //System.out.println("material " + material);
1635716395                 //Applet3D.tracein(this, selected);
16358
-                vector2buffer = checker.projectedVertices;
16396
+                //vector2buffer = checker.projectedVertices;
1635916397 
1636016398         //checker.GetMaterial().Draw(this, false); // true);
16361
-        DrawMaterial(checker.GetMaterial(), false); // true);
16399
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1636216400 
1636316401                 materialdepth -= 1;
1636416402                 if (materialdepth > 0)
1636516403                 {
16366
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367
-                    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);
1636816406                 }
1636916407         //checker.GetMaterial().opacity = 1f;
1637016408         ////checker.GetMaterial().ambient = 1f;
....@@ -16587,6 +16625,8 @@
1658716625 //                System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1658816626 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1658916627 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16628
+                
16629
+                CreateSelectedPoint();
1659016630                 
1659116631                 // Will fit the mesh !!!
1659216632                 selectedpoint.toParent[0][0] = 0.0001;
....@@ -17227,23 +17267,15 @@
1722717267     int AAbuffersize = 0;
1722817268     
1722917269     //double[] selectedpoint = new double[3];
17230
-    static Superellipsoid selectedpoint = new Superellipsoid();
17270
+    static Superellipsoid selectedpoint;
1723117271     static Sphere previousselectedpoint = null;
17232
-    static Sphere debugpointG = new Sphere();
17233
-    static Sphere debugpointP = new Sphere();
17234
-    static Sphere debugpointC = new Sphere();
17235
-    static Sphere debugpointR = new Sphere();
17272
+    static Sphere debugpointG;
17273
+    static Sphere debugpointP;
17274
+    static Sphere debugpointC;
17275
+    static Sphere debugpointR;
1723617276     
1723717277     static Sphere debugpoints[] = new Sphere[8];
1723817278  
17239
-    static
17240
-    {
17241
-        for (int i=0; i<8; i++)
17242
-        {
17243
-            debugpoints[i] = new Sphere();
17244
-        }
17245
-    }
17246
-    
1724717279     static void InitPoints(float radius)
1724817280     {
1724917281         for (int i=0; i<8; i++)