Normand Briere
2019-04-29 8c837a9e50c29e66bdf5bd7ea2fd15b1a7d5d598
cSpringEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66
7
+import grafeme.ui.*;
8
+
79 class cSpringEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
810 {
911
....@@ -133,7 +135,7 @@
133135 // ObjEditor.aConstraints.gridwidth = 1;
134136 // //ObjEditor.aConstraints.fill = 0;
135137 // 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);
137139 Return();
138140
139141 /**/
....@@ -472,7 +474,11 @@
472474
473475 spring.W.AddForce(spring.new Avoider(GetEditor().copy.selection.get(0)));
474476 }
475
-// else
477
+ else
478
+ {
479
+ if (spring.W instanceof cSpring.ActingForces)
480
+ ((cSpring.ActingForces)spring.W).forces.clear();
481
+ }
476482 /*
477483 if (spring.Phys == null) // || spring.IsAutoFreeze())
478484 spring.InitPhysics();
....@@ -564,7 +570,7 @@
564570 spring.K = k;
565571 spring.M = m;
566572 spring.G.acceleration = g;
567
- spring.normalpusH = d; // * Math.sqrt(m/k);
573
+ spring.normalpush = d; // * Math.sqrt(m/k);
568574 spring.limit = L;
569575 spring.restlengthFactor = t;
570576 spring.W.wind = v;
....@@ -744,25 +750,25 @@
744750 JLabel liftLabel;
745751 JLabel solidityLabel;
746752
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;
764770
765
- NumberSlider poseField;
771
+ cNumberSlider poseField;
766772
767773 // JCheckBox animate;
768774 JCheckBox thick;