From 6ed65dcb597fb2153cef75bf1845978f1115658c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Fri, 14 Dec 2018 22:53:55 -0500
Subject: [PATCH] Repair shadow, normal push + attractor mesh.
---
cSpringEditor.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cSpringEditor.java b/cSpringEditor.java
index 50018df..d94eeeb 100644
--- a/cSpringEditor.java
+++ b/cSpringEditor.java
@@ -133,7 +133,7 @@
// ObjEditor.aConstraints.gridwidth = 1;
// //ObjEditor.aConstraints.fill = 0;
// ObjEditor.aConstraints.gridx -= 1;
- normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpusH+1), 1);
+ normalField = AddSlider(oe.ctrlPanel, "Normal:", 0, 20.0, Math.log(spring.normalpush+1), 1);
Return();
/**/
@@ -472,7 +472,11 @@
spring.W.AddForce(spring.new Avoider(GetEditor().copy.selection.get(0)));
}
-// else
+ else
+ {
+ if (spring.W instanceof cSpring.ActingForces)
+ ((cSpring.ActingForces)spring.W).forces.clear();
+ }
/*
if (spring.Phys == null) // || spring.IsAutoFreeze())
spring.InitPhysics();
@@ -564,7 +568,7 @@
spring.K = k;
spring.M = m;
spring.G.acceleration = g;
- spring.normalpusH = d; // * Math.sqrt(m/k);
+ spring.normalpush = d; // * Math.sqrt(m/k);
spring.limit = L;
spring.restlengthFactor = t;
spring.W.wind = v;
--
Gitblit v1.6.2