Better navigation.

Normand Briere

2019-09-20 cbe4e90105d07d7d3fecabffaa01342403aa2ae3

 GroupEditor.java
..
..
@@ -483,11 +483,16 @@
483
483
         
484
484
         Object3D parent = obj.parent;
485
485
         obj.parent = null;
486
+        
486
487
         //               Object3D support = obj.support;
487
488
         //               obj.support = null;
488
489
         if (!supports)
489
490
             obj.SaveSupports();
491
+        
490
492
         Object3D clone = (Object3D)Grafreed.clone(obj);
493
+        
494
+        clone.ResetUUIDs();
495
+        
491
496
         obj.parent = parent;
492
497
         //               obj.support = support;
493
498
         //               clone.support = support; // aout 2013
..
..
@@ -557,8 +562,10 @@
557
562
 		pasteLinkItem.addActionListener(this);
558
563
 		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
559
564
 		pasteCloneItem.addActionListener(this);
560
-// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
561
-//		pasteExpandItem.addActionListener(this);
565
+// CRASH
566
+                pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
567
+//		
568
+                pasteExpandItem.addActionListener(this);
562
569
 		//menu.add("-");
563
570
                 oe.jTree.popup.addSeparator();
564
571
                 
..
..
@@ -796,7 +803,7 @@
796
803
 		genNormalsCADItem.addActionListener(this);
797
804
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
798
805
 		genNormalsMESHItem.addActionListener(this);
799
-        if (Globals.ADVANCED)
806
+        //if (Globals.ADVANCED)
800
807
         {
801
808
 		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
802
809
 		genNormalsMINEItem.addActionListener(this);
..
..
@@ -959,7 +966,7 @@
959
966
             currenttab.setName(tabname);
960
967
             //added = false;
961
968
             resourcecontainer.add(currenttab);
962
-            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
969
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
963
970
             rowcount = 1;
964
971
             colcount = 0;
965
972
             texturecount = 0;
..
..
@@ -974,6 +981,11 @@
974
981
                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
975
982
             }
976
983
             
984
+        columns = 5;
985
+        
986
+        if (path[0].contains("D&R") || path[0].contains("Paint"))
987
+            columns = 4;
988
+        
977
989
             AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
978
990
             totalcount++;
979
991
             
..
..
@@ -1188,6 +1200,7 @@
1188
1200
 		//clearButton.addActionListener(this);
1189
1201
 
1190
1202
                 cGridBag row1 = new cGridBag();
1203
+                row1.preferredHeight = 8;
1191
1204
                 
1192
1205
                 // INSERT
1193
1206
                 row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1228,6 +1241,7 @@
1228
1241
                 oe.toolboxPanel.add(row1);
1229
1242
                 
1230
1243
                 cGridBag row2 = new cGridBag();
1244
+                row2.preferredHeight = 8;
1231
1245
                 
1232
1246
                 row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
1247
                 groupButton.setToolTipText("Create group");
..
..
@@ -1390,7 +1404,7 @@
1390
1404
 //                supportCB.setToolTipText("Enable rigging");
1391
1405
 //                                supportCB.addItemListener(this);
1392
1406
 
1393
-                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1407
+                panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1394
1408
                 freezeCB.setToolTipText("Fast moving camera");
1395
1409
                                 freezeCB.addItemListener(this);
1396
1410
 
..
..
@@ -1399,9 +1413,12 @@
1399
1413
 
1400
1414
                 panel.Return();
1401
1415
                 
1416
+            if (Globals.ADVANCED)
1417
+            {
1402
1418
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1403
1419
                 crowdCB.setToolTipText("Used for crowds");
1404
1420
                                 crowdCB.addItemListener(this);
1421
+            }
1405
1422
 
1406
1423
                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1407
1424
                 smoothCB.setToolTipText("Snapping delay");
..
..
@@ -1414,30 +1431,26 @@
1414
1431
                 minshaderCB.setToolTipText("Minimal fast shader");
1415
1432
                                 minshaderCB.addItemListener(this);
1416
1433
                                 
1417
-//        	constraints.gridy += 1;
1418
1434
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1419
1435
 //                                speakerMocapCB.addItemListener(this);
1420
1436
 
1421
-                panel.Return();
1422
-                
1423
1437
             if (false)
1424
1438
             {
1425
1439
                 // handled in scripts
1426
-        	//constraints.gridy += 1;
1427
1440
                 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1428
1441
                                 speakerCameraCB.addItemListener(this);
1429
1442
 
1430
-        	//constraints.gridy += 1;
1431
1443
                 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1432
1444
                                 speakerFocusCB.addItemListener(this);
1433
1445
 
1434
-        	//constraints.gridy += 1;
1435
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1436
-                                smoothfocusCB.addItemListener(this);
1437
1446
                 panel.Return();
1438
1447
             }
1439
1448
 
1440
-//constraints.gridx += 1;
1449
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+                                smoothfocusCB.addItemListener(this);
1451
+                                
1452
+                panel.Return();
1453
+                
1441
1454
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1442
1455
 //                debugCB.addItemListener(this);
1443
1456
 
..
..
@@ -2076,7 +2089,7 @@
2076
2089
             Object3D obj = (Object3D)group.selection.elementAt(0);
2077
2090
             objEditor.ScreenFit(obj, false);
2078
2091
             
2079
-            cameraView.pingthread.StepToTarget(true);
2092
+            cameraView.pingthread.StepToTarget(); //true);
2080
2093
             refreshContents();
2081
2094
         }
2082
2095
 
..
..
@@ -2113,7 +2126,7 @@
2113
2126
                 obj.parent.TransformToWorld(maxima); //, maxima);
2114
2127
             }
2115
2128
             
2116
-            Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+            Object3D shadow = new Object3D("Shadow" + obj.name);
2117
2130
             
2118
2131
             shadow.toParent = LA.newMatrix();
2119
2132
             shadow.fromParent = LA.newMatrix();
..
..
@@ -2841,7 +2854,7 @@
2841
2854
 		if (source == saveVersionButton)
2842
2855
 		{
2843
2856
                         // Save a new version
2844
-			if (!Save(true))
2857
+			if (!DuplicateVersion()) //true))
2845
2858
                             java.awt.Toolkit.getDefaultToolkit().beep();
2846
2859
 		} else
2847
2860
 		if (source == deleteVersionButton)
..
..
@@ -4860,6 +4873,7 @@
4860
4873
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4861
4874
             }
4862
4875
             
4876
+            Globals.lighttouched = true;
4863
4877
             refreshContents();
4864
4878
 	}
4865
4879
 	
..
..
@@ -5394,7 +5408,7 @@
5394
5408
                             if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5395
5409
                             {
5396
5410
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5397
-                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5411
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5398
5412
                             }
5399
5413
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5400
5414
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;