.. | .. |
---|
4 | 4 | import javax.swing.*; |
---|
5 | 5 | import javax.swing.event.*; |
---|
6 | 6 | |
---|
| 7 | +import grafeme.ui.*; |
---|
| 8 | + |
---|
7 | 9 | class cSpringEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener |
---|
8 | 10 | { |
---|
9 | 11 | |
---|
.. | .. |
---|
133 | 135 | // ObjEditor.aConstraints.gridwidth = 1; |
---|
134 | 136 | // //ObjEditor.aConstraints.fill = 0; |
---|
135 | 137 | // ObjEditor.aConstraints.gridx -= 1; |
---|
136 | | - normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpusH+1), 1); |
---|
| 138 | + normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpush+1), 1); |
---|
137 | 139 | Return(); |
---|
138 | 140 | |
---|
139 | 141 | /**/ |
---|
.. | .. |
---|
472 | 474 | |
---|
473 | 475 | spring.W.AddForce(spring.new Avoider(GetEditor().copy.selection.get(0))); |
---|
474 | 476 | } |
---|
475 | | -// else |
---|
| 477 | + else |
---|
| 478 | + { |
---|
| 479 | + if (spring.W instanceof cSpring.ActingForces) |
---|
| 480 | + ((cSpring.ActingForces)spring.W).forces.clear(); |
---|
| 481 | + } |
---|
476 | 482 | /* |
---|
477 | 483 | if (spring.Phys == null) // || spring.IsAutoFreeze()) |
---|
478 | 484 | spring.InitPhysics(); |
---|
.. | .. |
---|
564 | 570 | spring.K = k; |
---|
565 | 571 | spring.M = m; |
---|
566 | 572 | spring.G.acceleration = g; |
---|
567 | | - spring.normalpusH = d; // * Math.sqrt(m/k); |
---|
| 573 | + spring.normalpush = d; // * Math.sqrt(m/k); |
---|
568 | 574 | spring.limit = L; |
---|
569 | 575 | spring.restlengthFactor = t; |
---|
570 | 576 | spring.W.wind = v; |
---|
.. | .. |
---|
744 | 750 | JLabel liftLabel; |
---|
745 | 751 | JLabel solidityLabel; |
---|
746 | 752 | |
---|
747 | | - NumberSlider stiffnessField; |
---|
748 | | - NumberSlider massField; |
---|
749 | | - NumberSlider gravityField; |
---|
750 | | - NumberSlider normalField; |
---|
751 | | - NumberSlider mgravityField; |
---|
752 | | - NumberSlider fluidspeedField; |
---|
753 | | - NumberSlider viscosityField; |
---|
754 | | - NumberSlider floorField; |
---|
755 | | - NumberSlider limitField; |
---|
756 | | - NumberSlider restlengthField; |
---|
757 | | - NumberSlider distortionField; |
---|
758 | | - NumberSlider frictionField; |
---|
759 | | - NumberSlider timestepField; |
---|
760 | | - NumberSlider poseslownessField; |
---|
761 | | - NumberSlider dampingField; |
---|
762 | | - NumberSlider liftField; |
---|
763 | | - NumberSlider solidityField; |
---|
| 753 | + cNumberSlider stiffnessField; |
---|
| 754 | + cNumberSlider massField; |
---|
| 755 | + cNumberSlider gravityField; |
---|
| 756 | + cNumberSlider normalField; |
---|
| 757 | + cNumberSlider mgravityField; |
---|
| 758 | + cNumberSlider fluidspeedField; |
---|
| 759 | + cNumberSlider viscosityField; |
---|
| 760 | + cNumberSlider floorField; |
---|
| 761 | + cNumberSlider limitField; |
---|
| 762 | + cNumberSlider restlengthField; |
---|
| 763 | + cNumberSlider distortionField; |
---|
| 764 | + cNumberSlider frictionField; |
---|
| 765 | + cNumberSlider timestepField; |
---|
| 766 | + cNumberSlider poseslownessField; |
---|
| 767 | + cNumberSlider dampingField; |
---|
| 768 | + cNumberSlider liftField; |
---|
| 769 | + cNumberSlider solidityField; |
---|
764 | 770 | |
---|
765 | | - NumberSlider poseField; |
---|
| 771 | + cNumberSlider poseField; |
---|
766 | 772 | |
---|
767 | 773 | // JCheckBox animate; |
---|
768 | 774 | JCheckBox thick; |
---|