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.
---
ObjEditor.java | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 6877515..f7c8293 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -28,6 +28,8 @@
iSendInfo
//KeyListener
{
+ boolean timeline;
+ boolean wasFullScreen;
// SCRIPT
@@ -158,12 +160,16 @@
objEditor.ctrlPanel.remove(slowerButton);
objEditor.ctrlPanel.remove(fasterButton);
objEditor.ctrlPanel.remove(remarkButton);
+
+ Remove(normalpushField);
}
public ObjEditor GetEditor()
{
return objEditor; //.GetEditor();
}
+
+ // Sometimes myself, sometimes my callee's.
ObjEditor objEditor;
/*
@@ -238,7 +244,7 @@
//if (!isDisplayable())
//setUndecorated(true);
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
client = inClient;
copy = localCopy;
copy.editWindow = this;
@@ -292,11 +298,11 @@
//normalLensItem.addActionListener(this);
cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
revertCameraItem.addActionListener(this);
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
toggleFullScreenItem.addItemListener(this);
toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
- toggleTimelineItem.addItemListener(this);
cameraMenu.add("-");
cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
toggleTextureItem.addItemListener(this);
@@ -596,6 +602,22 @@
}
}
+ void ToggleFullScreen()
+ {
+ if (CameraPane.FULLSCREEN)
+ {
+ frame.getContentPane().remove(/*"Center",*/bigThree);
+ framePanel.add(bigThree);
+ frame.getContentPane().add(/*"Center",*/framePanel);
+ } else
+ {
+ frame.getContentPane().remove(/*"Center",*/framePanel);
+ framePanel.remove(bigThree);
+ frame.getContentPane().add(/*"Center",*/bigThree);
+ }
+ cameraView.ToggleFullScreen();
+ }
+
private JTextArea createTextPane()
{
String[] initString =
@@ -796,7 +818,7 @@
aConstraints.fill = GridBagConstraints.VERTICAL;
jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
- aConstraints.gridwidth = 2;
+ aConstraints.gridwidth = 1;
ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
aConstraints.gridx += 1;
aConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -965,6 +987,9 @@
Return();
+ normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
+ Return();
+
// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
// ObjEditor.aConstraints.gridx += 1;
@@ -1428,7 +1453,7 @@
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
//aConstraints.weightx = 0;
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1438,7 +1463,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1448,7 +1473,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1458,7 +1483,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1468,7 +1493,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1537,7 +1562,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1606,7 +1631,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1677,7 +1702,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -2966,37 +2991,34 @@
return;
} else if (event.getSource() == toggleTimelineItem)
{
- copy.timeline ^= true;
+ timeline ^= true;
- if (copy.timeline)
+ if (timeline)
{
centralPanel.remove(cameraView);
centralPanel.add(timelinePanel);
frame.setJMenuBar(timelineMenubar);
+ wasFullScreen = CameraPane.FULLSCREEN;
+ if (!CameraPane.FULLSCREEN)
+ ToggleFullScreen();
+ toggleFullScreenItem.setEnabled(false);
}
else
{
centralPanel.remove(timelinePanel);
centralPanel.add(cameraView);
frame.setJMenuBar(null);
+ if (!wasFullScreen)
+ ToggleFullScreen();
+ toggleFullScreenItem.setEnabled(true);
}
frame.validate();
return;
} else if (event.getSource() == toggleFullScreenItem)
{
- if (CameraPane.FULLSCREEN)
- {
- frame.getContentPane().remove(/*"Center",*/bigThree);
- framePanel.add(bigThree);
- frame.getContentPane().add(/*"Center",*/framePanel);
- } else
- {
- frame.getContentPane().remove(/*"Center",*/framePanel);
- frame.getContentPane().add(/*"Center",*/bigThree);
- }
+ ToggleFullScreen();
frame.validate();
- cameraView.ToggleFullScreen();
return;
} else if (event.getSource() == toggleRandomItem)
@@ -3534,7 +3556,13 @@
//System.out.println("PARENT = " + parent);
//if (parent != null)
// parent.applySelf();
- refreshContents();
+ if (e.getSource() == normalpushField)
+ {
+ objEditor.refreshContents();
+ //Refresh();
+ }
+ else
+ refreshContents();
// ??? client.refreshEditWindow();
}
//else
@@ -3546,7 +3574,7 @@
//group.name = nameField.getText();
//objEditor.applySelf();
- assert (objEditor == this);
+ // OCT2018: assert (objEditor == this);
if (copy.selection == null || copy.selection.size() == 0)
//super.applySelf()
; else
@@ -3570,12 +3598,18 @@
objEditor.copy = keep;
}
}
+
+ if (normalpushField != null)
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
}
void SnapObject()
{
- Object3D obj = (Object3D)copy.selection.elementAt(0);
- SnapObject(obj);
+ if (copy.selection.size() > 0)
+ {
+ Object3D obj = (Object3D)copy.selection.elementAt(0);
+ SnapObject(obj);
+ }
}
void SnapObject(Object3D obj)
@@ -4611,4 +4645,6 @@
NumberSlider opacityPowerField;
JTree jTree;
//ObjectUI parent;
+
+ NumberSlider normalpushField;
}
--
Gitblit v1.6.2