blame | history | patch | commit | commitdiff
Normand Briere
2018-10-27 d34fd9341c61d13677e029cb187d4dacff5e44ea 
 GroupEditor.java
....@@ -219,6 +219,8 @@
219219 		resetsupportItem.addActionListener(this);
220220 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
221221 		linkverticesItem.addActionListener(this);
222
+		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223
+		relinkverticesItem.addActionListener(this);
222224 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223225 		setMasterItem.addActionListener(this);
224226                 
....@@ -231,6 +233,10 @@
231233 		frontItem.addActionListener(this);
232234 		compositeItem = menu.add(new MenuItem("Composite"));
233235 		compositeItem.addActionListener(this);
236
+		hideItem = menu.add(new MenuItem("Hide"));
237
+		hideItem.addActionListener(this);
238
+		ungroupItem = menu.add(new MenuItem("Ungroup"));
239
+		ungroupItem.addActionListener(this);
234240 		menu.add("-");
235241 		randomItem = menu.add(new MenuItem("Random"));
236242 		randomItem.addActionListener(this);
....@@ -252,6 +258,8 @@
252258 		oe.menuBar.add(menu = new Menu("Object"));
253259 		textureItem = menu.add(new MenuItem("Texture"));
254260 		textureItem.addActionListener(this);
261
+		billboardItem = menu.add(new MenuItem("Billboard"));
262
+		billboardItem.addActionListener(this);
255263 		csgItem = menu.add(new MenuItem("CSG"));
256264 		csgItem.addActionListener(this);
257265                 shadowXItem = menu.add(new MenuItem("Shadow X"));
....@@ -269,14 +277,12 @@
269277 		pointflowItem = menu.add(new MenuItem("Point Flow"));
270278 		pointflowItem.addActionListener(this);
271279 		menu.add("-");
272
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273
-		transformgeometryItem.addActionListener(this);
274280 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275281 		resetTransformItem.addActionListener(this);
276282 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277283 		resetCentroidItem.addActionListener(this);
278
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
279
-		ungroupItem.addActionListener(this);
284
+		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285
+		transformgeometryItem.addActionListener(this);
280286                 
281287 		oe.menuBar.add(menu = new Menu("Geometry"));
282288 		genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -287,6 +293,8 @@
287293 		genNormalsCADItem.addActionListener(this);
288294 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289295 		genNormalsMESHItem.addActionListener(this);
296
+		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297
+		genNormalsMINEItem.addActionListener(this);
290298 		stripifyItem = menu.add(new MenuItem("Stripify"));
291299 		stripifyItem.addActionListener(this);
292300 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -512,6 +520,9 @@
512520 		
513521 		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514522 		flashSelectionButton.addActionListener(this);
523
+                
524
+		oe.toolbarPanel.add(new cButton("     ", false));
525
+                
515526 		oe.aConstraints.gridx += 1;
516527 		oe.aConstraints.weighty = 0;
517528 		oe.aConstraints.gridwidth = 1;
....@@ -638,14 +649,14 @@
638649 	
639650         void EditObject(Object3D obj)
640651         {
641
-            cRadio dummyButton = new cRadio(obj.name);
642
-            dummyButton.SetObject(obj);
643
-            dummyButton.layout = sevenButton;
644
-            dummyButton.SetCamera(cameraView.renderCamera, false);
645
-            dummyButton.addActionListener(this);
646
-            radioPanel.add(dummyButton);
647
-            buttonGroup.add(dummyButton);
648
-            dummyButton.doClick();
652
+            cRadio radioButton = new cRadio(obj.name);
653
+            radioButton.SetObject(obj);
654
+            radioButton.layout = sevenButton;
655
+            radioButton.SetCamera(cameraView.renderCamera, false);
656
+            radioButton.addActionListener(this);
657
+            radioPanel.add(radioButton);
658
+            buttonGroup.add(radioButton);
659
+            radioButton.doClick();
649660         }
650661         void SetupViews(ObjEditor oe)
651662         {
....@@ -707,8 +718,7 @@
707718                     dropAttributes |= Object3D.TEXTURE;
708719                 else
709720                     dropAttributes &= ~Object3D.TEXTURE;
710
-            }
711
-            else if(e.getSource() == liveCB)
721
+            } else if(e.getSource() == liveCB)
712722             {
713723                 cameraView.ToggleLive();
714724             }
....@@ -1035,6 +1045,8 @@
10351045 		torusItem.addActionListener(this);
10361046 		superItem = menu.add(new MenuItem("Superellipsoid"));
10371047 		superItem.addActionListener(this);
1048
+		kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049
+		kleinItem.addActionListener(this);
10381050 		particleItem = menu.add(new MenuItem("Particle system"));
10391051 		particleItem.addActionListener(this);
10401052 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1595,6 +1607,10 @@
15951607 		{
15961608 			makeSomething(new Superellipsoid());
15971609 		} else
1610
+		if (event.getSource() == kleinItem)
1611
+		{
1612
+			makeSomething(new Klein());
1613
+		} else
15981614 		if (event.getSource() == blobItem)
15991615 		{
16001616 			Blob blob = new Blob();
....@@ -1780,7 +1796,7 @@
17801796 		if (event.getSource() == invariantsItem)
17811797 		{
17821798                     System.out.println("Invariants:");
1783
-                    GrafreeD.theApplet3D.universe.invariants();
1799
+                    GrafreeD.grafreeD.universe.invariants();
17841800 		} else
17851801 		if (event.getSource() == memoryItem)
17861802 		{
....@@ -2003,23 +2019,28 @@
20032019                     if (group.selection.size() == 1)
20042020                         one = true;
20052021 
2022
+                    Object3D merge = null;
2023
+                    
20062024                     Object3D content = new cGroup();
20072025                     
20082026                     for (int i=0; i<group.selection.size(); i++)
20092027                     {
2010
-                        Object3D sel = new Merge(group.selection.get(i));
2028
+                        merge = new Merge(group.selection.get(i));
20112029                         
20122030                         if (one)
2013
-                            makeSomething(sel, false);
2031
+                            makeSomething(merge, false);
20142032                         else
2015
-                            content.addChild(sel);
2033
+                            content.addChild(merge);
20162034                     }
20172035                     
20182036                     if (!one)
2019
-                        makeSomething(content, false);
2020
-                    
2021
-                    ResetModel();
2022
-                    refreshContents();
2037
+                        makeSomething(content, true);
2038
+                    else
2039
+                    {
2040
+                        ResetModel();
2041
+                        Select(merge.GetTreePath(), true, false); // unselect... false);
2042
+                        refreshContents();
2043
+                    }
20232044 		} else
20242045 		if (event.getSource() == mergeGeometriesItem)
20252046 		{
....@@ -2096,6 +2117,15 @@
20962117 
20972118                     refreshContents();
20982119 		} else
2120
+		if (event.getSource() == relinkverticesItem)
2121
+		{
2122
+                    boolean random = CameraPane.RANDOM;
2123
+                    CameraPane.RANDOM = false; // parse all random nodes
2124
+                    group.selection.RelinkToSupport();
2125
+                    CameraPane.RANDOM = random;
2126
+
2127
+                    refreshContents();
2128
+		} else
20992129 		if (event.getSource() == resetreferencesItem)
21002130 		{
21012131                     for (int i=0; i<group.selection.size(); i++)
....@@ -2164,6 +2194,10 @@
21642194 		if (event.getSource() == grabItem)
21652195 		{
21662196 			group(new cGroup(), true);
2197
+		} else
2198
+		if (event.getSource() == hideItem)
2199
+		{
2200
+			group(new HiddenObject());
21672201 		} else
21682202 		if (event.getSource() == frontItem)
21692203 		{
....@@ -2287,6 +2321,10 @@
22872321 		{
22882322 			group(new TextureNode());
22892323 		} else
2324
+		if (event.getSource() == billboardItem)
2325
+		{
2326
+			group(new BillboardNode());
2327
+		} else
22902328 		if (event.getSource() == shadowXItem)
22912329 		{
22922330 			CastShadow(0);
....@@ -2301,7 +2339,15 @@
23012339 		} else
23022340 		if (event.getSource() == ungroupItem)
23032341 		{
2304
-			ungroup();
2342
+			//ungroup();
2343
+                    for (int i=0; i<group.selection.size(); i++)
2344
+                    {
2345
+                        Ungroup(group.selection.get(i));
2346
+                    }
2347
+
2348
+                    ClearSelection(false);
2349
+                    
2350
+                    refreshContents();
23052351 		} else
23062352 		if (event.getSource() == genUVItem)
23072353                 {
....@@ -2318,6 +2364,10 @@
23182364 		if (event.getSource() == genNormalsORGANItem)
23192365                 {
23202366 			GenNormals(false);
2367
+		} else
2368
+		if (event.getSource() == genNormalsMINEItem)
2369
+                {
2370
+			GenNormalsMINE();
23212371 		} else
23222372 		if (event.getSource() == stripifyItem)
23232373                 {
....@@ -2590,8 +2640,8 @@
25902640                     // bug
25912641                     //gridPanel.setDividerLocation(1.0);
25922642                     //bigPanel.setDividerLocation(0.0);
2593
-                    bigThree.remove(jtp);
2594
-                    bigThree.remove(cameraPanel);
2643
+                    bigThree.remove(scenePanel);
2644
+                    bigThree.remove(centralPanel);
25952645                     bigThree.remove(XYZPanel);
25962646                     aWindowConstraints.gridx = 0;
25972647                     aWindowConstraints.gridy = 0;
....@@ -2606,7 +2656,7 @@
26062656             //        aConstraints.gridheight = 3;
26072657                     aWindowConstraints.gridx = 1;
26082658                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2609
-                    bigThree.add(cameraPanel, aWindowConstraints);
2659
+                    bigThree.add(centralPanel, aWindowConstraints);
26102660                     aWindowConstraints.weightx = 0;
26112661                     aWindowConstraints.gridx = 4;
26122662                     aWindowConstraints.gridwidth = 1;
....@@ -2618,8 +2668,8 @@
26182668 		if (event.getSource() == threeButton)
26192669 		{
26202670                     radio.layout = threeButton;
2621
-                    bigThree.remove(jtp);
2622
-                    bigThree.remove(cameraPanel);
2671
+                    bigThree.remove(scenePanel);
2672
+                    bigThree.remove(centralPanel);
26232673                     bigThree.remove(XYZPanel);
26242674                     aWindowConstraints.gridx = 0;
26252675                     aWindowConstraints.gridy = 0;
....@@ -2634,7 +2684,7 @@
26342684             //        aConstraints.gridheight = 3;
26352685                     aWindowConstraints.gridx = 1;
26362686                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2637
-                    bigThree.add(cameraPanel, aWindowConstraints);
2687
+                    bigThree.add(centralPanel, aWindowConstraints);
26382688                     aWindowConstraints.weightx = 0;
26392689                     aWindowConstraints.gridx = 4;
26402690                     aWindowConstraints.gridwidth = 1;
....@@ -2646,8 +2696,8 @@
26462696 		if (event.getSource() == fourButton)
26472697 		{
26482698                     radio.layout = fourButton;
2649
-                    bigThree.remove(jtp);
2650
-                    bigThree.remove(cameraPanel);
2699
+                    bigThree.remove(scenePanel);
2700
+                    bigThree.remove(centralPanel);
26512701                     bigThree.remove(XYZPanel);
26522702                     aWindowConstraints.gridx = 0;
26532703                     aWindowConstraints.gridy = 0;
....@@ -2656,7 +2706,7 @@
26562706                     aWindowConstraints.fill = GridBagConstraints.BOTH;
26572707                     aWindowConstraints.weightx = 1;
26582708                     aWindowConstraints.weighty = 1;
2659
-                    bigThree.add(jtp, aWindowConstraints);
2709
+                    bigThree.add(scenePanel, aWindowConstraints);
26602710                     aWindowConstraints.weightx = 1;
26612711                     aWindowConstraints.gridwidth = 3;
26622712               //      aConstraints.gridheight = 3;
....@@ -2674,8 +2724,8 @@
26742724 		if (event.getSource() == sixButton)
26752725 		{
26762726                     radio.layout = sixButton;
2677
-                    bigThree.remove(jtp);
2678
-                    bigThree.remove(cameraPanel);
2727
+                    bigThree.remove(scenePanel);
2728
+                    bigThree.remove(centralPanel);
26792729                     bigThree.remove(XYZPanel);
26802730                     aWindowConstraints.gridx = 0;
26812731                     aWindowConstraints.gridy = 0;
....@@ -2684,13 +2734,13 @@
26842734                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
26852735                     aWindowConstraints.weightx = 0;
26862736                     aWindowConstraints.weighty = 1;
2687
-                    bigThree.add(jtp, aWindowConstraints);
2737
+                    bigThree.add(scenePanel, aWindowConstraints);
26882738                     aWindowConstraints.weightx = 1;
26892739                     aWindowConstraints.gridwidth = 3;
26902740               //      aWindowConstraints.gridheight = 3;
26912741                     aWindowConstraints.gridx = 1;
26922742                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2693
-                    bigThree.add(cameraPanel, aWindowConstraints);
2743
+                    bigThree.add(centralPanel, aWindowConstraints);
26942744                     aWindowConstraints.weightx = 0;
26952745                     aWindowConstraints.gridx = 4;
26962746                     aWindowConstraints.gridwidth = 1;
....@@ -2702,8 +2752,8 @@
27022752 		if (event.getSource() == sevenButton)
27032753 		{
27042754                     radio.layout = sevenButton;
2705
-                    bigThree.remove(jtp);
2706
-                    bigThree.remove(cameraPanel);
2755
+                    bigThree.remove(scenePanel);
2756
+                    bigThree.remove(centralPanel);
27072757                     bigThree.remove(XYZPanel);
27082758                     aWindowConstraints.gridx = 0;
27092759                     aWindowConstraints.gridy = 0;
....@@ -2712,13 +2762,13 @@
27122762                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
27132763                     aWindowConstraints.weightx = 0;
27142764                     aWindowConstraints.weighty = 1;
2715
-                    bigThree.add(jtp, aWindowConstraints);
2765
+                    bigThree.add(scenePanel, aWindowConstraints);
27162766                     aWindowConstraints.weightx = 1;
27172767                     aWindowConstraints.gridwidth = 3;
27182768                //     aWindowConstraints.gridheight = 3;
27192769                     aWindowConstraints.gridx = 1;
27202770                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2721
-                    bigThree.add(cameraPanel, aWindowConstraints);
2771
+                    bigThree.add(centralPanel, aWindowConstraints);
27222772                     aWindowConstraints.weightx = 0;
27232773                     aWindowConstraints.gridx = 4;
27242774                     aWindowConstraints.gridwidth = 1;
....@@ -3179,6 +3229,13 @@
31793229 		refreshContents();
31803230 	}
31813231 	
3232
+	void GenNormalsMINE()
3233
+	{
3234
+		group.selection.GenNormalsMINE();
3235
+		
3236
+		refreshContents();
3237
+	}
3238
+	
31823239 	void Stripify()
31833240 	{
31843241 		group.StripifyS();
....@@ -3447,12 +3504,26 @@
34473504         
34483505 	void Align()
34493506 	{
3507
+            if (group.selection.size() == 0)
3508
+                return;
3509
+            
3510
+            cVector bbmin = new cVector();
3511
+            cVector bbmax = new cVector();
3512
+            
3513
+            group.selection.get(0).getBounds(bbmin, bbmax, true);
3514
+            
3515
+            double dx = bbmax.x - bbmin.x;
3516
+            double dy = bbmax.y - bbmin.y;
3517
+            double dz = bbmax.z - bbmin.z;
3518
+            
3519
+            double scale = Math.sqrt(dx*dx + dy*dy + dz*dz);
3520
+            
34503521             for (int i=0; i<group.selection.size(); i++)
34513522             {
34523523 		Object3D obj = group.selection.get(i);
34533524                 
3454
-                LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455
-                LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
3525
+                LA.matTranslate(obj.toParent, i * scale, 0, 0);
3526
+                LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
34563527             }
34573528             
34583529             refreshContents();
....@@ -4474,6 +4545,26 @@
44744545 		makeSomething(csg);
44754546 	}
44764547 	
4548
+        void Ungroup(Object3D g)
4549
+        {
4550
+            if (g instanceof HiddenObject)
4551
+            {
4552
+                HiddenObject h = (HiddenObject) g;
4553
+                
4554
+                for (int i=0; i<h.ActualSize(); i++)
4555
+                {
4556
+                    objEditor.makeSomething(h.get(i), false);
4557
+                }
4558
+            }
4559
+            else
4560
+            {
4561
+                for (int i=0; i<g.Size(); i++)
4562
+                {
4563
+                    objEditor.makeSomething(g.get(i), false);
4564
+                }
4565
+            }
4566
+        }
4567
+        
44774568 	void ungroup()
44784569 	{
44794570             /*
....@@ -4833,6 +4924,7 @@
48334924 	private MenuItem resetsupportItem;
48344925 	private MenuItem resetreferencesItem;
48354926 	private MenuItem linkverticesItem;
4927
+	private MenuItem relinkverticesItem;
48364928 	private MenuItem setMasterItem;
48374929 	private MenuItem resetMeshItem;
48384930 	private MenuItem stepAllItem;
....@@ -4854,6 +4946,7 @@
48544946 	private MenuItem genNormalsMESHItem;
48554947 	private MenuItem genNormalsCADItem;
48564948 	private MenuItem genNormalsORGANItem;
4949
+	private MenuItem genNormalsMINEItem;
48574950 	private MenuItem stripifyItem;
48584951 	private MenuItem unstripifyItem;
48594952 	private MenuItem trimItem;
....@@ -4895,6 +4988,7 @@
48954988 	private MenuItem resetCentroidItem;
48964989 	private MenuItem transformgeometryItem;
48974990 	private MenuItem resetTransformItem;
4991
+	private MenuItem hideItem;
48984992 	private MenuItem grabItem;
48994993 	private MenuItem backItem;
49004994 	private MenuItem frontItem;
....@@ -4935,6 +5029,7 @@
49355029 	private MenuItem coneItem;
49365030 	private MenuItem torusItem;
49375031 	private MenuItem superItem;
5032
+	private MenuItem kleinItem;
49385033 	private MenuItem blobItem;
49395034 	private MenuItem latheItem;
49405035 	private MenuItem bezierItem;
....@@ -4947,6 +5042,7 @@
49475042 	private MenuItem csgItem;
49485043 	private MenuItem templateItem;
49495044 	private MenuItem textureItem;
5045
+	private MenuItem billboardItem;
49505046 	private MenuItem shadowXItem;
49515047 	private MenuItem shadowYItem;
49525048 	private MenuItem shadowZItem;