Grafreed 1.0.1 Option panel

Normand Briere

2019-04-28 f23e09019d161b02d566ffe312fdc553459fb954

Grafreed 1.0.1 Option panel

 BoundaryRep.java
..
..
@@ -3247,12 +3247,21 @@
3247
3247
                     max = ay;
3248
3248
                 }
3249
3249
                 
3250
+                if (max == 0)
3251
+                {
3252
+                        uvmap[i2] = 0.5f;
3253
+                        uvmap[i2+1] = 0.5f;
3254
+                        continue;
3255
+                }
3256
+                
3250
3257
                 x /= max;
3251
3258
                 y /= max;
3252
3259
 
3253
3260
                 double angle = Math.acos(Math.abs(z*2));
3254
3261
                 
3255
3262
                 double k = angle / Math.PI * 2;
3263
+                
3264
+                assert(k >= 0);
3256
3265
                 
3257
3266
                 // k == 0 => uv = 0 (center)
3258
3267
                 // k == 1 => uv = -1,1 (border)
..
..
@@ -3268,7 +3277,8 @@
3268
3277
                 t = Math.pow(t, 3);
3269
3278
                 
3270
3279
                 // Interpolate between k/length2 (center) and k (border)
3271
-                k = k / length2 * (1 - t) + k * t;
3280
+                if (length2 > 0)
3281
+                        k *= (1 - t) / length2 + t;
3272
3282
                 
3273
3283
                 double u = k*x;
3274
3284
                 double v = k*y;
 GroupEditor.java
..
..
@@ -434,6 +434,9 @@
434
434
         oe.buttonGroup.add(dummyButton);
435
435
          */
436
436
                 aConstraints.gridy += 1;
437
+                
438
+                //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439
+                
437
440
 		oe.aConstraints.gridwidth = 1;
438
441
         	oe.aConstraints.gridx = 0;
439
442
                 
..
..
@@ -442,76 +445,7 @@
442
445
                                 liveCB.addItemListener(this);
443
446
 
444
447
         	oe.aConstraints.gridx += 1;
445
-                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446
-                fastCB.setToolTipText("Fast mode");
447
-                                fastCB.addItemListener(this);
448
-        	oe.aConstraints.gridx += 1;
449
-                oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450
-                supportCB.setToolTipText("Enabled rigging");
451
-                                supportCB.addItemListener(this);
452
-
453
-        //	oe.aConstraints.gridx += 1;
454
-        //        oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455
-        //                        localCB.addItemListener(this);
456
-
457
-        	oe.aConstraints.gridx += 1;
458
-                oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459
-                crowdCB.setToolTipText("Used for crowds");
460
-                                crowdCB.addItemListener(this);
461
-
462
-        	oe.aConstraints.gridx += 1;
463
-                oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464
-                smoothCB.setToolTipText("Snapping delay");
465
-                                smoothCB.addItemListener(this);
466
-
467
-        	oe.aConstraints.gridx += 1;
468
-                oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469
-                slowCB.setToolTipText("Smooth interpolation");
470
-                                slowCB.addItemListener(this);
471
-        	oe.aConstraints.gridx += 1;
472
-                oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473
-                boxCB.setToolTipText("Display bounding boxes");
474
-                                boxCB.addItemListener(this);
475
-        	oe.aConstraints.gridx += 1;
476
-                oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478
-                                zoomBoxCB.addItemListener(this);
479
-
480
-//        	oe.aConstraints.gridx += 1;
481
-//                oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482
-//                                speakerMocapCB.addItemListener(this);
483
-
484
-            if (false)
485
-            {
486
-                // handled in scripts
487
-        	oe.aConstraints.gridx += 1;
488
-                oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489
-                                speakerCameraCB.addItemListener(this);
490
-
491
-        	oe.aConstraints.gridx += 1;
492
-                oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493
-                                speakerFocusCB.addItemListener(this);
494
-
495
-        	oe.aConstraints.gridx += 1;
496
-                oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497
-                                smoothfocusCB.addItemListener(this);
498
-            }
499
-
500
-//oe.aConstraints.gridx += 1;
501
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502
-//                debugCB.addItemListener(this);
503
-
504
-        	oe.aConstraints.gridx += 1;
505
-                oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506
-                                oeilCB.addItemListener(this);
507
-
508
-        	oe.aConstraints.gridx += 1;
509
-                oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510
-                lookAtCB.setToolTipText("Look-at target");
511
-                                lookAtCB.addItemListener(this);
512
-
513
-        	oe.aConstraints.gridx += 1;
514
-                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
448
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
515
449
                 trackCB.setToolTipText("Enable tracking");
