blame | history | patch | commit | commitdiff
Normand Briere
2018-07-01 89c1ad67bc65d24ceadfa9e95f8c5515283f1e97 
 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"));
....@@ -1033,6 +1043,8 @@
10331043 		torusItem.addActionListener(this);
10341044 		superItem = menu.add(new MenuItem("Superellipsoid"));
10351045 		superItem.addActionListener(this);
1046
+		kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047
+		kleinItem.addActionListener(this);
10361048 		particleItem = menu.add(new MenuItem("Particle system"));
10371049 		particleItem.addActionListener(this);
10381050 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1593,6 +1605,10 @@
15931605 		{
15941606 			makeSomething(new Superellipsoid());
15951607 		} else
1608
+		if (event.getSource() == kleinItem)
1609
+		{
1610
+			makeSomething(new Klein());
1611
+		} else
15961612 		if (event.getSource() == blobItem)
15971613 		{
15981614 			Blob blob = new Blob();
....@@ -2001,23 +2017,28 @@
20012017                     if (group.selection.size() == 1)
20022018                         one = true;
20032019 
2020
+                    Object3D merge = null;
2021
+                    
20042022                     Object3D content = new cGroup();
20052023                     
20062024                     for (int i=0; i<group.selection.size(); i++)
20072025                     {
2008
-                        Object3D sel = new Merge(group.selection.get(i));
2026
+                        merge = new Merge(group.selection.get(i));
20092027                         
20102028                         if (one)
2011
-                            makeSomething(sel, false);
2029
+                            makeSomething(merge, false);
20122030                         else
2013
-                            content.addChild(sel);
2031
+                            content.addChild(merge);
20142032                     }
20152033                     
20162034                     if (!one)
2017
-                        makeSomething(content, false);
2018
-                    
2019
-                    ResetModel();
2020
-                    refreshContents();
2035
+                        makeSomething(content, true);
2036
+                    else
2037
+                    {
2038
+                        ResetModel();
2039
+                        Select(merge.GetTreePath(), true, false); // unselect... false);
2040
+                        refreshContents();
2041
+                    }
20212042 		} else
20222043 		if (event.getSource() == mergeGeometriesItem)
20232044 		{
....@@ -2094,6 +2115,15 @@
20942115 
20952116                     refreshContents();
20962117 		} else
2118
+		if (event.getSource() == relinkverticesItem)
2119
+		{
2120
+                    boolean random = CameraPane.RANDOM;
2121
+                    CameraPane.RANDOM = false; // parse all random nodes
2122
+                    group.selection.RelinkToSupport();
2123
+                    CameraPane.RANDOM = random;
2124
+
2125
+                    refreshContents();
2126
+		} else
20972127 		if (event.getSource() == resetreferencesItem)
20982128 		{
20992129                     for (int i=0; i<group.selection.size(); i++)
....@@ -2162,6 +2192,10 @@
21622192 		if (event.getSource() == grabItem)
21632193 		{
21642194 			group(new cGroup(), true);
2195
+		} else
2196
+		if (event.getSource() == hideItem)
2197
+		{
2198
+			group(new HiddenObject());
21652199 		} else
21662200 		if (event.getSource() == frontItem)
21672201 		{
....@@ -2285,6 +2319,10 @@
22852319 		{
22862320 			group(new TextureNode());
22872321 		} else
2322
+		if (event.getSource() == billboardItem)
2323
+		{
2324
+			group(new BillboardNode());
2325
+		} else
22882326 		if (event.getSource() == shadowXItem)
22892327 		{
22902328 			CastShadow(0);
....@@ -2299,7 +2337,15 @@
22992337 		} else
23002338 		if (event.getSource() == ungroupItem)
23012339 		{
2302
-			ungroup();
2340
+			//ungroup();
2341
+                    for (int i=0; i<group.selection.size(); i++)
2342
+                    {
2343
+                        Ungroup(group.selection.get(i));
2344
+                    }
2345
+
2346
+                    ClearSelection(false);
2347
+                    
2348
+                    refreshContents();
23032349 		} else
23042350 		if (event.getSource() == genUVItem)
23052351                 {
....@@ -2309,9 +2355,17 @@
23092355                 {
23102356 			GenNormals(true);
23112357 		} else
2358
+		if (event.getSource() == genNormalsMESHItem)
2359
+                {
2360
+			GenNormals(true); // TODO
2361
+		} else
23122362 		if (event.getSource() == genNormalsORGANItem)
23132363                 {
23142364 			GenNormals(false);
2365
+		} else
2366
+		if (event.getSource() == genNormalsMINEItem)
2367
+                {
2368
+			GenNormalsMINE();
23152369 		} else
23162370 		if (event.getSource() == stripifyItem)
23172371                 {
....@@ -3173,6 +3227,13 @@
31733227 		refreshContents();
31743228 	}
31753229 	
3230
+	void GenNormalsMINE()
3231
+	{
3232
+		group.selection.GenNormalsMINE();
3233
+		
3234
+		refreshContents();
3235
+	}
3236
+	
31763237 	void Stripify()
31773238 	{
31783239 		group.StripifyS();
....@@ -3441,12 +3502,26 @@
34413502         
34423503 	void Align()
34433504 	{
3505
+            if (group.selection.size() == 0)
3506
+                return;
3507
+            
3508
+            cVector bbmin = new cVector();
3509
+            cVector bbmax = new cVector();
3510
+            
3511
+            group.selection.get(0).getBounds(bbmin, bbmax, true);
3512
+            
3513
+            double dx = bbmax.x - bbmin.x;
3514
+            double dy = bbmax.y - bbmin.y;
3515
+            double dz = bbmax.z - bbmin.z;
3516
+            
3517
+            double scale = Math.sqrt(dx*dx + dy*dy + dz*dz);
3518
+            
34443519             for (int i=0; i<group.selection.size(); i++)
34453520             {
34463521 		Object3D obj = group.selection.get(i);
34473522                 
3448
-                LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449
-                LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
3523
+                LA.matTranslate(obj.toParent, i * scale, 0, 0);
3524
+                LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
34503525             }
34513526             
34523527             refreshContents();
....@@ -4468,6 +4543,26 @@
44684543 		makeSomething(csg);
44694544 	}
44704545 	
4546
+        void Ungroup(Object3D g)
4547
+        {
4548
+            if (g instanceof HiddenObject)
4549
+            {
4550
+                HiddenObject h = (HiddenObject) g;
4551
+                
4552
+                for (int i=0; i<h.ActualSize(); i++)
4553
+                {
4554
+                    objEditor.makeSomething(h.get(i), false);
4555
+                }
4556
+            }
4557
+            else
4558
+            {
4559
+                for (int i=0; i<g.Size(); i++)
4560
+                {
4561
+                    objEditor.makeSomething(g.get(i), false);
4562
+                }
4563
+            }
4564
+        }
4565
+        
44714566 	void ungroup()
44724567 	{
44734568             /*
....@@ -4827,6 +4922,7 @@
48274922 	private MenuItem resetsupportItem;
48284923 	private MenuItem resetreferencesItem;
48294924 	private MenuItem linkverticesItem;
4925
+	private MenuItem relinkverticesItem;
48304926 	private MenuItem setMasterItem;
48314927 	private MenuItem resetMeshItem;
48324928 	private MenuItem stepAllItem;
....@@ -4845,8 +4941,10 @@
48454941 	private MenuItem clearItem;
48464942 	private MenuItem clearAllItem;
48474943 	private MenuItem genUVItem;
4944
+	private MenuItem genNormalsMESHItem;
48484945 	private MenuItem genNormalsCADItem;
48494946 	private MenuItem genNormalsORGANItem;
4947
+	private MenuItem genNormalsMINEItem;
48504948 	private MenuItem stripifyItem;
48514949 	private MenuItem unstripifyItem;
48524950 	private MenuItem trimItem;
....@@ -4888,6 +4986,7 @@
48884986 	private MenuItem resetCentroidItem;
48894987 	private MenuItem transformgeometryItem;
48904988 	private MenuItem resetTransformItem;
4989
+	private MenuItem hideItem;
48914990 	private MenuItem grabItem;
48924991 	private MenuItem backItem;
48934992 	private MenuItem frontItem;
....@@ -4928,6 +5027,7 @@
49285027 	private MenuItem coneItem;
49295028 	private MenuItem torusItem;
49305029 	private MenuItem superItem;
5030
+	private MenuItem kleinItem;
49315031 	private MenuItem blobItem;
49325032 	private MenuItem latheItem;
49335033 	private MenuItem bezierItem;
....@@ -4940,6 +5040,7 @@
49405040 	private MenuItem csgItem;
49415041 	private MenuItem templateItem;
49425042 	private MenuItem textureItem;
5043
+	private MenuItem billboardItem;
49435044 	private MenuItem shadowXItem;
49445045 	private MenuItem shadowYItem;
49455046 	private MenuItem shadowZItem;