blame | history | patch | commit | commitdiff
Normand Briere
2018-07-08 c8024a8777faf76727fbb6975ddf4fecb567b426 
 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"));
....@@ -285,6 +291,10 @@
285291 		genNormalsORGANItem.addActionListener(this);
286292 		genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287293 		genNormalsCADItem.addActionListener(this);
294
+		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295
+		genNormalsMESHItem.addActionListener(this);
296
+		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297
+		genNormalsMINEItem.addActionListener(this);
288298 		stripifyItem = menu.add(new MenuItem("Stripify"));
289299 		stripifyItem.addActionListener(this);
290300 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -510,6 +520,9 @@
510520 		
511521 		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512522 		flashSelectionButton.addActionListener(this);
523
+                
524
+		oe.toolbarPanel.add(new cButton("     ", false));
525
+                
513526 		oe.aConstraints.gridx += 1;
514527 		oe.aConstraints.weighty = 0;
515528 		oe.aConstraints.gridwidth = 1;
....@@ -636,14 +649,14 @@
636649 	
637650         void EditObject(Object3D obj)
638651         {
639
-            cRadio dummyButton = new cRadio(obj.name);
640
-            dummyButton.SetObject(obj);
641
-            dummyButton.layout = sevenButton;
642
-            dummyButton.SetCamera(cameraView.renderCamera, false);
643
-            dummyButton.addActionListener(this);
644
-            radioPanel.add(dummyButton);
645
-            buttonGroup.add(dummyButton);
646
-            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();
647660         }
648661         void SetupViews(ObjEditor oe)
649662         {
....@@ -705,8 +718,7 @@
705718                     dropAttributes |= Object3D.TEXTURE;
706719                 else
707720                     dropAttributes &= ~Object3D.TEXTURE;
708
-            }
709
-            else if(e.getSource() == liveCB)
721
+            } else if(e.getSource() == liveCB)
710722             {
711723                 cameraView.ToggleLive();
712724             }
....@@ -1033,6 +1045,8 @@
10331045 		torusItem.addActionListener(this);
10341046 		superItem = menu.add(new MenuItem("Superellipsoid"));
10351047 		superItem.addActionListener(this);
1048
+		kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049
+		kleinItem.addActionListener(this);
10361050 		particleItem = menu.add(new MenuItem("Particle system"));
10371051 		particleItem.addActionListener(this);
10381052 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1593,6 +1607,10 @@
15931607 		{
15941608 			makeSomething(new Superellipsoid());
15951609 		} else
1610
+		if (event.getSource() == kleinItem)
1611
+		{
1612
+			makeSomething(new Klein());
1613
+		} else
15961614 		if (event.getSource() == blobItem)
15971615 		{
15981616 			Blob blob = new Blob();
....@@ -1778,7 +1796,7 @@
17781796 		if (event.getSource() == invariantsItem)
17791797 		{
17801798                     System.out.println("Invariants:");
1781
-                    GrafreeD.theApplet3D.universe.invariants();
1799
+                    GrafreeD.grafreeD.universe.invariants();
17821800 		} else
17831801 		if (event.getSource() == memoryItem)
17841802 		{
....@@ -2001,23 +2019,28 @@
20012019                     if (group.selection.size() == 1)
20022020                         one = true;
20032021 
2022
+                    Object3D merge = null;
2023
+                    
20042024                     Object3D content = new cGroup();
20052025                     
20062026                     for (int i=0; i<group.selection.size(); i++)
20072027                     {
2008
-                        Object3D sel = new Merge(group.selection.get(i));
2028
+                        merge = new Merge(group.selection.get(i));
20092029                         
20102030                         if (one)
2011
-                            makeSomething(sel, false);
2031
+                            makeSomething(merge, false);
20122032                         else
2013
-                            content.addChild(sel);
2033
+                            content.addChild(merge);
20142034                     }
20152035                     
20162036                     if (!one)
2017
-                        makeSomething(content, false);
2018
-                    
2019
-                    ResetModel();
2020
-                    refreshContents();
2037
+                        makeSomething(content, true);
2038
+                    else
2039
+                    {
2040
+                        ResetModel();
2041
+                        Select(merge.GetTreePath(), true, false); // unselect... false);
2042
+                        refreshContents();
2043
+                    }
20212044 		} else
20222045 		if (event.getSource() == mergeGeometriesItem)
20232046 		{
....@@ -2094,6 +2117,15 @@
20942117 
20952118                     refreshContents();
20962119 		} 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
20972129 		if (event.getSource() == resetreferencesItem)
20982130 		{
20992131                     for (int i=0; i<group.selection.size(); i++)
....@@ -2162,6 +2194,10 @@
21622194 		if (event.getSource() == grabItem)
21632195 		{
21642196 			group(new cGroup(), true);
2197
+		} else
2198
+		if (event.getSource() == hideItem)
2199
+		{
2200
+			group(new HiddenObject());
21652201 		} else
21662202 		if (event.getSource() == frontItem)
21672203 		{
....@@ -2285,6 +2321,10 @@
22852321 		{
22862322 			group(new TextureNode());
22872323 		} else
2324
+		if (event.getSource() == billboardItem)
2325
+		{
2326
+			group(new BillboardNode());
2327
+		} else
22882328 		if (event.getSource() == shadowXItem)
22892329 		{
22902330 			CastShadow(0);
....@@ -2299,7 +2339,15 @@
22992339 		} else
23002340 		if (event.getSource() == ungroupItem)
23012341 		{
2302
-			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();
23032351 		} else
23042352 		if (event.getSource() == genUVItem)
23052353                 {
....@@ -2309,9 +2357,17 @@
23092357                 {
23102358 			GenNormals(true);
23112359 		} else
2360
+		if (event.getSource() == genNormalsMESHItem)
2361
+                {
2362
+			GenNormals(true); // TODO
2363
+		} else
23122364 		if (event.getSource() == genNormalsORGANItem)
23132365                 {
23142366 			GenNormals(false);
2367
+		} else
2368
+		if (event.getSource() == genNormalsMINEItem)
2369
+                {
2370
+			GenNormalsMINE();
23152371 		} else
23162372 		if (event.getSource() == stripifyItem)
23172373                 {
....@@ -2584,8 +2640,8 @@
25842640                     // bug
25852641                     //gridPanel.setDividerLocation(1.0);
25862642                     //bigPanel.setDividerLocation(0.0);
2587
-                    bigThree.remove(jtp);
2588
-                    bigThree.remove(cameraPanel);
2643
+                    bigThree.remove(scenePanel);
2644
+                    bigThree.remove(centralPanel);
25892645                     bigThree.remove(XYZPanel);
25902646                     aWindowConstraints.gridx = 0;
25912647                     aWindowConstraints.gridy = 0;
....@@ -2600,7 +2656,7 @@
26002656             //        aConstraints.gridheight = 3;
26012657                     aWindowConstraints.gridx = 1;
26022658                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2603
-                    bigThree.add(cameraPanel, aWindowConstraints);
2659
+                    bigThree.add(centralPanel, aWindowConstraints);
26042660                     aWindowConstraints.weightx = 0;
26052661                     aWindowConstraints.gridx = 4;
26062662                     aWindowConstraints.gridwidth = 1;
....@@ -2612,8 +2668,8 @@
26122668 		if (event.getSource() == threeButton)
26132669 		{
26142670                     radio.layout = threeButton;
2615
-                    bigThree.remove(jtp);
2616
-                    bigThree.remove(cameraPanel);
2671
+                    bigThree.remove(scenePanel);
2672
+                    bigThree.remove(centralPanel);
26172673                     bigThree.remove(XYZPanel);
26182674                     aWindowConstraints.gridx = 0;
26192675                     aWindowConstraints.gridy = 0;
....@@ -2628,7 +2684,7 @@
26282684             //        aConstraints.gridheight = 3;
26292685                     aWindowConstraints.gridx = 1;
26302686                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2631
-                    bigThree.add(cameraPanel, aWindowConstraints);
2687
+                    bigThree.add(centralPanel, aWindowConstraints);
26322688                     aWindowConstraints.weightx = 0;
26332689                     aWindowConstraints.gridx = 4;
26342690                     aWindowConstraints.gridwidth = 1;
....@@ -2640,8 +2696,8 @@
26402696 		if (event.getSource() == fourButton)
26412697 		{
26422698                     radio.layout = fourButton;
2643
-                    bigThree.remove(jtp);
2644
-                    bigThree.remove(cameraPanel);
2699
+                    bigThree.remove(scenePanel);
2700
+                    bigThree.remove(centralPanel);
26452701                     bigThree.remove(XYZPanel);
26462702                     aWindowConstraints.gridx = 0;
26472703                     aWindowConstraints.gridy = 0;
....@@ -2650,7 +2706,7 @@
26502706                     aWindowConstraints.fill = GridBagConstraints.BOTH;
26512707                     aWindowConstraints.weightx = 1;
26522708                     aWindowConstraints.weighty = 1;
2653
-                    bigThree.add(jtp, aWindowConstraints);
2709
+                    bigThree.add(scenePanel, aWindowConstraints);
26542710                     aWindowConstraints.weightx = 1;
26552711                     aWindowConstraints.gridwidth = 3;
26562712               //      aConstraints.gridheight = 3;
....@@ -2668,8 +2724,8 @@
26682724 		if (event.getSource() == sixButton)
26692725 		{
26702726                     radio.layout = sixButton;
2671
-                    bigThree.remove(jtp);
2672
-                    bigThree.remove(cameraPanel);
2727
+                    bigThree.remove(scenePanel);
2728
+                    bigThree.remove(centralPanel);
26732729                     bigThree.remove(XYZPanel);
26742730                     aWindowConstraints.gridx = 0;
26752731                     aWindowConstraints.gridy = 0;
....@@ -2678,13 +2734,13 @@
26782734                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
26792735                     aWindowConstraints.weightx = 0;
26802736                     aWindowConstraints.weighty = 1;
2681
-                    bigThree.add(jtp, aWindowConstraints);
2737
+                    bigThree.add(scenePanel, aWindowConstraints);
26822738                     aWindowConstraints.weightx = 1;
26832739                     aWindowConstraints.gridwidth = 3;
26842740               //      aWindowConstraints.gridheight = 3;
26852741                     aWindowConstraints.gridx = 1;
26862742                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2687
-                    bigThree.add(cameraPanel, aWindowConstraints);
2743
+                    bigThree.add(centralPanel, aWindowConstraints);
26882744                     aWindowConstraints.weightx = 0;
26892745                     aWindowConstraints.gridx = 4;
26902746                     aWindowConstraints.gridwidth = 1;
....@@ -2696,8 +2752,8 @@
26962752 		if (event.getSource() == sevenButton)
26972753 		{
26982754                     radio.layout = sevenButton;
2699
-                    bigThree.remove(jtp);
2700
-                    bigThree.remove(cameraPanel);
2755
+                    bigThree.remove(scenePanel);
2756
+                    bigThree.remove(centralPanel);
27012757                     bigThree.remove(XYZPanel);
27022758                     aWindowConstraints.gridx = 0;
27032759                     aWindowConstraints.gridy = 0;
....@@ -2706,13 +2762,13 @@
27062762                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
27072763                     aWindowConstraints.weightx = 0;
27082764                     aWindowConstraints.weighty = 1;
2709
-                    bigThree.add(jtp, aWindowConstraints);
2765
+                    bigThree.add(scenePanel, aWindowConstraints);
27102766                     aWindowConstraints.weightx = 1;
27112767                     aWindowConstraints.gridwidth = 3;
27122768                //     aWindowConstraints.gridheight = 3;
27132769                     aWindowConstraints.gridx = 1;
27142770                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2715
-                    bigThree.add(cameraPanel, aWindowConstraints);
2771
+                    bigThree.add(centralPanel, aWindowConstraints);
27162772                     aWindowConstraints.weightx = 0;
27172773                     aWindowConstraints.gridx = 4;
27182774                     aWindowConstraints.gridwidth = 1;
....@@ -3173,6 +3229,13 @@
31733229 		refreshContents();
31743230 	}
31753231 	
3232
+	void GenNormalsMINE()
3233
+	{
3234
+		group.selection.GenNormalsMINE();
3235
+		
3236
+		refreshContents();
3237
+	}
3238
+	
31763239 	void Stripify()
31773240 	{
31783241 		group.StripifyS();
....@@ -3441,12 +3504,26 @@
34413504         
34423505 	void Align()
34433506 	{
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
+            
34443521             for (int i=0; i<group.selection.size(); i++)
34453522             {
34463523 		Object3D obj = group.selection.get(i);
34473524                 
3448
-                LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449
-                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);
34503527             }
34513528             
34523529             refreshContents();
....@@ -4468,6 +4545,26 @@
44684545 		makeSomething(csg);
44694546 	}
44704547 	
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
+        
44714568 	void ungroup()
44724569 	{
44734570             /*
....@@ -4827,6 +4924,7 @@
48274924 	private MenuItem resetsupportItem;
48284925 	private MenuItem resetreferencesItem;
48294926 	private MenuItem linkverticesItem;
4927
+	private MenuItem relinkverticesItem;
48304928 	private MenuItem setMasterItem;
48314929 	private MenuItem resetMeshItem;
48324930 	private MenuItem stepAllItem;
....@@ -4845,8 +4943,10 @@
48454943 	private MenuItem clearItem;
48464944 	private MenuItem clearAllItem;
48474945 	private MenuItem genUVItem;
4946
+	private MenuItem genNormalsMESHItem;
48484947 	private MenuItem genNormalsCADItem;
48494948 	private MenuItem genNormalsORGANItem;
4949
+	private MenuItem genNormalsMINEItem;
48504950 	private MenuItem stripifyItem;
48514951 	private MenuItem unstripifyItem;
48524952 	private MenuItem trimItem;
....@@ -4888,6 +4988,7 @@
48884988 	private MenuItem resetCentroidItem;
48894989 	private MenuItem transformgeometryItem;
48904990 	private MenuItem resetTransformItem;
4991
+	private MenuItem hideItem;
48914992 	private MenuItem grabItem;
48924993 	private MenuItem backItem;
48934994 	private MenuItem frontItem;
....@@ -4928,6 +5029,7 @@
49285029 	private MenuItem coneItem;
49295030 	private MenuItem torusItem;
49305031 	private MenuItem superItem;
5032
+	private MenuItem kleinItem;
49315033 	private MenuItem blobItem;
49325034 	private MenuItem latheItem;
49335035 	private MenuItem bezierItem;
....@@ -4940,6 +5042,7 @@
49405042 	private MenuItem csgItem;
49415043 	private MenuItem templateItem;
49425044 	private MenuItem textureItem;
5045
+	private MenuItem billboardItem;
49435046 	private MenuItem shadowXItem;
49445047 	private MenuItem shadowYItem;
49455048 	private MenuItem shadowZItem;