Normand Briere
2018-12-15 6ed65dcb597fb2153cef75bf1845978f1115658c
cSpringEditor.java
....@@ -133,7 +133,7 @@
133133 // ObjEditor.aConstraints.gridwidth = 1;
134134 // //ObjEditor.aConstraints.fill = 0;
135135 // ObjEditor.aConstraints.gridx -= 1;
136
- normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpusH+1), 1);
136
+ normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpush+1), 1);
137137 Return();
138138
139139 /**/
....@@ -472,7 +472,11 @@
472472
473473 spring.W.AddForce(spring.new Avoider(GetEditor().copy.selection.get(0)));
474474 }
475
-// else
475
+ else
476
+ {
477
+ if (spring.W instanceof cSpring.ActingForces)
478
+ ((cSpring.ActingForces)spring.W).forces.clear();
479
+ }
476480 /*
477481 if (spring.Phys == null) // || spring.IsAutoFreeze())
478482 spring.InitPhysics();
....@@ -564,7 +568,7 @@
564568 spring.K = k;
565569 spring.M = m;
566570 spring.G.acceleration = g;
567
- spring.normalpusH = d; // * Math.sqrt(m/k);
571
+ spring.normalpush = d; // * Math.sqrt(m/k);
568572 spring.limit = L;
569573 spring.restlengthFactor = t;
570574 spring.W.wind = v;