From 6c2c00ee7f33ec46f79eba11c349f766cb207ec0 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 29 Apr 2019 10:39:23 -0400
Subject: [PATCH] Material pane
---
cSpringEditor.java | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/cSpringEditor.java b/cSpringEditor.java
index 50018df..788ebea 100644
--- a/cSpringEditor.java
+++ b/cSpringEditor.java
@@ -4,6 +4,8 @@
import javax.swing.*;
import javax.swing.event.*;
+import grafeme.ui.*;
+
class cSpringEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
{
@@ -133,7 +135,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 +474,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 +570,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;
@@ -744,25 +750,25 @@
JLabel liftLabel;
JLabel solidityLabel;
- NumberSlider stiffnessField;
- NumberSlider massField;
- NumberSlider gravityField;
- NumberSlider normalField;
- NumberSlider mgravityField;
- NumberSlider fluidspeedField;
- NumberSlider viscosityField;
- NumberSlider floorField;
- NumberSlider limitField;
- NumberSlider restlengthField;
- NumberSlider distortionField;
- NumberSlider frictionField;
- NumberSlider timestepField;
- NumberSlider poseslownessField;
- NumberSlider dampingField;
- NumberSlider liftField;
- NumberSlider solidityField;
+ cNumberSlider stiffnessField;
+ cNumberSlider massField;
+ cNumberSlider gravityField;
+ cNumberSlider normalField;
+ cNumberSlider mgravityField;
+ cNumberSlider fluidspeedField;
+ cNumberSlider viscosityField;
+ cNumberSlider floorField;
+ cNumberSlider limitField;
+ cNumberSlider restlengthField;
+ cNumberSlider distortionField;
+ cNumberSlider frictionField;
+ cNumberSlider timestepField;
+ cNumberSlider poseslownessField;
+ cNumberSlider dampingField;
+ cNumberSlider liftField;
+ cNumberSlider solidityField;
- NumberSlider poseField;
+ cNumberSlider poseField;
// JCheckBox animate;
JCheckBox thick;
--
Gitblit v1.6.2