new torus code and VR

Normand Briere

2018-05-22 42107f9a01652cb2f47228d20c1148a2a22f6a63

 GroupEditor.java
..
..
@@ -219,6 +219,8 @@
219
219
 		resetsupportItem.addActionListener(this);
220
220
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
221
221
 		linkverticesItem.addActionListener(this);
222
+		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223
+		relinkverticesItem.addActionListener(this);
222
224
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223
225
 		setMasterItem.addActionListener(this);
224
226
                 
..
..
@@ -231,6 +233,10 @@
231
233
 		frontItem.addActionListener(this);
232
234
 		compositeItem = menu.add(new MenuItem("Composite"));
233
235
 		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);
234
240
 		menu.add("-");
235
241
 		randomItem = menu.add(new MenuItem("Random"));
236
242
 		randomItem.addActionListener(this);
..
..
@@ -252,6 +258,8 @@
252
258
 		oe.menuBar.add(menu = new Menu("Object"));
253
259
 		textureItem = menu.add(new MenuItem("Texture"));
254
260
 		textureItem.addActionListener(this);
261
+		billboardItem = menu.add(new MenuItem("Billboard"));
262
+		billboardItem.addActionListener(this);
255
263
 		csgItem = menu.add(new MenuItem("CSG"));
256
264
 		csgItem.addActionListener(this);
257
265
                 shadowXItem = menu.add(new MenuItem("Shadow X"));
..
..
@@ -269,14 +277,12 @@
269
277
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
270
278
 		pointflowItem.addActionListener(this);
271
279
 		menu.add("-");
272
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273
-		transformgeometryItem.addActionListener(this);
274
280
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275
281
 		resetTransformItem.addActionListener(this);
276
282
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277
283
 		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);
280
286
                 
281
287
 		oe.menuBar.add(menu = new Menu("Geometry"));
282
288
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -287,6 +293,8 @@
287
293
 		genNormalsCADItem.addActionListener(this);
288
294
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289
295
 		genNormalsMESHItem.addActionListener(this);
296
+		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297
+		genNormalsMINEItem.addActionListener(this);
290
298
 		stripifyItem = menu.add(new MenuItem("Stripify"));
291
299
 		stripifyItem.addActionListener(this);
292
300
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -1035,6 +1043,8 @@
1035
1043
 		torusItem.addActionListener(this);
1036
1044
 		superItem = menu.add(new MenuItem("Superellipsoid"));
1037
1045
 		superItem.addActionListener(this);
1046
+		kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047
+		kleinItem.addActionListener(this);
1038
1048
 		particleItem = menu.add(new MenuItem("Particle system"));
1039
1049
 		particleItem.addActionListener(this);
1040
1050
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
..
..
@@ -1595,6 +1605,10 @@
1595
1605
 		{
1596
1606
 			makeSomething(new Superellipsoid());
1597
1607
 		} else
1608
+		if (event.getSource() == kleinItem)
1609
+		{
1610
+			makeSomething(new Klein());
1611
+		} else
1598
1612
 		if (event.getSource() == blobItem)
1599
1613
 		{
1600
1614
 			Blob blob = new Blob();
..
..
@@ -2003,23 +2017,28 @@
2003
2017
                     if (group.selection.size() == 1)
2004
2018
                         one = true;
2005
2019
 
2020
+                    Object3D merge = null;
2021
+                    
2006
2022
                     Object3D content = new cGroup();
2007
2023
                     
2008
2024
                     for (int i=0; i<group.selection.size(); i++)
2009
2025
                     {
2010
-                        Object3D sel = new Merge(group.selection.get(i));
2026
+                        merge = new Merge(group.selection.get(i));
2011
2027
                         
2012
2028
                         if (one)
2013
-                            makeSomething(sel, false);
2029
+                            makeSomething(merge, false);
2014
2030
                         else
2015
-                            content.addChild(sel);
2031
+                            content.addChild(merge);
2016
2032
                     }
2017
2033
                     
2018
2034
                     if (!one)
2019
-                        makeSomething(content, false);
2020
-                    
2021
-                    ResetModel();
2022
-                    refreshContents();
2035
+                        makeSomething(content, true);
2036
+                    else
2037
+                    {
2038
+                        ResetModel();
2039
+                        Select(merge.GetTreePath(), true, false); // unselect... false);
2040
+                        refreshContents();
2041
+                    }
2023
2042
 		} else
2024
2043
 		if (event.getSource() == mergeGeometriesItem)
2025
2044
 		{
..
..
@@ -2096,6 +2115,15 @@
2096
2115
 
2097
2116
                     refreshContents();
2098
2117
 		} 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
2099
2127
 		if (event.getSource() == resetreferencesItem)
