From e8908d5b90d44e43b9da885bc0202fb665a912d0 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 30 Sep 2019 20:00:22 -0400
Subject: [PATCH] klein
---
PhysicsEditor.java | 106 +++++++++++++++++++++++-----------------------------
1 files changed, 47 insertions(+), 59 deletions(-)
diff --git a/PhysicsEditor.java b/PhysicsEditor.java
index 223d83b..b5cfbe7 100644
--- a/PhysicsEditor.java
+++ b/PhysicsEditor.java
@@ -1,16 +1,10 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-/**
- *
- * @author nbriere
- */
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
+
+import grafeme.ui.*;
class PhysicsEditor extends ObjEditor implements //ItemListener,
ChangeListener, ObjectUI, ActionListener
@@ -76,52 +70,35 @@
*/
super.SetupUI2(oe);
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridwidth = 1;
+ gravityPanel = AddSlider(oe.ctrlPanel, "Gravity:", 0, 10.0, physicsnode.gravity, 1);
+ gravityField = (cNumberSlider)gravityPanel.getComponent(1);
- oe.aConstraints.fill = GridBagConstraints.VERTICAL;
- oe.ctrlPanel.add(gravityLabel = new JLabel("Gravity: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(gravityField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.add(gravityLabel = new JLabel("Gravity: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.Return();
+// oe.ctrlPanel.add(gravityField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- gravityField.setFloat(physicsnode.gravity);
+ oe.ctrlPanel.Return();
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = 1;
-
- oe.aConstraints.fill = GridBagConstraints.VERTICAL;
- oe.ctrlPanel.add(windLabel = new JLabel("Wind: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(windField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ windPanel = AddSlider(oe.ctrlPanel, "Wind:", 0, 10.0, physicsnode.wind, 1);
+ windField = (cNumberSlider)windPanel.getComponent(1);
- windField.setFloat(physicsnode.wind);
+// oe.ctrlPanel.add(windLabel = new JLabel("Wind: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.Return();
+// oe.ctrlPanel.add(windField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = 1;
-
- oe.aConstraints.fill = GridBagConstraints.VERTICAL;
- oe.ctrlPanel.add(floorLabel = new JLabel("Floor: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(floorField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ oe.ctrlPanel.Return();
- floorField.setFloat(physicsnode.floor);
- oe.aConstraints.gridy += 1;
-
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx -= 1;
- oe.aConstraints.fill = GridBagConstraints.VERTICAL;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
-
+ floorPanel = AddSlider(oe.ctrlPanel, "Floor:", 0, 20.0, physicsnode.floor, 1);
+ floorField = (cNumberSlider)floorPanel.getComponent(1);
+
+// oe.ctrlPanel.add(floorLabel = new JLabel("Floor: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.Return();
+// oe.ctrlPanel.add(floorField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+
+ oe.ctrlPanel.Return();
+
gravityField.addChangeListener(this);
+ windField.addChangeListener(this);
floorField.addChangeListener(this);
}
@@ -173,6 +150,7 @@
{
//System.out.println("Biparam :: stateChanged");
if (e.getSource() == gravityField ||
+ e.getSource() == windField ||
e.getSource() == floorField)
{
//System.out.println("#U = " + biparam.uDivs);
@@ -225,6 +203,7 @@
physicsnode.floor = (float)floorField.getFloat(); // biparam.minUDivs, 99);
//biparam.name = nameField.getText();
+ physicsnode.transientDynamicsWorld.setGravity(new javax.vecmath.Vector3f(0, -physicsnode.gravity, physicsnode.wind));
// june 2013 super.applySelf();
}
/**/
@@ -234,14 +213,19 @@
ObjEditor oe = objEditor;
gravityField.removeChangeListener(this);
+ windField.removeChangeListener(this);
floorField.removeChangeListener(this);
- oe.ctrlPanel.remove(gravityField);
- oe.ctrlPanel.remove(gravityLabel);
- oe.ctrlPanel.remove(windField);
- oe.ctrlPanel.remove(windLabel);
- oe.ctrlPanel.remove(floorField);
- oe.ctrlPanel.remove(floorLabel);
+ oe.ctrlPanel.remove(gravityPanel);
+ oe.ctrlPanel.remove(windPanel);
+ oe.ctrlPanel.remove(floorPanel);
+
+ //oe.ctrlPanel.remove(gravityField);
+ //oe.ctrlPanel.remove(gravityLabel);
+ //oe.ctrlPanel.remove(windField);
+ //oe.ctrlPanel.remove(windLabel);
+ //oe.ctrlPanel.remove(floorField);
+ //oe.ctrlPanel.remove(floorLabel);
//oe.ctrlPanel.repaint();
super.closeUI();
@@ -259,12 +243,16 @@
PhysicsNode physicsnode;
- JLabel gravityLabel;
- NumberSlider gravityField;
- JLabel windLabel;
- NumberSlider windField;
- JLabel floorLabel;
- NumberSlider floorField;
+ cGridBag gravityPanel;
+ cGridBag windPanel;
+ cGridBag floorPanel;
+
+ //JLabel gravityLabel;
+ cNumberSlider gravityField;
+ //JLabel windLabel;
+ cNumberSlider windField;
+ //JLabel floorLabel;
+ cNumberSlider floorField;
ObjectUI parent;
--
Gitblit v1.6.2