Transform count UI

Normand Briere

2019-11-11 bdd402e82c0821cb759ad27fbbe0fde689694d4f

Transform count UI

 BoundaryRep.java
..
..
@@ -531,7 +531,7 @@
531
531
     static Vertex vertextemp = new Vertex(true);
532
532
     static Vertex vertextemp2 = new Vertex(true);
533
533
     
534
-    static double SEUIL = 0.025f; // 0.1 for rag doll; 0.07;
534
+    static double SEUIL = 0.0025f; // 0.1 for rag doll; 0.07;
535
535
         
536
536
     // Compute weight of point w/r to this
537
537
     float ComputeWeight(Vertex v, double[][] toRoot, int k)
 Box.java
..
..
@@ -1,6 +1,6 @@
1
1
 public class Box extends Object3D implements java.io.Serializable
2
2
 {
3
-    static final long serialVersionUID = 0;
3
+    static final long serialVersionUID = -8881546880864755550L; // 0;
4
4
 
5
5
     boolean open;
6
6
     
 CameraPane.java
..
..
@@ -15647,7 +15647,7 @@
15647
15647
     {
15648
15648
 // Set the blank cursor to the JFrame.
15649
15649
 //object.editWindow.frame.
15650
-        if (Globals.ADVANCED)
15650
+        if (key == ENTER) // Globals.ADVANCED)
15651
15651
             setCursor(blankCursor); // Contaminates other apps!
15652
15652
 
15653
15653
         if (key >= '0' && key <= '5')
 GroupEditor.java
..
..
@@ -917,17 +917,18 @@
917
917
 		shareGeometriesItem.addActionListener(this);
918
918
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
919
919
 		mergeGeometriesItem.addActionListener(this);
920
-		menu.add("-");
921
-		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
922
-		editLeafItem.addActionListener(this);
923
920
         if (Globals.ADVANCED)
924
921
         {
925
922
             // Pretty much the same as duplicate and clone.
926
923
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
927
924
 		extractGeometriesItem.addActionListener(this);
925
+        }
928
926
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
929
927
 		cloneGeometriesItem.addActionListener(this);
930
-        }
928
+                
929
+		menu.add("-");
930
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
931
+		editLeafItem.addActionListener(this);
931
932
                 
932
933
 		oe.menuBar.add(menu = new Menu("Insert"));
933
934
 		buildCreateMenu(menu);
 ObjEditor.java
..
..
@@ -328,10 +328,11 @@
328
328
         objEditor.ctrlPanel.remove(setupPanel2);
329
329
         objEditor.ctrlPanel.remove(objectCommandsPanel);
330
330
         objEditor.ctrlPanel.remove(pushPanel);
331
+        objEditor.ctrlPanel.remove(transformCountPanel);
331
332
         if (versionPanel != null)
332
333
             objEditor.ctrlPanel.remove(versionPanel);
333
-        if (countPanel != null)
334
-            objEditor.ctrlPanel.remove(countPanel);
334
+        if (loopCountPanel != null)
335
+            objEditor.ctrlPanel.remove(loopCountPanel);
335
336
         //objEditor.ctrlPanel.remove(fillPanel);
336
337
         
337
338
         //Remove(normalpushField);
..
..
@@ -1213,11 +1214,12 @@
1213
1214
     cGridBag setupPanel2;
1214
1215
     cGridBag objectCommandsPanel;
1215
1216
     cGridBag pushPanel;
1217
+    cGridBag transformCountPanel;
1216
1218
     cGridBag versionPanel;
1217
-    cGridBag countPanel;
1219
+    cGridBag loopCountPanel;
1218
1220
     cGridBag fillPanel;
1219
1221
 
1220
-    cNumberSlider countField;
1222
+    cNumberSlider loopCountField;
1221
1223
     
1222
1224
     JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
1223
1225
     {
..
..
@@ -1471,13 +1473,20 @@
1471
1473
         oe.ctrlPanel.add(objectCommandsPanel);
1472
1474
         oe.ctrlPanel.Return();
1473
1475
 
1476
+        if (copy.maxcount == 0)
1477
+            copy.maxcount = 128;
1478
+        
1479
+        transformCountPanel = AddSlider(oe.ctrlPanel, "Transform", 0, 128, copy.transformcount * 128 / copy.maxcount);
1480
+        transformCountField = (cNumberSlider)transformCountPanel.getComponent(1);
1481
+        
1482
+        oe.ctrlPanel.Return();
1474
1483
     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1475
1484
     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1476
1485
     if (copy instanceof Composite && !(copy instanceof cGroup))
1477
1486
     {
1478
1487
         oe.ctrlPanel.Return();
1479
-        countPanel = AddSlider(oe.ctrlPanel, "Count", 0, 50, copy.count);
1480
-        countField = (cNumberSlider)countPanel.getComponent(1);
1488
+        loopCountPanel = AddSlider(oe.ctrlPanel, "Loop", 0, 50, copy.count);
1489
+        loopCountField = (cNumberSlider)loopCountPanel.getComponent(1);
1481
1490
     }
1482
1491
     if (false && copy.versionlist != null && copy.versionindex != -1)
1483
1492
     {
..
..
@@ -4426,19 +4435,19 @@
4426
4435
                 cameraPanel.add(cameraView);
4427
4436
                 centralPanel.add(cameraPanel);
4428
4437
                 frame.setJMenuBar(timelineMenubar);
4429
-                wasFullScreen = CameraPane.FULLSCREEN;
4430
-                if (!CameraPane.FULLSCREEN)
4431
-                    ToggleFullScreen();
4432
-                toggleFullScreenItem.setEnabled(false);
4438
+                //wasFullScreen = CameraPane.FULLSCREEN;
4439
+                //if (!CameraPane.FULLSCREEN)
4440
+                //    ToggleFullScreen();
4441
+                //toggleFullScreenItem.setEnabled(false);
4433
4442
             }
4434
4443
             else
4435
4444
             {
4436
4445
                 centralPanel.remove(cameraPanel);
4437
4446
                 centralPanel.add(cameraView);
4438
4447
                 frame.setJMenuBar(null);
4439
-                if (!wasFullScreen)
4440
-                    ToggleFullScreen();
4441
-                toggleFullScreenItem.setEnabled(true);
4448
+                //if (!wasFullScreen)
4449
+                //    ToggleFullScreen();
4450
+                //toggleFullScreenItem.setEnabled(true);
4442
4451
             }
4443
4452
 
4444
4453
             frame.validate();
..
..
@@ -5584,6 +5593,8 @@
5584
5593
         //copy.Touch();
5585
5594
     }
5586
5595
 
5596
+    cNumberSlider transformCountField;
5597
+    
5587
5598
     cNumberSlider versionSlider; // Main
5588
5599
     cNumberSlider versionField; // selection (off)
5589
5600
     
..
..
@@ -5632,9 +5643,17 @@
5632
5643
             return;
5633
5644
         }
