Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e
GroupEditor.java
....@@ -470,6 +470,14 @@
470470 markleavesItem.addActionListener(this);
471471 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472472 unmarkleavesItem.addActionListener(this);
473
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474
+ rewindleavesItem.addActionListener(this);
475
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
476
+ unrewindleavesItem.addActionListener(this);
477
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
478
+ randomleavesItem.addActionListener(this);
479
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
480
+ unrandomleavesItem.addActionListener(this);
473481 menu.add("-");
474482 flipVItem = menu.add(new MenuItem("Flip V"));
475483 flipVItem.addActionListener(this);
....@@ -871,6 +879,7 @@
871879 } else if(e.getSource() == liveCB)
872880 {
873881 cameraView.ToggleLive();
882
+ refreshContents(false);
874883 }
875884 else if(e.getSource() == supportCB)
876885 {
....@@ -1278,7 +1287,7 @@
12781287 memoryItem.addActionListener(this);
12791288 menu.add(analyzeItem = new MenuItem("Analyze"));
12801289 analyzeItem.addActionListener(this);
1281
- menu.add(dumpItem = new MenuItem("Dump"));
1290
+ menu.add(dumpItem = new MenuItem("Print"));
12821291 dumpItem.addActionListener(this);
12831292 // menu.add(pathItem = new MenuItem("From-to path"));
12841293 // pathItem.addActionListener(this);
....@@ -2542,7 +2551,7 @@
25422551 } else
25432552 if (source == genNormalsMESHItem)
25442553 {
2545
- GenNormals(true); // TODO
2554
+ GenNormalsMESH();
25462555 } else
25472556 if (source == genNormalsORGANItem)
25482557 {
....@@ -2607,6 +2616,22 @@
26072616 if (source == unmarkleavesItem)
26082617 {
26092618 MarkLeaves(false);
2619
+ } else
2620
+ if (source == rewindleavesItem)
2621
+ {
2622
+ RewindLeaves(true);
2623
+ } else
2624
+ if (source == unrewindleavesItem)
2625
+ {
2626
+ RewindLeaves(false);
2627
+ } else
2628
+ if (source == randomleavesItem)
2629
+ {
2630
+ RandomLeaves(true);
2631
+ } else
2632
+ if (source == unrandomleavesItem)
2633
+ {
2634
+ RandomLeaves(false);
26102635 } else
26112636 if (source == flipVItem)
26122637 {
....@@ -3429,7 +3454,8 @@
34293454
34303455 int size = obj.MemorySize();
34313456
3432
- System.err.println((size/1024) + " KB is the size of " + obj);
3457
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3458
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
34333459 }
34343460 }
34353461 catch (Exception e)
....@@ -3510,6 +3536,13 @@
35103536 void GenNormals(boolean crease)
35113537 {
35123538 group.GenNormalsS(crease);
3539
+
3540
+ refreshContents();
3541
+ }
3542
+
3543
+ void GenNormalsMESH()
3544
+ {
3545
+ group.GenNormalsMeshS();
35133546
35143547 refreshContents();
35153548 }
....@@ -4137,6 +4170,18 @@
41374170 refreshContents();
41384171 }
41394172
4173
+ void RewindLeaves(boolean hide)
4174
+ {
4175
+ group.selection.RewindLeaves(hide);
4176
+ refreshContents();
4177
+ }
4178
+
4179
+ void RandomLeaves(boolean hide)
4180
+ {
4181
+ group.selection.RandomLeaves(hide);
4182
+ refreshContents();
4183
+ }
4184
+
41404185 void SetTexRes(int tr)
41414186 {
41424187 group.selection.SetTexRes(tr);
....@@ -4312,7 +4357,6 @@
43124357 //case 702: // Event.LIST_DESELECT
43134358 group.deselectAll();
43144359 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4315
- objEditor.ClearInfo(); // .GetMaterial());
43164360 if (tps != null)
43174361 {
43184362 for (int i=0; i < tps.length; i++)
....@@ -4321,10 +4365,8 @@
43214365
43224366 //if (child.parent != null)
43234367 //child.parent.addSelectee(child);
4368
+ objEditor.SetMaterial(child);
43244369 group.addSelectee(child);
4325
- objEditor.SetMaterial(child); // .GetMaterial());
4326
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4327
- System.err.println("info : " + child.GetPath());
43284370 }
43294371 }
43304372 // else
....@@ -4334,8 +4376,6 @@
43344376 // System.err.println("info : " + group.GetPath());
43354377 // }
43364378
4337
- objEditor.SetText(); // jan 2014
4338
-
43394379 if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43404380 CameraPane.flash = true;
43414381
....@@ -4359,6 +4399,26 @@
43594399
43604400 freezemodel = false;
43614401 }
4402
+
4403
+ void refreshContents(boolean cp)
4404
+ {
4405
+ if (!Globals.MOUSEDRAGGED)
4406
+ {
4407
+ objEditor.ClearInfo(); // .GetMaterial());
4408
+
4409
+ for (int i=0; i < group.selection.Size(); i++)
4410
+ {
4411
+ Object3D child = (Object3D) group.selection.get(i);
4412
+
4413
+ objEditor.AddInfo(child, this, true);
4414
+ System.err.println("info : " + child.GetPath());
4415
+ }
4416
+
4417
+ objEditor.SetText(); // jan 2014
4418
+ }
4419
+
4420
+ super.refreshContents(cp);
4421
+ }
43624422
43634423 void linkSomething(Object3D thing)
43644424 {
....@@ -5259,6 +5319,10 @@
52595319 private MenuItem showleavesItem;
52605320 private MenuItem markleavesItem;
52615321 private MenuItem unmarkleavesItem;
5322
+ private MenuItem rewindleavesItem;
5323
+ private MenuItem unrewindleavesItem;
5324
+ private MenuItem randomleavesItem;
5325
+ private MenuItem unrandomleavesItem;
52625326
52635327 private MenuItem flipVItem;
52645328 private MenuItem unflipVItem;