blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 CameraPane.java
....@@ -326,7 +326,7 @@
326326                 cStatic.objectstack[materialdepth++] = obj;
327327                 //System.out.println("material " + material);
328328                 //Applet3D.tracein(this, selected);
329
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
330330                 if (obj instanceof Camera)
331331                 {
332332                     display.options1[0] = material.shift;
....@@ -358,7 +358,7 @@
358358                 /**/
359359                 } else
360360                 {
361
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
362362                 }
363363             } else
364364             {
....@@ -382,8 +382,8 @@
382382             cStatic.objectstack[materialdepth++] = obj;
383383             //System.out.println("material " + material);
384384             //Applet3D.tracein("selected ", selected);
385
-            display.vector2buffer = obj.projectedVertices;
386
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
387387         }
388388     }
389389     
....@@ -400,8 +400,8 @@
400400                 materialdepth -= 1;
401401                 if (materialdepth > 0)
402402                 {
403
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
-                    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);
405405                 }
406406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
407407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -421,8 +421,8 @@
421421             materialdepth -= 1;
422422             if (materialdepth > 0)
423423             {
424
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
-                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);
426426             }
427427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
428428         //else
....@@ -1610,7 +1610,7 @@
16101610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16111611     }
16121612     
1613
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16141614     {
16151615             CameraPane display = this;
16161616         //new Exception().printStackTrace();
....@@ -1645,7 +1645,7 @@
16451645             colorV[0] = display.modelParams0[0] * material.diffuse;
16461646             colorV[1] = display.modelParams0[1] * material.diffuse;
16471647             colorV[2] = display.modelParams0[2] * material.diffuse;
1648
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16491649 
16501650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16511651             //System.out.println("Opacity = " + opacity);
....@@ -1753,9 +1753,9 @@
17531753         display.modelParams7[2] = 0;
17541754         display.modelParams7[3] = 0;
17551755 
1756
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17571757         
1758
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17591759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17601760         {
17611761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -10481,6 +10481,7 @@
1048110481                     ANTIALIAS = 0;
1048210482                     //System.out.println("RESTART");
1048310483                     AAtimer.restart();
10484
+                    Globals.TIMERRUNNING = true;
1048410485                 }
1048510486             }
1048610487         }
....@@ -10548,7 +10549,8 @@
1054810549             ambientOcclusion = false;
1054910550         }
1055010551 
10551
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552
+        if (//Globals.lighttouched &&
10553
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1055210554         {
1055310555             //if (RENDERSHADOW) // ?
1055410556             if (!IsFrozen())
....@@ -11458,7 +11460,7 @@
1145811460 
1145911461     static boolean zoomonce = false;
1146011462     
11461
-    void CreateSelectedPoint()
11463
+    static void CreateSelectedPoint()
1146211464     {
1146311465         if (selectedpoint == null)
1146411466         {
....@@ -13315,7 +13317,8 @@
1331513317     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1331613318     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1331713319     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13318
-    Object3D.cVector2[] vector2buffer;
13320
+    
13321
+    //Object3D.cVector2[] vector2buffer;
1331913322 
1332013323     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1332113324     // OUT : diff, spec
....@@ -13838,6 +13841,7 @@
1383813841         else
1383913842         if (evt.getSource() == AAtimer)
1384013843         {
13844
+                    Globals.TIMERRUNNING = false;
1384113845             if (mouseDown)
1384213846             {
1384313847             //new Exception().printStackTrace();
....@@ -13912,6 +13916,7 @@
1391213916             return;
1391313917         
1391413918         AAtimer.restart(); // 
13919
+        Globals.TIMERRUNNING = true;
1391513920 
1391613921 //        waslive = LIVE;
1391713922 //        LIVE = false;
....@@ -14375,7 +14380,8 @@
1437514380                 info.camera = renderCamera;
1437614381                 info.x = x;
1437714382                 info.y = y;
14378
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14383
+                object.GetWindow().copy
14384
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1437914385             } else
1438014386             {
1438114387                 if (x < startX)
....@@ -14539,7 +14545,9 @@
1453914545         ci.camera = renderCamera;
1454014546         if (!isRenderer)
1454114547         {
14542
-            if (object.editWindow.copy.doEditClick(ci, 0))
14548
+            //ObjEditor editWindow = object.editWindow;
14549
+            //Object3D copy = editWindow.copy;
14550
+            if (object.doEditClick(ci, 0))
1454314551             {
1454414552                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1454514553             } else
....@@ -15373,7 +15381,7 @@
1537315381         }
1537415382          */
1537515383 
15376
-        object.editWindow.EditSelection();
15384
+        object.editWindow.EditSelection(false);
1537715385     }
1537815386 
1537915387     void SelectParent()
....@@ -16385,16 +16393,16 @@
1638516393                 cStatic.objectstack[materialdepth++] = checker;
1638616394                 //System.out.println("material " + material);
1638716395                 //Applet3D.tracein(this, selected);
16388
-                vector2buffer = checker.projectedVertices;
16396
+                //vector2buffer = checker.projectedVertices;
1638916397 
1639016398         //checker.GetMaterial().Draw(this, false); // true);
16391
-        DrawMaterial(checker.GetMaterial(), false); // true);
16399
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1639216400 
1639316401                 materialdepth -= 1;
1639416402                 if (materialdepth > 0)
1639516403                 {
16396
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16397
-                    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);
1639816406                 }
1639916407         //checker.GetMaterial().opacity = 1f;
1640016408         ////checker.GetMaterial().ambient = 1f;
....@@ -16618,6 +16626,8 @@
1661816626 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1661916627 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1662016628                 
16629
+                CreateSelectedPoint();
16630
+                
1662116631                 // Will fit the mesh !!!
1662216632                 selectedpoint.toParent[0][0] = 0.0001;
1662316633                 selectedpoint.toParent[1][1] = 0.0001;