516
450
                                 trackCB.addItemListener(this);
517
451
 
..
..
@@ -669,6 +603,80 @@
669
603
         radio.layout = sevenButton;
670
604
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671
605
 	}
606
+        
607
+        void AddOptions(JPanel panel, GridBagConstraints constraints)
608
+        {
609
+        	constraints.gridx = 0;
610
+        	constraints.gridy = 0;
611
+                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612
+                fastCB.setToolTipText("Fast mode");
613
+                                fastCB.addItemListener(this);
614
+        	constraints.gridy += 1;
615
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616
+                supportCB.setToolTipText("Enabled rigging");
617
+                                supportCB.addItemListener(this);
618
+
619
+        //	constraints.gridy += 1;
620
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621
+        //                        localCB.addItemListener(this);
622
+
623
+        	constraints.gridy += 1;
624
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625
+                crowdCB.setToolTipText("Used for crowds");
626
+                                crowdCB.addItemListener(this);
627
+
628
+        	constraints.gridy += 1;
629
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630
+                smoothCB.setToolTipText("Snapping delay");
631
+                                smoothCB.addItemListener(this);
632
+
633
+        	constraints.gridy += 1;
634
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635
+                slowCB.setToolTipText("Smooth interpolation");
636
+                                slowCB.addItemListener(this);
637
+        	constraints.gridy += 1;
638
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639
+                boxCB.setToolTipText("Display bounding boxes");
640
+                                boxCB.addItemListener(this);
641
+        	constraints.gridy += 1;
642
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644
+                                zoomBoxCB.addItemListener(this);
645
+
646
+//        	constraints.gridy += 1;
647
+//                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648
+//                                speakerMocapCB.addItemListener(this);
649
+
650
+            if (false)
651
+            {
652
+                // handled in scripts
653
+        	constraints.gridy += 1;
654
+                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
655
+                                speakerCameraCB.addItemListener(this);
656
+
657
+        	constraints.gridy += 1;
658
+                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
659
+                                speakerFocusCB.addItemListener(this);
660
+
661
+        	constraints.gridy += 1;
662
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
663
+                                smoothfocusCB.addItemListener(this);
664
+            }
665
+
666
+//constraints.gridx += 1;
667
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668
+//                debugCB.addItemListener(this);
669
+
670
+        	constraints.gridy += 1;
671
+                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
672
+                                oeilCB.addItemListener(this);
673
+
674
+        	constraints.gridy += 1;
675
+                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
676
+                lookAtCB.setToolTipText("Look-at target");
677
+                                lookAtCB.addItemListener(this);
678
+
679
+        }
672
680
 	
673
681
         void EditObject(Object3D obj)
674
682
         {
 ObjEditor.java
..
..
@@ -1292,6 +1292,9 @@
1292
1292
         optionsPanel = new JPanel(new GridBagLayout());
1293
1293
 
1294
1294
         optionsPanel.setName("Options");
1295
+        
1296
+        AddOptions(optionsPanel, aConstraints);
1297
+        
1295
1298
         scenePanel.add(optionsPanel);
1296
1299
 
1297
1300
 
..
..
@@ -1393,6 +1396,10 @@
1393
1396
         });
1394
1397
     }
1395
1398
 
1399
+    void AddOptions(JPanel panel, GridBagConstraints constraints)
1400
+    {
1401
+    }
1402
+    
1396
1403
     JTree GetTree()
1397
1404
     {
1398
1405
         return objEditor.jTree;