5634
5645
         
5635
-        if (e.getSource() == countField)
5646
+        if (e.getSource() == loopCountField)
5636
5647
         {
5637
-            copy.count = countField.getInteger();
5648
+            copy.count = loopCountField.getInteger();
5649
+            Globals.lighttouched = true;
5650
+            objEditor.refreshContents();
5651
+            return;
5652
+        }
5653
+        
5654
+        if (e.getSource() == transformCountField)
5655
+        {
5656
+            copy.transformcount = transformCountField.getInteger() * copy.maxcount / 256;
5638
5657
             Globals.lighttouched = true;
5639
5658
             objEditor.refreshContents();
5640
5659
             return;
 Object3D.java
..
..
@@ -1149,7 +1149,7 @@
1149
1149
             transformcount++;
1150
1150
     }
1151
1151
 
1152
-    int maxcount;
1152
+    int maxcount = 128;
1153
1153
     int transformcount;
1154
1154
     int step;
1155
1155
     
..
..
@@ -1202,7 +1202,10 @@
1202
1202
         if (step == 0)
1203
1203
             step = 1;
1204
1204
         if (maxcount == 0)
1205
-            maxcount = 128; // 2048; // 4;
1205
+        {
1206
+            System.out.println("maxcount == 0");
1207
+            System.exit(0); // maxcount = 128; // 2048; // 4;
1208
+        }
1206
1209
 //        if (acceleration == 0)
1207
1210
 //            acceleration = 10;
1208
1211
         if (delay == 0) // serial
 Superellipsoid.java
..
..
@@ -11,8 +11,8 @@
11
11
         dv = new cVector();
12
12
 		
13
13
         name = "Superellipsoid";
14
-        east = 1;
15
-        north = 1;
14
+        east = 2;
15
+        north = 2;
16
16
         //uDivs = vDivs = 32;
17
17
         uDivs = 36;
18
18
         vDivs = 34;