blame | history | patch | commit | commitdiff
Normand Briere
2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2 
 GroupEditor.java
....@@ -803,7 +803,7 @@
803803 		genNormalsCADItem.addActionListener(this);
804804 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
805805 		genNormalsMESHItem.addActionListener(this);
806
-        if (Globals.ADVANCED)
806
+        //if (Globals.ADVANCED)
807807         {
808808 		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
809809 		genNormalsMINEItem.addActionListener(this);
....@@ -966,7 +966,7 @@
966966             currenttab.setName(tabname);
967967             //added = false;
968968             resourcecontainer.add(currenttab);
969
-            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
969
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
970970             rowcount = 1;
971971             colcount = 0;
972972             texturecount = 0;
....@@ -981,6 +981,11 @@
981981                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
982982             }
983983             
984
+        columns = 5;
985
+        
986
+        if (path[0].contains("D&R") || path[0].contains("Paint"))
987
+            columns = 4;
988
+        
984989             AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
985990             totalcount++;
986991             
....@@ -1195,6 +1200,7 @@
11951200 		//clearButton.addActionListener(this);
11961201 
11971202                 cGridBag row1 = new cGridBag();
1203
+                row1.preferredHeight = 8;
11981204                 
11991205                 // INSERT
12001206                 row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
....@@ -1235,6 +1241,7 @@
12351241                 oe.toolboxPanel.add(row1);
12361242                 
12371243                 cGridBag row2 = new cGridBag();
1244
+                row2.preferredHeight = 8;
12381245                 
12391246                 row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12401247                 groupButton.setToolTipText("Create group");
....@@ -1397,7 +1404,7 @@
13971404 //                supportCB.setToolTipText("Enable rigging");
13981405 //                                supportCB.addItemListener(this);
13991406 
1400
-                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1407
+                panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
14011408                 freezeCB.setToolTipText("Fast moving camera");
14021409                                 freezeCB.addItemListener(this);
14031410 
....@@ -1406,9 +1413,12 @@
14061413 
14071414                 panel.Return();
14081415                 
1416
+            if (Globals.ADVANCED)
1417
+            {
14091418                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
14101419                 crowdCB.setToolTipText("Used for crowds");
14111420                                 crowdCB.addItemListener(this);
1421
+            }
14121422 
14131423                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
14141424                 smoothCB.setToolTipText("Snapping delay");
....@@ -1421,30 +1431,26 @@
14211431                 minshaderCB.setToolTipText("Minimal fast shader");
14221432                                 minshaderCB.addItemListener(this);
14231433                                 
1424
-//        	constraints.gridy += 1;
14251434 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
14261435 //                                speakerMocapCB.addItemListener(this);
14271436 
1428
-                panel.Return();
1429
-                
14301437             if (false)
14311438             {
14321439                 // handled in scripts
1433
-        	//constraints.gridy += 1;
14341440                 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
14351441                                 speakerCameraCB.addItemListener(this);
14361442 
1437
-        	//constraints.gridy += 1;
14381443                 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
14391444                                 speakerFocusCB.addItemListener(this);
14401445 
1441
-        	//constraints.gridy += 1;
1442
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1443
-                                smoothfocusCB.addItemListener(this);
14441446                 panel.Return();
14451447             }
14461448 
1447
-//constraints.gridx += 1;
1449
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+                                smoothfocusCB.addItemListener(this);
1451
+                                
1452
+                panel.Return();
1453
+                
14481454 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
14491455 //                debugCB.addItemListener(this);
14501456 
....@@ -2083,7 +2089,7 @@
20832089             Object3D obj = (Object3D)group.selection.elementAt(0);
20842090             objEditor.ScreenFit(obj, false);
20852091             
2086
-            cameraView.pingthread.StepToTarget(true);
2092
+            cameraView.pingthread.StepToTarget(); //true);
20872093             refreshContents();
20882094         }
20892095 
....@@ -2120,7 +2126,7 @@
21202126                 obj.parent.TransformToWorld(maxima); //, maxima);
21212127             }
21222128             
2123
-            Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+            Object3D shadow = new Object3D("Shadow" + obj.name);
21242130             
21252131             shadow.toParent = LA.newMatrix();
21262132             shadow.fromParent = LA.newMatrix();
....@@ -4867,6 +4873,7 @@
48674873                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
48684874             }
48694875             
4876
+            Globals.lighttouched = true;
48704877             refreshContents();
48714878 	}
48724879 	
....@@ -5401,7 +5408,7 @@
54015408                             if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
54025409                             {
54035410                                 CameraPane.camerachangeframe = 0; // don't refuse it
5404
-                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5411
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
54055412                             }
54065413                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
54075414                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;