blame | history | patch | commit | commitdiff
Normand Briere
2019-09-20 cbe4e90105d07d7d3fecabffaa01342403aa2ae3 
 GroupEditor.java
....@@ -483,11 +483,16 @@
483483         
484484         Object3D parent = obj.parent;
485485         obj.parent = null;
486
+        
486487         //               Object3D support = obj.support;
487488         //               obj.support = null;
488489         if (!supports)
489490             obj.SaveSupports();
491
+        
490492         Object3D clone = (Object3D)Grafreed.clone(obj);
493
+        
494
+        clone.ResetUUIDs();
495
+        
491496         obj.parent = parent;
492497         //               obj.support = support;
493498         //               clone.support = support; // aout 2013
....@@ -798,7 +803,7 @@
798803 		genNormalsCADItem.addActionListener(this);
799804 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
800805 		genNormalsMESHItem.addActionListener(this);
801
-        if (Globals.ADVANCED)
806
+        //if (Globals.ADVANCED)
802807         {
803808 		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
804809 		genNormalsMINEItem.addActionListener(this);
....@@ -961,7 +966,7 @@
961966             currenttab.setName(tabname);
962967             //added = false;
963968             resourcecontainer.add(currenttab);
964
-            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
969
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
965970             rowcount = 1;
966971             colcount = 0;
967972             texturecount = 0;
....@@ -976,6 +981,11 @@
976981                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
977982             }
978983             
984
+        columns = 5;
985
+        
986
+        if (path[0].contains("D&R") || path[0].contains("Paint"))
987
+            columns = 4;
988
+        
979989             AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
980990             totalcount++;
981991             
....@@ -1190,6 +1200,7 @@
11901200 		//clearButton.addActionListener(this);
11911201 
11921202                 cGridBag row1 = new cGridBag();
1203
+                row1.preferredHeight = 8;
11931204                 
11941205                 // INSERT
11951206                 row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
....@@ -1230,6 +1241,7 @@
12301241                 oe.toolboxPanel.add(row1);
12311242                 
12321243                 cGridBag row2 = new cGridBag();
1244
+                row2.preferredHeight = 8;
12331245                 
12341246                 row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12351247                 groupButton.setToolTipText("Create group");
....@@ -1392,7 +1404,7 @@
13921404 //                supportCB.setToolTipText("Enable rigging");
13931405 //                                supportCB.addItemListener(this);
13941406 
1395
-                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1407
+                panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
13961408                 freezeCB.setToolTipText("Fast moving camera");
13971409                                 freezeCB.addItemListener(this);
13981410 
....@@ -1401,9 +1413,12 @@
14011413 
14021414                 panel.Return();
14031415                 
1416
+            if (Globals.ADVANCED)
1417
+            {
14041418                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
14051419                 crowdCB.setToolTipText("Used for crowds");
14061420                                 crowdCB.addItemListener(this);
1421
+            }
14071422 
14081423                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
14091424                 smoothCB.setToolTipText("Snapping delay");
....@@ -1416,30 +1431,26 @@
14161431                 minshaderCB.setToolTipText("Minimal fast shader");
14171432                                 minshaderCB.addItemListener(this);
14181433                                 
1419
-//        	constraints.gridy += 1;
14201434 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
14211435 //                                speakerMocapCB.addItemListener(this);
14221436 
1423
-                panel.Return();
1424
-                
14251437             if (false)
14261438             {
14271439                 // handled in scripts
1428
-        	//constraints.gridy += 1;
14291440                 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
14301441                                 speakerCameraCB.addItemListener(this);
14311442 
1432
-        	//constraints.gridy += 1;
14331443                 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
14341444                                 speakerFocusCB.addItemListener(this);
14351445 
1436
-        	//constraints.gridy += 1;
1437
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1438
-                                smoothfocusCB.addItemListener(this);
14391446                 panel.Return();
14401447             }
14411448 
1442
-//constraints.gridx += 1;
1449
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+                                smoothfocusCB.addItemListener(this);
1451
+                                
1452
+                panel.Return();
1453
+                
14431454 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
14441455 //                debugCB.addItemListener(this);
14451456 
....@@ -2078,7 +2089,7 @@
20782089             Object3D obj = (Object3D)group.selection.elementAt(0);
20792090             objEditor.ScreenFit(obj, false);
20802091             
2081
-            cameraView.pingthread.StepToTarget(true);
2092
+            cameraView.pingthread.StepToTarget(); //true);
20822093             refreshContents();
20832094         }
20842095 
....@@ -2115,7 +2126,7 @@
21152126                 obj.parent.TransformToWorld(maxima); //, maxima);
21162127             }
21172128             
2118
-            Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+            Object3D shadow = new Object3D("Shadow" + obj.name);
21192130             
21202131             shadow.toParent = LA.newMatrix();
21212132             shadow.fromParent = LA.newMatrix();
....@@ -2843,7 +2854,7 @@
28432854 		if (source == saveVersionButton)
28442855 		{
28452856                         // Save a new version
2846
-			if (!Save(true))
2857
+			if (!DuplicateVersion()) //true))
28472858                             java.awt.Toolkit.getDefaultToolkit().beep();
28482859 		} else
28492860 		if (source == deleteVersionButton)
....@@ -4862,6 +4873,7 @@
48624873                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
48634874             }
48644875             
4876
+            Globals.lighttouched = true;
48654877             refreshContents();
48664878 	}
48674879 	
....@@ -5396,7 +5408,7 @@
53965408                             if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
53975409                             {
53985410                                 CameraPane.camerachangeframe = 0; // don't refuse it
5399
-                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5411
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
54005412                             }
54015413                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
54025414                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;