2100
2128
 		{
2101
2129
                     for (int i=0; i<group.selection.size(); i++)
..
..
@@ -2164,6 +2192,10 @@
2164
2192
 		if (event.getSource() == grabItem)
2165
2193
 		{
2166
2194
 			group(new cGroup(), true);
2195
+		} else
2196
+		if (event.getSource() == hideItem)
2197
+		{
2198
+			group(new HiddenObject());
2167
2199
 		} else
2168
2200
 		if (event.getSource() == frontItem)
2169
2201
 		{
..
..
@@ -2287,6 +2319,10 @@
2287
2319
 		{
2288
2320
 			group(new TextureNode());
2289
2321
 		} else
2322
+		if (event.getSource() == billboardItem)
2323
+		{
2324
+			group(new BillboardNode());
2325
+		} else
2290
2326
 		if (event.getSource() == shadowXItem)
2291
2327
 		{
2292
2328
 			CastShadow(0);
..
..
@@ -2301,7 +2337,15 @@
2301
2337
 		} else
2302
2338
 		if (event.getSource() == ungroupItem)
2303
2339
 		{
2304
-			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();
2305
2349
 		} else
2306
2350
 		if (event.getSource() == genUVItem)
2307
2351
                 {
..
..
@@ -2318,6 +2362,10 @@
2318
2362
 		if (event.getSource() == genNormalsORGANItem)
2319
2363
                 {
2320
2364
 			GenNormals(false);
2365
+		} else
2366
+		if (event.getSource() == genNormalsMINEItem)
2367
+                {
2368
+			GenNormalsMINE();
2321
2369
 		} else
2322
2370
 		if (event.getSource() == stripifyItem)
2323
2371
                 {
..
..
@@ -3179,6 +3227,13 @@
3179
3227
 		refreshContents();
3180
3228
 	}
3181
3229
 	
3230
+	void GenNormalsMINE()
3231
+	{
3232
+		group.selection.GenNormalsMINE();
3233
+		
3234
+		refreshContents();
3235
+	}
3236
+	
3182
3237
 	void Stripify()
3183
3238
 	{
3184
3239
 		group.StripifyS();
..
..
@@ -3447,12 +3502,26 @@
3447
3502
         
3448
3503
 	void Align()
3449
3504
 	{
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
+            
3450
3519
             for (int i=0; i<group.selection.size(); i++)
3451
3520
             {
3452
3521
 		Object3D obj = group.selection.get(i);
3453
3522
                 
3454
-                LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455
-                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);
3456
3525
             }
3457
3526
             
3458
3527
             refreshContents();
..
..
@@ -4474,6 +4543,26 @@
4474
4543
 		makeSomething(csg);
4475
4544
 	}
4476
4545
 	
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
+        
4477
4566
 	void ungroup()
4478
4567
 	{
4479
4568
             /*
..
..
@@ -4833,6 +4922,7 @@
4833
4922
 	private MenuItem resetsupportItem;
4834
4923
 	private MenuItem resetreferencesItem;
4835
4924
 	private MenuItem linkverticesItem;
4925
+	private MenuItem relinkverticesItem;
4836
4926
 	private MenuItem setMasterItem;
4837
4927
 	private MenuItem resetMeshItem;
4838
4928
 	private MenuItem stepAllItem;
..
..
@@ -4854,6 +4944,7 @@
4854
4944
 	private MenuItem genNormalsMESHItem;
4855
4945
 	private MenuItem genNormalsCADItem;
4856
4946
 	private MenuItem genNormalsORGANItem;
4947
+	private MenuItem genNormalsMINEItem;
4857
4948
 	private MenuItem stripifyItem;
4858
4949
 	private MenuItem unstripifyItem;
4859
4950
 	private MenuItem trimItem;
..
..
@@ -4895,6 +4986,7 @@
4895
4986
 	private MenuItem resetCentroidItem;
4896
4987
 	private MenuItem transformgeometryItem;
4897
4988
 	private MenuItem resetTransformItem;
4989
+	private MenuItem hideItem;
4898
4990
 	private MenuItem grabItem;
4899
4991
 	private MenuItem backItem;
4900
4992
 	private MenuItem frontItem;
..
..
@@ -4935,6 +5027,7 @@
4935
5027
 	private MenuItem coneItem;
4936
5028
 	private MenuItem torusItem;
4937
5029
 	private MenuItem superItem;
5030
+	private MenuItem kleinItem;
4938
5031
 	private MenuItem blobItem;
4939
5032
 	private MenuItem latheItem;
4940
5033
 	private MenuItem bezierItem;
..
..
@@ -4947,6 +5040,7 @@
4947
5040
 	private MenuItem csgItem;
4948
5041
 	private MenuItem templateItem;
4949
5042
 	private MenuItem textureItem;
5043
+	private MenuItem billboardItem;
4950
5044
 	private MenuItem shadowXItem;
4951
5045
 	private MenuItem shadowYItem;
4952
5046
 	private MenuItem shadowZItem;